From 341f4d10365d8963aa83f5d2ec3612490dba0804 Mon Sep 17 00:00:00 2001
From: Shilpa Rani <shilpa@Shilpas-MacBook-Pro.local>
Date: Sun, 1 Nov 2020 20:55:14 -0600
Subject: [PATCH 001/599] Fixing the flakiness caused by
 testGetProteinSequenceForStructure

---
 .../org/biojava/nbio/structure/io/StructureSequenceMatcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
index 3c884bbc2d..e3c70452a7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
@@ -119,7 +119,7 @@ public static ProteinSequence getProteinSequenceForStructure(Structure struct, M
 
 		for(Chain chain : struct.getChains()) {
 			List<Group> groups = chain.getAtomGroups();
-			Map<Integer,Integer> chainIndexPosition = new HashMap<Integer, Integer>();
+			Map<Integer,Integer> chainIndexPosition = new LinkedHashMap<Integer, Integer>();
 			int prevLen = seqStr.length();
 
 			// get the sequence for this chain

From 9b2335e97da0789bd69ba3ea66022f838dda3fda Mon Sep 17 00:00:00 2001
From: Vidishab18 <71988063+Vidishab18@users.noreply.github.com>
Date: Fri, 13 Nov 2020 17:44:18 -0800
Subject: [PATCH 002/599] Update StructureSequenceMatcher.java

---
 .../org/biojava/nbio/structure/io/StructureSequenceMatcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
index e3c70452a7..3c884bbc2d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
@@ -119,7 +119,7 @@ public static ProteinSequence getProteinSequenceForStructure(Structure struct, M
 
 		for(Chain chain : struct.getChains()) {
 			List<Group> groups = chain.getAtomGroups();
-			Map<Integer,Integer> chainIndexPosition = new LinkedHashMap<Integer, Integer>();
+			Map<Integer,Integer> chainIndexPosition = new HashMap<Integer, Integer>();
 			int prevLen = seqStr.length();
 
 			// get the sequence for this chain

From 43f8dcdd80aab451c0b9ad86f8079aa9d3ee9646 Mon Sep 17 00:00:00 2001
From: Vidishab18 <71988063+Vidishab18@users.noreply.github.com>
Date: Fri, 13 Nov 2020 17:45:12 -0800
Subject: [PATCH 003/599] Update MmtfStructureReader.java

---
 .../biojava/nbio/structure/io/mmtf/MmtfStructureReader.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
index 09d8ca58a8..fbdf9d3869 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
@@ -27,6 +27,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -105,7 +106,7 @@ public class MmtfStructureReader implements StructureAdapterInterface, Serializa
 	private List<Chain> chainList;
 
 	/** All the chains as a list of maps */
-	private List<Map<String,Chain>> chainMap;
+	private List<LinkedHashMap<String,Chain>> chainMap;
 
 	private List<double[]> transformList;
 
@@ -178,7 +179,7 @@ public void setModelInfo(int inputModelNumber,
 			int chainCount) {
 		modelNumber = inputModelNumber;
 		structure.addModel(new ArrayList<Chain>(chainCount));
-		chainMap.add(new HashMap<>());
+		chainMap.add(new LinkedHashMap<>());
 	}
 
 	/* (non-Javadoc)

From 2cbb6c6813ef959dd4dc747478570cf2511da190 Mon Sep 17 00:00:00 2001
From: Vidishab18 <71988063+Vidishab18@users.noreply.github.com>
Date: Fri, 13 Nov 2020 17:48:55 -0800
Subject: [PATCH 004/599] Update MmtfStructureReader.java

---
 .../org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
index fbdf9d3869..6385b92391 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
@@ -106,7 +106,7 @@ public class MmtfStructureReader implements StructureAdapterInterface, Serializa
 	private List<Chain> chainList;
 
 	/** All the chains as a list of maps */
-	private List<LinkedHashMap<String,Chain>> chainMap;
+	private List<Map<String,Chain>> chainMap;
 
 	private List<double[]> transformList;
 

From e3bad37bd4bc39bdec3c70d1d76bc98acbec46bb Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Wed, 18 Nov 2020 15:10:30 -0800
Subject: [PATCH 005/599] detach mmcif.model.DatabasePdbrevRecord

- replaced by DatabasePdbRevRecord
---
 .../nbio/structure/DatabasePdbRevRecord.java  | 43 +++++++++++++++++++
 .../org/biojava/nbio/structure/PDBHeader.java |  7 ++-
 .../structure/io/cif/CifFileConsumerImpl.java | 22 +++++-----
 3 files changed, 56 insertions(+), 16 deletions(-)
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePdbRevRecord.java

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePdbRevRecord.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePdbRevRecord.java
new file mode 100644
index 0000000000..91ec85549f
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePdbRevRecord.java
@@ -0,0 +1,43 @@
+package org.biojava.nbio.structure;
+
+import java.io.Serializable;
+
+public class DatabasePdbRevRecord implements Serializable {
+    private static final long serialVersionUID = -791924804009516791L;
+    private String rev_num;
+    private String type;
+    private String details;
+
+    public String getRev_num() {
+        return rev_num;
+    }
+
+    public void setRev_num(String rev_num) {
+        this.rev_num = rev_num;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getDetails() {
+        return details;
+    }
+
+    public void setDetails(String details) {
+        this.details = details;
+    }
+
+    @Override
+    public String toString() {
+        return "DatabasePdbrevRecord{" +
+                "rev_num='" + rev_num + '\'' +
+                ", type='" + type + '\'' +
+                ", details='" + details + '\'' +
+                '}';
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
index dbcc0f794c..1071c52c23 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
@@ -20,7 +20,6 @@
  */
 package org.biojava.nbio.structure;
 
-import org.biojava.nbio.structure.io.mmcif.model.DatabasePdbrevRecord;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -77,7 +76,7 @@ public class PDBHeader implements PDBRecord {
 
 	private Map<Integer,BioAssemblyInfo> bioAssemblies ;
 
-	List<DatabasePdbrevRecord> revisionRecords;
+	List<DatabasePdbRevRecord> revisionRecords;
 
 	public PDBHeader(){
 
@@ -663,11 +662,11 @@ public int getNrBioAssemblies() {
 		return this.bioAssemblies.size();
 	}
 
-	public List<DatabasePdbrevRecord> getRevisionRecords() {
+	public List<DatabasePdbRevRecord> getRevisionRecords() {
 		return revisionRecords;
 	}
 
-	public void setRevisionRecords(List<DatabasePdbrevRecord> revisionRecords) {
+	public void setRevisionRecords(List<DatabasePdbRevRecord> revisionRecords) {
 		this.revisionRecords = revisionRecords;
 	}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumerImpl.java
index 7a8fae1e5d..a3af75fc91 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumerImpl.java
@@ -7,6 +7,7 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.ChainImpl;
 import org.biojava.nbio.structure.DBRef;
+import org.biojava.nbio.structure.DatabasePdbRevRecord;
 import org.biojava.nbio.structure.Element;
 import org.biojava.nbio.structure.EntityInfo;
 import org.biojava.nbio.structure.EntityType;
@@ -30,7 +31,6 @@
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.SeqRes2AtomAligner;
 import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.model.DatabasePdbrevRecord;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyBuilder;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyTransformation;
@@ -97,8 +97,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-// TODO detach the impl from the redundant mmCIF impl
-
 /**
  * An implementation of a CifFileConsumer for BioJava. Will process the information provided by a CifFile instance and
  * use it to build up a {@link Structure} object. The implementation is for the most part really close to that in
@@ -144,7 +142,7 @@ class CifFileConsumerImpl implements CifFileConsumer<Structure> {
     private Map<String, String> asymId2authorId;
     private Matrix4d parsedScaleMatrix;
 
-    private FileParsingParameters params;
+    private final FileParsingParameters params;
 
     public CifFileConsumerImpl(FileParsingParameters params) {
         this.params = params;
@@ -624,7 +622,7 @@ public void consumeDatabasePDBrev(DatabasePDBRev databasePDBrev) {
 
     @Override
     public void consumeDatabasePDBrevRecord(DatabasePDBRevRecord databasePDBrevRecord) {
-        List<DatabasePdbrevRecord> revRecords = pdbHeader.getRevisionRecords();
+        List<DatabasePdbRevRecord> revRecords = pdbHeader.getRevisionRecords();
         if (revRecords == null) {
             revRecords = new ArrayList<>();
             pdbHeader.setRevisionRecords(revRecords);
@@ -633,10 +631,10 @@ public void consumeDatabasePDBrevRecord(DatabasePDBRevRecord databasePDBrevRecor
         revRecords.addAll(convert(databasePDBrevRecord));
     }
 
-    private List<DatabasePdbrevRecord> convert(DatabasePDBRevRecord databasePDBrevRecord) {
-        List<DatabasePdbrevRecord> revRecords = new ArrayList<>();
+    private List<DatabasePdbRevRecord> convert(DatabasePDBRevRecord databasePDBrevRecord) {
+        List<DatabasePdbRevRecord> revRecords = new ArrayList<>();
         for (int rowIndex = 0; rowIndex < databasePDBrevRecord.getRowCount(); rowIndex++) {
-            DatabasePdbrevRecord revRecord = new DatabasePdbrevRecord();
+            DatabasePdbRevRecord revRecord = new DatabasePdbRevRecord();
             revRecord.setDetails(databasePDBrevRecord.getDetails().get(rowIndex));
             revRecord.setRev_num(databasePDBrevRecord.getRevNum().getStringData(rowIndex));
             revRecord.setType(databasePDBrevRecord.getType().get(rowIndex));
@@ -1297,14 +1295,14 @@ private void addEntity(int asymRowIndex, String entityId, String pdbxDescription
         } catch (NumberFormatException e) {
             logger.warn("Could not parse mol_id from string {}. Will use 0 for creating Entity", entityId);
         }
-        
+
         int entityRowIndex = IntStream.range(0, entity.getRowCount())
                 .filter(i -> entity.getId().get(i).equals(entityId))
                 .findFirst()
                 .orElse(-1);
-        
+
         EntityInfo entityInfo = structure.getEntityById(eId);
-        
+
         if (entityInfo == null) {
             entityInfo = new EntityInfo();
             entityInfo.setMolId(eId);
@@ -1320,7 +1318,7 @@ private void addEntity(int asymRowIndex, String entityId, String pdbxDescription
                 }
                 addAncilliaryEntityData(asymRowIndex, entityInfo);
                 structure.addEntityInfo(entityInfo);
-                logger.debug("Adding Entity with entity id {} from _entity, with name: {}", eId, 
+                logger.debug("Adding Entity with entity id {} from _entity, with name: {}", eId,
                         entityInfo.getDescription());
             }
         }

From b4ecf191199c91e2fe2f2ec7c25144de30dbfdc7 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Sun, 1 Nov 2020 13:35:04 -0800
Subject: [PATCH 006/599] WIP: start of pdbstatus rewrite

---
 .../org/biojava/nbio/structure/PDBStatus.java | 240 +++++++-----------
 1 file changed, 85 insertions(+), 155 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
index dfb95eab8e..1fc54f9410 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
@@ -23,6 +23,8 @@
  */
 package org.biojava.nbio.structure;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 import org.biojava.nbio.structure.align.util.URLConnectionTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,19 +45,22 @@
  * Methods for getting the status of a PDB file (current, obsolete, etc)
  * and for accessing different versions of the structure.
  *
- * <p>All methods query the
- * <a href="http://www.rcsb.org/pdb/rest/idStatus?structureId=1HHB,3HHB,4HHB">
- * PDB website.</a>
+ * <p>
+ * All methods query the
+ * <a href="https://data.rcsb.org">
+ * RCSB Data REST API</a>
  *
- * <p>PDB supersessions form a directed acyclic graph, where edges point from an
+ * <p>
+ * PDB supersessions form a directed acyclic graph, where edges point from an
  * obsolete ID to the entry that directly superseded it. For example, here are
- * edges from one portion of the graph:<br/>
- *
+ * edges from one portion of the graph:
+ * <p>
  * 1CAT -> 3CAT<br/>
  * 3CAT -> 7CAT<br/>
  * 3CAT -> 8CAT<br/>
  *
- * <p>The methods {@link #getReplaces(String, boolean) getReplaces(pdbId, false)}/
+ * <p>
+ * The methods {@link #getReplaces(String, boolean) getReplaces(pdbId, false)}/
  * {@link #getReplacement(String, boolean, boolean) getReplacement(pdbId, false, true)}
  * just get the incoming/outgoing edges for a single node. The recursive versions
  * ({@link #getReplaces(String, boolean) getReplaces(pdbId, true)},
@@ -63,39 +68,46 @@
  * will do a depth-first search up/down the tree and return a list of all nodes ]
  * reached.
  *
- * <p>Finally, the getCurrent() method returns a single PDB ID from among the
+ * <p>
+ * Finally, the {@link #getCurrent(String)} method returns a single PDB ID from among the
  * results of
- * {@link #getReplacement(String, boolean) getReplacement(pdbId, true)}.
+ * {@link #getReplacement(String, boolean, boolean)}.
  * To be consistent with the old REST ordering, this is the PDB ID that occurs
  * last alphabetically.
  *
- * <p>Results are cached to reduce server load.
+ * <p>
+ * Results are cached to reduce server load.
  *
- * @author Spencer Bliven <sbliven@ucsd.edu>
+ * @author Spencer Bliven
  * @author Amr AL-Hossary
+ * @author Jose Duarte
  * @since 3.0.2
  */
 public class PDBStatus {
 
 	private static final Logger logger = LoggerFactory.getLogger(PDBStatus.class);
 
-	public static final String DEFAULT_PDB_SERVER = "www.rcsb.org";
-	public static final String PDB_SERVER_PROPERTY = "PDB.SERVER";
+	//public static final String DEFAULT_PDB_SERVER = "www.rcsb.org";
+	public static final String DEFAULT_RCSB_DATA_API_SERVER = "data.rcsb.org";
+	public static final String ALL_CURRENT_ENDPOINT = "https://%s/rest/v1/holdings/current/entry_ids";
 
 	/**
 	 * saves the returned results for further use.
 	 *
 	 */
-	//TODO Use SoftReferences to allow garbage collection
-	private static Map<String, Map<String, String>> recordsCache= new Hashtable<String, Map<String, String>>();
+	private static final Map<String, Map<String, String>> recordsCache= new Hashtable<>();
 
 	/**
 	 * Represents the status of PDB IDs. 'OBSOLETE' and 'CURRENT' are the most
 	 * common.
-	 * @author Spencer Bliven <sbliven@ucsd.edu>
+	 * @author Spencer Bliven
 	 *
 	 */
 	public enum Status {
+		// this is the list for unreleased: "AUCO" "AUTH" "HOLD" "HPUB" "POLC" "PROC" "REFI" "REPL" "WAIT" "WDRN"
+		// The remaining from below are removed-related: OBSOLETE, MODEL (not available in Data API).
+		// In Data API in rcsb_repository_holdings_insilico_models.status_code: 3 values "OBS", "TRSF", "WDRN" and 1 in  rcsb_repository_holdings_transferred.status_code: "TRSF"
+		// for current: CURRENT (not available in current API)
 		OBSOLETE,
 		CURRENT,
 		AUTH,
@@ -110,11 +122,7 @@ public enum Status {
 		MODEL,
 		UNKNOWN;
 
-
 		/**
-		 *
-		 * @param statusStr
-		 * @return
 		 * @throws IllegalArgumentException If the string is not recognized
 		 */
 		public static Status fromString(String statusStr) {
@@ -159,7 +167,7 @@ else if(statusStrUpper.equalsIgnoreCase("UNKNOWN"))
 	 * @param pdbId
 	 * @return The status, or null if an error occurred.
 	 */
-	public static Status getStatus(String pdbId) {
+	public static Status getStatus(String pdbId) throws IOException {
 		Status[] statuses = getStatus(new String[] {pdbId});
 		if(statuses != null) {
 			assert(statuses.length == 1);
@@ -176,7 +184,7 @@ public static Status getStatus(String pdbId) {
 	 * @param pdbIds
 	 * @return The status array, or null if an error occurred.
 	 */
-	public static Status[] getStatus(String[] pdbIds) {
+	public static Status[] getStatus(String[] pdbIds) throws IOException {
 		Status[] statuses = new Status[pdbIds.length];
 
 		List<Map<String,String>> attrList = getStatusIdRecords(pdbIds);
@@ -234,8 +242,8 @@ public static Status[] getStatus(String[] pdbIds) {
 	 * @param oldPdbId
 	 * @return The replacement for oldPdbId, or null if none are found or if an error occurred.
 	 */
-	public static String getCurrent(String oldPdbId) {
-		List<String> replacements =  getReplacement(oldPdbId,true, false);
+	public static String getCurrent(String oldPdbId) throws IOException {
+		List<String> replacements = getReplacement(oldPdbId,true, false);
 		if(replacements != null && !replacements.isEmpty())
 			return replacements.get(0);
 		else
@@ -260,7 +268,7 @@ public static String getCurrent(String oldPdbId) {
 	 * 		current records. A return value of null indicates that the ID has
 	 * 		been removed from the PDB or that an error has occurred.
 	 */
-	public static List<String> getReplacement(String oldPdbId, boolean recurse, boolean includeObsolete) {
+	public static List<String> getReplacement(String oldPdbId, boolean recurse, boolean includeObsolete) throws IOException {
 		List<Map<String,String>> attrList = getStatusIdRecords(new String[] {oldPdbId});
 		//Expect a single record
 		if(attrList == null || attrList.size() != 1) {
@@ -291,7 +299,7 @@ public static List<String> getReplacement(String oldPdbId, boolean recurse, bool
 		}
 
 		// If we're current, just return
-		LinkedList<String> results = new LinkedList<String>();
+		LinkedList<String> results = new LinkedList<>();
 		switch(status) {
 			case CURRENT:
 				results.add(oldPdbId);
@@ -459,7 +467,7 @@ private static void mergeReversed(List<String> merged,
 	 * @return A (possibly empty) list of ID(s) of the ancestor(s) of
 	 * 		newPdbId, or <tt>null</tt> if an error occurred.
 	 */
-	public static List<String> getReplaces(String newPdbId, boolean recurse) {
+	public static List<String> getReplaces(String newPdbId, boolean recurse) throws IOException {
 		List<Map<String,String>> attrList = getStatusIdRecords(new String[] {newPdbId});
 		//Expect a single record
 		if(attrList == null || attrList.size() != 1) {
@@ -516,34 +524,34 @@ public static void clearCache() {
 	/**
 	 * Fetches the status of one or more pdbIDs from the server.
 	 *
-	 * <p>Returns the results as a list of Attributes.
+	 * <p>
+	 * Returns the results as a list of Attributes.
 	 * Each attribute should contain "structureId" and "status" attributes, and
 	 * possibly more.
 	 *
-	 * <p>Example:</br>
+	 * <p>
+	 * Example:
+	 * <p>
 	 * <tt>http://www.rcsb.org/pdb/rest/idStatus?structureID=1HHB,4HHB</tt></br>
-	 *<pre>&lt;idStatus&gt;
-	 *  &lt;record structureId="1HHB" status="OBSOLETE" replacedBy="4HHB"/&gt;
-	 *  &lt;record structureId="4HHB" status="CURRENT" replaces="1HHB"/&gt;
-	 *&lt;/idStatus&gt;
+	 * <pre>
+	 * &lt;idStatus&gt;
+	 *   &lt;record structureId="1HHB" status="OBSOLETE" replacedBy="4HHB"/&gt;
+	 *   &lt;record structureId="4HHB" status="CURRENT" replaces="1HHB"/&gt;
+	 * &lt;/idStatus&gt;
 	 * </pre>
 	 *
-	 * <p>Results are not guaranteed to be returned in the same order as pdbIDs.
+	 * <p>
+	 * Results are not guaranteed to be returned in the same order as pdbIDs.
 	 * Refer to the structureId property to match them.
 	 *
-	 * @param pdbIDs
+	 * @param pdbIDs the PDB identifiers
 	 * @return A map between attributes and values
 	 */
-	private static List<Map<String, String>> getStatusIdRecords(String[] pdbIDs) {
-
-		List<Map<String,String>> result = new ArrayList<Map<String,String>>(pdbIDs.length);
+	private static List<Map<String, String>> getStatusIdRecords(String[] pdbIDs) throws IOException {
 
-		String serverName = System.getProperty(PDB_SERVER_PROPERTY);
+		List<Map<String,String>> result = new ArrayList<>(pdbIDs.length);
 
-		if ( serverName == null)
-			serverName = DEFAULT_PDB_SERVER;
-		else
-			logger.info(String.format("Got System property %s=%s",PDB_SERVER_PROPERTY,serverName));
+		String serverName = DEFAULT_RCSB_DATA_API_SERVER;
 
 		// Build REST query URL
 		if(pdbIDs.length < 1) {
@@ -566,143 +574,65 @@ private static List<Map<String, String>> getStatusIdRecords(String[] pdbIDs) {
 			return result;
 		}
 
-		try {
-			logger.info("Fetching {}", urlStr);
+		logger.info("Fetching {}", urlStr);
 
-			URL url = new URL(urlStr);
+		URL url = new URL(urlStr);
 
-			InputStream uStream = url.openStream();
+		InputStream uStream = url.openStream();
 
-			InputSource source = new InputSource(uStream);
-			SAXParserFactory parserFactory = SAXParserFactory.newInstance();
-			SAXParser parser = parserFactory.newSAXParser();
-			XMLReader reader = parser.getXMLReader();
+		InputSource source = new InputSource(uStream);
+		SAXParserFactory parserFactory = SAXParserFactory.newInstance();
+		SAXParser parser = parserFactory.newSAXParser();
+		XMLReader reader = parser.getXMLReader();
 
-			PDBStatusXMLHandler handler = new PDBStatusXMLHandler();
+		PDBStatusXMLHandler handler = new PDBStatusXMLHandler();
 
-			reader.setContentHandler(handler);
-			reader.parse(source);
+		reader.setContentHandler(handler);
+		reader.parse(source);
 
-			// Fetch results of SAX parsing
-			List<Map<String,String>> records = handler.getRecords();
+		// Fetch results of SAX parsing
+		List<Map<String, String>> records = handler.getRecords();
 
-			//add to cache
-			for(Map<String,String> record : records) {
-				String pdbId = record.get("structureId").toUpperCase();
-				if(pdbId != null) {
-					recordsCache.put(pdbId, record);
-				}
+		//add to cache
+		for (Map<String, String> record : records) {
+			String pdbId = record.get("structureId").toUpperCase();
+			if (pdbId != null) {
+				recordsCache.put(pdbId, record);
 			}
-
-			// return results
-			result.addAll(handler.getRecords());
-
-			// TODO should throw these forward and let the caller log
-		} catch (IOException e){
-			logger.error("Problem getting status for {} from PDB server. Error: {}", Arrays.toString(pdbIDs), e.getMessage());
-			return null;
-		} catch (SAXException e) {
-			logger.error("Problem getting status for {} from PDB server. Error: {}", Arrays.toString(pdbIDs), e.getMessage());
-			return null;
-		} catch (ParserConfigurationException e) {
-			logger.error("Problem getting status for {} from PDB server. Error: {}", Arrays.toString(pdbIDs), e.getMessage());
-			return null;
 		}
 
+		// return results
+		result.addAll(handler.getRecords());
+
 		return result;
 	}
 
 	/**
-	 * Handles idStatus xml by storing attributes for all record elements.
-	 *
-	 * @author Spencer Bliven <sbliven@ucsd.edu>
-	 *
-	 */
-	private static class PDBStatusXMLHandler extends DefaultHandler {
-		private List<Map<String,String>> records;
-
-		public PDBStatusXMLHandler() {
-			records = new ArrayList<Map<String,String>>();
-		}
-
-		/**
-		 * @param uri
-		 * @param localName
-		 * @param qName
-		 * @param attributes
-		 * @throws SAXException
-		 * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
-		 */
-		@Override
-		public void startElement(String uri, String localName, String qName,
-		                         Attributes attributes) throws SAXException {
-			//System.out.format("Starting element: uri='%s' localName='%s' qName='%s'\n", uri, localName, qName);
-			if(qName.equals("record")) {
-				//Convert attributes into a Map, as it should have been.
-				//Important since SAX reuses Attributes objects for different calls
-				Map<String,String> attrMap = new HashMap<String,String>(attributes.getLength()*2);
-				for(int i=0;i<attributes.getLength();i++) {
-					attrMap.put(attributes.getQName(i), attributes.getValue(i));
-				}
-				records.add(attrMap);
-			}
-		}
-
-
-		/**
-		 * @param e
-		 * @throws SAXException
-		 * @see org.xml.sax.helpers.DefaultHandler#error(org.xml.sax.SAXParseException)
-		 */
-		@Override
-		public void error(SAXParseException e) throws SAXException {
-			logger.error(e.getMessage());
-			super.error(e);
-		}
-
-
-		public List<Map<String, String>> getRecords() {
-			return records;
-		}
-	}
-
-	/** Returns a list of current PDB IDs
+	 * Returns all current PDB IDs
 	 *
-	 * @return a list of PDB IDs, or null if a problem occurred
+	 * @return a list of PDB IDs
+	 * @throws IOException if a problem occurs retrieving the information
 	 */
-
 	public static SortedSet<String> getCurrentPDBIds() throws IOException {
 
-		SortedSet<String> allPDBs = new TreeSet<String>();
-		String serverName = System.getProperty(PDB_SERVER_PROPERTY);
-
-		if ( serverName == null)
-			serverName = DEFAULT_PDB_SERVER;
-		else
-			logger.info(String.format("Got System property %s=%s",PDB_SERVER_PROPERTY,serverName));
+		//String serverName = System.getProperty(PDB_SERVER_PROPERTY);
+		String serverName = DEFAULT_RCSB_DATA_API_SERVER;
 
 		// Build REST query URL
-
-		String urlStr = String.format("http://%s/pdb/rest/getCurrent",serverName);
+		String urlStr = String.format(ALL_CURRENT_ENDPOINT, serverName);
 		URL u = new URL(urlStr);
 
 		InputStream stream = URLConnectionTools.getInputStream(u, 60000);
 
-		if (stream != null) {
-			BufferedReader reader = new BufferedReader(
-					new InputStreamReader(stream));
-
-			String line = null;
-
-			while ((line = reader.readLine()) != null) {
-				int index = line.lastIndexOf("structureId=");
-				if (index > 0) {
-					allPDBs.add(line.substring(index + 13, index + 17));
-				}
-			}
-		}
-		return allPDBs;
+		ObjectMapper objectMapper = new ObjectMapper();
+		TypeFactory typeFactory = objectMapper.getTypeFactory();
+		List<String> pdbIdList = objectMapper.readValue(stream, typeFactory.constructCollectionType(List.class, String.class));
 
+		return new TreeSet<>(pdbIdList);
 	}
 
+	public static void main(String[] args) throws Exception {
+		SortedSet<String> all = getCurrentPDBIds();
+		System.out.println("Number of current PDB ids is: " + all.size());
+	}
 }

From 0a70219111cbb9dfa5def02ec8368849724c2bf5 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Sun, 22 Nov 2020 14:44:25 -0800
Subject: [PATCH 007/599] Now PDBStatus uses the current RCSB Data API

---
 .../org/biojava/nbio/structure/PDBStatus.java | 558 ++----------------
 .../nbio/structure/io/LocalPDBDirectory.java  |   2 +-
 .../biojava/nbio/structure/PDBStatusTest.java | 167 +-----
 3 files changed, 64 insertions(+), 663 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
index 1fc54f9410..7abd790fb4 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
@@ -18,65 +18,29 @@
  *      http://www.biojava.org/
  *
  */
-/**
- *
- */
 package org.biojava.nbio.structure;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import org.biojava.nbio.structure.align.util.URLConnectionTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.xml.sax.*;
-import org.xml.sax.helpers.DefaultHandler;
 
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.*;
 
 /**
- * Methods for getting the status of a PDB file (current, obsolete, etc)
+ * Methods for getting the status of a PDB file (current, obsolete, unreleased)
  * and for accessing different versions of the structure.
  *
  * <p>
  * All methods query the
  * <a href="https://data.rcsb.org">
  * RCSB Data REST API</a>
- *
- * <p>
- * PDB supersessions form a directed acyclic graph, where edges point from an
- * obsolete ID to the entry that directly superseded it. For example, here are
- * edges from one portion of the graph:
- * <p>
- * 1CAT -> 3CAT<br/>
- * 3CAT -> 7CAT<br/>
- * 3CAT -> 8CAT<br/>
- *
- * <p>
- * The methods {@link #getReplaces(String, boolean) getReplaces(pdbId, false)}/
- * {@link #getReplacement(String, boolean, boolean) getReplacement(pdbId, false, true)}
- * just get the incoming/outgoing edges for a single node. The recursive versions
- * ({@link #getReplaces(String, boolean) getReplaces(pdbId, true)},
- * {@link #getReplacement(String, boolean, boolean) getReplacement(pdbId, true, false)})
- * will do a depth-first search up/down the tree and return a list of all nodes ]
- * reached.
- *
  * <p>
- * Finally, the {@link #getCurrent(String)} method returns a single PDB ID from among the
- * results of
- * {@link #getReplacement(String, boolean, boolean)}.
- * To be consistent with the old REST ordering, this is the PDB ID that occurs
- * last alphabetically.
- *
- * <p>
- * Results are cached to reduce server load.
  *
  * @author Spencer Bliven
  * @author Amr AL-Hossary
@@ -87,40 +51,21 @@ public class PDBStatus {
 
 	private static final Logger logger = LoggerFactory.getLogger(PDBStatus.class);
 
-	//public static final String DEFAULT_PDB_SERVER = "www.rcsb.org";
 	public static final String DEFAULT_RCSB_DATA_API_SERVER = "data.rcsb.org";
 	public static final String ALL_CURRENT_ENDPOINT = "https://%s/rest/v1/holdings/current/entry_ids";
+	public static final String STATUS_ENDPOINT = "https://%s/rest/v1/holdings/status/%s";
+	public static final String STATUS_LIST_ENDPOINT = "https://%s/rest/v1/holdings/status?ids=%s";
 
 	/**
-	 * saves the returned results for further use.
-	 *
-	 */
-	private static final Map<String, Map<String, String>> recordsCache= new Hashtable<>();
-
-	/**
-	 * Represents the status of PDB IDs. 'OBSOLETE' and 'CURRENT' are the most
-	 * common.
+	 * Represents a simplified 3 state status of PDB IDs.
 	 * @author Spencer Bliven
 	 *
 	 */
 	public enum Status {
-		// this is the list for unreleased: "AUCO" "AUTH" "HOLD" "HPUB" "POLC" "PROC" "REFI" "REPL" "WAIT" "WDRN"
-		// The remaining from below are removed-related: OBSOLETE, MODEL (not available in Data API).
-		// In Data API in rcsb_repository_holdings_insilico_models.status_code: 3 values "OBS", "TRSF", "WDRN" and 1 in  rcsb_repository_holdings_transferred.status_code: "TRSF"
-		// for current: CURRENT (not available in current API)
-		OBSOLETE,
+		// the simplified status enum in rcsb_repository_holdings_combined
+		REMOVED,
 		CURRENT,
-		AUTH,
-		HOLD,
-		HPUB,
-		POLC,
-		PROC,
-		REFI,
-		REPL,
-		WAIT,
-		WDRN,
-		MODEL,
-		UNKNOWN;
+		UNRELEASED;
 
 		/**
 		 * @throws IllegalArgumentException If the string is not recognized
@@ -128,32 +73,12 @@ public enum Status {
 		public static Status fromString(String statusStr) {
 			Status status;
 			String statusStrUpper = statusStr.toUpperCase();
-			if(statusStrUpper.equalsIgnoreCase("OBSOLETE"))
-				status = Status.OBSOLETE;
+			if(statusStrUpper.equalsIgnoreCase("REMOVED"))
+				status = Status.REMOVED;
 			else if(statusStrUpper.equalsIgnoreCase("CURRENT"))
 				status = Status.CURRENT;
-			else if(statusStrUpper.equalsIgnoreCase("AUTH"))
-				status = Status.AUTH;
-			else if(statusStrUpper.equalsIgnoreCase("HOLD"))
-				status = Status.HOLD;
-			else if(statusStrUpper.equalsIgnoreCase("HPUB"))
-				status = Status.HPUB;
-			else if(statusStrUpper.equalsIgnoreCase("POLC"))
-				status = Status.POLC;
-			else if(statusStrUpper.equalsIgnoreCase("PROC"))
-				status = Status.PROC;
-			else if(statusStrUpper.equalsIgnoreCase("REFI"))
-				status = Status.REFI;
-			else if(statusStrUpper.equalsIgnoreCase("REPL"))
-				status = Status.REPL;
-			else if(statusStrUpper.equalsIgnoreCase("WAIT"))
-				status = Status.WAIT;
-			else if(statusStrUpper.equalsIgnoreCase("WDRN"))
-				status = Status.WDRN;
-			else if(statusStrUpper.equalsIgnoreCase("MODEL"))
-				status = Status.MODEL;
-			else if(statusStrUpper.equalsIgnoreCase("UNKNOWN"))
-				status = Status.UNKNOWN;
+			else if(statusStrUpper.equalsIgnoreCase("UNRELEASED"))
+				status = Status.UNRELEASED;
 			else {
 				throw new IllegalArgumentException("Unable to parse status '"+statusStrUpper+"'.");
 			}
@@ -164,447 +89,81 @@ else if(statusStrUpper.equalsIgnoreCase("UNKNOWN"))
 	/**
 	 * Get the status of the PDB in question.
 	 *
-	 * @param pdbId
+	 * @param pdbId the id
 	 * @return The status, or null if an error occurred.
 	 */
 	public static Status getStatus(String pdbId) throws IOException {
-		Status[] statuses = getStatus(new String[] {pdbId});
-		if(statuses != null) {
-			assert(statuses.length == 1);
-			return statuses[0];
-		} else {
-			return null;
-		}
+		URL url = new URL(String.format(STATUS_ENDPOINT, DEFAULT_RCSB_DATA_API_SERVER, pdbId.toUpperCase()));
+		ObjectMapper objectMapper = new ObjectMapper();
+		JsonNode node = objectMapper.readValue(url.openStream(), JsonNode.class);
+		return parseStatusRecord(node);
 	}
 
 	/**
 	 * Get the status of the a collection of PDBs in question in a single query.
 	 *
 	 * @see #getStatus(String)
-	 * @param pdbIds
+	 * @param pdbIds the ids
 	 * @return The status array, or null if an error occurred.
 	 */
 	public static Status[] getStatus(String[] pdbIds) throws IOException {
-		Status[] statuses = new Status[pdbIds.length];
-
-		List<Map<String,String>> attrList = getStatusIdRecords(pdbIds);
-		//Expect a single record
-		if(attrList == null || attrList.size() != pdbIds.length) {
-			logger.error("Error getting Status for {} from the PDB website.", Arrays.toString(pdbIds));
-			return null;
-		}
 
+		URL url = new URL(String.format(STATUS_LIST_ENDPOINT, DEFAULT_RCSB_DATA_API_SERVER, String.join(",", pdbIds)));
 
-		for(int pdbNum = 0;pdbNum<pdbIds.length;pdbNum++) {
-			//Locate first element of attrList with matching structureId.
-			//attrList is usually short, so don't worry about performance
-			boolean foundAttr = false;
-			for( Map<String,String> attrs : attrList) {
+		List<Status> statuses = new ArrayList<>();
 
-				//Check that the record matches pdbId
-				String id = attrs.get("structureId");
-				if(id == null || !id.equalsIgnoreCase(pdbIds[pdbNum])) {
-					continue;
-				}
-
-				//Check that the status is given
-				String statusStr = attrs.get("status");
-				Status status = null;
-				if(statusStr == null ) {
-					logger.error("No status returned for {}", pdbIds[pdbNum]);
-					statuses[pdbNum] = null;
-				} else {
-					status = Status.fromString(statusStr);
-				}
-
-				if(status == null) {
-					logger.error("Unknown status '{}'", statusStr);
-					statuses[pdbNum] = null;
-				}
+		ObjectMapper objectMapper = new ObjectMapper();
+		JsonNode node = objectMapper.readValue(url.openStream(), JsonNode.class);
 
-				statuses[pdbNum] = status;
-				foundAttr = true;
-			}
-			if(!foundAttr) {
-				logger.error("No result found for {}", pdbIds[pdbNum]);
-				statuses[pdbNum] = null;
+		if (node !=null && node.isArray()) {
+			for (JsonNode record : node) {
+				Status status = parseStatusRecord(record);
+				statuses.add(status);
 			}
 		}
 
-		return statuses;
-	}
-
-	/**
-	 * Gets the current version of a PDB ID. This is equivalent to selecting
-	 * the first element from
-	 * {@link #getReplacement(String,boolean,boolean)
-	 *
-	 * @param oldPdbId
-	 * @return The replacement for oldPdbId, or null if none are found or if an error occurred.
-	 */
-	public static String getCurrent(String oldPdbId) throws IOException {
-		List<String> replacements = getReplacement(oldPdbId,true, false);
-		if(replacements != null && !replacements.isEmpty())
-			return replacements.get(0);
-		else
-			return null;
-	}
-
-	/**
-	 * Gets the PDB which superseded oldPdbId. For CURRENT IDs, this will
-	 * be itself. For obsolete IDs, the behavior depends on the recursion
-	 * parameter. If false, only IDs which directly supersede oldPdbId are
-	 * returned. If true, the replacements for obsolete records are recursively
-	 * fetched, yielding a list of all current replacements of oldPdbId.
-	 *
-	 *
-	 *
-	 * @param oldPdbId A pdb ID
-	 * @param recurse Indicates whether the replacements for obsolete records
-	 * 		should be fetched.
-	 * @param includeObsolete Indicates whether obsolete records should be
-	 * 		included in the results.
-	 * @return The PDB which replaced oldPdbId. This may be oldPdbId itself, for
-	 * 		current records. A return value of null indicates that the ID has
-	 * 		been removed from the PDB or that an error has occurred.
-	 */
-	public static List<String> getReplacement(String oldPdbId, boolean recurse, boolean includeObsolete) throws IOException {
-		List<Map<String,String>> attrList = getStatusIdRecords(new String[] {oldPdbId});
-		//Expect a single record
-		if(attrList == null || attrList.size() != 1) {
-			logger.error("Error getting Status for {} from the PDB website.", oldPdbId);
-			return null;
-		}
-
-		Map<String,String> attrs = attrList.get(0);
-
-		//Check that the record matches pdbId
-		String id = attrs.get("structureId");
-		if(id == null || !id.equalsIgnoreCase(oldPdbId)) {
-			logger.error("Results returned from the query don't match {}", oldPdbId);
-			return null;
-		}
-
-		//Check that the status is given
-		String statusStr = attrs.get("status");
-		if(statusStr == null ) {
-			logger.error("No status returned for {}", oldPdbId);
-			return null;
-		}
-
-		Status status = Status.fromString(statusStr);
-		if(status == null ) {
-			logger.error("Unknown status '{}'", statusStr);
-			return null;
+		if (statuses.size() != pdbIds.length) {
+			logger.warn("RCSB status request was for {} ids, but {} were returned", pdbIds.length, statuses.size());
 		}
 
-		// If we're current, just return
-		LinkedList<String> results = new LinkedList<>();
-		switch(status) {
-			case CURRENT:
-				results.add(oldPdbId);
-				return results;
-			case OBSOLETE: {
-				String replacementStr = attrs.get("replacedBy");
-				if(replacementStr == null) {
-					logger.error("{} is OBSOLETE but lacks a replacedBy attribute.", oldPdbId);
-					return null;
-				}
-				replacementStr = replacementStr.toUpperCase();
-				//include this result
-				if(includeObsolete) {
-					results.add(oldPdbId);
-				}
-				// Some PDBs are not replaced.
-				if(replacementStr.equals("NONE")) {
-					return results; //empty
-				}
-
-				String[] replacements = replacementStr.split(" ");
-				Arrays.sort(replacements, new Comparator<String>() {
-					@Override
-					public int compare(String o1, String o2) {
-						return o2.compareToIgnoreCase(o1);
-					}
-				});
-				for(String replacement : replacements) {
-
-					// Return the replacement.
-					if(recurse) {
-						List<String> others = PDBStatus.getReplacement(replacement, recurse, includeObsolete);
-						mergeReversed(results,others);
-					}
-					else {
-						if(includeObsolete) {
-							mergeReversed(results,Arrays.asList(replacement));
-						} else {
-							// check status of replacement
-							Status replacementStatus = getStatus(replacement);
-							switch(replacementStatus) {
-								case OBSOLETE:
-									//ignore obsolete
-									break;
-								case CURRENT:
-								default:
-									// include it
-									mergeReversed(results,Arrays.asList(replacement));
-							}
-						}
-					}
-				}
-
-
-				return results;
-			}
-			case UNKNOWN:
-				return null;
-			default: { //TODO handle other cases explicitly. They might have other syntax than "replacedBy"
-				String replacementStr = attrs.get("replacedBy");
-
-				if(replacementStr == null) {
-					// If no "replacedBy" attribute, treat like we're current
-					// TODO is this correct?
-					results.add(oldPdbId);
-					return results;
-				}
-
-				replacementStr = replacementStr.toUpperCase();
-				// Some PDBs are not replaced.
-				if(replacementStr.equals("NONE")) {
-					return null;
-				}
-
-
-				//include this result, since it's not obsolete
-				results.add(oldPdbId);
-
-				String[] replacements = replacementStr.split(" ");
-				Arrays.sort(replacements, new Comparator<String>() {
-					@Override
-					public int compare(String o1, String o2) {
-						return o2.compareToIgnoreCase(o1);
-					}
-				});
-				for(String replacement : replacements) {
-
-					// Return the replacement.
-					if(recurse) {
-						List<String> others = PDBStatus.getReplacement(replacement, recurse, includeObsolete);
-						mergeReversed(results,others);
-					}
-					else {
-						mergeReversed(results,Arrays.asList(replacement));
-					}
-				}
-
-
-				return results;
-			}
-		}
+		return statuses.toArray(new Status[0]);
 	}
 
-	/**
-	 * Takes two reverse sorted lists of strings and merges the second into the
-	 * first. Duplicates are removed.
-	 *
-	 * @param merged A reverse sorted list. Modified by this method to contain
-	 * 		the contents of other.
-	 * @param other A reverse sorted list. Not modified.
-	 */
-	private static void mergeReversed(List<String> merged,
-	                                  final List<String> other) {
-
-		if(other.isEmpty())
-			return;
-
-		if(merged.isEmpty()) {
-			merged.addAll(other);
-			return;
-		}
-
-		ListIterator<String> m = merged.listIterator();
-		ListIterator<String> o = other.listIterator();
-
-		String nextM, prevO;
-		prevO = o.next();
-		while(m.hasNext()) {
-			// peek at m
-			nextM = m.next();
-			m.previous();
-
-			//insert from O until exhausted or occurs after nextM
-			while(prevO.compareTo(nextM) > 0) {
-				m.add(prevO);
-				if(!o.hasNext()) {
-					return;
-				}
-				prevO = o.next();
-			}
-			//remove duplicates
-			if(prevO.equals(nextM)) {
-				if(!o.hasNext()) {
-					return;
-				}
-				prevO = o.next();
-			}
-
-			m.next();
-		}
-		m.add(prevO);
-		while(o.hasNext()) {
-			m.add(o.next());
-		}
-
+	private static Status parseStatusRecord(JsonNode jsonNode) {
+		// "rcsb_repository_holdings_combined": {
+		//"id_code_replaced_by_latest": "4HHB",
+		//"status": "REMOVED",
+		//"status_code": "OBS"
+		//},
+		JsonNode rcsbRepoHoldingsNode = jsonNode.get("rcsb_repository_holdings_combined");
+		return Status.fromString(rcsbRepoHoldingsNode.get("status").asText());
 	}
 
-
 	/**
-	 * Get the ID of the protein which was made obsolete by newPdbId.
+	 * Gets the current version of a PDB ID.
 	 *
-	 * @param newPdbId PDB ID of the newer structure
-	 * @param recurse If true, return all ancestors of newPdbId.
-	 * 		Otherwise, just go one step newer than oldPdbId.
-	 * @return A (possibly empty) list of ID(s) of the ancestor(s) of
-	 * 		newPdbId, or <tt>null</tt> if an error occurred.
+	 * @param oldPdbId the id
+	 * @return The replacement for oldPdbId, or null if none are found.
+	 * If entry is current then the input PDB id is returned
 	 */
-	public static List<String> getReplaces(String newPdbId, boolean recurse) throws IOException {
-		List<Map<String,String>> attrList = getStatusIdRecords(new String[] {newPdbId});
-		//Expect a single record
-		if(attrList == null || attrList.size() != 1) {
-			//TODO Is it possible to have multiple record per ID?
-			// They seem to be combined into one record with space-delimited 'replaces'
-			logger.error("Error getting Status for {} from the PDB website.", newPdbId);
-			return null;
-		}
-
-		Map<String,String> attrs = attrList.get(0);
-
-		//Check that the record matches pdbId
-		String id = attrs.get("structureId");
-		if(id == null || !id.equals(newPdbId)) {
-			logger.error("Results returned from the query don't match {}", newPdbId);
-			return null;
-		}
-
-
-		String replacedList = attrs.get("replaces"); //space-delimited list
-		if(replacedList == null) {
-			// no replaces value; assume root
-			return new ArrayList<String>();
-		}
-		String[] directDescendents = replacedList.split("\\s");
-
-		// Not the root! Return the replaced PDB.
-		if(recurse) {
-			// Note: Assumes a proper directed acyclic graph of revisions
-			// Cycles will cause infinite loops.
-			List<String> allDescendents = new LinkedList<String>();
-			for(String replaced : directDescendents) {
-				List<String> roots = PDBStatus.getReplaces(replaced, recurse);
-				mergeReversed(allDescendents,roots);
-			}
-			mergeReversed(allDescendents,Arrays.asList(directDescendents));
-
-			return allDescendents;
+	public static String getCurrent(String oldPdbId) throws IOException {
+		URL url = new URL(String.format(STATUS_ENDPOINT, DEFAULT_RCSB_DATA_API_SERVER, oldPdbId.toUpperCase()));
+		ObjectMapper objectMapper = new ObjectMapper();
+		JsonNode node = objectMapper.readValue(url.openStream(), JsonNode.class);
+		JsonNode rcsbRepoHoldingsNode = node.get("rcsb_repository_holdings_combined");
+		Status st = Status.fromString(rcsbRepoHoldingsNode.get("status").asText());
+		if (st == Status.REMOVED) {
+			JsonNode replacedByNode = rcsbRepoHoldingsNode.get("id_code_replaced_by_latest");
+			if (replacedByNode != null)
+				return replacedByNode.asText();
+			else
+				return null;
+		} else if (st == Status.CURRENT) {
+			return oldPdbId;
 		} else {
-			return Arrays.asList(directDescendents);
-		}
-	}
-
-
-	/**
-	 * The status of PDB IDs are cached to reduce server overload.
-	 *
-	 * This method clears the cached records.
-	 */
-	public static void clearCache() {
-		recordsCache.clear();
-	}
-
-	/**
-	 * Fetches the status of one or more pdbIDs from the server.
-	 *
-	 * <p>
-	 * Returns the results as a list of Attributes.
-	 * Each attribute should contain "structureId" and "status" attributes, and
-	 * possibly more.
-	 *
-	 * <p>
-	 * Example:
-	 * <p>
-	 * <tt>http://www.rcsb.org/pdb/rest/idStatus?structureID=1HHB,4HHB</tt></br>
-	 * <pre>
-	 * &lt;idStatus&gt;
-	 *   &lt;record structureId="1HHB" status="OBSOLETE" replacedBy="4HHB"/&gt;
-	 *   &lt;record structureId="4HHB" status="CURRENT" replaces="1HHB"/&gt;
-	 * &lt;/idStatus&gt;
-	 * </pre>
-	 *
-	 * <p>
-	 * Results are not guaranteed to be returned in the same order as pdbIDs.
-	 * Refer to the structureId property to match them.
-	 *
-	 * @param pdbIDs the PDB identifiers
-	 * @return A map between attributes and values
-	 */
-	private static List<Map<String, String>> getStatusIdRecords(String[] pdbIDs) throws IOException {
-
-		List<Map<String,String>> result = new ArrayList<>(pdbIDs.length);
-
-		String serverName = DEFAULT_RCSB_DATA_API_SERVER;
-
-		// Build REST query URL
-		if(pdbIDs.length < 1) {
-			throw new IllegalArgumentException("No pdbIDs specified");
-		}
-		String urlStr = String.format("http://%s/pdb/rest/idStatus?structureId=",serverName);
-		for(String pdbId : pdbIDs) {
-			pdbId = pdbId.toUpperCase();
-			//check the cache
-			if (recordsCache.containsKey(pdbId)) {
-				//logger.debug("Fetching "+pdbId+" from Cache");
-				result.add( recordsCache.get(pdbId) );
-			} else {
-				urlStr += pdbId + ",";
-			}
-		}
-
-		// check if any ids still need fetching
-		if(urlStr.charAt(urlStr.length()-1) == '=') {
-			return result;
-		}
-
-		logger.info("Fetching {}", urlStr);
-
-		URL url = new URL(urlStr);
-
-		InputStream uStream = url.openStream();
-
-		InputSource source = new InputSource(uStream);
-		SAXParserFactory parserFactory = SAXParserFactory.newInstance();
-		SAXParser parser = parserFactory.newSAXParser();
-		XMLReader reader = parser.getXMLReader();
-
-		PDBStatusXMLHandler handler = new PDBStatusXMLHandler();
-
-		reader.setContentHandler(handler);
-		reader.parse(source);
-
-		// Fetch results of SAX parsing
-		List<Map<String, String>> records = handler.getRecords();
-
-		//add to cache
-		for (Map<String, String> record : records) {
-			String pdbId = record.get("structureId").toUpperCase();
-			if (pdbId != null) {
-				recordsCache.put(pdbId, record);
-			}
+			return null;
 		}
 
-		// return results
-		result.addAll(handler.getRecords());
-
-		return result;
 	}
 
 	/**
@@ -615,11 +174,8 @@ private static List<Map<String, String>> getStatusIdRecords(String[] pdbIDs) thr
 	 */
 	public static SortedSet<String> getCurrentPDBIds() throws IOException {
 
-		//String serverName = System.getProperty(PDB_SERVER_PROPERTY);
-		String serverName = DEFAULT_RCSB_DATA_API_SERVER;
-
 		// Build REST query URL
-		String urlStr = String.format(ALL_CURRENT_ENDPOINT, serverName);
+		String urlStr = String.format(ALL_CURRENT_ENDPOINT, DEFAULT_RCSB_DATA_API_SERVER);
 		URL u = new URL(urlStr);
 
 		InputStream stream = URLConnectionTools.getInputStream(u, 60000);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index 61735ecfa6..4dd31b25f6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -492,7 +492,7 @@ protected File downloadStructure(String pdbId) throws IOException{
 			}
 			return downloadStructure(current, splitDirURL,false, existing);
 		} else if(obsoleteBehavior == ObsoleteBehavior.FETCH_OBSOLETE
-				&& PDBStatus.getStatus(pdbId) == Status.OBSOLETE) {
+				&& PDBStatus.getStatus(pdbId) == Status.REMOVED) {
 			return downloadStructure(pdbId, obsoleteDirURL, true, existing);
 		} else {
 			return downloadStructure(pdbId, splitDirURL, false, existing);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/PDBStatusTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/PDBStatusTest.java
index 8bcd2d1e98..bda33d98ab 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/PDBStatusTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/PDBStatusTest.java
@@ -18,17 +18,14 @@
  *      http://www.biojava.org/
  *
  */
-/**
- *
- */
 package org.biojava.nbio.structure;
 
 import org.biojava.nbio.structure.PDBStatus.Status;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.lang.reflect.Method;
-import java.util.*;
+import java.io.IOException;
+
 
 /**
  * @author Spencer Bliven <sbliven@ucsd.edu>
@@ -46,172 +43,20 @@ public class PDBStatusTest {
 	 *</pre>
 	 */
 	@Test
-	public void testGetStatus() {
-		Assert.assertEquals(Status.OBSOLETE, PDBStatus.getStatus("1HHB"));
+	public void testGetStatus() throws IOException {
+		Assert.assertEquals(Status.REMOVED, PDBStatus.getStatus("1HHB"));
 		Assert.assertEquals(Status.CURRENT, PDBStatus.getStatus("3HHB"));
 		Assert.assertEquals(Status.CURRENT, PDBStatus.getStatus("4HHB"));
 	}
 
 	@Test
-	public void testGetReplacement() {
-		Assert.assertFalse(Arrays.asList("YES").equals(Arrays.asList("NO"))); //check for deep equals
-
-		// 1CMW is replacedBy NONE
-		Assert.assertEquals(Arrays.asList(), PDBStatus.getReplacement("1CMW", true, false));
-		Assert.assertEquals(Arrays.asList("1CMW"), PDBStatus.getReplacement("1CMW", true, true));
-
-		// 1HHB is replacedBy 2-4HHB
-		Assert.assertEquals(Arrays.asList("3HHB"), PDBStatus.getReplacement("3HHB", false, false));
-		Assert.assertEquals(Arrays.asList("3HHB"), PDBStatus.getReplacement("3HHB", false, true));
-		Assert.assertEquals(Arrays.asList("4HHB", "3HHB", "2HHB"), PDBStatus.getReplacement("1HHB", false, false));
-		Assert.assertEquals(Arrays.asList("4HHB", "3HHB", "2HHB", "1HHB"), PDBStatus.getReplacement("1HHB", false, true));
-
-		// 1CAT is replacedBy 3CAT is replacedBy 7-8CAT
-		Assert.assertEquals(Arrays.asList("8CAT", "7CAT", "3CAT", "1CAT"), PDBStatus.getReplacement("1CAT", true, true));
-		Assert.assertEquals(Arrays.asList("8CAT", "7CAT"), PDBStatus.getReplacement("1CAT", true, false));
-		Assert.assertEquals(Arrays.asList("8CAT", "7CAT", "3CAT"), PDBStatus.getReplacement("3CAT", true, true));
-		Assert.assertEquals(Arrays.asList("8CAT", "7CAT"), PDBStatus.getReplacement("3CAT", true, false));
-	}
-
-
-	@Test
-	public void testGetCurrent() {
+	public void testGetCurrent() throws IOException {
 		Assert.assertEquals("4HHB", PDBStatus.getCurrent("1HHB"));
 		Assert.assertEquals("3HHB", PDBStatus.getCurrent("3HHB"));
-		Assert.assertEquals(null, PDBStatus.getCurrent("1CMW"));
+		Assert.assertNull(PDBStatus.getCurrent("1CMW"));
 		Assert.assertEquals("3ENI", PDBStatus.getCurrent("1KSA"));
 		Assert.assertEquals("8CAT", PDBStatus.getCurrent("1CAT"));
 		Assert.assertEquals("8CAT", PDBStatus.getCurrent("3CAT"));
 		Assert.assertEquals("7CAT", PDBStatus.getCurrent("7CAT"));
 	}
-
-	@Test
-	public void testGetReplaces() {
-		Assert.assertEquals(new ArrayList<String>(), Arrays.asList(new String[]{}));
-
-		Assert.assertEquals(Arrays.asList("1HHB"), PDBStatus.getReplaces("4HHB", false));
-		Assert.assertEquals(Arrays.asList("1HHB"), PDBStatus.getReplaces("3HHB", false));
-		Assert.assertEquals(Arrays.asList(), PDBStatus.getReplaces("1HHB", false));
-		Assert.assertEquals(Arrays.asList("1M50", "1KSA"), PDBStatus.getReplaces("3ENI", false));
-		Assert.assertEquals(Arrays.asList("1M50", "1KSA"), PDBStatus.getReplaces("3ENI", true));
-		Assert.assertEquals(Arrays.asList("3CAT"), PDBStatus.getReplaces("8CAT", false));
-		Assert.assertEquals(Arrays.asList("3CAT", "1CAT"), PDBStatus.getReplaces("8CAT", true));
-
-	}
-
-	/**
-	 * Tests a helper method for merging that was giving me problems
-	 */
-	@Test
-	public void testMergeReversed() {
-		try {
-			Method mergeReversed = PDBStatus.class.getDeclaredMethod("mergeReversed",
-					List.class,List.class);
-			mergeReversed.setAccessible(true);
-
-
-			List<String> a,b;
-
-			b = Arrays.asList("F","A");
-			a = new LinkedList<String>();
-			mergeReversed.invoke(null, a,b);
-			Assert.assertEquals(Arrays.asList("F", "A"), a);
-
-			a = new LinkedList<String>();
-			a.add("B");
-			mergeReversed.invoke(null, a,b);
-			Assert.assertEquals(Arrays.asList("F", "B", "A"), a);
-
-			a = new LinkedList<String>();
-			a.add("G");
-			mergeReversed.invoke(null, a,b);
-			Assert.assertEquals(Arrays.asList("G", "F", "A"), a);
-
-			a = new LinkedList<String>();
-			a.add("1");
-			mergeReversed.invoke(null, a,b);
-			Assert.assertEquals(Arrays.asList("F", "A", "1"), a);
-
-			a = new LinkedList<String>();
-			a.add("G");
-			a.add("1");
-			mergeReversed.invoke(null, a,b);
-			Assert.assertEquals(Arrays.asList("G", "F", "A", "1"), a);
-
-			b = Arrays.asList();
-			mergeReversed.invoke(null, a,b);
-			Assert.assertEquals(Arrays.asList("G", "F", "A", "1"), a);
-
-			b = Arrays.asList("G","D","C","A");
-			a = new LinkedList<String>();
-			a.add("F");
-			a.add("B");
-			a.add("1");
-			mergeReversed.invoke(null, a,b);
-			Assert.assertEquals(Arrays.asList("G", "F", "D", "C", "B", "A", "1"), a);
-
-		} catch(Exception e) {
-			e.printStackTrace();
-			Assert.fail(e.getMessage());
-		}
-	}
-
-	/**
-	 * Test low-level connectivity to the PDB
-	 */
-	@Test
-	@SuppressWarnings("unchecked")
-	public void testGetStatusIdRecords() {
-		try {
-		Method getStatusIdRecords = PDBStatus.class.getDeclaredMethod("getStatusIdRecords",
-				String[].class);
-		getStatusIdRecords.setAccessible(true);
-
-
-			List<Map<String,String>> attrsList;
-			String[] pdbIds;
-			Map<String,String> attrs;
-
-			// Test invocation with a single ID
-			pdbIds = new String[] {"1HHB"};
-			attrsList = (List<Map<String,String>>) getStatusIdRecords.invoke(null, (Object) pdbIds);
-			Assert.assertEquals("Wrong number of records.", 1, attrsList.size());
-			attrs = attrsList.get(0);
-			Assert.assertEquals("Wrong number of attributes", 3, attrs.size());
-			Assert.assertEquals("Wrong structureId", "1HHB", attrs.get("structureId"));
-			Assert.assertEquals("Wrong status", "OBSOLETE", attrs.get("status"));
-			Assert.assertEquals("Wrong replacedBy", "4HHB 3HHB 2HHB", attrs.get("replacedBy"));
-
-			// Test with multiple IDs
-			pdbIds = new String[] {"1HHB","4HHB"};
-			attrsList = (List<Map<String,String>>) getStatusIdRecords.invoke(null, (Object) pdbIds);
-			Assert.assertEquals("Wrong number of records.", 2, attrsList.size());
-			attrs = attrsList.get(1);
-			Assert.assertEquals("Wrong number of attributes", 3, attrs.size());
-			Assert.assertEquals("Wrong structureId", "4HHB", attrs.get("structureId"));
-			Assert.assertEquals("Wrong status", "CURRENT", attrs.get("status"));
-			Assert.assertEquals("Wrong replaces", "1HHB", attrs.get("replaces"));
-			attrs = attrsList.get(0);
-			Assert.assertEquals("Wrong number of attributes", 3, attrs.size());
-			Assert.assertEquals("Wrong structureId", "1HHB", attrs.get("structureId"));
-			Assert.assertEquals("Wrong status", "OBSOLETE", attrs.get("status"));
-			Assert.assertEquals("Wrong replacedBy", "4HHB 3HHB 2HHB", attrs.get("replacedBy"));
-
-			// Test invocation with a single ID
-			pdbIds = new String[] {"3ENI"};
-			attrsList = (List<Map<String,String>>) getStatusIdRecords.invoke(null, (Object) pdbIds);
-			Assert.assertEquals("Wrong number of records.", 1, attrsList.size());
-			attrs = attrsList.get(0);
-			Assert.assertEquals("Wrong number of attributes", 3, attrs.size());
-			Assert.assertEquals("Wrong structureId", "3ENI", attrs.get("structureId"));
-			Assert.assertEquals("Wrong status", "CURRENT", attrs.get("status"));
-			Assert.assertEquals("Wrong replacedBy", "1M50 1KSA", attrs.get("replaces"));
-
-
-		} catch(Exception e) {
-			e.printStackTrace();
-			Assert.fail(e.getMessage());
-		}
-	}
-
 }

From ef35e93ecfab2f654f14d58299aa75f113e939bf Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Sun, 22 Nov 2020 15:54:01 -0800
Subject: [PATCH 008/599] Docs

---
 CHANGELOG.md                                           |  2 ++
 .../java/org/biojava/nbio/structure/PDBStatus.java     | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00a530e652..22f265c548 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ BioJava 6.0.0 (future release)
 * The whole `org.biojava.nbio.structure.validation` package
 * The `org.biojava.nbio.structure.domain.PDBDomainProvider` class to pull domain definitions from legacy RCSB PDB APIs
 * Support for automatically fetching dssp files from RCSB (`org.biojava.nbio.structure.secstruc.DSSPParser.fetch()`)
+* `org.biojava.nbio.structure.PDBStatus`: simplified `Status` enum to 3 states, with OBSOLETE now called REMOVED
+* `org.biojava.nbio.structure.PDBStatus`: removed `getReplacement` and `getReplaces` 
 
 BioJava 5.4.0
 =============
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
index 7abd790fb4..0ded68c05c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
@@ -59,7 +59,6 @@ public class PDBStatus {
 	/**
 	 * Represents a simplified 3 state status of PDB IDs.
 	 * @author Spencer Bliven
-	 *
 	 */
 	public enum Status {
 		// the simplified status enum in rcsb_repository_holdings_combined
@@ -87,10 +86,10 @@ else if(statusStrUpper.equalsIgnoreCase("UNRELEASED"))
 	}
 
 	/**
-	 * Get the status of the PDB in question.
+	 * Get the status of a PDB id.
 	 *
 	 * @param pdbId the id
-	 * @return The status, or null if an error occurred.
+	 * @return The status.
 	 */
 	public static Status getStatus(String pdbId) throws IOException {
 		URL url = new URL(String.format(STATUS_ENDPOINT, DEFAULT_RCSB_DATA_API_SERVER, pdbId.toUpperCase()));
@@ -100,11 +99,11 @@ public static Status getStatus(String pdbId) throws IOException {
 	}
 
 	/**
-	 * Get the status of the a collection of PDBs in question in a single query.
+	 * Get the status of a collection of PDB ids (in a single API query).
 	 *
 	 * @see #getStatus(String)
 	 * @param pdbIds the ids
-	 * @return The status array, or null if an error occurred.
+	 * @return The status array
 	 */
 	public static Status[] getStatus(String[] pdbIds) throws IOException {
 
@@ -130,6 +129,7 @@ public static Status[] getStatus(String[] pdbIds) throws IOException {
 	}
 
 	private static Status parseStatusRecord(JsonNode jsonNode) {
+		// e.g.
 		// "rcsb_repository_holdings_combined": {
 		//"id_code_replaced_by_latest": "4HHB",
 		//"status": "REMOVED",

From 95db39cc4f17fdce3373e5145e52504f14d8643e Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Sun, 22 Nov 2020 16:30:08 -0800
Subject: [PATCH 009/599] One more test

---
 .../java/org/biojava/nbio/structure/PDBStatusTest.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/PDBStatusTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/PDBStatusTest.java
index bda33d98ab..82e26bd802 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/PDBStatusTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/PDBStatusTest.java
@@ -26,7 +26,6 @@
 
 import java.io.IOException;
 
-
 /**
  * @author Spencer Bliven <sbliven@ucsd.edu>
  *
@@ -49,6 +48,15 @@ public void testGetStatus() throws IOException {
 		Assert.assertEquals(Status.CURRENT, PDBStatus.getStatus("4HHB"));
 	}
 
+	@Test
+	public void testGetStatusMultipleIds() throws IOException {
+		String[] ids = {"1HHB", "3HHB", "4HHB"};
+		Status[] statuses = PDBStatus.getStatus(ids);
+		Assert.assertEquals(Status.REMOVED, statuses[0]);
+		Assert.assertEquals(Status.CURRENT, statuses[1]);
+		Assert.assertEquals(Status.CURRENT, statuses[2]);
+	}
+
 	@Test
 	public void testGetCurrent() throws IOException {
 		Assert.assertEquals("4HHB", PDBStatus.getCurrent("1HHB"));

From 245742d522d12440ece32f5c2d665ff81c465e98 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 24 Nov 2020 14:11:19 -0800
Subject: [PATCH 010/599] Fixing test

---
 .../test/symmetry/TestQuatSymmetryDetectorExamples.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java
index b5a8a5a2e1..aab2ec5c89 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java
@@ -240,7 +240,7 @@ public void testLocal() throws IOException, StructureException {
 		testIds.add("BIO:3JC9:1");
 			testStoichiometries.add("A12B12C12D12E12F12G5H2");
 			localSymmetries = new HashMap<>();
-				localSymmetries.put("A12C12D12E12F12H2","C2");
+				localSymmetries.put("A12B12C12D12E12H2","C2");
 				localSymmetries.put("A12B12C12D12E12F12","C12");
 				localSymmetries.put("G5","H");
 			testLocalSymmetries.add(localSymmetries);
@@ -268,7 +268,7 @@ public void testLocal() throws IOException, StructureException {
 			for (QuatSymmetryResults local:foundLocal) {
 				logger.info("Found stoichiometry "+local.getStoichiometry().toString()+" with symmetry "+local.getSymmetry());
 				assertTrue("Stoichiometry "+local.getStoichiometry().toString()+" not expected for "+testIds.get(iTest),
-						refLocal.keySet().contains(local.getStoichiometry().toString()));
+						refLocal.containsKey(local.getStoichiometry().toString()));
 
 				assertEquals("Symmetry "+local.getSymmetry()+" with stoichiometry "+local.getStoichiometry().toString()+
 								" not expected for "+testIds.get(iTest),

From 203f5e38252958bf8ac145861d412d88a888f359 Mon Sep 17 00:00:00 2001
From: Bhat <vidisha2@fa20-cs527-043.cs.illinois.edu>
Date: Wed, 25 Nov 2020 13:30:52 -0600
Subject: [PATCH 011/599] Flaky Test Fixed in TestStructureSerialization

---
 .../src/main/java/org/biojava/nbio/structure/PDBHeader.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
index dbcc0f794c..eb7245dffa 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
@@ -108,6 +108,7 @@ public String toString(){
 			Class<?> c = Class.forName(PDBHeader.class.getName());
 			Method[] methods  = c.getMethods();
 
+			Arrays.sort(methods, (o1, o2)->o1.getName().compareTo(o2.getName()));
 			for (Method m : methods) {
 				String name = m.getName();
 

From 846c13f1f0e6257bd24ea1b6ae12380f74b60eb9 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 25 Nov 2020 11:51:37 -0800
Subject: [PATCH 012/599] Corrections suggested in review

---
 .../org/biojava/nbio/structure/PDBStatus.java | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
index 0ded68c05c..29203825a6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
@@ -33,7 +33,7 @@
 import java.util.*;
 
 /**
- * Methods for getting the status of a PDB file (current, obsolete, unreleased)
+ * Methods for getting the status of a PDB file (current, removed, unreleased)
  * and for accessing different versions of the structure.
  *
  * <p>
@@ -70,18 +70,16 @@ public enum Status {
 		 * @throws IllegalArgumentException If the string is not recognized
 		 */
 		public static Status fromString(String statusStr) {
-			Status status;
-			String statusStrUpper = statusStr.toUpperCase();
-			if(statusStrUpper.equalsIgnoreCase("REMOVED"))
-				status = Status.REMOVED;
-			else if(statusStrUpper.equalsIgnoreCase("CURRENT"))
-				status = Status.CURRENT;
-			else if(statusStrUpper.equalsIgnoreCase("UNRELEASED"))
-				status = Status.UNRELEASED;
+			if (statusStr == null) return null;
+			if(statusStr.equalsIgnoreCase("REMOVED"))
+				return Status.REMOVED;
+			else if(statusStr.equalsIgnoreCase("CURRENT"))
+				return Status.CURRENT;
+			else if(statusStr.equalsIgnoreCase("UNRELEASED"))
+				return Status.UNRELEASED;
 			else {
-				throw new IllegalArgumentException("Unable to parse status '"+statusStrUpper+"'.");
+				throw new IllegalArgumentException("Unable to parse status '"+statusStr+"'.");
 			}
-			return status;
 		}
 	}
 

From f04effa094b239fbba573a110aeb02a75624cfa3 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 25 Nov 2020 11:55:12 -0800
Subject: [PATCH 013/599] Better handlng of null

---
 .../src/main/java/org/biojava/nbio/structure/PDBStatus.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
index 29203825a6..dd69115c91 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
@@ -70,7 +70,7 @@ public enum Status {
 		 * @throws IllegalArgumentException If the string is not recognized
 		 */
 		public static Status fromString(String statusStr) {
-			if (statusStr == null) return null;
+			if (statusStr == null) throw new IllegalArgumentException("Status string can't be null");
 			if(statusStr.equalsIgnoreCase("REMOVED"))
 				return Status.REMOVED;
 			else if(statusStr.equalsIgnoreCase("CURRENT"))

From 13565b17d4d6729d4c3e86d7f42b53871133ce98 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Mon, 7 Dec 2020 17:32:47 +0100
Subject: [PATCH 014/599] Revert "Flaky Test Fixed in
 TestStructureSerialization"

---
 .../src/main/java/org/biojava/nbio/structure/PDBHeader.java      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
index eb7245dffa..dbcc0f794c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
@@ -108,7 +108,6 @@ public String toString(){
 			Class<?> c = Class.forName(PDBHeader.class.getName());
 			Method[] methods  = c.getMethods();
 
-			Arrays.sort(methods, (o1, o2)->o1.getName().compareTo(o2.getName()));
 			for (Method m : methods) {
 				String name = m.getName();
 

From c290ea9af37a8e2c381437c488d426626259a3cd Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Wed, 13 Jan 2021 11:50:05 -0800
Subject: [PATCH 015/599] wip (most of structure parsing done)

---
 .../structure/gui/util/PDBUploadPanel.java    |    1 -
 .../java/demo/DemoChangeChemCompProvider.java |   64 +-
 .../src/main/java/demo/DemoMMCIFReader.java   |    1 -
 .../java/demo/DemoMmcifToPdbConverter.java    |   47 +-
 .../nbio/structure/AtomPositionMap.java       |    5 +-
 .../org/biojava/nbio/structure/Chain.java     |    1 -
 .../org/biojava/nbio/structure/ChainImpl.java |    7 +-
 .../nbio/structure/DatabasePDBRevRecord.java  |   62 +
 .../nbio/structure/DatabasePdbRevRecord.java  |   43 -
 .../org/biojava/nbio/structure/Group.java     |   99 +-
 .../org/biojava/nbio/structure/GroupType.java |    4 +-
 .../biojava/nbio/structure/HetatomImpl.java   |   22 +-
 .../org/biojava/nbio/structure/PDBHeader.java |    6 +-
 .../biojava/nbio/structure/StructureIO.java   |    7 +-
 .../biojava/nbio/structure/URLIdentifier.java |   42 +-
 .../nbio/structure/align/util/AtomCache.java  |    5 +-
 .../structure/chem/AllChemCompProvider.java   |  185 ++
 .../biojava/nbio/structure/chem/ChemComp.java |  405 +++
 .../nbio/structure/chem/ChemCompAtom.java     |  205 ++
 .../nbio/structure/chem/ChemCompBond.java     |  114 +
 .../structure/chem/ChemCompContainer.java     |   13 +
 .../structure/chem/ChemCompDescriptor.java    |   80 +
 .../structure/chem/ChemCompGroupFactory.java  |  131 +
 .../nbio/structure/chem/ChemCompProvider.java |   15 +
 .../nbio/structure/chem/ChemCompTools.java    |  209 ++
 .../chem/ChemicalComponentDictionary.java     |  104 +
 .../chem/DownloadChemCompProvider.java        |  420 ++++
 .../nbio/structure/chem/PolymerType.java      |  161 ++
 .../chem/ReducedChemCompProvider.java         |   56 +
 .../nbio/structure/chem/ResidueType.java      |  125 +
 .../structure/contact/StructureInterface.java |    7 +-
 .../biojava/nbio/structure/io/BondMaker.java  |   69 +-
 .../nbio/structure/io/FileConvert.java        |   64 +-
 .../nbio/structure/io/MMCIFFileReader.java    |  143 --
 ...Impl.java => AbstractCifFileSupplier.java} |   68 +-
 .../structure/io/cif/ChainSupplierImpl.java   |   20 +
 .../structure/io/cif/ChemCompConsumer.java    |   14 +
 .../io/cif/ChemCompConsumerImpl.java          |   70 +
 .../nbio/structure/io/cif/CifBean.java        |   12 +
 .../structure/io/cif/CifFileConsumer.java     |  274 +--
 .../structure/io/cif/CifFileConverter.java    |   52 +-
 .../structure/io/cif/CifFileSupplier.java     |    4 +-
 .../structure/io/cif/StructureConsumer.java   |  320 +++
 ...erImpl.java => StructureConsumerImpl.java} |  152 +-
 .../io/cif/StructureSupplierImpl.java         |   28 +
 .../io/mmcif/AllChemCompProvider.java         |  246 --
 .../structure/io/mmcif/ChemCompConsumer.java  |  327 ---
 .../io/mmcif/ChemCompGroupFactory.java        |  168 --
 .../structure/io/mmcif/ChemCompProvider.java  |   39 -
 .../io/mmcif/ChemicalComponentDictionary.java |  143 --
 .../io/mmcif/DownloadChemCompProvider.java    |  507 ----
 .../structure/io/mmcif/MMCIFFileTools.java    |  575 -----
 .../structure/io/mmcif/MMcifConsumer.java     |  116 -
 .../nbio/structure/io/mmcif/MMcifParser.java  |   66 -
 .../structure/io/mmcif/MetalBondConsumer.java |  294 ---
 .../structure/io/mmcif/MetalBondParser.java   |   86 -
 .../io/mmcif/ReducedChemCompProvider.java     |   91 -
 .../io/mmcif/SimpleMMcifConsumer.java         | 2167 -----------------
 .../structure/io/mmcif/SimpleMMcifParser.java | 1281 ----------
 .../io/mmcif/ZipChemCompProvider.java         |  313 ---
 .../io/mmcif/chem/ChemCompTools.java          |  261 --
 .../io/mmcif/chem/MetalBondDistance.java      |   76 -
 .../structure/io/mmcif/chem/PolymerType.java  |  191 --
 .../structure/io/mmcif/chem/ResidueType.java  |  150 --
 .../io/mmcif/model/AbstractBean.java          |  103 -
 .../structure/io/mmcif/model/AtomSite.java    |  218 --
 .../structure/io/mmcif/model/AtomSites.java   |  421 ----
 .../structure/io/mmcif/model/AuditAuthor.java |   51 -
 .../structure/io/mmcif/model/CIFLabel.java    |   38 -
 .../nbio/structure/io/mmcif/model/Cell.java   |  143 --
 .../structure/io/mmcif/model/ChemComp.java    |  618 -----
 .../io/mmcif/model/ChemCompAtom.java          |  219 --
 .../io/mmcif/model/ChemCompBond.java          |  133 -
 .../io/mmcif/model/ChemCompDescriptor.java    |  136 --
 .../io/mmcif/model/DatabasePDBremark.java     |   41 -
 .../io/mmcif/model/DatabasePDBrev.java        |   83 -
 .../io/mmcif/model/DatabasePdbrevRecord.java  |   69 -
 .../nbio/structure/io/mmcif/model/Entity.java |  123 -
 .../structure/io/mmcif/model/EntityPoly.java  |  152 --
 .../io/mmcif/model/EntityPolySeq.java         |   72 -
 .../io/mmcif/model/EntitySrcGen.java          |  427 ----
 .../io/mmcif/model/EntitySrcNat.java          |  224 --
 .../io/mmcif/model/EntitySrcSyn.java          |   75 -
 .../nbio/structure/io/mmcif/model/Exptl.java  |   98 -
 .../structure/io/mmcif/model/IgnoreField.java |   37 -
 .../mmcif/model/PdbxAuditRevisionHistory.java |   66 -
 .../mmcif/model/PdbxChemCompDescriptor.java   |   71 -
 .../mmcif/model/PdbxChemCompIdentifier.java   |   73 -
 .../io/mmcif/model/PdbxDatabaseStatus.java    |  101 -
 .../io/mmcif/model/PdbxEntityNonPoly.java     |   51 -
 .../io/mmcif/model/PdbxNonPolyScheme.java     |  107 -
 .../io/mmcif/model/PdbxPolySeqScheme.java     |  117 -
 .../io/mmcif/model/PdbxStructAssembly.java    |   85 -
 .../io/mmcif/model/PdbxStructAssemblyGen.java |   67 -
 .../PdbxStructAssemblyGenXMLContainer.java    |  101 -
 .../model/PdbxStructAssemblyXMLContainer.java |   99 -
 .../io/mmcif/model/PdbxStructOperList.java    |  222 --
 .../model/PdbxStructOperListXMLContainer.java |  101 -
 .../nbio/structure/io/mmcif/model/Refine.java |  658 -----
 .../nbio/structure/io/mmcif/model/Struct.java |   86 -
 .../structure/io/mmcif/model/StructAsym.java  |   68 -
 .../structure/io/mmcif/model/StructConn.java  |  466 ----
 .../io/mmcif/model/StructKeywords.java        |   46 -
 .../io/mmcif/model/StructNcsOper.java         |  282 ---
 .../structure/io/mmcif/model/StructRef.java   |   89 -
 .../io/mmcif/model/StructRefSeq.java          |  146 --
 .../io/mmcif/model/StructRefSeqDif.java       |  147 --
 .../structure/io/mmcif/model/StructSite.java  |  114 -
 .../io/mmcif/model/StructSiteGen.java         |  166 --
 .../structure/io/mmcif/model/Symmetry.java    |   71 -
 .../io/mmcif/model/package-info.java          |   24 -
 .../nbio/structure/io/mmcif/package-info.java |   26 -
 .../quaternary/BiologicalAssemblyBuilder.java |  157 +-
 .../biojava/nbio/structure/TestAtomCache.java |    1 -
 .../structure/align/util/AtomCacheTest.java   |    1 -
 115 files changed, 3085 insertions(+), 15238 deletions(-)
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePDBRevRecord.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePdbRevRecord.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/AllChemCompProvider.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompAtom.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompBond.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompContainer.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompDescriptor.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompProvider.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/PolymerType.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ReducedChemCompProvider.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ResidueType.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/MMCIFFileReader.java
 rename biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/{CifFileSupplierImpl.java => AbstractCifFileSupplier.java} (84%)
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChainSupplierImpl.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifBean.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumer.java
 rename biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/{CifFileConsumerImpl.java => StructureConsumerImpl.java} (89%)
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureSupplierImpl.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/AllChemCompProvider.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemCompConsumer.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemCompGroupFactory.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemCompProvider.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemicalComponentDictionary.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/DownloadChemCompProvider.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MMCIFFileTools.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MMcifConsumer.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MMcifParser.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MetalBondConsumer.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MetalBondParser.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ReducedChemCompProvider.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifConsumer.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifParser.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ZipChemCompProvider.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/ChemCompTools.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/MetalBondDistance.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/PolymerType.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/ResidueType.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AbstractBean.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AtomSite.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AtomSites.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AuditAuthor.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/CIFLabel.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Cell.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemComp.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemCompAtom.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemCompBond.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemCompDescriptor.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/DatabasePDBremark.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/DatabasePDBrev.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/DatabasePdbrevRecord.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Entity.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntityPoly.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntityPolySeq.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntitySrcGen.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntitySrcNat.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntitySrcSyn.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Exptl.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/IgnoreField.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxAuditRevisionHistory.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxChemCompDescriptor.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxChemCompIdentifier.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxDatabaseStatus.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxEntityNonPoly.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxNonPolyScheme.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxPolySeqScheme.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssembly.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssemblyGen.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssemblyGenXMLContainer.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssemblyXMLContainer.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructOperList.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructOperListXMLContainer.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Refine.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Struct.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructAsym.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructConn.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructKeywords.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructNcsOper.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructRef.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructRefSeq.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructRefSeqDif.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructSite.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructSiteGen.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Symmetry.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/package-info.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/package-info.java

diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
index 2c542f0797..92efbeaf36 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
@@ -26,7 +26,6 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.structure.io.MMCIFFileReader;
 import org.biojava.nbio.structure.io.PDBFileReader;
 import org.biojava.nbio.structure.io.StructureIOFile;
 import org.slf4j.Logger;
diff --git a/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java b/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
index 756c44302f..b8e4eb5430 100644
--- a/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
+++ b/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
@@ -23,35 +23,33 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.chem.AllChemCompProvider;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.ChemCompProvider;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.PDBFileReader;
-import org.biojava.nbio.structure.io.mmcif.AllChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.ChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
 
 import java.util.List;
 
-
 /**
- *  This demo shows how to use an alternative ChemCompProvider. The default mechanism in BioJava is to access chemical components
- *  by using the {@link DownloadChemCompProvider}. It fetches and locally caches chemical component definitions as they are encountered during file parsing.
- *  It can be enabled by using the {@link FileParsingParameters#setLoadChemCompInfo(boolean)} method.
+ *  This demo shows how to use an alternative ChemCompProvider. The default mechanism in BioJava is to access chemical
+ *  componentsby using the {@link DownloadChemCompProvider}. It fetches and locally caches chemical component
+ *  definitions as they are encountered during file parsing. It can be enabled by using the
+ *  {@link FileParsingParameters#setLoadChemCompInfo(boolean)} method.
  *
- * The {@link AllChemCompProvider} downloads and unpacks all chemcomps. It is slower and requires more memory than the default {@link DownloadChemCompProvider},
- * but it avoids network access to the FTP site, if a new chemcomp is detected, that has not been downloaded yet.
+ * The {@link AllChemCompProvider} downloads and unpacks all chemcomps. It is slower and requires more memory than the
+ * default {@link DownloadChemCompProvider}, but it avoids network access to the FTP site, if a new chemcomp is
+ * detected, that has not been downloaded yet.
  *
  * Since all chemcomps will be kept in memory, the standard memory that is available to a JVM will not be sufficient
  * in order to run this demo. Please start with -Xmx200M
  *
  * @author Andreas Prlic
- *
  */
 public class DemoChangeChemCompProvider {
-
 	public static void main(String[] args){
 		String pdbId = "1O1G";
-
 		boolean loadChemComp = true;
 
 		//////
@@ -66,82 +64,60 @@ public static void main(String[] args){
 		// or via
 		// by setting the PDB_PATH environmental variable or system property
 		// when running the demo (e.g. -DPDB_DIR=/path/to/pdb)
-
-		if ( loadChemComp) {
-
+		if (loadChemComp) {
 			// The AllChemCompProvider loads all chem comps at startup.
 			// This is slow (13 sec on my laptop) and requires more
 			// memory than the default DownloadChemCompProvider.
 			// In contrast to it it keeps all definitions in memory.
 			ChemCompProvider all = new AllChemCompProvider();
-
 			ChemCompGroupFactory.setChemCompProvider(all);
 		}
 
 		DemoChangeChemCompProvider demo = new DemoChangeChemCompProvider();
 
 		// run the demo
-		demo.basicLoad(reader,loadChemComp, pdbId);
-
+		demo.basicLoad(reader, pdbId);
 	}
 
-	public void basicLoad(PDBFileReader reader, boolean loadChemComp, String pdbId){
-
+	public void basicLoad(PDBFileReader reader, String pdbId) {
 		try {
 			// configure the parameters of file parsing
-
 			FileParsingParameters params = new FileParsingParameters();
-
 			// should the ATOM and SEQRES residues be aligned when creating the internal data model?
 			// only do this if you need to work with SEQRES sequences. If all you need are ATOMs, then
 			// set it to false to have quicker file loading.
 			params.setAlignSeqRes(true);
 
-			//
 			// should secondary structure get parsed from the file
 			params.setParseSecStruc(false);
-
 			reader.setFileParsingParameters(params);
-
 			Structure struc = reader.getStructureById(pdbId);
-
 			printStructure(struc);
-
-
 		} catch (Exception e){
 			e.printStackTrace();
 		}
-
 	}
 
 	private void printStructure(Structure struc) {
-
 		System.out.println(struc);
-
-		//Chain c = struc.getChainByPDB("C");
 		String pdbid = struc.getPDBCode();
 		for (int i = 0; i < struc.nrModels(); i++) {
-
 			// loop chain
 			for (Chain ch : struc.getModel(i)) {
-				if (! ch.getName().equals("A") )
+				if (!ch.getName().equals("A")) {
 					continue;
-				System.out.println(pdbid + ">>>" + ch.getName() + ">>>"
-						+ ch.getAtomSequence());
-				System.out.println(pdbid + ">>>" + ch.getName() + ">>>"
-						+ ch.getSeqResSequence());
+				}
+				System.out.println(pdbid + ">>>" + ch.getName() + ">>>" + ch.getAtomSequence());
+				System.out.println(pdbid + ">>>" + ch.getName() + ">>>" + ch.getSeqResSequence());
 				// Test the getAtomGroups() and getSeqResGroups() method
-
 				List<Group> group = ch.getSeqResGroups();
 				int seqPos = 0;
 				for (Group gp : group) {
-					System.out.println(ch.getName() + ":"+seqPos + ":" + gp.getResidueNumber() + ":"
-							+ gp.getPDBName() + " " + gp.getType());
+					System.out.println(ch.getName() + ":" + seqPos + ":" + gp.getResidueNumber() + ":" +
+							gp.getPDBName() + " " + gp.getType());
 					seqPos++;
 				}
 			}
 		}
-
-
 	}
 }
diff --git a/biojava-structure/src/main/java/demo/DemoMMCIFReader.java b/biojava-structure/src/main/java/demo/DemoMMCIFReader.java
index 8ed28e9c58..d5ae3fea58 100644
--- a/biojava-structure/src/main/java/demo/DemoMMCIFReader.java
+++ b/biojava-structure/src/main/java/demo/DemoMMCIFReader.java
@@ -26,7 +26,6 @@
 
 import org.biojava.nbio.structure.*;
 import org.biojava.nbio.structure.align.util.AtomCache;
-import org.biojava.nbio.structure.io.MMCIFFileReader;
 import org.biojava.nbio.structure.io.StructureProvider;
 
 import java.util.List;
diff --git a/biojava-structure/src/main/java/demo/DemoMmcifToPdbConverter.java b/biojava-structure/src/main/java/demo/DemoMmcifToPdbConverter.java
index 5a5c1a222f..bd84ae8f1e 100644
--- a/biojava-structure/src/main/java/demo/DemoMmcifToPdbConverter.java
+++ b/biojava-structure/src/main/java/demo/DemoMmcifToPdbConverter.java
@@ -23,9 +23,6 @@
 
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.io.mmcif.MMcifParser;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifConsumer;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -38,42 +35,32 @@
  * An example of how to convert mmCIF file to PDB file
  *
  * @author Jose Duarte
- *
  */
-public class DemoMmcifToPdbConverter
-{
-
+public class DemoMmcifToPdbConverter {
 	public static void main(String[] args) throws Exception {
-
 		File inFile = new File(args[0]);
 		File outFile = new File(args[1]);
 		convert(inFile, outFile);
 	}
 
-
-
 	public static void convert(File inFile, File outFile) throws IOException {
-
-	MMcifParser parser = new SimpleMMcifParser();
-
-	SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-	parser.addMMcifConsumer(consumer);
-	parser.parse(new BufferedReader(new InputStreamReader(new FileInputStream(inFile))));
-
-	// now get the protein structure.
-	Structure cifStructure = consumer.getStructure();
-
-	// and write it out as PDB format
-	PrintWriter pr = new PrintWriter(outFile);
-	for (Chain c : cifStructure.getChains()) {
-			// we can override the chain name, the mmCIF chain names might have more than 1 character
-			c.setName(c.getName().substring(0, 1));
-			pr.print(c.toPDB());
-			pr.println("TER");
-	}
+		MMcifParser parser = new SimpleMMcifParser();
+		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
+		parser.addMMcifConsumer(consumer);
+		parser.parse(new BufferedReader(new InputStreamReader(new FileInputStream(inFile))));
+
+		// now get the protein structure.
+		Structure cifStructure = consumer.getStructure();
+
+		// and write it out as PDB format
+		PrintWriter pr = new PrintWriter(outFile);
+		for (Chain c : cifStructure.getChains()) {
+				// we can override the chain name, the mmCIF chain names might have more than 1 character
+				c.setName(c.getName().substring(0, 1));
+				pr.print(c.toPDB());
+				pr.println("TER");
+		}
 
 		pr.close();
-
-
 	}
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomPositionMap.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomPositionMap.java
index b6c806417e..d6d6f778ff 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomPositionMap.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomPositionMap.java
@@ -32,9 +32,8 @@
 import java.util.NavigableMap;
 import java.util.TreeMap;
 
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
-import org.biojava.nbio.structure.io.mmcif.chem.ResidueType;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
+import org.biojava.nbio.structure.chem.PolymerType;
+import org.biojava.nbio.structure.chem.ResidueType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java
index 150d806995..c8413228ee 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java
@@ -25,7 +25,6 @@
 
 import org.biojava.nbio.core.sequence.template.Sequence;
 import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
index 9400333aba..7275fb07a9 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
@@ -24,10 +24,9 @@
 package org.biojava.nbio.structure;
 
 
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.PolymerType;
 import org.biojava.nbio.structure.io.FileConvert;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
 import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
 import org.biojava.nbio.core.sequence.ProteinSequence;
 import org.biojava.nbio.core.sequence.compound.AminoAcidCompound;
@@ -686,7 +685,7 @@ public String toPDB() {
 
 	@Override
 	public String toMMCIF() {
-		return FileConvert.toMMCIF(this, true);
+		return FileConvert.toMMCIF(this);
 	}
 
 	@Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePDBRevRecord.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePDBRevRecord.java
new file mode 100644
index 0000000000..e14ef16776
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePDBRevRecord.java
@@ -0,0 +1,62 @@
+package org.biojava.nbio.structure;
+
+import org.biojava.nbio.structure.io.cif.CifBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DatabasePDBRevRecord implements CifBean<org.rcsb.cif.schema.mm.DatabasePDBRevRecord> {
+    private static final long serialVersionUID = 1L;
+    private String revNum;
+    private String type;
+    private String details;
+
+    public DatabasePDBRevRecord() {
+
+    }
+
+    public DatabasePDBRevRecord(String revNum, String type, String details) {
+        this.revNum = revNum;
+        this.type = type;
+        this.details = details;
+    }
+
+    public DatabasePDBRevRecord(org.rcsb.cif.schema.mm.DatabasePDBRevRecord cif, int row) {
+        this(cif.getDetails().get(row),
+                cif.getRevNum().getStringData(row),
+                cif.getType().get(row));
+    }
+
+    public String getRevNum() {
+        return revNum;
+    }
+
+    public void setRevNum(String revNum) {
+        this.revNum = revNum;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getDetails() {
+        return details;
+    }
+
+    public void setDetails(String details) {
+        this.details = details;
+    }
+
+    @Override
+    public String toString() {
+        return "DatabasePDBRevRecord{" +
+                "revNum='" + revNum + '\'' +
+                ", type='" + type + '\'' +
+                ", details='" + details + '\'' +
+                '}';
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePdbRevRecord.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePdbRevRecord.java
deleted file mode 100644
index 91ec85549f..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePdbRevRecord.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.biojava.nbio.structure;
-
-import java.io.Serializable;
-
-public class DatabasePdbRevRecord implements Serializable {
-    private static final long serialVersionUID = -791924804009516791L;
-    private String rev_num;
-    private String type;
-    private String details;
-
-    public String getRev_num() {
-        return rev_num;
-    }
-
-    public void setRev_num(String rev_num) {
-        this.rev_num = rev_num;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getDetails() {
-        return details;
-    }
-
-    public void setDetails(String details) {
-        this.details = details;
-    }
-
-    @Override
-    public String toString() {
-        return "DatabasePdbrevRecord{" +
-                "rev_num='" + rev_num + '\'' +
-                ", type='" + type + '\'' +
-                ", details='" + details + '\'' +
-                '}';
-    }
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java
index f2bc5a506a..36b8d3b1cd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java
@@ -23,7 +23,7 @@
  */
 package org.biojava.nbio.structure;
 
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
+import org.biojava.nbio.structure.chem.ChemComp;
 
 import java.io.Serializable;
 import java.util.Iterator;
@@ -53,29 +53,28 @@
  *
  */
 public interface Group extends Serializable {
-
 	/** Group property key for secondary structure annotation */
-	public static final String SEC_STRUC = "secstruc";
+	String SEC_STRUC = "secstruc";
 
 	/**
 	 * Get number of atoms.
 	 * @return number of atoms of this Group
 	 */
-	public int size();
+	int size();
 
 	/**
 	 * Return true or false, depending if this group has 3D coordinates or not.
 	 *
 	 * @return true if Group has 3D coordinates
 	 */
-	public boolean has3D ();
+	boolean has3D();
 
 	/**
 	 * Flag if group has 3D data .
 	 *
 	 * @param flag  true to set flag that this Group has 3D coordinates
 	 */
-	public void setPDBFlag(boolean flag);
+	void setPDBFlag(boolean flag);
 
 	/**
 	 * Get Type of group, one of {@link GroupType#AMINOACID}, {@link GroupType#HETATM}
@@ -83,14 +82,14 @@ public interface Group extends Serializable {
 	 *
 	 * @return a String representing the type value
 	 */
-	public GroupType getType();
+	GroupType getType();
 
 	/**
 	 * Add an atom to this group.
 	 *
 	 * @param atom  an Atom object
 	 */
-	public void addAtom(Atom atom);
+	void addAtom(Atom atom);
 
 	/**
 	 * Get list of atoms.
@@ -98,21 +97,20 @@ public interface Group extends Serializable {
 	 * @return a List object representing the atoms
 	 * @see #setAtoms(List)
 	 */
-	public List<Atom> getAtoms() ;
-
+	List<Atom> getAtoms();
 
 	/**
 	 * Set the atoms of this group.
 	 * @see Atom
 	 * @param atoms a list of atoms
 	 */
-	public void setAtoms(List<Atom> atoms);
+	void setAtoms(List<Atom> atoms);
 
 	/**
 	 * Remove all atoms from this group.
 	 *
 	 */
-	public void clearAtoms();
+	void clearAtoms();
 
 	/**
 	 * Get an atom given its PDB name.
@@ -125,15 +123,15 @@ public interface Group extends Serializable {
 	 * @param name  a trimmed String representing the atom's PDB name, e.g. "CA"
 	 * @return an Atom object or null if no such atom exists within this group
 	 */
-	public Atom getAtom(String name) ;
-	
+	Atom getAtom(String name);
+
 	/**
 	 * Get at atom by position.
 	 *
 	 * @param position  an int
 	 * @return an Atom object or null if no Atom exists for given position
 	 */
-	public Atom getAtom(int position) ;
+	Atom getAtom(int position);
 
 	/**
 	 * Tell whether a particular atom exists within this group.
@@ -143,7 +141,7 @@ public interface Group extends Serializable {
 	 * @param name  a trimmed String representing the atom's PDB name, e.g. "CA"
 	 * @return true if Atom with name exists within this group
 	 */
-	public boolean hasAtom(String name);
+	boolean hasAtom(String name);
 
 	/**
 	 * Get the PDB 3-letter name for this group. (e.g. ALA)
@@ -151,7 +149,7 @@ public interface Group extends Serializable {
 	 * @return a String representing the PDBName value
 	 * @see #setPDBName
 	 */
-	public String getPDBName();
+	String getPDBName();
 
 	/**
 	 * Set the PDB 3-letter name for this group. (e.g. ALA)
@@ -159,8 +157,7 @@ public interface Group extends Serializable {
 	 * @param s  a String specifying the PDBName value
 	 * @see #getPDBName
 	 */
-	public void setPDBName(String s) ;
-
+	void setPDBName(String s);
 
 	/**
 	 * Calculate if this group has all atoms required for an amino acid backbone.
@@ -183,33 +180,28 @@ public interface Group extends Serializable {
 	 * @return true if all Atoms required for an AminoAcid are available (N, CA, C, O)
 	 * @see #getType
 	 */
-	public boolean hasAminoAtoms() ;
-
+	boolean hasAminoAtoms();
 
 	/**
 	 * Check if this group is a polymeric group, from the definition in Chemical Component Dictionary
 	 *
 	 * @return true if a polymeric group
 	 */
-	public boolean isPolymeric();
-
+	boolean isPolymeric();
 
 	/**
 	 * Check if this group is an aminoacid group, from the definition in Chemical Component Dictionary
 	 *
 	 * @return true if an amino acid
 	 */
-	public boolean isAminoAcid();
-
+	boolean isAminoAcid();
 
 	/**
 	 * Check if this group is a nucleotide group, from the definition in Chemical Component Dictionary
 	 *
 	 * @return true if a nucleotide
 	 */
-	public boolean isNucleotide();
-
-
+	boolean isNucleotide();
 
 	/**
 	 * Properties of this amino acid. Currently available properties are:
@@ -220,7 +212,7 @@ public interface Group extends Serializable {
 	 * @param properties  a Map object specifying the properties value
 	 * @see #getProperties
 	 */
-	public void setProperties(Map<String,Object> properties) ;
+	void setProperties(Map<String, Object> properties);
 
 	/**
 	 * Return properties.
@@ -228,7 +220,7 @@ public interface Group extends Serializable {
 	 *
 	 * @return a HashMap object representing the properties value
 	 */
-	public Map<String,Object> getProperties() ;
+	Map<String,Object> getProperties();
 
 	/**
 	 * Set a single property .
@@ -237,7 +229,7 @@ public interface Group extends Serializable {
 	 * @param value  an Object
 	 * @see #getProperty
 	 */
-	public void setProperty(String key, Object value) ;
+	void setProperty(String key, Object value);
 
 	/**
 	 * Get a single property .
@@ -246,21 +238,20 @@ public interface Group extends Serializable {
 	 * @return an Object
 	 * @see #setProperty
 	 */
-	public Object getProperty(String key) ;
+	Object getProperty(String key);
 
 	/**
 	 * Get an Atom Iterator.
 	 *
 	 * @return an Iterator object
 	 */
-	public Iterator<Atom> iterator() ;
-
+	Iterator<Atom> iterator();
 
 	/**
 	 * Returns and identical copy of this Group object .
 	 * @return  and identical copy of this Group object
 	 */
-	public Object clone();
+	Object clone();
 
 	/**
 	 * Sets the back-reference to its parent Chain.
@@ -268,7 +259,7 @@ public interface Group extends Serializable {
 	 * @see #getChain()
 	 * @since 3.0
 	 */
-	public void setChain(Chain chain);
+	void setChain(Chain chain);
 
 	/**
 	 * Returns the parent Chain of the Group.
@@ -277,7 +268,7 @@ public interface Group extends Serializable {
 	 * @see #setChain(Chain)
 	 * @since 3.0
 	 */
-	public Chain getChain() ;
+	Chain getChain();
 
 	/**
 	 * Returns a dynamically created ResidueNumber for the group - this
@@ -286,15 +277,14 @@ public interface Group extends Serializable {
 	 * @return ResidueNumber for the group.
 	 * @since 3.0
 	 */
-	public ResidueNumber getResidueNumber();
-
+	ResidueNumber getResidueNumber();
 
 	/**
 	 * Sets the ResidueNumber for this Group
 	 *
 	 * @param residueNumber the PDB residueNumber
 	 */
-	public void setResidueNumber(ResidueNumber residueNumber);
+	void setResidueNumber(ResidueNumber residueNumber);
 
 	/**
 	 * Utility method to temporarily set a chainID for a group, if a parent chain object does not exist yet.
@@ -304,7 +294,7 @@ public interface Group extends Serializable {
 	 * @param residueNumber
 	 * @param iCode
 	 */
-	public void setResidueNumber(String chainId, Integer residueNumber, Character iCode);
+	void setResidueNumber(String chainId, Integer residueNumber, Character iCode);
 
 	/**
 	 * Utility method for returning the chainId of the Group or null if no
@@ -314,22 +304,21 @@ public interface Group extends Serializable {
 	 * @since 3.0
 	 * @return  the ID of the chain
 	 */
-	public String getChainId();
+	String getChainId();
 
 	/**
 	 * Set the Chemical Component that closer describes this group.
 	 *
 	 * @param cc the chemical component
 	 */
-	public void setChemComp(ChemComp cc);
+	void setChemComp(ChemComp cc);
 
 	/**
 	 * Get the chemical component that closer describes this group. If the information does not exist yet, fetches the information from PDB web site.
 	 *
 	 * @return the Chemical Component definition for this Group.
 	 */
-	public ChemComp getChemComp();
-
+	ChemComp getChemComp();
 
 	/**
 	 * Check if this group has alternate location groups.
@@ -337,8 +326,7 @@ public interface Group extends Serializable {
 	 * @return boolean flag if there are alternate locations.
 	 * @see #getAltLocs()
 	 */
-	public boolean hasAltLoc();
-
+	boolean hasAltLoc();
 
 	/**
 	 * Get the list of other alternate location groups.
@@ -363,14 +351,14 @@ public interface Group extends Serializable {
 	 *
 	 * @return List of other groups that are on alternate locations
 	 */
-	public List<Group> getAltLocs();
+	List<Group> getAltLocs();
 
 	/**
 	 * Add a group that is an alternate location for this group.
 	 *
 	 * @param g the altloc group to add
 	 */
-	public void addAltLoc(Group g);
+	void addAltLoc(Group g);
 
 	/**
 	 * Determines if this group is water.
@@ -378,7 +366,7 @@ public interface Group extends Serializable {
 	 * @see GroupType#WATERNAMES
 	 * @return true if it's water, false otherwise.
 	 */
-	public boolean isWater();
+	boolean isWater();
 
 	/**
 	 * Gets the alternate location group to this group that has the alt-loc character code passed.
@@ -386,21 +374,20 @@ public interface Group extends Serializable {
 	 * @param altLoc the alternate location code of the group desired
 	 * @return the alternate location group if found, or null otherwise
 	 */
-	public Group getAltLocGroup(Character altLoc);
-
+	Group getAltLocGroup(Character altLoc);
 
 	/**
 	 * Attempts to reduce the memory imprint of this group by trimming
 	 * all internal Collection objects to the required size.
 	 *
 	 */
-	public void trimToSize();
+	void trimToSize();
 
 	/**
 	 * Function to get the Group as an MDL molblock
 	 * @return the string of the MDL molblock
 	 */
-	public String toSDF();
+	String toSDF();
 
 	/**
 	 * Tells whether the group is annotated as HETATM in the file.
@@ -408,7 +395,7 @@ public interface Group extends Serializable {
 	 * polymeric group is in a ligand chain or not.
 	 * @return
 	 */
-	public boolean isHetAtomInFile();
+	boolean isHetAtomInFile();
 
 	/**
 	 * Sets the field isHetAtomInFile which is intented only for
@@ -416,5 +403,5 @@ public interface Group extends Serializable {
 	 * or in a polymeric chain.
 	 * @param isHetAtomInFile
 	 */
-	public void setHetAtomInFile(boolean isHetAtomInFile);
+	void setHetAtomInFile(boolean isHetAtomInFile);
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/GroupType.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/GroupType.java
index 234813ef42..7fa92f7363 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/GroupType.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/GroupType.java
@@ -20,8 +20,8 @@
  */
 package org.biojava.nbio.structure;
 
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
-import org.biojava.nbio.structure.io.mmcif.chem.ResidueType;
+import org.biojava.nbio.structure.chem.PolymerType;
+import org.biojava.nbio.structure.chem.ResidueType;
 
 import java.util.*;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
index 037dcb2b0b..ddc4f2f636 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
@@ -23,15 +23,19 @@
  */
 package org.biojava.nbio.structure;
 
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.PolymerType;
+import org.biojava.nbio.structure.chem.ResidueType;
 import org.biojava.nbio.structure.io.GroupToSDF;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
-import org.biojava.nbio.structure.io.mmcif.chem.ResidueType;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
+import org.rcsb.cif.schema.mm.ChemComp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -332,9 +336,9 @@ public boolean isAminoAcid() {
 			return getType().equals(GroupType.AMINOACID);
 
 
-		ResidueType rt = cc.getResidueType();
+		ResidueType rt = ResidueType.getResidueTypeFromString(cc.getType().get(0));
 
-		if ( rt.equals(ResidueType.nonPolymer))
+		if (ResidueType.nonPolymer.equals(rt))
 			return false;
 
 		PolymerType pt = rt.getPolymerType();
@@ -351,9 +355,9 @@ public boolean isNucleotide() {
 		if ( cc == null)
 			return  getType().equals(GroupType.NUCLEOTIDE);
 
-		ResidueType rt = cc.getResidueType();
+		ResidueType rt = ResidueType.getResidueTypeFromString(cc.getType().get(0));
 
-		if ( rt.equals(ResidueType.nonPolymer))
+		if (ResidueType.nonPolymer.equals(rt))
 			return false;
 
 		PolymerType pt = rt.getPolymerType();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
index 1071c52c23..d65c61ae95 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
@@ -76,7 +76,7 @@ public class PDBHeader implements PDBRecord {
 
 	private Map<Integer,BioAssemblyInfo> bioAssemblies ;
 
-	List<DatabasePdbRevRecord> revisionRecords;
+	List<DatabasePDBRevRecord> revisionRecords;
 
 	public PDBHeader(){
 
@@ -662,11 +662,11 @@ public int getNrBioAssemblies() {
 		return this.bioAssemblies.size();
 	}
 
-	public List<DatabasePdbRevRecord> getRevisionRecords() {
+	public List<DatabasePDBRevRecord> getRevisionRecords() {
 		return revisionRecords;
 	}
 
-	public void setRevisionRecords(List<DatabasePdbRevRecord> revisionRecords) {
+	public void setRevisionRecords(List<DatabasePDBRevRecord> revisionRecords) {
 		this.revisionRecords = revisionRecords;
 	}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
index 193ed78e3d..e0592dfae3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
@@ -25,8 +25,10 @@
 import java.util.List;
 
 import org.biojava.nbio.structure.align.util.AtomCache;
-import org.biojava.nbio.structure.io.MMCIFFileReader;
+import org.biojava.nbio.structure.io.BcifFileReader;
+import org.biojava.nbio.structure.io.CifFileReader;
 import org.biojava.nbio.structure.io.PDBFileReader;
+import org.rcsb.cif.binary.BinaryCifReader;
 
 /**
  * A class that provides static access methods for easy lookup of protein structure related components
@@ -282,7 +284,8 @@ public static void setPdbPath(String pathToPDBFiles){
 
 	public static enum StructureFiletype {
 		PDB( (new PDBFileReader()).getExtensions()),
-		CIF( new MMCIFFileReader().getExtensions()),
+		CIF(new CifFileReader().getExtensions()),
+		BCIF(new BcifFileReader().getExtensions()),
 		UNKNOWN(Collections.<String>emptyList());
 
 		private List<String> extensions;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
index 653683ee0f..91cccd6a38 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
@@ -20,10 +20,14 @@
  */
 package org.biojava.nbio.structure;
 
-import java.io.BufferedReader;
+import org.biojava.nbio.structure.StructureIO.StructureFiletype;
+import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.io.PDBFileReader;
+import org.biojava.nbio.structure.io.cif.CifFileConverter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -36,16 +40,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.biojava.nbio.core.util.InputStreamProvider;
-import org.biojava.nbio.structure.StructureIO.StructureFiletype;
-import org.biojava.nbio.structure.align.util.AtomCache;
-import org.biojava.nbio.structure.io.PDBFileReader;
-import org.biojava.nbio.structure.io.mmcif.MMcifParser;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifConsumer;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Represents a structure loaded from a URL (including a file URL)
  *
@@ -159,27 +153,7 @@ public Structure loadStructure(AtomCache cache) throws StructureException,
 
 		switch(format) {
 		case CIF:
-			// need to do mmcif parsing!
-
-			InputStreamProvider prov = new InputStreamProvider();
-			InputStream inStream =  prov.getInputStream(url);
-
-			MMcifParser parser = new SimpleMMcifParser();
-
-			SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-			consumer.setFileParsingParameters(cache.getFileParsingParams());
-
-
-			parser.addMMcifConsumer(consumer);
-
-			try {
-				parser.parse(new BufferedReader(new InputStreamReader(inStream)));
-			} catch (IOException e){
-				e.printStackTrace();
-			}
-
-			// now get the protein structure.
-			return consumer.getStructure();
+			return CifFileConverter.fromURL(url);
 		default:
 		case PDB:
 			// pdb file based parsing
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
index 4b96d5f433..cc0220da07 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
@@ -33,10 +33,10 @@
 import org.biojava.nbio.structure.cath.CathDatabase;
 import org.biojava.nbio.structure.cath.CathDomain;
 import org.biojava.nbio.structure.cath.CathFactory;
+import org.biojava.nbio.structure.io.CifFileReader;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.ObsoleteBehavior;
-import org.biojava.nbio.structure.io.MMCIFFileReader;
 import org.biojava.nbio.structure.io.MMTFFileReader;
 import org.biojava.nbio.structure.io.PDBFileReader;
 import org.biojava.nbio.core.util.FileDownloadUtils;
@@ -879,12 +879,11 @@ protected Structure loadStructureFromCifByPdbId(String pdbId) throws IOException
 		Structure s;
 		flagLoading(pdbId);
 		try {
-			MMCIFFileReader reader = new MMCIFFileReader(path);
+			CifFileReader reader = new CifFileReader(path);
 			reader.setFetchBehavior(fetchBehavior);
 			reader.setObsoleteBehavior(obsoleteBehavior);
 			reader.setFileParsingParameters(params);
 			s = reader.getStructureById(pdbId.toLowerCase());
-
 		} finally {
 			flagLoadingFinished(pdbId);
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/AllChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/AllChemCompProvider.java
new file mode 100644
index 0000000000..ef3b7414b8
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/AllChemCompProvider.java
@@ -0,0 +1,185 @@
+package org.biojava.nbio.structure.chem;
+
+import org.biojava.nbio.core.util.InputStreamProvider;
+import org.biojava.nbio.structure.align.util.UserConfiguration;
+import org.biojava.nbio.structure.io.LocalPDBDirectory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * A ChemComp provider that downloads and caches the components.cif file from the wwPDB site. It then loads
+ * all chemical components at startup and keeps them in memory. This provider is not used as a default
+ * since it is slower at startup and requires more memory than the {@link DownloadChemCompProvider} that is used by default.
+ *
+ * @author Andreas Prlic
+ *
+ */
+public class AllChemCompProvider implements ChemCompProvider, Runnable{
+    private static final Logger logger = LoggerFactory.getLogger(AllChemCompProvider.class);
+    public static final String COMPONENTS_FILE_LOCATION = "pub/pdb/data/monomers/components.cif.gz";
+
+    private static String path;
+    private static String serverName;
+
+    // there will be only one copy of the dictionary across all instances
+    // to reduce memory impact
+    static ChemicalComponentDictionary dict;
+
+    // flags to make sure there is only one thread running that is loading the dictionary
+    static AtomicBoolean loading = new AtomicBoolean(false);
+    static AtomicBoolean isInitialized = new AtomicBoolean(false);
+
+    public AllChemCompProvider(){
+        if (loading.get()) {
+            logger.warn("other thread is already loading all chemcomps, no need to init twice");
+            return;
+        }
+        if (isInitialized.get()) {
+            return;
+        }
+
+        loading.set(true);
+
+        Thread t = new Thread(this);
+        t.start();
+    }
+
+    /**
+     * make sure all paths are initialized correctly
+     */
+    private static void initPath(){
+        if (path == null) {
+            UserConfiguration config = new UserConfiguration();
+            path = config.getCacheFilePath();
+        }
+    }
+
+    private static void initServerName() {
+        if (serverName == null) {
+            serverName = LocalPDBDirectory.getServerName();
+        }
+    }
+
+    private void ensureFileExists() {
+        String fileName = getLocalFileName();
+        File f = new File(fileName);
+
+        if (!f.exists()) {
+            try {
+                downloadFile();
+            } catch (IOException e) {
+                logger.error("Caught IOException", e);
+            }
+        }
+    }
+
+    /**
+     * Downloads the components.cif.gz file from the wwPDB site.
+     */
+    public static void downloadFile() throws IOException {
+        initPath();
+        initServerName();
+
+        String localName = getLocalFileName();
+        String u = serverName + "/" + COMPONENTS_FILE_LOCATION;
+
+        downloadFileFromRemote(new URL(u), new File(localName));
+    }
+
+    private static void downloadFileFromRemote(URL remoteURL, File localFile) throws IOException {
+        logger.info("Downloading " + remoteURL + " to: " + localFile);
+        FileOutputStream out = new FileOutputStream(localFile);
+
+        InputStream in = remoteURL.openStream();
+        byte[] buf = new byte[4 * 1024]; // 4K buffer
+        int bytesRead;
+        while ((bytesRead = in.read(buf)) != -1) {
+            out.write(buf, 0, bytesRead);
+        }
+        in.close();
+        out.close();
+    }
+
+    private static String getLocalFileName(){
+        File dir = new File(path, DownloadChemCompProvider.CHEM_COMP_CACHE_DIRECTORY);
+
+        if (!dir.exists()) {
+            logger.info("Creating directory {}", dir.toString());
+            dir.mkdir();
+        }
+
+        return new File(dir, "components.cif.gz").toString();
+    }
+
+    /**
+     * Load all {@link ChemComp} definitions into memory.
+     */
+    private void loadAllChemComps() throws IOException {
+        String fileName = getLocalFileName();
+        logger.debug("Loading " + fileName);
+        InputStreamProvider isp = new InputStreamProvider();
+
+        InputStream inStream = isp.getInputStream(fileName);
+        MMcifParser parser = new SimpleMMcifParser();
+        ChemCompConsumer consumer = new ChemCompConsumer();
+
+        // The Consumer builds up the BioJava - structure object.
+        // you could also hook in your own and build up you own data model.
+        parser.addMMcifConsumer(consumer);
+        parser.parse(new BufferedReader(new InputStreamReader(inStream)));
+        dict = consumer.getDictionary();
+        inStream.close();
+    }
+
+    /**
+     *  {@inheritDoc}
+     */
+    @Override
+    public ChemComp getChemComp(String recordName) {
+        while (loading.get()) {
+            // another thread is still initializing the definitions
+            try {
+                // wait half a second
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+                logger.error("Interrupted thread while waiting: " + e.getMessage());
+                //e.printStackTrace();
+            }
+        }
+
+        return dict.getChemComp(recordName);
+    }
+
+
+    /**
+     * Do the actual loading of the dictionary in a thread.
+     */
+    @Override
+    public void run() {
+        long timeS = System.currentTimeMillis();
+        initPath();
+        ensureFileExists();
+
+        try {
+            loadAllChemComps();
+
+            long timeE = System.currentTimeMillis();
+            logger.debug("Time to init chem comp dictionary: " + (timeE - timeS) / 1000 + " sec.");
+        } catch (IOException e) {
+            logger.error("Could not load chemical components definition file {}. Error: {}", getLocalFileName(), e.getMessage());
+        } finally {
+            loading.set(false);
+            isInitialized.set(true);
+        }
+    }
+}
+
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
new file mode 100644
index 0000000000..96631fe736
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
@@ -0,0 +1,405 @@
+package org.biojava.nbio.structure.chem;
+
+import org.biojava.nbio.structure.io.cif.CifBean;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Properties of a chemical component.
+ */
+public class ChemComp implements CifBean<org.rcsb.cif.schema.mm.ChemComp>, Comparable<ChemComp> {
+    private static final long serialVersionUID = -4736341142030215915L;
+
+    private String id;
+    private String name;
+    private String type;
+    private String pdbxType;
+    private String formula;
+    private String monNstdParentCompId;
+    private String pdbxSynonyms;
+    private String pdbxFormalCharge;
+    private String pdbxInitialDate;
+    private String pdbxModifiedDate;
+    private String pdbxAmbiguousFlag;
+    private String pdbxReleaseStatus;
+    private String pdbxReplacedBy;
+    private String pdbxReplaces;
+    private String formulaWeight;
+    private String oneLetterCode;
+    private String threeLetterCode;
+    private String pdbxModelCoordinatesDetails;
+    private String pdbxModelCoordinatesMissingFlag;
+    private String pdbxIdealCoordinatesDetails;
+    private String pdbxIdealCoordinatesMissingFlag;
+    private String pdbxModelCoordinatesDbCode;
+    private String pdbxSubcomponentList;
+    private String pdbxProcessingSite;
+    private String monNstdFlag;
+
+    private List<ChemCompDescriptor> descriptors = new ArrayList<>();
+    private List<ChemCompBond> bonds = new ArrayList<>();
+    private List<ChemCompAtom> atoms = new ArrayList<>();
+
+    // and some derived data for easier processing...
+    private ResidueType residueType;
+    private PolymerType polymerType;
+    private boolean standard;
+
+    @Override
+    public String toString(){
+        StringBuffer buf = new StringBuffer("ChemComp ");
+        buf.append(id)
+                .append(" ")
+                .append(oneLetterCode)
+                .append(" ")
+                .append(threeLetterCode)
+                .append(" poly:")
+                .append(getPolymerType())
+                .append(" resi:")
+                .append(getResidueType())
+                .append(isStandard() ? " standard" : " modified")
+                .append(" ")
+                .append(name)
+                .append(" ")
+                .append(pdbxType)
+                .append(" ")
+                .append(formula)
+                .append(" parent:")
+                .append(monNstdParentCompId);
+        return buf.toString();
+    }
+
+    public boolean hasParent(){
+        String pid = monNstdParentCompId;
+        return (pid != null) && (!pid.equals("?"));
+    }
+
+    public boolean isStandard(){
+        return standard;
+    }
+
+    private void setStandardFlag(){
+        standard = ChemCompTools.isStandardChemComp(this);
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+        this.residueType = ResidueType.getResidueTypeFromString(type);
+        if (residueType != null) {
+            polymerType = residueType.polymerType;
+        }
+    }
+
+    public ResidueType getResidueType() {
+        return residueType;
+    }
+
+    public void setResidueType(ResidueType residueType) {
+        this.residueType = residueType;
+    }
+
+    public PolymerType getPolymerType() {
+        return polymerType;
+    }
+
+    public void setPolymerType(PolymerType polymerType) {
+        this.polymerType = polymerType;
+    }
+
+    public String getPdbxType() {
+        return pdbxType;
+    }
+
+    public void setPdbxType(String pdbxType) {
+        this.pdbxType = pdbxType;
+    }
+
+    public String getFormula() {
+        return formula;
+    }
+
+    public void setFormula(String formula) {
+        this.formula = formula;
+    }
+
+    public String getMonNstdParentCompId() {
+        return monNstdParentCompId;
+    }
+
+    public void setMonNstdParentCompId(String monNstdParentCompId) {
+        this.monNstdParentCompId = monNstdParentCompId;
+        setStandardFlag();
+    }
+
+    public String getPdbxSynonyms() {
+        return pdbxSynonyms;
+    }
+
+    public void setPdbxSynonyms(String pdbxSynonyms) {
+        this.pdbxSynonyms = pdbxSynonyms;
+    }
+
+    public String getPdbxFormalCharge() {
+        return pdbxFormalCharge;
+    }
+
+    public void setPdbxFormalCharge(String pdbxFormalCharge) {
+        this.pdbxFormalCharge = pdbxFormalCharge;
+    }
+
+    public String getPdbxInitialDate() {
+        return pdbxInitialDate;
+    }
+
+    public void setPdbxInitialDate(String pdbxInitialDate) {
+        this.pdbxInitialDate = pdbxInitialDate;
+    }
+
+    public String getPdbxModifiedDate() {
+        return pdbxModifiedDate;
+    }
+
+    public void setPdbxModifiedDate(String pdbxModifiedDate) {
+        this.pdbxModifiedDate = pdbxModifiedDate;
+    }
+
+    public String getPdbxAmbiguousFlag() {
+        return pdbxAmbiguousFlag;
+    }
+
+    public void setPdbxAmbiguousFlag(String pdbxAmbiguousFlag) {
+        this.pdbxAmbiguousFlag = pdbxAmbiguousFlag;
+    }
+
+    public String getPdbxReleaseStatus() {
+        return pdbxReleaseStatus;
+    }
+
+    public void setPdbxReleaseStatus(String pdbxReleaseStatus) {
+        this.pdbxReleaseStatus = pdbxReleaseStatus;
+    }
+
+    public String getPdbxReplacedBy() {
+        return pdbxReplacedBy;
+    }
+
+    public void setPdbxReplacedBy(String pdbxReplacedBy) {
+        this.pdbxReplacedBy = pdbxReplacedBy;
+    }
+
+    public String getPdbxReplaces() {
+        return pdbxReplaces;
+    }
+
+    public void setPdbxReplaces(String pdbxReplaces) {
+        this.pdbxReplaces = pdbxReplaces;
+    }
+
+    public String getFormulaWeight() {
+        return formulaWeight;
+    }
+
+    public void setFormulaWeight(String formulaWeight) {
+        this.formulaWeight = formulaWeight;
+    }
+
+    public String getOneLetterCode() {
+        return oneLetterCode;
+    }
+
+    public void setOneLetterCode(String oneLetterCode) {
+        this.oneLetterCode = oneLetterCode;
+        setStandardFlag();
+    }
+
+    public String getThreeLetterCode() {
+        return threeLetterCode;
+    }
+
+    public void setThreeLetterCode(String threeLetterCode) {
+        this.threeLetterCode = threeLetterCode;
+    }
+
+    public String getPdbxModelCoordinatesDetails() {
+        return pdbxModelCoordinatesDetails;
+    }
+
+    public void setPdbxModelCoordinatesDetails(String pdbxModelCoordinatesDetails) {
+        this.pdbxModelCoordinatesDetails = pdbxModelCoordinatesDetails;
+    }
+
+    public String getPdbxModelCoordinatesMissingFlag() {
+        return pdbxModelCoordinatesMissingFlag;
+    }
+
+    public void setPdbxModelCoordinatesMissingFlag(String pdbxModelCoordinatesMissingFlag) {
+        this.pdbxModelCoordinatesMissingFlag = pdbxModelCoordinatesMissingFlag;
+    }
+
+    public String getPdbxIdealCoordinatesDetails() {
+        return pdbxIdealCoordinatesDetails;
+    }
+
+    public void setPdbxIdealCoordinatesDetails(String pdbxIdealCoordinatesDetails) {
+        this.pdbxIdealCoordinatesDetails = pdbxIdealCoordinatesDetails;
+    }
+
+    public String getPdbxIdealCoordinatesMissingFlag() {
+        return pdbxIdealCoordinatesMissingFlag;
+    }
+
+    public void setPdbxIdealCoordinatesMissingFlag(String pdbxIdealCoordinatesMissingFlag) {
+        this.pdbxIdealCoordinatesMissingFlag = pdbxIdealCoordinatesMissingFlag;
+    }
+
+    public String getPdbxModelCoordinatesDbCode() {
+        return pdbxModelCoordinatesDbCode;
+    }
+
+    public void setPdbxModelCoordinatesDbCode(String pdbxModelCoordinatesDbCode) {
+        this.pdbxModelCoordinatesDbCode = pdbxModelCoordinatesDbCode;
+    }
+
+    public String getPdbxSubcomponentList() {
+        return pdbxSubcomponentList;
+    }
+
+    public void setPdbxSubcomponentList(String pdbxSubcomponentList) {
+        this.pdbxSubcomponentList = pdbxSubcomponentList;
+    }
+
+    public String getPdbxProcessingSite() {
+        return pdbxProcessingSite;
+    }
+
+    public void setPdbxProcessingSite(String pdbxProcessingSite) {
+        this.pdbxProcessingSite = pdbxProcessingSite;
+    }
+
+    public String getMonNstdFlag() {
+        return monNstdFlag;
+    }
+
+    public void setMonNstdFlag(String monNstdFlag) {
+        this.monNstdFlag = monNstdFlag;
+    }
+
+    public List<ChemCompDescriptor> getDescriptors() {
+        return descriptors;
+    }
+
+    public void setDescriptors(List<ChemCompDescriptor> descriptors) {
+        this.descriptors = descriptors;
+    }
+
+    public List<ChemCompBond> getBonds() {
+        return bonds;
+    }
+
+    public void setBonds(List<ChemCompBond> bonds) {
+        this.bonds = bonds;
+    }
+
+    public List<ChemCompAtom> getAtoms() {
+        return atoms;
+    }
+
+    public void setAtoms(List<ChemCompAtom> atoms) {
+        this.atoms = atoms;
+    }
+
+    @Override
+    public int compareTo(ChemComp arg0) {
+        if (this.equals(arg0))
+            return 0;
+        return this.getId().compareTo(arg0.getId());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ChemComp chemComp = (ChemComp) o;
+        return standard == chemComp.standard &&
+                Objects.equals(id, chemComp.id) &&
+                Objects.equals(name, chemComp.name) &&
+                Objects.equals(type, chemComp.type) &&
+                Objects.equals(pdbxType, chemComp.pdbxType) &&
+                Objects.equals(formula, chemComp.formula) &&
+                Objects.equals(monNstdParentCompId, chemComp.monNstdParentCompId) &&
+                Objects.equals(pdbxSynonyms, chemComp.pdbxSynonyms) &&
+                Objects.equals(pdbxFormalCharge, chemComp.pdbxFormalCharge) &&
+                Objects.equals(pdbxInitialDate, chemComp.pdbxInitialDate) &&
+                Objects.equals(pdbxModifiedDate, chemComp.pdbxModifiedDate) &&
+                Objects.equals(pdbxAmbiguousFlag, chemComp.pdbxAmbiguousFlag) &&
+                Objects.equals(pdbxReleaseStatus, chemComp.pdbxReleaseStatus) &&
+                Objects.equals(pdbxReplacedBy, chemComp.pdbxReplacedBy) &&
+                Objects.equals(pdbxReplaces, chemComp.pdbxReplaces) &&
+                Objects.equals(formulaWeight, chemComp.formulaWeight) &&
+                Objects.equals(oneLetterCode, chemComp.oneLetterCode) &&
+                Objects.equals(threeLetterCode, chemComp.threeLetterCode) &&
+                Objects.equals(pdbxModelCoordinatesDetails, chemComp.pdbxModelCoordinatesDetails) &&
+                Objects.equals(pdbxModelCoordinatesMissingFlag, chemComp.pdbxModelCoordinatesMissingFlag) &&
+                Objects.equals(pdbxIdealCoordinatesDetails, chemComp.pdbxIdealCoordinatesDetails) &&
+                Objects.equals(pdbxIdealCoordinatesMissingFlag, chemComp.pdbxIdealCoordinatesMissingFlag) &&
+                Objects.equals(pdbxModelCoordinatesDbCode, chemComp.pdbxModelCoordinatesDbCode) &&
+                Objects.equals(pdbxSubcomponentList, chemComp.pdbxSubcomponentList) &&
+                Objects.equals(pdbxProcessingSite, chemComp.pdbxProcessingSite) &&
+                Objects.equals(monNstdFlag, chemComp.monNstdFlag) &&
+                Objects.equals(descriptors, chemComp.descriptors) &&
+                Objects.equals(bonds, chemComp.bonds) &&
+                Objects.equals(atoms, chemComp.atoms) &&
+                residueType == chemComp.residueType &&
+                polymerType == chemComp.polymerType;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name, type, pdbxType, formula, monNstdParentCompId, pdbxSynonyms, pdbxFormalCharge, pdbxInitialDate, pdbxModifiedDate, pdbxAmbiguousFlag, pdbxReleaseStatus, pdbxReplacedBy, pdbxReplaces, formulaWeight, oneLetterCode, threeLetterCode, pdbxModelCoordinatesDetails, pdbxModelCoordinatesMissingFlag, pdbxIdealCoordinatesDetails, pdbxIdealCoordinatesMissingFlag, pdbxModelCoordinatesDbCode, pdbxSubcomponentList, pdbxProcessingSite, monNstdFlag, descriptors, bonds, atoms, residueType, polymerType, standard);
+    }
+
+    /**
+     * Creates a new instance of the dummy empty ChemComp.
+     * @return a ChemComp
+     */
+    public static ChemComp getEmptyChemComp() {
+        ChemComp comp = new ChemComp();
+
+        comp.setOneLetterCode("?");
+        comp.setThreeLetterCode("???"); // Main signal for isEmpty()
+        comp.setPolymerType(PolymerType.unknown);
+        comp.setResidueType(ResidueType.atomn);
+        return comp;
+    }
+
+    /**
+     * Indicates whether this compound was created with
+     * @return a boolean
+     */
+    public boolean isEmpty() {
+        // Is this the best flag for it being empty?
+        return id == null || getThreeLetterCode() == null || getThreeLetterCode().equals("???");
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompAtom.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompAtom.java
new file mode 100644
index 0000000000..cad290820e
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompAtom.java
@@ -0,0 +1,205 @@
+package org.biojava.nbio.structure.chem;
+
+import org.biojava.nbio.structure.io.cif.CifBean;
+
+public class ChemCompAtom implements CifBean<org.rcsb.cif.schema.mm.ChemCompAtom> {
+    private static final long serialVersionUID = 4070599340294758941L;
+    private String compId;
+    private String atomId;
+    private String altAtomId;
+    private String typeSymbol;
+    private String charge;
+    private String pdbxAlign;
+    private String pdbxAromaticFlag;
+    private String pdbxLeavingAtomFlag;
+    private String pdbxStereoConfig;
+    private String modelCartnX;
+    private String modelCartnY;
+    private String modelCartnZ;
+    private String pdbxModelCartnXIdeal;
+    private String pdbxModelCartnYIdeal;
+    private String pdbxModelCartnZIdeal;
+    private String pdbxComponentCompId;
+    private String pdbxResidueNumbering;
+    private String pdbxComponentAtomId;
+    private String pdbxPolymerType;
+    private String pdbxRefId;
+    private String pdbxComponentId;
+    private String pdbxOrdinal;
+
+    public String getCompId() {
+        return compId;
+    }
+
+    public void setCompId(String compId) {
+        this.compId = compId;
+    }
+
+    public String getAtomId() {
+        return atomId;
+    }
+
+    public void setAtomId(String atomId) {
+        this.atomId = atomId;
+    }
+
+    public String getAltAtomId() {
+        return altAtomId;
+    }
+
+    public void setAltAtomId(String altAtomId) {
+        this.altAtomId = altAtomId;
+    }
+
+    public String getTypeSymbol() {
+        return typeSymbol;
+    }
+
+    public void setTypeSymbol(String typeSymbol) {
+        this.typeSymbol = typeSymbol;
+    }
+
+    public String getCharge() {
+        return charge;
+    }
+
+    public void setCharge(String charge) {
+        this.charge = charge;
+    }
+
+    public String getPdbxAlign() {
+        return pdbxAlign;
+    }
+
+    public void setPdbxAlign(String pdbxAlign) {
+        this.pdbxAlign = pdbxAlign;
+    }
+
+    public String getPdbxAromaticFlag() {
+        return pdbxAromaticFlag;
+    }
+
+    public void setPdbxAromaticFlag(String pdbxAromaticFlag) {
+        this.pdbxAromaticFlag = pdbxAromaticFlag;
+    }
+
+    public String getPdbxLeavingAtomFlag() {
+        return pdbxLeavingAtomFlag;
+    }
+
+    public void setPdbxLeavingAtomFlag(String pdbxLeavingAtomFlag) {
+        this.pdbxLeavingAtomFlag = pdbxLeavingAtomFlag;
+    }
+
+    public String getPdbxStereoConfig() {
+        return pdbxStereoConfig;
+    }
+
+    public void setPdbxStereoConfig(String pdbxStereoConfig) {
+        this.pdbxStereoConfig = pdbxStereoConfig;
+    }
+
+    public String getModelCartnX() {
+        return modelCartnX;
+    }
+
+    public void setModelCartnX(String modelCartnX) {
+        this.modelCartnX = modelCartnX;
+    }
+
+    public String getModelCartnY() {
+        return modelCartnY;
+    }
+
+    public void setModelCartnY(String modelCartnY) {
+        this.modelCartnY = modelCartnY;
+    }
+
+    public String getModelCartnZ() {
+        return modelCartnZ;
+    }
+
+    public void setModelCartnZ(String modelCartnZ) {
+        this.modelCartnZ = modelCartnZ;
+    }
+
+    public String getPdbxModelCartnXIdeal() {
+        return pdbxModelCartnXIdeal;
+    }
+
+    public void setPdbxModelCartnXIdeal(String pdbxModelCartnXIdeal) {
+        this.pdbxModelCartnXIdeal = pdbxModelCartnXIdeal;
+    }
+
+    public String getPdbxModelCartnYIdeal() {
+        return pdbxModelCartnYIdeal;
+    }
+
+    public void setPdbxModelCartnYIdeal(String pdbxModelCartnYIdeal) {
+        this.pdbxModelCartnYIdeal = pdbxModelCartnYIdeal;
+    }
+
+    public String getPdbxModelCartnZIdeal() {
+        return pdbxModelCartnZIdeal;
+    }
+
+    public void setPdbxModelCartnZIdeal(String pdbxModelCartnZIdeal) {
+        this.pdbxModelCartnZIdeal = pdbxModelCartnZIdeal;
+    }
+
+    public String getPdbxComponentCompId() {
+        return pdbxComponentCompId;
+    }
+
+    public void setPdbxComponentCompId(String pdbxComponentCompId) {
+        this.pdbxComponentCompId = pdbxComponentCompId;
+    }
+
+    public String getPdbxResidueNumbering() {
+        return pdbxResidueNumbering;
+    }
+
+    public void setPdbxResidueNumbering(String pdbxResidueNumbering) {
+        this.pdbxResidueNumbering = pdbxResidueNumbering;
+    }
+
+    public String getPdbxComponentAtomId() {
+        return pdbxComponentAtomId;
+    }
+
+    public void setPdbxComponentAtomId(String pdbxComponentAtomId) {
+        this.pdbxComponentAtomId = pdbxComponentAtomId;
+    }
+
+    public String getPdbxPolymerType() {
+        return pdbxPolymerType;
+    }
+
+    public void setPdbxPolymerType(String pdbxPolymerType) {
+        this.pdbxPolymerType = pdbxPolymerType;
+    }
+
+    public String getPdbxRefId() {
+        return pdbxRefId;
+    }
+
+    public void setPdbxRefId(String pdbxRefId) {
+        this.pdbxRefId = pdbxRefId;
+    }
+
+    public String getPdbxComponentId() {
+        return pdbxComponentId;
+    }
+
+    public void setPdbxComponentId(String pdbxComponentId) {
+        this.pdbxComponentId = pdbxComponentId;
+    }
+
+    public String getPdbxOrdinal() {
+        return pdbxOrdinal;
+    }
+
+    public void setPdbxOrdinal(String pdbxOrdinal) {
+        this.pdbxOrdinal = pdbxOrdinal;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompBond.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompBond.java
new file mode 100644
index 0000000000..b5a4d4e7f4
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompBond.java
@@ -0,0 +1,114 @@
+package org.biojava.nbio.structure.chem;
+
+import org.biojava.nbio.structure.io.cif.CifBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ChemCompBond implements CifBean<org.rcsb.cif.schema.mm.ChemCompBond> {
+    private static final long serialVersionUID = 5905371029161975421L;
+    private static final Logger logger = LoggerFactory.getLogger(ChemCompBond.class);
+
+    private String compId;
+    private String atomId1;
+    private String atomId2;
+    private String valueOrder;
+    private String pdbxAromaticFlag;
+    private String pdbxStereoConfig;
+    private String pdbxOrdinal;
+
+    public static Logger getLogger() {
+        return logger;
+    }
+
+    public String getCompId() {
+        return compId;
+    }
+
+    public void setCompId(String compId) {
+        this.compId = compId;
+    }
+
+    public String getAtomId1() {
+        return atomId1;
+    }
+
+    public void setAtomId1(String atomId1) {
+        this.atomId1 = atomId1;
+    }
+
+    public String getAtomId2() {
+        return atomId2;
+    }
+
+    public void setAtomId2(String atomId2) {
+        this.atomId2 = atomId2;
+    }
+
+    public String getValueOrder() {
+        return valueOrder;
+    }
+
+    public void setValueOrder(String valueOrder) {
+        this.valueOrder = valueOrder;
+    }
+
+    public String getPdbxAromaticFlag() {
+        return pdbxAromaticFlag;
+    }
+
+    public void setPdbxAromaticFlag(String pdbxAromaticFlag) {
+        this.pdbxAromaticFlag = pdbxAromaticFlag;
+    }
+
+    public String getPdbxStereoConfig() {
+        return pdbxStereoConfig;
+    }
+
+    public void setPdbxStereoConfig(String pdbxStereoConfig) {
+        this.pdbxStereoConfig = pdbxStereoConfig;
+    }
+
+    public String getPdbxOrdinal() {
+        return pdbxOrdinal;
+    }
+
+    public void setPdbxOrdinal(String pdbxOrdinal) {
+        this.pdbxOrdinal = pdbxOrdinal;
+    }
+
+    /**
+     * Converts this ChemCompBond's value_order attribute into an int using the
+     * conversion:
+     *
+     * <pre>
+     * 	SING -> 1
+     * 	DOUB -> 2
+     * 	TRIP -> 3
+     * 	QUAD -> 4
+     * </pre>
+     *
+     * Any other values will return -1.
+     * <p>
+     * (Source:
+     * http://mmcif.rcsb.org/dictionaries/mmcif_mdb.dic/Items/_chem_comp_bond.
+     * value_order.html)
+     *
+     * @return the numerical value of this ChemCompBond's bond order, or -1 if
+     *         the value is non-numeric or unknown.
+     */
+    public int getNumericalBondOrder() {
+        switch (valueOrder) {
+            case "SING":
+                return 1;
+            case "DOUB":
+                return 2;
+            case "TRIP":
+                return 3;
+            case "QUAD":
+                return 4;
+            default:
+                logger.error("Unknown or non-numeric value for value_order: " + valueOrder);
+                return -1;
+        }
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompContainer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompContainer.java
new file mode 100644
index 0000000000..322f927895
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompContainer.java
@@ -0,0 +1,13 @@
+package org.biojava.nbio.structure.chem;
+
+import org.rcsb.cif.schema.mm.ChemComp;
+
+public class ChemCompContainer {
+    private final ChemComp delegate;
+
+    public ChemCompContainer(ChemComp chemComp) {
+        this.delegate = chemComp;
+    }
+
+
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompDescriptor.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompDescriptor.java
new file mode 100644
index 0000000000..7628caef53
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompDescriptor.java
@@ -0,0 +1,80 @@
+package org.biojava.nbio.structure.chem;
+
+import org.biojava.nbio.structure.io.cif.CifBean;
+
+import java.util.Objects;
+
+public class ChemCompDescriptor implements CifBean<org.rcsb.cif.schema.mm.PdbxChemCompDescriptor> {
+    private static final long serialVersionUID = 1078685833800736278L;
+    private String compId;
+    private String type;
+    private String program;
+    private String programVersion;
+    private String descriptor;
+
+    public String getCompId() {
+        return compId;
+    }
+
+    public void setCompId(String compId) {
+        this.compId = compId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getProgram() {
+        return program;
+    }
+
+    public void setProgram(String program) {
+        this.program = program;
+    }
+
+    public String getProgramVersion() {
+        return programVersion;
+    }
+
+    public void setProgramVersion(String programVersion) {
+        this.programVersion = programVersion;
+    }
+
+    public String getDescriptor() {
+        return descriptor;
+    }
+
+    public void setDescriptor(String descriptor) {
+        this.descriptor = descriptor;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ChemCompDescriptor that = (ChemCompDescriptor) o;
+        return Objects.equals(compId, that.compId) &&
+                Objects.equals(type, that.type) &&
+                Objects.equals(program, that.program) &&
+                Objects.equals(programVersion, that.programVersion) &&
+                Objects.equals(descriptor, that.descriptor);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(compId, type, program, programVersion, descriptor);
+    }
+
+    @Override
+    public String toString() {
+        return "ChemCompDescriptor [comp_id=" + compId +
+                ", type=" + type +
+                ", program=" + program +
+                ", program_version=" + programVersion +
+                ", descriptor=" + descriptor + "]";
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java
new file mode 100644
index 0000000000..cad709223f
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java
@@ -0,0 +1,131 @@
+package org.biojava.nbio.structure.chem;
+
+import org.biojava.nbio.core.util.SoftHashMap;
+import org.biojava.nbio.structure.AminoAcid;
+import org.biojava.nbio.structure.AminoAcidImpl;
+import org.biojava.nbio.structure.Group;
+import org.biojava.nbio.structure.HetatomImpl;
+import org.biojava.nbio.structure.NucleotideImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+
+public class ChemCompGroupFactory {
+    private static final Logger logger = LoggerFactory.getLogger(ChemCompGroupFactory.class);
+    private static ChemCompProvider chemCompProvider = new DownloadChemCompProvider();
+    private static Map<String, ChemComp> cache = new SoftHashMap<>(0);
+
+    public static ChemComp getChemComp(String recordName) {
+        recordName = recordName.toUpperCase().trim();
+
+        // we are using the cache, to avoid hitting the file system too often.
+        ChemComp chemComp = cache.get(recordName);
+        if (chemComp != null) {
+            logger.debug("Chem comp " + chemComp.getThreeLetterCode() + " read from cache");
+            return chemComp;
+        }
+
+        // not cached, get the chem comp from the provider
+        logger.debug("Chem comp " + recordName + " read from provider " + chemCompProvider.getClass().getCanonicalName());
+        chemComp = chemCompProvider.getChemComp(recordName);
+
+        // Note that this also caches null or empty responses
+        cache.put(recordName, chemComp);
+        return chemComp;
+    }
+
+    /**
+     * The new ChemCompProvider will be set in the static variable,
+     * so this provider will be used from now on until it is changed
+     * again. Note that this change can have unexpected behavior of
+     * code executed afterwards.
+     * <p>
+     * Changing the provider also resets the cache, so any groups
+     * previously accessed will be reread or re-downloaded.
+     *
+     * @param provider
+     */
+    public static void setChemCompProvider(ChemCompProvider provider) {
+        logger.debug("Setting new chem comp provider to " + provider.getClass().getCanonicalName());
+        chemCompProvider = provider;
+        // clear cache
+        cache.clear();
+    }
+
+    public static ChemCompProvider getChemCompProvider(){
+        return chemCompProvider;
+    }
+
+    /**
+     * Force the in-memory cache to be reset.
+     *
+     * Note that the ChemCompProvider may have additional memory or disk caches that need to be cleared too.
+     */
+    public static void clearCache() {
+        cache.clear();
+    }
+
+    public static Group getGroupFromChemCompDictionary(String recordName) {
+        // make sure we work with upper case records
+        recordName = recordName.toUpperCase().trim();
+        ChemComp chemComp = getChemComp(recordName);
+        Group group;
+
+        if (chemComp == null) {
+            return null;
+        }
+
+        PolymerType polymerType = PolymerType.polymerTypeFromString(chemComp.getType());
+        if (PolymerType.PROTEIN_ONLY.contains(polymerType)) {
+            AminoAcid aminoAcid = new AminoAcidImpl();
+
+            String oneLetterCode = chemComp.getOneLetterCode();
+            if (oneLetterCode == null || oneLetterCode.equals("X") || oneLetterCode.equals("?") || oneLetterCode.length() == 0) {
+                String parent = chemComp.getMonNstdParentCompId();
+                if (parent != null && parent.length() == 3) {
+                    String parentId = chemComp.getMonNstdParentCompId();
+                    ChemComp parentChemComp = getChemComp(parentId);
+                    oneLetterCode = parentChemComp.getOneLetterCode();
+                }
+            }
+
+            if (oneLetterCode == null || oneLetterCode.length() == 0 || oneLetterCode.equals("?")) {
+                // e.g. problem with PRR, which probably should have a parent of ALA, but as of 20110127 does not.
+                logger.warn("Problem with chemical component: " + recordName + "  Did not find one letter code! Setting it to 'X'");
+                aminoAcid.setAminoType('X');
+            } else {
+                aminoAcid.setAminoType(oneLetterCode.charAt(0));
+            }
+
+            group = aminoAcid;
+        } else if (PolymerType.POLYNUCLEOTIDE_ONLY.contains(polymerType)) {
+            group = new NucleotideImpl();
+        } else {
+            group = new HetatomImpl();
+        }
+
+        group.setChemComp(chemComp);
+        return group;
+    }
+
+    public static String getOneLetterCode(ChemComp chemComp) {
+        String oneLetterCode = chemComp.getOneLetterCode();
+        if (oneLetterCode == null || oneLetterCode.equals("X") || oneLetterCode.equals("?")) {
+            String parentId = chemComp.getMonNstdParentCompId();
+            if (parentId == null) {
+                return oneLetterCode;
+            }
+            // cases like OIM have multiple parents (comma separated), we shouldn't try grab a chemcomp for those strings
+            if (parentId.length() > 3) {
+                return oneLetterCode;
+            }
+            ChemComp parentChemComp = ChemCompGroupFactory.getChemComp(parentId);
+            if (parentChemComp == null) {
+                return oneLetterCode;
+            }
+            oneLetterCode = parentChemComp.getOneLetterCode();
+        }
+        return oneLetterCode;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompProvider.java
new file mode 100644
index 0000000000..936f5ef8cf
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompProvider.java
@@ -0,0 +1,15 @@
+package org.biojava.nbio.structure.chem;
+
+/**
+ * Interface that is implemented by all classes that can provide {@link ChemComp} definitions.
+ * @author Andreas Prlic
+ * @since 3.0
+ */
+public interface ChemCompProvider {
+    /**
+     * Returns a new instance of a chemical component definition.
+     * @param recordName the ID of the {@link ChemComp}
+     * @return a new {@link ChemComp} definition.
+     */
+    ChemComp getChemComp(String recordName);
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java
new file mode 100644
index 0000000000..b24fd5d51a
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java
@@ -0,0 +1,209 @@
+package org.biojava.nbio.structure.chem;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ChemCompTools {
+    private static final Character UNKNOWN_ONE_LETTER_CODE = 'X';
+    private static final Character UNKNOWN_NUCLEOTIDE = 'N';
+    /**
+     * Lookup table to convert standard amino acid's monomer ids to one-letter-codes
+     */
+    private static final Map<String, Character> AMINO_ACID_LOOKUP_3TO1;
+    /**
+     * Lookup table to convert standard amino acid's one-letter-codes to monomer ids
+     */
+    private static final Map<Character, String> AMINO_ACID_LOOKUP_1TO3;
+    /**
+     * Lookup table to convert standard nucleic acid's monomer ids to one-letter-codes
+     */
+    private static final Map<String, Character> DNA_LOOKUP_2TO1;
+    /**
+     * Lookup table to convert standard nucleic acid's one-letter-codes to monomer ids
+     */
+    private static final Map<Character, String> DNA_LOOKUP_1TO2;
+    /*
+      Static block that initializes lookup maps and initializes their <tt>ResidueInfo</tt> instances
+     */
+    static {
+        Map<String, Character> foo = new HashMap<>();
+        foo.put("ALA", 'A');
+        foo.put("ASP", 'D');
+        foo.put("ASN", 'N');
+        foo.put("ASX", 'B');
+        foo.put("ARG", 'R');
+        foo.put("CYS", 'C');
+        foo.put("GLU", 'E');
+        foo.put("GLN", 'Q');
+        foo.put("GLY", 'G');
+        foo.put("GLX", 'Z');
+        foo.put("HIS", 'H');
+        foo.put("ILE", 'I');
+        foo.put("LYS", 'K');
+        foo.put("LEU", 'L');
+        foo.put("MET", 'M');
+        foo.put("PHE", 'F');
+        foo.put("PRO", 'P');
+        foo.put("SER", 'S');
+        foo.put("THR", 'T');
+        foo.put("TRP", 'W');
+        foo.put("TYR", 'Y');
+        foo.put("VAL", 'V');
+        AMINO_ACID_LOOKUP_3TO1 = Collections.unmodifiableMap((Collections.synchronizedMap(foo)));
+
+        Map<Character, String> bar = new HashMap<>();
+        bar.put('A', "ALA");
+        bar.put('D', "ASP");
+        bar.put('N', "ASN");
+        bar.put('B', "ASX");
+        bar.put('R', "ARG");
+        bar.put('C', "CYS");
+        bar.put('E', "GLU");
+        bar.put('Q', "GLN");
+        bar.put('G', "GLY");
+        bar.put('Z', "GLX");
+        bar.put('H', "HIS");
+        bar.put('I', "ILE");
+        bar.put('K', "LYS");
+        bar.put('L', "LEU");
+        bar.put('M', "MET");
+        bar.put('F', "PHE");
+        bar.put('P', "PRO");
+        bar.put('S', "SER");
+        bar.put('T', "THR");
+        bar.put('W', "TRP");
+        bar.put('Y', "TYR");
+        bar.put('V', "VAL");
+        AMINO_ACID_LOOKUP_1TO3 = Collections.unmodifiableMap(Collections.synchronizedMap(bar));
+
+        foo = new HashMap<>();
+        foo.put("DA",'A');
+        foo.put("DC",'C');
+        foo.put("DG",'G');
+        foo.put("DI",'I');
+        foo.put("DU",'U');
+        foo.put("DT",'T');
+        DNA_LOOKUP_2TO1 = Collections.unmodifiableMap((Collections.synchronizedMap(foo)));
+
+        bar = new HashMap<>();
+        bar.put('A',"DA");
+        bar.put('C',"DC");
+        bar.put('G',"DG");
+        bar.put('I',"DI");
+        bar.put('U',"DU");
+        bar.put('T',"DT");
+        DNA_LOOKUP_1TO2 = Collections.unmodifiableMap(Collections.synchronizedMap(bar));
+
+
+        // initialise standard chemical components
+        List<String> stdMonIds = new ArrayList<>();
+        stdMonIds.addAll(AMINO_ACID_LOOKUP_3TO1.keySet());
+        stdMonIds.addAll(DNA_LOOKUP_2TO1.keySet());
+    }
+
+    public static Character getAminoOneLetter(String chemCompId){
+        return AMINO_ACID_LOOKUP_3TO1.get(chemCompId);
+    }
+
+    public static Character getDNAOneLetter(String chemCompId){
+        return DNA_LOOKUP_2TO1.get(chemCompId);
+    }
+
+    public static String getAminoThreeLetter(Character c){
+        return AMINO_ACID_LOOKUP_1TO3.get(c);
+    }
+
+    public static String getDNATwoLetter(Character c){
+        return DNA_LOOKUP_1TO2.get(c);
+    }
+
+    public static boolean isStandardChemComp(ChemComp cc){
+        String pid = cc.getMonNstdParentCompId();
+        String one = cc.getOneLetterCode();
+
+        PolymerType polymerType = cc.getPolymerType();
+
+        // standard residues have no parent
+        if ((pid == null) || (pid.equals("?"))) {
+            // and they have a one letter code
+            if ((one != null) && (!one.equals("?"))) {
+                // peptides and dpeptides must not have X
+                if (polymerType == PolymerType.peptide || polymerType == PolymerType.dpeptide) {
+                    return performPeptideCheck(cc, one);
+                }
+                if (polymerType == PolymerType.rna) {
+                    return performRNACheck(cc);
+                }
+                if (polymerType == PolymerType.dna) {
+                    return performDNACheck(cc);
+                }
+
+                //System.err.println("Non standard chem comp: " + cc);
+                return false;
+            }
+        }
+        return false;
+    }
+
+    private static boolean performRNACheck(ChemComp cc) {
+        return cc.getId().length() == 1;
+    }
+
+    private static boolean performDNACheck(ChemComp cc) {
+        if (cc.getId().equals(UNKNOWN_NUCLEOTIDE.toString())) {
+            return false;
+        }
+
+        Character c = getDNAOneLetter(cc.getId());
+        // we did not find it in the list of standard nucleotides
+        return c != null;
+    }
+
+    private static boolean performPeptideCheck(ChemComp cc, String one) {
+        if (one.equals(UNKNOWN_ONE_LETTER_CODE.toString())) {
+            return false;
+        }
+        Character c = getAminoOneLetter(cc.getId());
+        // we did not find it in the list of standard aminos
+        return c != null;
+    }
+
+    // TODO: component 175 has 3 chars as a one letter code...
+    // Figure out what to do with it...
+    // so does: 4F3,5ZA and others
+    public static Character getOneLetterCode(ChemComp cc, ChemicalComponentDictionary dictionary) {
+        if (cc.getResidueType() == ResidueType.nonPolymer) {
+            return null;
+        }
+
+        if (cc.isStandard()) {
+            return cc.getOneLetterCode().charAt(0);
+        }
+
+        ChemComp parent = dictionary.getParent(cc);
+        if (parent == null) {
+            //System.err.println("parent is null " + cc);
+            return cc.getOneLetterCode().charAt(0);
+        }
+        PolymerType poly = cc.getPolymerType();
+        if (poly == PolymerType.peptide || poly == PolymerType.dpeptide) {
+            Character c = getAminoOneLetter(parent.getId());
+            if (c == null) {
+                c = UNKNOWN_ONE_LETTER_CODE;
+            }
+            return c;
+        }
+        if (poly == PolymerType.dna) {
+            Character c = getDNAOneLetter(parent.getId());
+            if (c == null) {
+                c = UNKNOWN_NUCLEOTIDE;
+            }
+            return c;
+
+        }
+        return cc.getMonNstdParentCompId().charAt(0);
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java
new file mode 100644
index 0000000000..2f48e612d7
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java
@@ -0,0 +1,104 @@
+package org.biojava.nbio.structure.chem;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ChemicalComponentDictionary {
+    private final Map<String, ChemComp> dictionary;
+    private final Map<String, String> replaces;
+    private final Map<String, String> isReplacedBy;
+
+    public ChemicalComponentDictionary() {
+        this.dictionary = new HashMap<>();
+        this.replaces = new HashMap<>();
+        this.isReplacedBy = new HashMap<>();
+    }
+
+    public boolean isReplaced(ChemComp c) {
+        return isReplaced(c.getId());
+    }
+
+    public boolean isReplaced(String id) {
+        return isReplacedBy.containsKey(id);
+    }
+
+    public boolean isReplacer(ChemComp c){
+        return isReplacer(c.getId());
+    }
+
+    public boolean isReplacer(String id) {
+        return replaces.containsKey(id);
+    }
+
+    /** if ChemComp is replaced by another one, get the newer version
+     * otherwise return the same ChemComp again.
+     * @param c
+     * @return get the component that replaced ChemComp.
+     */
+    public ChemComp getReplacer(ChemComp c){
+        return getReplacer(c.getId());
+    }
+
+    public ChemComp getReplacer(String id){
+        if (isReplaced(id)) {
+            return dictionary.get(isReplacedBy.get(id));
+        }
+        return dictionary.get(id);
+    }
+
+    /** if ChemComp is replacing another one, get the old version
+     * otherwise return the same ChemComp again.
+     * @param  c the ChemComp for which older versions should be looked up.
+     */
+    public ChemComp getReplaced(ChemComp c){
+        return getReplaced(c.getId());
+    }
+
+    public ChemComp getReplaced(String id){
+        if (isReplacer(id)) {
+            return dictionary.get(replaces.get(id));
+        }
+        return dictionary.get(id);
+    }
+
+    /**
+     * Get the parent of a component. If component has no parent, return null
+     * @param c
+     * @return get the parent component or null if ChemComp has no parent.
+     */
+    public ChemComp getParent(ChemComp c) {
+        if (c.hasParent()) {
+            return dictionary.get(c.getMonNstdParentCompId());
+        }
+        return null;
+    }
+
+    /**
+     * Add a new component to the dictionary
+     * @param comp
+     */
+    public void addChemComp(ChemComp comp) {
+        dictionary.put(comp.getId(), comp);
+        String rep = comp.getPdbxReplaces();
+        if (rep != null && !rep.equals("?")) {
+            replaces.put(comp.getId(), rep);
+        }
+
+        String isRep = comp.getPdbxReplacedBy();
+        if (isRep != null && !isRep.equals("?")) {
+            isReplacedBy.put(comp.getId(), isRep);
+        }
+    }
+
+    /**
+     * Returns the number of ChemComps in this dictionary
+     * @return nr. of ChemComps
+     */
+    public int size(){
+        return dictionary.size();
+    }
+
+    public ChemComp getChemComp(String id){
+        return dictionary.get(id);
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
new file mode 100644
index 0000000000..5b52bcab52
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -0,0 +1,420 @@
+package org.biojava.nbio.structure.chem;
+
+import org.biojava.nbio.core.util.InputStreamProvider;
+import org.biojava.nbio.structure.align.util.URLConnectionTools;
+import org.biojava.nbio.structure.align.util.UserConfiguration;
+import org.biojava.nbio.structure.io.LocalPDBDirectory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.zip.GZIPOutputStream;
+
+/**
+ * This provider of chemical components can download and cache chemical component definition files from the RCSB PDB web
+ * site. It is the default way to access these definitions. If this provider is called he first time, it will download
+ * and install all chemical component definitions in a local directory. Once the definition files have been installed,
+ * it has quick startup time and low memory requirements.
+ *
+ * An alternative provider, that keeps all definitions in memory is the {@link AllChemCompProvider}. Another provider,
+ * that does not require any network access, but only can support a limited set of chemical component definitions, is
+ * the {@link ReducedChemCompProvider}.
+ *
+ * @author Andreas Prlic
+ */
+public class DownloadChemCompProvider implements ChemCompProvider {
+    private static final Logger logger = LoggerFactory.getLogger(DownloadChemCompProvider.class);
+    public static final String CHEM_COMP_CACHE_DIRECTORY = "chemcomp";
+    public static final String DEFAULT_SERVER_URL = "http://files.rcsb.org/ligands/download/";
+    public static String serverBaseUrl = DEFAULT_SERVER_URL;
+
+    /**
+     * Use default RCSB server layout (true) or internal RCSB server layout (false)
+     */
+    public static boolean useDefaultUrlLayout = true;
+
+    private static File path;
+    private static final String NEWLINE = System.getProperty("line.separator");
+
+    // flags to make sure there is only one thread running that is loading the dictionary
+    static AtomicBoolean loading = new AtomicBoolean(false);
+
+    static final List<String> protectedIDs = new ArrayList<>();
+    static {
+        protectedIDs.add("CON");
+        protectedIDs.add("PRN");
+        protectedIDs.add("AUX");
+        protectedIDs.add("NUL");
+    }
+
+    private static ChemCompProvider fallback = null; // Fallback provider if the download fails
+    /**
+     * by default we will download only some of the files. User has to request that all files should be downloaded...
+     */
+    boolean downloadAll = false;
+
+    public DownloadChemCompProvider() {
+        this(null);
+    }
+
+    public DownloadChemCompProvider(String cacheFilePath) {
+        logger.debug("Initialising DownloadChemCompProvider");
+
+        // note that path is static, so this is just to make sure that all non-static methods will have path initialised
+        if (cacheFilePath != null) {
+            path = new File(cacheFilePath);
+        }
+    }
+
+    /**
+     * Get this provider's cache path
+     * @return
+     */
+    public static File getPath(){
+        if (path == null) {
+            UserConfiguration config = new UserConfiguration();
+            path = new File(config.getCacheFilePath());
+        }
+        return path;
+    }
+
+    /**
+     * Checks if the chemical components already have been installed into the PDB directory.
+     * If not, will download the chemical components definitions file and split it up into small
+     * subfiles.
+     */
+    public void checkDoFirstInstall(){
+        if (!downloadAll) {
+            return;
+        }
+
+        // this makes sure there is a file separator between every component,
+        // if path has a trailing file separator or not, it will work for both cases
+        File dir = new File(getPath(), CHEM_COMP_CACHE_DIRECTORY);
+        File f = new File(dir, "components.cif.gz");
+
+        if (!f.exists()) {
+            downloadAllDefinitions();
+        } else {
+            // file exists.. did it get extracted?
+            FilenameFilter filter = (dir1, file) -> file.endsWith(".cif.gz");
+            String[] files = dir.list(filter);
+            if (files.length < 500) {
+                // not all did get unpacked
+                try {
+                    split();
+                } catch (IOException e) {
+                    logger.error("Could not split file {} into individual chemical component files. Error: {}",
+                            f.toString(), e.getMessage());
+                }
+            }
+        }
+    }
+
+    private void split() throws IOException {
+        logger.info("Installing individual chem comp files ...");
+
+        File dir = new File(getPath(), CHEM_COMP_CACHE_DIRECTORY);
+        File f = new File(dir, "components.cif.gz");
+
+        int counter = 0;
+        InputStreamProvider prov = new InputStreamProvider();
+
+        try (BufferedReader buf = new BufferedReader(new InputStreamReader(prov.getInputStream(f)))) {
+            String line;
+            line = buf.readLine();
+            StringWriter writer = new StringWriter();
+
+            String currentID = null;
+            while (line != null) {
+                if (line.startsWith("data_")) {
+                    // a new record found!
+                    if (currentID != null) {
+                        writeID(writer.toString(), currentID);
+                        counter++;
+                    }
+
+                    currentID = line.substring(5);
+                    writer = new StringWriter();
+                }
+
+                writer.append(line);
+                writer.append(NEWLINE);
+
+                line = buf.readLine ();
+            }
+
+            // write the last record...
+            writeID(writer.toString(), currentID);
+            counter++;
+        }
+
+        logger.info("Created " + counter + " chemical component files.");
+    }
+
+    /**
+     * Output chemical contents to a file
+     * @param contents File contents
+     * @param currentID Chemical ID, used to determine the filename
+     * @throws IOException
+     */
+    private void writeID(String contents, String currentID) throws IOException {
+        String localName = getLocalFileName(currentID);
+
+        try (PrintWriter pw = new PrintWriter(new GZIPOutputStream(new FileOutputStream(localName)))) {
+            pw.print(contents);
+            pw.flush();
+        }
+    }
+
+    /**
+     * Loads the definitions for this {@link ChemComp} from a local file and instantiates a new object.
+     *
+     * @param recordName the ID of the {@link ChemComp}
+     * @return a new {@link ChemComp} definition.
+     */
+    @Override
+    public ChemComp getChemComp(String recordName) {
+        // make sure we work with upper case records
+        recordName = recordName.toUpperCase().trim();
+
+        boolean haveFile = true;
+        if (recordName.equals("?")) {
+            return null;
+        }
+
+        if (fileIsAbsent(recordName)) {
+            // check if we should install all components
+            checkDoFirstInstall();
+        }
+        if (fileIsAbsent(recordName)) {
+            // we previously have installed already the definitions,
+            // just do an incrememntal update
+            haveFile = downloadChemCompRecord(recordName);
+        }
+
+        // Added check that download was successful and chemical component is available.
+        if (haveFile) {
+            String filename = getLocalFileName(recordName);
+            InputStream inStream = null;
+            try {
+                InputStreamProvider isp = new InputStreamProvider();
+                inStream = isp.getInputStream(filename);
+
+                MMcifParser parser = new SimpleMMcifParser();
+                ChemCompConsumer consumer = new ChemCompConsumer();
+
+                // The Consumer builds up the BioJava - structure object.
+                // you could also hook in your own and build up you own data model.
+                parser.addMMcifConsumer(consumer);
+                parser.parse(new BufferedReader(new InputStreamReader(inStream)));
+
+                ChemicalComponentDictionary dict = consumer.getDictionary();
+                ChemComp chemComp = dict.getChemComp(recordName);
+
+                // May be null if the file was corrupt. Fall back on ReducedChemCompProvider in that case
+                if (chemComp != null) {
+                    return chemComp;
+                }
+            } catch (IOException e) {
+                logger.warn("Could not download chemical component file {} for {}. Error: {}. Now trying to use the " +
+                                "local chemical component definitions.",
+                        filename, recordName, e.getMessage());
+            } finally {
+                // Now close it
+                if (inStream != null) {
+                    try {
+                        inStream.close();
+                    } catch (IOException e) {
+                        // This would be weird...
+                        logger.error("Could not close chemical component file {}. A resource leak could occur!!", filename);
+                    }
+                }
+            }
+        }
+
+        // see https://github.com/biojava/biojava/issues/315
+        // probably a network error happened. Try to use the ReducedChemCOmpProvider
+        if (fallback == null) {
+            fallback = new ReducedChemCompProvider();
+        }
+
+        logger.warn("Falling back to ReducedChemCompProvider for {}. This could indicate a network error.", recordName);
+        return fallback.getChemComp(recordName);
+
+    }
+
+    /**
+     * Returns the file name that contains the definition for this {@link ChemComp}
+     *
+     * @param recordName the ID of the {@link ChemComp}
+     * @return full path to the file
+     */
+    public static String getLocalFileName(String recordName) {
+        if (protectedIDs.contains(recordName)) {
+            recordName = "_" + recordName;
+        }
+
+        File f = new File(getPath(), CHEM_COMP_CACHE_DIRECTORY);
+        if (!f.exists()) {
+            logger.info("Creating directory " + f);
+            boolean success = f.mkdir();
+            // we've checked in initPath that path is writable, so there's no need to check if it succeeds
+            // in the unlikely case that in the meantime it isn't writable at least we log an error
+            if (!success) {
+                logger.error("Directory {} could not be created", f);
+            }
+        }
+
+        File theFile = new File(f,recordName + ".cif.gz");
+        return theFile.toString();
+    }
+
+    private static boolean fileIsAbsent(String recordName){
+        String fileName = getLocalFileName(recordName);
+        File f = new File(fileName);
+
+        // delete files that are too short to have contents
+        if (f.length() < LocalPDBDirectory.MIN_PDB_FILE_SIZE) {
+            // Delete defensively.
+            // Note that if delete is unsuccessful, we re-download the file anyways
+            f.delete();
+            return true;
+        }
+
+        return !f.exists();
+    }
+
+    /**
+     * @param recordName three-letter name
+     * @return true if successful download
+     */
+    private static boolean downloadChemCompRecord(String recordName) {
+        String localName = getLocalFileName(recordName);
+        File newFile;
+        try {
+            newFile = File.createTempFile("chemcomp" + recordName, "cif");
+            logger.debug("Will write chem comp file to temp file {}", newFile.toString());
+        } catch (IOException e) {
+            logger.error("Could not write to temp directory {} to create the chemical component download temp file",
+                    System.getProperty("java.io.tmpdir"));
+            return false;
+        }
+        String u;
+        if (useDefaultUrlLayout) {
+            u = serverBaseUrl + recordName + ".cif";
+        } else {
+            u = serverBaseUrl + recordName.charAt(0) + "/"  + recordName +"/" + recordName + ".cif";
+        }
+
+        logger.debug("downloading " + u);
+        URL url = null;
+        try {
+            url = new URL(u);
+            URLConnection uconn = URLConnectionTools.openURLConnection(url);
+
+            try (PrintWriter pw = new PrintWriter(new GZIPOutputStream(new FileOutputStream(newFile)));
+                 BufferedReader fileBuffer = new BufferedReader(new InputStreamReader(uconn.getInputStream()))) {
+
+                String line;
+                while ((line = fileBuffer.readLine()) != null) {
+                    pw.println(line);
+                }
+                pw.flush();
+            }
+            // Now we move this across to where it actually wants to be
+            Files.move(newFile.toPath(), Paths.get(localName), StandardCopyOption.REPLACE_EXISTING);
+
+            return true;
+        } catch (IOException e) {
+            logger.error("Could not download " + url.toString() + " OR store locally to " + localName + " Error =" + e.getMessage());
+            newFile.delete();
+        }
+        return false;
+    }
+
+    private void downloadAllDefinitions() {
+        if (loading.get()) {
+            logger.info("Waiting for other thread to install chemical components...");
+        }
+
+        while (loading.get()) {
+            // another thread is already downloading the components definitions
+            // wait for the other thread to finish...
+            try {
+                // wait half a second
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+                //e.printStackTrace();
+                logger.error("Thread interrupted "+e.getMessage());
+            }
+
+            logger.info("Another thread installed the chemical components.");
+            return;
+        }
+
+        loading.set(true);
+        long timeS = System.currentTimeMillis();
+
+        logger.info("Performing first installation of chemical components.");
+        logger.info("Downloading components.cif.gz ...");
+
+        try {
+            AllChemCompProvider.downloadFile();
+        } catch (IOException e) {
+            logger.error("Could not download the all chemical components file. Error: {}. "
+                    + "Chemical components information won't be available", e.getMessage());
+            // no point in trying to split if the file could not be downloaded
+            loading.set(false);
+            return;
+        }
+
+        try {
+            split();
+        } catch (IOException e) {
+            logger.error("Could not split all chem comp file into individual chemical component files. Error: {}",
+                    e.getMessage());
+            // no point in reporting time
+            loading.set(false);
+            return;
+        }
+
+        long timeE = System.currentTimeMillis();
+        logger.info("time to install chem comp dictionary: " + (timeE - timeS) / 1000 + " sec.");
+        loading.set(false);
+    }
+
+    /**
+     * By default this provider will download only some of the {@link ChemComp} files.
+     * The user has to request that all files should be downloaded by setting this parameter to true.
+     *  @return flag if the all components should be downloaded and installed at startup. (default: false)
+     */
+    public boolean isDownloadAll() {
+        return downloadAll;
+    }
+
+    /**
+     * By default this provider will download only some of the {@link ChemComp} files.
+     * The user has to request that all files should be downloaded by setting this parameter to true.
+     * @param downloadAll if the all components should be downloaded and installed at startup. (default: false)
+     */
+    public void setDownloadAll(boolean downloadAll) {
+        this.downloadAll = downloadAll;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/PolymerType.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/PolymerType.java
new file mode 100644
index 0000000000..78bae77f86
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/PolymerType.java
@@ -0,0 +1,161 @@
+package org.biojava.nbio.structure.chem;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Enumerates the classification of polymers.
+ * This information is derived from the mmcif dictionary
+ * @author mulvaney
+ * @author Andreas Prlic
+ * @see <a href="http://mmcif.rcsb.org/dictionaries/mmcif_pdbx.dic/Items/_entity_poly.type.html">link into mmCIF dictionary</a>
+ * @since 1.7
+ */
+public enum PolymerType implements Serializable {
+    /**
+     * polypeptide(L)
+     */
+    peptide("polypeptide(L)"),
+    /**
+     * polypeptide(D)
+     */
+    dpeptide("polypeptide(D)"),
+    /**
+     * polydeoxyribonucleotide
+     */
+    dna("polydeoxyribonucleotide"),
+    /**
+     * polyribonucleotide
+     */
+    rna("polyribonucleotide"),
+    /**
+     * polydeoxyribonucleotide/polyribonucleotide hybrid
+     */
+    dnarna("polydeoxyribonucleotide/polyribonucleotide hybrid"),
+    /**
+     * polysaccharide(D)
+     */
+    polysaccharide("polysaccharide(D)"),
+    /**
+     * polysaccharide(L)
+     */
+    lpolysaccharide("polysaccharide(L)"),
+    /**
+     * other
+     */
+    otherPolymer("other"),
+    /**
+     * cyclic peptides
+     */
+    cyclicPeptide("cyclic-pseudo-peptide"),
+    /**
+     * Peptide nucleic acids
+     */
+    peptideNucleicAcid("peptide nucleic acid"),
+    /**
+     * if all else fails...
+     */
+    unknown(null);
+
+    static Map<String, PolymerType> lookupTable = new HashMap<>();
+
+    static {
+        for (PolymerType polymerType : PolymerType.values()) {
+            if (polymerType == unknown) {
+                continue;
+            }
+
+            lookupTable.put(polymerType.entity_poly_type,polymerType);
+            lookupTable.put(polymerType.entity_poly_type.toLowerCase(), polymerType);
+        }
+    }
+
+    public final String entity_poly_type;
+
+    PolymerType(String entity_poly_type) {
+        this.entity_poly_type = entity_poly_type;
+    }
+
+    public static PolymerType polymerTypeFromString(String polymerTypeString) {
+        if (polymerTypeString.equalsIgnoreCase(peptide.entity_poly_type)) {
+            return peptide;
+        }
+
+        PolymerType lookedUpPolymerType = lookupTable.get(polymerTypeString);
+        if (lookedUpPolymerType != null) {
+            return lookedUpPolymerType;
+        }
+
+        lookedUpPolymerType = lookupTable.get(polymerTypeString.toLowerCase());
+        if (lookedUpPolymerType != null) {
+            return lookedUpPolymerType;
+        }
+
+        for (PolymerType polymerType : PolymerType.values()) {
+            if (polymerTypeString.equals(polymerType.entity_poly_type)) {
+                return polymerType;
+            }
+        }
+
+        return unknown;
+    }
+
+    /**
+     * Convenience <tt>Set</tt> of polymer types classified as protein.  This only contains {@link #peptide}
+     */
+    public static final Set<PolymerType> PROTEIN_ONLY;
+
+    /**
+     * Convenience <tt>Set</tt> of polymer types classified as DNA.  This only contains {@link #dna}
+     */
+    public static final Set<PolymerType> DNA_ONLY;
+
+    /**
+     * Convenience <tt>Set</tt> of polymer types classified as RNA.  This only contains {@link #rna}
+     */
+    public static final Set<PolymerType> RNA_ONLY;
+
+    /**
+     * Convenience <tt>Set</tt> of polymer types classified as DNA.  This contains:
+     * <ul>
+     * <li>{@link #dna}</li>
+     * <li>{@link #rna}</li>
+     * <li>{@link #dnarna}</li>
+     * </ul>
+     */
+    public static final Set<PolymerType> POLYNUCLEOTIDE_ONLY;
+
+    /**
+     * Convenience <tt>Set</tt> of all polymer types.
+     */
+    public static final Set<PolymerType> ALL_POLYMER_TYPES;
+
+    static {
+        Set<PolymerType> tmp;
+
+        tmp = new HashSet<>();
+        tmp.add(peptide);
+        PROTEIN_ONLY = Collections.unmodifiableSet(tmp);
+
+        tmp = new HashSet<>();
+        tmp.add(dna);
+        DNA_ONLY = Collections.unmodifiableSet(tmp);
+
+        tmp = new HashSet<>();
+        tmp.add(rna);
+        RNA_ONLY = Collections.unmodifiableSet(tmp);
+
+        tmp = new HashSet<>();
+        tmp.add(dna);
+        tmp.add(rna);
+        tmp.add(dnarna);
+        POLYNUCLEOTIDE_ONLY = Collections.unmodifiableSet(tmp);
+
+        ALL_POLYMER_TYPES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(values())));
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ReducedChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ReducedChemCompProvider.java
new file mode 100644
index 0000000000..9841fdc161
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ReducedChemCompProvider.java
@@ -0,0 +1,56 @@
+package org.biojava.nbio.structure.chem;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.zip.GZIPInputStream;
+
+/**
+ * Unlike the {@link DownloadChemCompProvider}, this {@link ChemCompProvider} does not download any chem comp
+ * definitions. It has access to a limited set of files that are part of the biojava distribution.
+ * @author Andreas Prlic
+ * @since 3.0
+ */
+public class ReducedChemCompProvider implements ChemCompProvider {
+    private static final Logger logger = LoggerFactory.getLogger(ReducedChemCompProvider.class);
+
+    public ReducedChemCompProvider(){
+        logger.debug("Initialising ReducedChemCompProvider");
+    }
+
+    @Override
+    public ChemComp getChemComp(String recordName) {
+        String name = recordName.toUpperCase().trim();
+        try (InputStream inStream = this.getClass().getResourceAsStream("/chemcomp/" + name + ".cif.gz")) {
+            logger.debug("Reading chemcomp/{}.cif.gz", name);
+
+            if (inStream == null) {
+                // could not find the chem comp definition for this in the jar file
+                logger.debug("Getting empty chem comp for {}", name);
+                ChemComp cc = ChemComp.getEmptyChemComp();
+                cc.setId(name);
+                return cc;
+            }
+
+            MMcifParser parser = new SimpleMMcifParser();
+            ChemCompConsumer consumer = new ChemCompConsumer();
+            // The Consumer builds up the BioJava - structure object.
+            // you could also hook in your own and build up you own data model.
+            parser.addMMcifConsumer(consumer);
+            parser.parse(new BufferedReader(new InputStreamReader(new GZIPInputStream(inStream))));
+
+            ChemicalComponentDictionary dict = consumer.getDictionary();
+            return dict.getChemComp(name);
+        } catch (IOException e){
+            logger.error("IOException caught while reading chem comp {}.", name, e);
+        }
+        logger.warn("Problem when loading chem comp {}, will use an empty chem comp for it", name);
+        ChemComp cc = ChemComp.getEmptyChemComp();
+        cc.setId(name);
+        return cc;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ResidueType.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ResidueType.java
new file mode 100644
index 0000000000..ddcaac453c
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ResidueType.java
@@ -0,0 +1,125 @@
+package org.biojava.nbio.structure.chem;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Enumerates the possible classifications of residues. These are generally more specific than PolymerTypes
+ * This information is derived from the mmcif dictionary.
+ * @author mulvaney
+ * @author Andreas Prlic
+ * @see <a href="http://mmcif.rcsb.org/dictionaries/mmcif_pdbx.dic/Items/_chem_comp.type.html">link into mmCIF dictionary</a>
+ * @since 1.7
+ */
+public enum ResidueType implements Serializable {
+    atomn(null, "null"), // present in db for _chem_comp.id_ = 'CFL' but not enumerated in dictionary
+    // Peptides
+    dPeptideLinking(PolymerType.dpeptide, "D-peptide linking"),
+    lPeptideLinking(PolymerType.peptide, "L-peptide linking"),
+    glycine(PolymerType.peptide,"PEPTIDE LINKING"),
+    peptideLike(PolymerType.otherPolymer, "peptide-like"),
+    dPeptideAminoTerminus(PolymerType.dpeptide, "D-peptide NH3 amino terminus"),
+    lPeptideAminoTerminus(PolymerType.peptide, "L-peptide NH3 amino terminus"),
+    dPeptideCarboxyTerminus(PolymerType.dpeptide, "D-peptide COOH carboxy terminus"),
+    lPeptideCarboxyTerminus(PolymerType.peptide, "L-peptide COOH carboxy terminus"),
+    // Nucleotides
+    dnaLinking(PolymerType.dna, "DNA linking"),
+    rnaLinking(PolymerType.rna, "RNA linking"),
+    dna3PrimeTerminus(PolymerType.dna, "DNA OH 3 prime terminus"),
+    rna3PrimeTerminus(PolymerType.rna, "RNA OH 3 prime terminus"),
+    dna5PrimeTerminus(PolymerType.dna, "DNA OH 5 prime terminus"),
+    rna5PrimeTerminus(PolymerType.rna, "RNA OH 5 prime terminus"),
+    // Sugars
+    dSaccharide(PolymerType.polysaccharide, "D-saccharide"),
+    dSaccharide14and14linking(PolymerType.polysaccharide, "D-saccharide 1,4 and 1,4 linking"),
+    dSaccharide14and16linking(PolymerType.polysaccharide, "D-saccharide 1,4 and 1,6 linking"),
+    lSaccharide(PolymerType.lpolysaccharide, "L-saccharide"),
+    lSaccharide14and14linking(PolymerType.lpolysaccharide, "L-saccharide 1,4 and 1,4 linking"),
+    lSaccharide14and16linking(PolymerType.lpolysaccharide, "L-saccharide 1,4 and 1,6 linking"),
+    saccharide(PolymerType.polysaccharide, "saccharide"),
+    // Iso-peptides
+    dBetaPeptideCGammaLinking(PolymerType.dpeptide,"D-beta-peptide, C-gamma linking"),
+    dGammaPeptideCDeltaLinking(PolymerType.dpeptide,"D-gamma-peptide, C-delta linking"),
+    lBetaPeptideCGammaLinking(PolymerType.peptide,"L-beta-peptide, C-gamma linking"),
+    lGammaPeptideCDeltaLinking(PolymerType.peptide,"L-gamma-peptide, C-delta linking"),
+    // L nucleotides. As of 2015-04, these are only found in D-DNA hybrids, so they don't have their own PolymerType
+    lDNALinking(PolymerType.dna,"L-DNA linking"),
+    lRNALinking(PolymerType.dna,"L-RNA linking"),
+    // Other
+    nonPolymer(null, "non-polymer"),
+    otherChemComp(null, "other");
+
+    static Map<String, ResidueType> lookupTable = new HashMap<>();
+
+    static {
+        for (ResidueType residueType : ResidueType.values() ) {
+            lookupTable.put(residueType.chem_comp_type, residueType);
+            lookupTable.put(residueType.chem_comp_type.toLowerCase(), residueType);
+        }
+    }
+
+    ResidueType(PolymerType polymerType, String chem_comp_type) {
+        this.polymerType = polymerType;
+        this.chem_comp_type = chem_comp_type;
+    }
+
+    /**
+     * The associated {@link PolymerType}
+     */
+    public final PolymerType polymerType;
+
+    /**
+     * Gets the associated PolymerType, which are less specific
+     * @return
+     */
+    public PolymerType getPolymerType() {
+        return polymerType;
+    }
+
+    /**
+     * String value of the type
+     */
+    public final String chem_comp_type;
+
+    /** Get ResidueType by chem_comp_type
+     *
+     * @param chem_comp_type e.g. L-peptide linking
+     * @return
+     */
+    public static ResidueType getResidueTypeFromString(String chem_comp_type) {
+        // Almost all calls to this method are for L-peptide linking. Use this knowledge for a shortcut.
+        if (chem_comp_type.equalsIgnoreCase(lPeptideLinking.chem_comp_type)) {
+            return lPeptideLinking;
+        }
+
+        ResidueType lookedUpResidueType = lookupTable.get(chem_comp_type);
+        if (lookedUpResidueType != null) {
+            return lookedUpResidueType;
+        }
+
+        /*
+         * Unfortunately it can be guaranteed that chem_comp_type case sensitivity is preserved.
+         * E.g. mmtf has it all upper-case. As such we need to do a second check
+         */
+        lookedUpResidueType = lookupTable.get(chem_comp_type.toLowerCase());
+        if (lookedUpResidueType != null) {
+            return lookedUpResidueType;
+        }
+
+        // preserving previous behaviour. Not sure if this is really necessary?
+        for (ResidueType residueType : ResidueType.values()) {
+            if(residueType.chem_comp_type.equalsIgnoreCase(chem_comp_type)) {
+                return residueType;
+            }
+
+            if (residueType.chem_comp_type.toLowerCase().startsWith(chem_comp_type.toLowerCase())) {
+                return residueType;
+            }
+            if (chem_comp_type.toLowerCase().startsWith(residueType.chem_comp_type.toLowerCase())) {
+                return residueType;
+            }
+        }
+        return null;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
index 40953a1ee2..b8e10ffbb8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
@@ -36,13 +36,10 @@
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.asa.AsaCalculator;
 import org.biojava.nbio.structure.asa.GroupAsa;
+import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.PolymerType;
 import org.biojava.nbio.structure.io.FileConvert;
 import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.mmcif.MMCIFFileTools;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
-import org.biojava.nbio.structure.io.mmcif.model.AtomSite;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
 import org.biojava.nbio.structure.xtal.CrystalTransform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
index bb92724aa4..aee22b0767 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
@@ -23,12 +23,9 @@
 package org.biojava.nbio.structure.io;
 
 import org.biojava.nbio.structure.*;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.ChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
-import org.biojava.nbio.structure.io.mmcif.model.ChemCompBond;
-import org.biojava.nbio.structure.io.mmcif.model.StructConn;
 import org.biojava.nbio.structure.io.util.PDBTemporaryStorageUtils.LinkRecord;
+import org.rcsb.cif.model.ValueKind;
+import org.rcsb.cif.schema.mm.StructConn;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,8 +50,6 @@
  *
  */
 public class BondMaker {
-
-
 	private static final Logger logger = LoggerFactory.getLogger(BondMaker.class);
 
 	/**
@@ -366,41 +361,44 @@ public void formLinkRecordBond(LinkRecord linkRecord) {
 	}
 
 
-	public void formBondsFromStructConn(List<StructConn> structConn) {
-
+	public void formBondsFromStructConn(StructConn conn) {
 		final String symop = "1_555"; // For now - accept bonds within origin asymmetric unit.
-
 		List<Bond> ssbonds = new ArrayList<>();
 
-		for (StructConn conn : structConn) {
-
-			if (!BOND_TYPES_TO_PARSE.contains(conn.getConn_type_id())) continue;
+		for (int i = 0; i < conn.getRowCount(); i++) {
+			if (!BOND_TYPES_TO_PARSE.contains(conn.getConnTypeId().get(i))) continue;
 			String chainId1;
 			String chainId2;
 
-			chainId1 = conn.getPtnr1_label_asym_id();
-			chainId2 = conn.getPtnr2_label_asym_id();
+			chainId1 = conn.getPtnr1LabelAsymId().get(i);
+			chainId2 = conn.getPtnr2LabelAsymId().get(i);
 
 			String insCode1 = "";
-			if (conn.getPdbx_ptnr1_PDB_ins_code() != null &&
-			        !conn.getPdbx_ptnr1_PDB_ins_code().equals("?")) insCode1 = conn.getPdbx_ptnr1_PDB_ins_code();
+			if (conn.getPdbxPtnr1PDBInsCode().getValueKind(i) == ValueKind.PRESENT) {
+				insCode1 = conn.getPdbxPtnr1PDBInsCode().get(i);
+			}
 			String insCode2 = "";
-			if (conn.getPdbx_ptnr2_PDB_ins_code() != null &&
-			        !conn.getPdbx_ptnr2_PDB_ins_code().equals("?")) insCode2 = conn.getPdbx_ptnr2_PDB_ins_code();
-
-			String seqId1 = conn.getPtnr1_auth_seq_id();
-			String seqId2 = conn.getPtnr2_auth_seq_id();
-			String resName1 = conn.getPtnr1_label_comp_id();
-			String resName2 = conn.getPtnr2_label_comp_id();
-			String atomName1 = conn.getPtnr1_label_atom_id();
-			String atomName2 = conn.getPtnr2_label_atom_id();
+			if (conn.getPdbxPtnr2PDBInsCode().getValueKind(i) == ValueKind.PRESENT) {
+				insCode2 = conn.getPdbxPtnr2PDBInsCode().get(i);
+			}
+
+			String seqId1 = conn.getPtnr1AuthSeqId().getStringData(i);
+			String seqId2 = conn.getPtnr2AuthSeqId().getStringData(i);
+			String resName1 = conn.getPtnr1LabelCompId().get(i);
+			String resName2 = conn.getPtnr2LabelCompId().get(i);
+			String atomName1 = conn.getPtnr1LabelAtomId().get(i);
+			String atomName2 = conn.getPtnr2LabelAtomId().get(i);
 			String altLoc1 = "";
-			if (!conn.getPdbx_ptnr1_label_alt_id().equals("?")) altLoc1 = conn.getPdbx_ptnr1_label_alt_id();
+			if (conn.getPdbxPtnr1LabelAltId().getValueKind(i) == ValueKind.PRESENT) {
+				altLoc1 = conn.getPdbxPtnr1LabelAltId().get(i);
+			}
 			String altLoc2 = "";
-			if (!conn.getPdbx_ptnr2_label_alt_id().equals("?")) altLoc2 = conn.getPdbx_ptnr2_label_alt_id();
+			if (conn.getPdbxPtnr2LabelAltId().getValueKind(i) == ValueKind.PRESENT) {
+				altLoc2 = conn.getPdbxPtnr2LabelAltId().get(i);
+			}
 
 			// TODO: when issue 220 is implemented, add robust symmetry handling to allow bonds between symmetry-related molecules.
-			if (!conn.getPtnr1_symmetry().equals(symop) || !conn.getPtnr2_symmetry().equals(symop) ) {
+			if (!conn.getPtnr1Symmetry().get(i).equals(symop) || !conn.getPtnr2Symmetry().get(i).equals(symop) ) {
 				logger.info("Skipping bond between atoms {}(residue {}{}) and {}(residue {}{}) belonging to different symmetry partners, because it is not supported yet",
 						atomName1, seqId1, insCode1, atomName2, seqId2, insCode2);
 				continue;
@@ -441,20 +439,19 @@ public void formBondsFromStructConn(List<StructConn> structConn) {
 			}
 
 			// assuming order 1 for all bonds, no information is provided by struct_conn
-			for(int i=0; i<structure.nrModels(); i++){
+			for (int j = 0; j < structure.nrModels(); j++) {
 				Bond bond = null;
-				if(a1.containsKey(i) && a2.containsKey(i)){
-					if(!a1.get(i).equals(a2.get(i))){
-						bond = new BondImpl(a1.get(i), a2.get(i), 1);
+				if (a1.containsKey(j) && a2.containsKey(j)) {
+					if (!a1.get(j).equals(a2.get(j))) {
+						bond = new BondImpl(a1.get(j), a2.get(j), 1);
 					}
 				}
-				if(bond!=null){
-					if (conn.getConn_type_id().equals("disulf")) {
+				if (bond != null) {
+					if (conn.getConnTypeId().get(i).equals("disulf")) {
 						ssbonds.add(bond);
 					}
 				}
 			}
-
 		}
 
 		// only for ss bonds we add a specific map in structure, all the rests are linked only from Atom.getBonds
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
index 1b4ce20b58..7cb62beffc 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
@@ -40,9 +40,7 @@
 import org.biojava.nbio.structure.PDBHeader;
 import org.biojava.nbio.structure.Site;
 import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.io.mmcif.MMCIFFileTools;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
-import org.biojava.nbio.structure.io.mmcif.model.AtomSite;
+import org.biojava.nbio.structure.io.cif.CifFileConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -595,63 +593,13 @@ else if (name.length()==1)
 
 
 	public String toMMCIF() {
+		return CifFileConverter.toText(this.structure);	}
 
-		StringBuilder str = new StringBuilder();
-
-		str.append(SimpleMMcifParser.MMCIF_TOP_HEADER+"BioJava_mmCIF_file"+newline);
-
-		if (structure.getPDBHeader()!=null && structure.getPDBHeader().getCrystallographicInfo()!=null &&
-				structure.getPDBHeader().getCrystallographicInfo().getSpaceGroup()!=null &&
-				structure.getPDBHeader().getCrystallographicInfo().getCrystalCell()!=null) {
-
-			str.append(MMCIFFileTools.toMMCIF("_cell",
-					MMCIFFileTools.convertCrystalCellToCell(structure.getPDBHeader().getCrystallographicInfo().getCrystalCell())));
-			str.append(MMCIFFileTools.toMMCIF("_symmetry",
-					MMCIFFileTools.convertSpaceGroupToSymmetry(structure.getPDBHeader().getCrystallographicInfo().getSpaceGroup())));
-
-		}
-
-
-		str.append(getAtomSiteHeader());
-
-		List<AtomSite> list =  MMCIFFileTools.convertStructureToAtomSites(structure);
-
-
-		str.append(MMCIFFileTools.toMMCIF(list,AtomSite.class));
-
-		return str.toString();
+	public static String toMMCIF(Chain chain, String authId, String asymId) {
+		return CifFileConverter.toText(chain, authId, asymId);
 	}
 
-	public static String toMMCIF(Chain chain, String authId, String asymId, boolean writeHeader) {
-		StringBuilder str = new StringBuilder();
-
-		if (writeHeader)
-			str.append(getAtomSiteHeader());
-
-
-		List<AtomSite> list = MMCIFFileTools.convertChainToAtomSites(chain, 1, authId, asymId);
-
-		str.append(MMCIFFileTools.toMMCIF(list,AtomSite.class));
-		return str.toString();
-	}
-
-	public static String toMMCIF(Chain chain, boolean writeHeader) {
-		StringBuilder sb = new StringBuilder();
-		sb.append(SimpleMMcifParser.MMCIF_TOP_HEADER+"BioJava_mmCIF_file"+newline);
-		sb.append(toMMCIF(chain, chain.getName(), chain.getId(),writeHeader));
-		return sb.toString();
-	}
-
-	public static String getAtomSiteHeader() {
-		String header;
-		try {
-			header = MMCIFFileTools.toLoopMmCifHeaderString("_atom_site", AtomSite.class.getName());
-
-		} catch (ClassNotFoundException e) {
-			logger.error("Class not found, will not have a header for this MMCIF category: "+e.getMessage());
-			header = "";
-		}
-
-		return header;
+	public static String toMMCIF(Chain chain) {
+		return CifFileConverter.toText(chain);
 	}
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/MMCIFFileReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/MMCIFFileReader.java
deleted file mode 100644
index ca91f8d70d..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/MMCIFFileReader.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Oct 18, 2008
- */
-package org.biojava.nbio.structure.io;
-
-import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.structure.io.mmcif.MMcifParser;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifConsumer;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-
-/** How to parse an mmCif file:
- * <pre>
-public static void main(String[] args) throws Exception {
-	String filename =  "/path/to/something.cif.gz" ;
-
-	StructureIOFile reader = new MMCIFFileReader();
-
-	Structure struc = reader.getStructure(filename);
-	System.out.println(struc);
-}
-</pre>
- *
- * @author Andreas Prlic
- * @since 1.7
- *
- */
-public class MMCIFFileReader extends LocalPDBDirectory {
-
-	//private static final Logger logger = LoggerFactory.getLogger(MMCIFFileReader.class);
-
-	public static final String[] MMCIF_SPLIT_DIR    = new String[]{"data","structures","divided" ,"mmCIF"};
-	public static final String[] MMCIF_OBSOLETE_DIR = new String[]{"data","structures","obsolete","mmCIF"};
-
-	private SimpleMMcifConsumer consumer;
-
-	public static void main(String[] args) throws Exception {
-
-		MMCIFFileReader reader = new MMCIFFileReader();
-		FileParsingParameters params = new FileParsingParameters();
-		reader.setFileParsingParameters(params);
-
-
-		Structure struc = reader.getStructureById("1m4x");
-		System.out.println(struc);
-		System.out.println(struc.toPDB());
-
-
-	}
-
-	/**
-	 * Constructs a new MMCIFFileReader, initializing the extensions member variable.
-	 * The path is initialized in the same way as {@link UserConfiguration},
-	 * i.e. to system property/environment variable {@link UserConfiguration#PDB_DIR}.
-	 * Both autoFetch and splitDir are initialized to false
-	 */
-	public MMCIFFileReader(){
-		this(null);
-	}
-
-	/**
-	 * Constructs a new PDBFileReader, initializing the extensions member variable.
-	 * The path is initialized to the given path, both autoFetch and splitDir are initialized to false.
-	 */
-	public MMCIFFileReader(String path){
-		super(path);
-		addExtension(".cif");
-		addExtension(".mmcif");
-		addExtension(".cif.gz");
-		addExtension(".mmcif.gz");
-	}
-
-	@Override
-	public Structure getStructure(InputStream inStream) throws IOException{
-
-		MMcifParser parser = new SimpleMMcifParser();
-
-		consumer = new SimpleMMcifConsumer();
-
-		consumer.setFileParsingParameters(getFileParsingParameters());
-
-
-		// The Consumer builds up the BioJava - structure object.
-		// you could also hook in your own and build up you own data model.
-		parser.addMMcifConsumer(consumer);
-
-		parser.parse(new BufferedReader(new InputStreamReader(inStream)));
-
-
-		// now get the protein structure.
-		Structure cifStructure = consumer.getStructure();
-
-		return cifStructure;
-	}
-
-	public SimpleMMcifConsumer getMMcifConsumer(){
-		return consumer;
-	}
-
-//	public void setMMCifConsumer(SimpleMMcifConsumer consumer){
-//		this.consumer = consumer;
-//	}
-
-	@Override
-	protected String getFilename(String pdbId) {
-		return pdbId.toLowerCase()+".cif.gz";
-	}
-
-	@Override
-	protected String[] getSplitDirPath() {
-		return MMCIF_SPLIT_DIR;
-	}
-
-	@Override
-	protected String[] getObsoleteDirPath() {
-		return MMCIF_OBSOLETE_DIR;
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
similarity index 84%
rename from biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImpl.java
rename to biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
index 6b39cf9c58..0c039467c1 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
@@ -20,7 +20,6 @@
 import org.rcsb.cif.schema.mm.MmCifCategoryBuilder;
 import org.rcsb.cif.schema.mm.MmCifFileBuilder;
 
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,13 +27,12 @@
 import java.util.stream.Collector;
 
 /**
- * Convert a BioJava {@link Structure} to a CifFile.
+ * Convert a BioJava object to a CifFile.
  * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
  * @since 5.3.0
  */
-class CifFileSupplierImpl implements CifFileSupplier<Structure> {
-    @Override
-    public CifFile get(Structure structure) {
+public abstract class AbstractCifFileSupplier<S> implements CifFileSupplier<S> {
+    protected CifFile getInternal(Structure structure, List<WrappedAtom> wrappedAtoms) {
         // for now BioJava only considered 3 categories for create a Cif representation of a structure
 
         // cell
@@ -42,7 +40,6 @@ public CifFile get(Structure structure) {
         // symmetry
         SpaceGroup spaceGroup = structure.getPDBHeader().getCrystallographicInfo().getSpaceGroup();
         // atom_site
-        List<WrappedAtom> wrappedAtoms = collectWrappedAtoms(structure);
         Category atomSite = wrappedAtoms.stream().collect(toAtomSite());
 
         MmCifBlockBuilder blockBuilder = CifBuilder.enterFile(StandardSchemata.MMCIF)
@@ -94,49 +91,40 @@ public CifFile get(Structure structure) {
         return blockBuilder.leaveBlock().leaveFile();
     }
 
-    private static List<WrappedAtom> collectWrappedAtoms(Structure structure) {
-        List<WrappedAtom> wrappedAtoms = new ArrayList<>();
-
-        for (int modelIndex = 0; modelIndex < structure.nrModels(); modelIndex++) {
-            final int model = modelIndex + 1;
-            for (Chain chain : structure.getChains(modelIndex)) {
-                final String chainName = chain.getName();
-                final String chainId = chain.getId();
-                for (Group group : chain.getAtomGroups()) {
-                    // The alt locs can have duplicates, since at parsing time we make sure that all alt loc groups have
-                    // all atoms (see StructureTools#cleanUpAltLocs)
-                    // Thus we have to remove duplicates here by using the atom id
-                    // See issue https://github.com/biojava/biojava/issues/778 and
-                    // TestAltLocs.testMmcifWritingAllAltlocs/testMmcifWritingPartialAltlocs
-                    Map<Integer, WrappedAtom> uniqueAtoms = new LinkedHashMap<>();
-                    for (int atomIndex = 0; atomIndex < group.size(); atomIndex++) {
-                        Atom atom = group.getAtom(atomIndex);
+    protected void handleChain(Chain chain, int model, List<WrappedAtom> wrappedAtoms) {
+        final String chainName = chain.getName();
+        final String chainId = chain.getId();
+        for (Group group : chain.getAtomGroups()) {
+            // The alt locs can have duplicates, since at parsing time we make sure that all alt loc groups have
+            // all atoms (see StructureTools#cleanUpAltLocs)
+            // Thus we have to remove duplicates here by using the atom id
+            // See issue https://github.com/biojava/biojava/issues/778 and
+            // TestAltLocs.testMmcifWritingAllAltlocs/testMmcifWritingPartialAltlocs
+            Map<Integer, WrappedAtom> uniqueAtoms = new LinkedHashMap<>();
+            for (int atomIndex = 0; atomIndex < group.size(); atomIndex++) {
+                Atom atom = group.getAtom(atomIndex);
+                if (atom == null) {
+                    continue;
+                }
+
+                uniqueAtoms.put(atom.getPDBserial(), new WrappedAtom(chain, model, chainName, chainId, atom, atom.getPDBserial()));
+            }
+
+            if (group.hasAltLoc()) {
+                for (Group alt : group.getAltLocs()) {
+                    for (int atomIndex = 0; atomIndex < alt.size(); atomIndex++) {
+                        Atom atom = alt.getAtom(atomIndex);
                         if (atom == null) {
                             continue;
                         }
 
                         uniqueAtoms.put(atom.getPDBserial(), new WrappedAtom(chain, model, chainName, chainId, atom, atom.getPDBserial()));
                     }
-
-                    if (group.hasAltLoc()) {
-                        for (Group alt : group.getAltLocs()) {
-                            for (int atomIndex = 0; atomIndex < alt.size(); atomIndex++) {
-                                Atom atom = alt.getAtom(atomIndex);
-                                if (atom == null) {
-                                    continue;
-                                }
-
-                                uniqueAtoms.put(atom.getPDBserial(), new WrappedAtom(chain, model, chainName, chainId, atom, atom.getPDBserial()));
-                            }
-                        }
-                    }
-
-                    wrappedAtoms.addAll(uniqueAtoms.values());
                 }
             }
-        }
 
-        return wrappedAtoms;
+            wrappedAtoms.addAll(uniqueAtoms.values());
+        }
     }
 
     static class WrappedAtom {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChainSupplierImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChainSupplierImpl.java
new file mode 100644
index 0000000000..08516d47b3
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChainSupplierImpl.java
@@ -0,0 +1,20 @@
+package org.biojava.nbio.structure.io.cif;
+
+import org.biojava.nbio.structure.Chain;
+import org.rcsb.cif.model.CifFile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChainSupplierImpl extends AbstractCifFileSupplier<Chain> {
+    @Override
+    public CifFile get(Chain container) {
+        return getInternal(container.getStructure(), collectWrappedAtoms(container));
+    }
+
+    private List<WrappedAtom> collectWrappedAtoms(Chain chain) {
+        List<WrappedAtom> wrappedAtoms = new ArrayList<>();
+        handleChain(chain, 1, wrappedAtoms);
+        return wrappedAtoms;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java
new file mode 100644
index 0000000000..c8553b21c7
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java
@@ -0,0 +1,14 @@
+package org.biojava.nbio.structure.io.cif;
+
+import org.biojava.nbio.structure.chem.ChemComp;
+import org.rcsb.cif.schema.mm.ChemCompAtom;
+import org.rcsb.cif.schema.mm.ChemCompBond;
+import org.rcsb.cif.schema.mm.PdbxChemCompDescriptor;
+
+public interface ChemCompConsumer extends CifFileConsumer<ChemComp> {
+    void consumeChemCompAtom(ChemCompAtom chemCompAtom);
+
+    void consumeChemCompBond(ChemCompBond chemCompBond);
+
+    void consumePdbxChemCompDescriptor(PdbxChemCompDescriptor pdbxChemCompDescriptor);
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java
new file mode 100644
index 0000000000..f97a89d271
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java
@@ -0,0 +1,70 @@
+package org.biojava.nbio.structure.io.cif;
+
+import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.ChemicalComponentDictionary;
+import org.biojava.nbio.structure.chem.ResidueType;
+import org.rcsb.cif.schema.mm.ChemCompAtom;
+import org.rcsb.cif.schema.mm.ChemCompBond;
+import org.rcsb.cif.schema.mm.PdbxChemCompDescriptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ChemCompConsumerImpl implements ChemCompConsumer<ChemComp> {
+    private static final Logger logger = LoggerFactory.getLogger(ChemCompConsumerImpl.class);
+    private ChemicalComponentDictionary dictionary;
+    private String latestChemCompId;
+
+    public ChemCompConsumerImpl(){
+        dictionary = new ChemicalComponentDictionary();
+    }
+
+    @Override
+    public void prepare() {
+
+    }
+
+    public ChemicalComponentDictionary getDictionary(){
+        return dictionary;
+    }
+
+    @Override
+    public void consumeChemCompAtom(ChemCompAtom chemCompAtom) {
+        dictionary.getChemComp(latestChemCompId).getAtoms().add(chemCompAtom);
+    }
+
+    @Override
+    public void consumeChemCompBond(ChemCompBond chemCompBond) {
+        dictionary.getChemComp(latestChemCompId).getBonds().add(chemCompBond);
+    }
+
+    @Override
+    public void consumePdbxChemCompDescriptor(PdbxChemCompDescriptor pdbxChemCompDescriptor) {
+        ChemComp cc = dictionary.getChemComp(latestChemCompId);
+        cc.getDescriptors().add(pdbxChemCompDescriptor);
+    }
+
+    @Override
+    public void finish() {
+
+    }
+
+    @Override
+    public ChemComp getContainer() {
+        if (c.getId() == null)
+            logger.warn("chem comp ID == null " + c);
+
+        latestChemCompId = c.getId();
+        dictionary.addChemComp(c);
+        if (c.getResidueType() == ResidueType.nonPolymer) {
+            return;
+        }
+
+        if (c.getResidueType() == ResidueType.saccharide) {
+            return;
+        }
+
+        if (c.getResidueType() == ResidueType.dSaccharide) {
+            return;
+        }
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifBean.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifBean.java
new file mode 100644
index 0000000000..1196aafada
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifBean.java
@@ -0,0 +1,12 @@
+package org.biojava.nbio.structure.io.cif;
+
+import org.rcsb.cif.model.Category;
+
+import java.io.Serializable;
+
+/**
+ * Flag for BioJava beans that actually resemble categories defined by the mmCIF schema.
+ * @param <C> the modeled ciftools-java category
+ */
+public interface CifBean<C extends Category> extends Serializable {
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumer.java
index d15c9cc140..198f288305 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumer.java
@@ -1,5 +1,7 @@
 package org.biojava.nbio.structure.io.cif;
 
+import org.biojava.nbio.structure.chem.ChemCompAtom;
+import org.biojava.nbio.structure.chem.ChemCompDescriptor;
 import org.rcsb.cif.schema.mm.AtomSite;
 import org.rcsb.cif.schema.mm.AtomSites;
 import org.rcsb.cif.schema.mm.AuditAuthor;
@@ -53,282 +55,12 @@
  * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
  * @since 5.3.0
  */
-interface CifFileConsumer<S> {
+public interface CifFileConsumer<S> {
     /**
      * Setup routine which initializes a new container.
      */
     void prepare();
 
-    /**
-     * Consume a particular Cif category.
-     * @param atomSite data
-     */
-    void consumeAtomSite(AtomSite atomSite);
-
-    /**
-     * Consume a particular Cif category.
-     * @param atomSites data
-     */
-    void consumeAtomSites(AtomSites atomSites);
-
-    /**
-     * Consume a particular Cif category.
-     * @param auditAuthor data
-     */
-    void consumeAuditAuthor(AuditAuthor auditAuthor);
-
-    /**
-     * Consume a particular Cif category.
-     * @param cell data
-     */
-    void consumeCell(Cell cell);
-
-    /**
-     * Consume a particular Cif category.
-     * @param chemComp data
-     */
-    void consumeChemComp(ChemComp chemComp);
-
-    /**
-     * Consume a particular Cif category.
-     * @param chemCompBond data
-     */
-    void consumeChemCompBond(ChemCompBond chemCompBond);
-
-    /**
-     * Consume a particular Cif category.
-     * @param databasePDBremark data
-     */
-    void consumeDatabasePDBremark(DatabasePDBRemark databasePDBremark);
-
-    /**
-     * Consume a particular Cif category.
-     * @param databasePDBrev data
-     */
-    void consumeDatabasePDBrev(DatabasePDBRev databasePDBrev);
-
-    /**
-     * Consume a particular Cif category.
-     * @param databasePDBrevRecord data
-     */
-    void consumeDatabasePDBrevRecord(DatabasePDBRevRecord databasePDBrevRecord);
-
-    /**
-     * Consume a particular Cif category.
-     * @param entity data
-     */
-    void consumeEntity(Entity entity);
-
-    /**
-     * Consume a particular Cif category.
-     * @param entityPoly data
-     */
-    void consumeEntityPoly(EntityPoly entityPoly);
-
-    /**
-     * Consume a particular Cif category.
-     * @param entitySrcGen data
-     */
-    void consumeEntitySrcGen(EntitySrcGen entitySrcGen);
-
-    /**
-     * Consume a particular Cif category.
-     * @param entitySrcNat data
-     */
-    void consumeEntitySrcNat(EntitySrcNat entitySrcNat);
-
-    /**
-     * Consume a particular Cif category.
-     * @param entitySrcSyn data
-     */
-    void consumeEntitySrcSyn(PdbxEntitySrcSyn entitySrcSyn);
-
-    /**
-     * Consume a particular Cif category.
-     * @param entityPolySeq data
-     */
-    void consumeEntityPolySeq(EntityPolySeq entityPolySeq);
-
-    /**
-     * Consume a particular Cif category.
-     * @param exptl data
-     */
-    void consumeExptl(Exptl exptl);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxAuditRevisionHistory data
-     */
-    void consumePdbxAuditRevisionHistory(PdbxAuditRevisionHistory pdbxAuditRevisionHistory);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxChemCompIdentifier data
-     */
-    void consumePdbxChemCompIdentifier(PdbxChemCompIdentifier pdbxChemCompIdentifier);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxDatabaseStatus data
-     */
-    void consumePdbxDatabaseStatus(PdbxDatabaseStatus pdbxDatabaseStatus);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxEntityBranchDescriptor data
-     */
-    void consumePdbxEntityBranchDescriptor(PdbxEntityBranchDescriptor pdbxEntityBranchDescriptor);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxMolecule data
-     */
-    void consumePdbxMolecule(PdbxMolecule pdbxMolecule);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxMoleculeFeatures data
-     */
-    void consumePdbxMoleculeFeatures(PdbxMoleculeFeatures pdbxMoleculeFeatures);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxNonpolyScheme data
-     */
-    void consumePdbxNonpolyScheme(PdbxNonpolyScheme pdbxNonpolyScheme);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxReferenceEntityLink data
-     */
-    void consumePdbxReferenceEntityLink(PdbxReferenceEntityLink pdbxReferenceEntityLink);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxReferenceEntityList data
-     */
-    void consumePdbxReferenceEntityList(PdbxReferenceEntityList pdbxReferenceEntityList);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxReferenceEntityPolyLink data
-     */
-    void consumePdbxReferenceEntityPolyLink(PdbxReferenceEntityPolyLink pdbxReferenceEntityPolyLink);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxStructAssembly data
-     */
-    void consumePdbxStructAssembly(PdbxStructAssembly pdbxStructAssembly);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxStructAssemblyGen data
-     */
-    void consumePdbxStructAssemblyGen(PdbxStructAssemblyGen pdbxStructAssemblyGen);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxStructModResidue data
-     */
-    void consumePdbxStructModResidue(PdbxStructModResidue pdbxStructModResidue);
-
-    /**
-     * Consume a particular Cif category.
-     * @param pdbxStructOperList data
-     */
-    void consumePdbxStructOperList(PdbxStructOperList pdbxStructOperList);
-
-    /**
-     * Consume a particular Cif category.
-     * @param refine data
-     */
-    void consumeRefine(Refine refine);
-
-    /**
-     * Consume a particular Cif category.
-     * @param struct data
-     */
-    void consumeStruct(Struct struct);
-
-    /**
-     * Consume a particular Cif category.
-     * @param structAsym data
-     */
-    void consumeStructAsym(StructAsym structAsym);
-
-    /**
-     * Consume a particular Cif category.
-     * @param structConf data
-     */
-    void consumeStructConf(StructConf structConf);
-
-    /**
-     * Consume a particular Cif category.
-     * @param structConn data
-     */
-    void consumeStructConn(StructConn structConn);
-
-    /**
-     * Consume a particular Cif category.
-     * @param structConnType data
-     */
-    void consumeStructConnType(StructConnType structConnType);
-
-    /**
-     * Consume a particular Cif category.
-     * @param structKeywords data
-     */
-    void consumeStructKeywords(StructKeywords structKeywords);
-
-    /**
-     * Consume a particular Cif category.
-     * @param structNcsOper data
-     */
-    void consumeStructNcsOper(StructNcsOper structNcsOper);
-
-    /**
-     * Consume a particular Cif category.
-     * @param structRef data
-     */
-    void consumeStructRef(StructRef structRef);
-
-    /**
-     * Consume a particular Cif category.
-     * @param structRefSeq data
-     */
-    void consumeStructRefSeq(StructRefSeq structRefSeq);
-
-    /**
-     * Consume a particular Cif category.
-     * @param structRefSeqDif data
-     */
-    void consumeStructRefSeqDif(StructRefSeqDif structRefSeqDif);
-
-    /**
-     * Consume a particular Cif category.
-     * @param structSheetRange data
-     */
-    void consumeStructSheetRange(StructSheetRange structSheetRange);
-
-    /**
-     * Consume a particular Cif category.
-     * @param structSite data
-     */
-    void consumeStructSite(StructSite structSite);
-
-    /**
-     * Consume a particular Cif category.
-     * @param structSiteGen data
-     */
-    void consumeStructSiteGen(StructSiteGen structSiteGen);
-
-    /**
-     * Consume a particular Cif category.
-     * @param symmetry data
-     */
-    void consumeSymmetry(Symmetry symmetry);
-
     /**
      * Ultimate setup which can include steps which require several categories to be available and integrate them into
      * the final container.
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConverter.java
index 8f82e310b6..30e5682b69 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConverter.java
@@ -1,5 +1,6 @@
 package org.biojava.nbio.structure.io.cif;
 
+import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.rcsb.cif.CifIO;
@@ -9,6 +10,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -99,7 +101,7 @@ public static Structure fromCifFile(CifFile cifFile) {
      */
     public static Structure fromCifFile(CifFile cifFile, FileParsingParameters parameters) {
         // initialize consumer
-        CifFileConsumer<Structure> consumer = new CifFileConsumerImpl(parameters);
+        StructureConsumer consumer = new StructureConsumerImpl(parameters);
 
         // init structure
         consumer.prepare();
@@ -113,9 +115,9 @@ public static Structure fromCifFile(CifFile cifFile, FileParsingParameters param
         consumer.consumeCell(cifBlock.getCell());
         consumer.consumeChemComp(cifBlock.getChemComp());
         consumer.consumeChemCompBond(cifBlock.getChemCompBond());
-        consumer.consumeDatabasePDBremark(cifBlock.getDatabasePDBRemark());
-        consumer.consumeDatabasePDBrev(cifBlock.getDatabasePDBRev());
-        consumer.consumeDatabasePDBrevRecord(cifBlock.getDatabasePDBRevRecord());
+        consumer.consumeDatabasePDBRemark(cifBlock.getDatabasePDBRemark());
+        consumer.consumeDatabasePDBRev(cifBlock.getDatabasePDBRev());
+        consumer.consumeDatabasePDBRevRecord(cifBlock.getDatabasePDBRevRecord());
         consumer.consumeEntity(cifBlock.getEntity());
         consumer.consumeEntityPoly(cifBlock.getEntityPoly());
         consumer.consumeEntitySrcGen(cifBlock.getEntitySrcGen());
@@ -183,20 +185,39 @@ public static void toBinaryFile(Structure structure, Path path) throws IOExcepti
      * Convert a structure to BCIF format.
      * @param structure the source
      * @return the binary representation of the structure
-     * @throws IOException thrown when writing fails
      */
-    public static byte[] toBinary(Structure structure) throws IOException {
-        return CifIO.writeText(toCifFile(structure));
+    public static byte[] toBinary(Structure structure) {
+        try {
+            return CifIO.writeText(toCifFile(structure));
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
     }
 
     /**
      * Convert a structure to mmCIF format.
      * @param structure the source
      * @return the mmCIF String representation of the structure
-     * @throws IOException thrown when writing fails
      */
-    public static String toText(Structure structure) throws IOException {
-        return new String(CifIO.writeText(toCifFile(structure)));
+    public static String toText(Structure structure) {
+        try {
+            return new String(CifIO.writeText(toCifFile(structure)));
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    /**
+     * Convert a chain to mmCIF format.
+     * @param chain the source
+     * @return the mmCIF String representation of the chain
+     */
+    public static String toText(Chain chain) {
+        try {
+            return new String(CifIO.writeText(toCifFile(chain)));
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
     }
 
     /**
@@ -205,6 +226,15 @@ public static String toText(Structure structure) throws IOException {
      * @return the target
      */
     public static CifFile toCifFile(Structure structure) {
-        return new CifFileSupplierImpl().get(structure);
+        return new AbstractCifFileSupplier().getStructure(structure);
+    }
+
+    /**
+     * Convert Chain to CifFile
+     * @param chain the source
+     * @return the target
+     */
+    public static CifFile toCifFile(Chain chain) {
+        return new AbstractCifFileSupplier().getChain(chain);
     }
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplier.java
index a4fcbe4c90..08f35fce54 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplier.java
@@ -2,13 +2,15 @@
 
 import org.rcsb.cif.model.CifFile;
 
+import java.util.function.Supplier;
+
 /**
  * Create a CifFile instance for a given container of structure data.
  * @param <S> the container type used as source
  * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
  * @since 5.3.0
  */
-interface CifFileSupplier<S> {
+public interface CifFileSupplier<S> {
     /**
      * Convert some model instance describing structure information to a CifFile instance.
      * @param container the source of structure information
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumer.java
new file mode 100644
index 0000000000..9594a2c71d
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumer.java
@@ -0,0 +1,320 @@
+package org.biojava.nbio.structure.io.cif;
+
+import org.biojava.nbio.structure.Structure;
+import org.rcsb.cif.schema.mm.AtomSite;
+import org.rcsb.cif.schema.mm.AtomSites;
+import org.rcsb.cif.schema.mm.AuditAuthor;
+import org.rcsb.cif.schema.mm.Cell;
+import org.rcsb.cif.schema.mm.ChemComp;
+import org.rcsb.cif.schema.mm.ChemCompBond;
+import org.rcsb.cif.schema.mm.DatabasePDBRemark;
+import org.rcsb.cif.schema.mm.DatabasePDBRev;
+import org.rcsb.cif.schema.mm.DatabasePDBRevRecord;
+import org.rcsb.cif.schema.mm.Entity;
+import org.rcsb.cif.schema.mm.EntityPoly;
+import org.rcsb.cif.schema.mm.EntityPolySeq;
+import org.rcsb.cif.schema.mm.EntitySrcGen;
+import org.rcsb.cif.schema.mm.EntitySrcNat;
+import org.rcsb.cif.schema.mm.Exptl;
+import org.rcsb.cif.schema.mm.PdbxAuditRevisionHistory;
+import org.rcsb.cif.schema.mm.PdbxChemCompIdentifier;
+import org.rcsb.cif.schema.mm.PdbxDatabaseStatus;
+import org.rcsb.cif.schema.mm.PdbxEntityBranchDescriptor;
+import org.rcsb.cif.schema.mm.PdbxEntitySrcSyn;
+import org.rcsb.cif.schema.mm.PdbxMolecule;
+import org.rcsb.cif.schema.mm.PdbxMoleculeFeatures;
+import org.rcsb.cif.schema.mm.PdbxNonpolyScheme;
+import org.rcsb.cif.schema.mm.PdbxReferenceEntityLink;
+import org.rcsb.cif.schema.mm.PdbxReferenceEntityList;
+import org.rcsb.cif.schema.mm.PdbxReferenceEntityPolyLink;
+import org.rcsb.cif.schema.mm.PdbxStructAssembly;
+import org.rcsb.cif.schema.mm.PdbxStructAssemblyGen;
+import org.rcsb.cif.schema.mm.PdbxStructModResidue;
+import org.rcsb.cif.schema.mm.PdbxStructOperList;
+import org.rcsb.cif.schema.mm.Refine;
+import org.rcsb.cif.schema.mm.Struct;
+import org.rcsb.cif.schema.mm.StructAsym;
+import org.rcsb.cif.schema.mm.StructConf;
+import org.rcsb.cif.schema.mm.StructConn;
+import org.rcsb.cif.schema.mm.StructConnType;
+import org.rcsb.cif.schema.mm.StructKeywords;
+import org.rcsb.cif.schema.mm.StructNcsOper;
+import org.rcsb.cif.schema.mm.StructRef;
+import org.rcsb.cif.schema.mm.StructRefSeq;
+import org.rcsb.cif.schema.mm.StructRefSeqDif;
+import org.rcsb.cif.schema.mm.StructSheetRange;
+import org.rcsb.cif.schema.mm.StructSite;
+import org.rcsb.cif.schema.mm.StructSiteGen;
+import org.rcsb.cif.schema.mm.Symmetry;
+
+public interface StructureConsumer extends CifFileConsumer<Structure> {
+    /**
+     * Consume a particular Cif category.
+     * @param atomSite data
+     */
+    void consumeAtomSite(AtomSite atomSite);
+
+    /**
+     * Consume a particular Cif category.
+     * @param atomSites data
+     */
+    void consumeAtomSites(AtomSites atomSites);
+
+    /**
+     * Consume a particular Cif category.
+     * @param auditAuthor data
+     */
+    void consumeAuditAuthor(AuditAuthor auditAuthor);
+
+    /**
+     * Consume a particular Cif category.
+     * @param cell data
+     */
+    void consumeCell(Cell cell);
+
+    /**
+     * Consume a particular Cif category.
+     * @param chemComp data
+     */
+    void consumeChemComp(ChemComp chemComp);
+
+    /**
+     * Consume a particular Cif category.
+     * @param chemCompBond data
+     */
+    void consumeChemCompBond(ChemCompBond chemCompBond);
+
+    /**
+     * Consume a particular Cif category.
+     * @param databasePDBremark data
+     */
+    void consumeDatabasePDBRemark(DatabasePDBRemark databasePDBremark);
+
+    /**
+     * Consume a particular Cif category.
+     * @param databasePDBrev data
+     */
+    void consumeDatabasePDBRev(DatabasePDBRev databasePDBrev);
+
+    /**
+     * Consume a particular Cif category.
+     * @param databasePDBrevRecord data
+     */
+    void consumeDatabasePDBRevRecord(DatabasePDBRevRecord databasePDBrevRecord);
+
+    /**
+     * Consume a particular Cif category.
+     * @param entity data
+     */
+    void consumeEntity(Entity entity);
+
+    /**
+     * Consume a particular Cif category.
+     * @param entityPoly data
+     */
+    void consumeEntityPoly(EntityPoly entityPoly);
+
+    /**
+     * Consume a particular Cif category.
+     * @param entitySrcGen data
+     */
+    void consumeEntitySrcGen(EntitySrcGen entitySrcGen);
+
+    /**
+     * Consume a particular Cif category.
+     * @param entitySrcNat data
+     */
+    void consumeEntitySrcNat(EntitySrcNat entitySrcNat);
+
+    /**
+     * Consume a particular Cif category.
+     * @param entitySrcSyn data
+     */
+    void consumeEntitySrcSyn(PdbxEntitySrcSyn entitySrcSyn);
+
+    /**
+     * Consume a particular Cif category.
+     * @param entityPolySeq data
+     */
+    void consumeEntityPolySeq(EntityPolySeq entityPolySeq);
+
+    /**
+     * Consume a particular Cif category.
+     * @param exptl data
+     */
+    void consumeExptl(Exptl exptl);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxAuditRevisionHistory data
+     */
+    void consumePdbxAuditRevisionHistory(PdbxAuditRevisionHistory pdbxAuditRevisionHistory);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxChemCompIdentifier data
+     */
+    void consumePdbxChemCompIdentifier(PdbxChemCompIdentifier pdbxChemCompIdentifier);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxDatabaseStatus data
+     */
+    void consumePdbxDatabaseStatus(PdbxDatabaseStatus pdbxDatabaseStatus);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxEntityBranchDescriptor data
+     */
+    void consumePdbxEntityBranchDescriptor(PdbxEntityBranchDescriptor pdbxEntityBranchDescriptor);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxMolecule data
+     */
+    void consumePdbxMolecule(PdbxMolecule pdbxMolecule);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxMoleculeFeatures data
+     */
+    void consumePdbxMoleculeFeatures(PdbxMoleculeFeatures pdbxMoleculeFeatures);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxNonpolyScheme data
+     */
+    void consumePdbxNonpolyScheme(PdbxNonpolyScheme pdbxNonpolyScheme);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxReferenceEntityLink data
+     */
+    void consumePdbxReferenceEntityLink(PdbxReferenceEntityLink pdbxReferenceEntityLink);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxReferenceEntityList data
+     */
+    void consumePdbxReferenceEntityList(PdbxReferenceEntityList pdbxReferenceEntityList);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxReferenceEntityPolyLink data
+     */
+    void consumePdbxReferenceEntityPolyLink(PdbxReferenceEntityPolyLink pdbxReferenceEntityPolyLink);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxStructAssembly data
+     */
+    void consumePdbxStructAssembly(PdbxStructAssembly pdbxStructAssembly);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxStructAssemblyGen data
+     */
+    void consumePdbxStructAssemblyGen(PdbxStructAssemblyGen pdbxStructAssemblyGen);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxStructModResidue data
+     */
+    void consumePdbxStructModResidue(PdbxStructModResidue pdbxStructModResidue);
+
+    /**
+     * Consume a particular Cif category.
+     * @param pdbxStructOperList data
+     */
+    void consumePdbxStructOperList(PdbxStructOperList pdbxStructOperList);
+
+    /**
+     * Consume a particular Cif category.
+     * @param refine data
+     */
+    void consumeRefine(Refine refine);
+
+    /**
+     * Consume a particular Cif category.
+     * @param struct data
+     */
+    void consumeStruct(Struct struct);
+
+    /**
+     * Consume a particular Cif category.
+     * @param structAsym data
+     */
+    void consumeStructAsym(StructAsym structAsym);
+
+    /**
+     * Consume a particular Cif category.
+     * @param structConf data
+     */
+    void consumeStructConf(StructConf structConf);
+
+    /**
+     * Consume a particular Cif category.
+     * @param structConn data
+     */
+    void consumeStructConn(StructConn structConn);
+
+    /**
+     * Consume a particular Cif category.
+     * @param structConnType data
+     */
+    void consumeStructConnType(StructConnType structConnType);
+
+    /**
+     * Consume a particular Cif category.
+     * @param structKeywords data
+     */
+    void consumeStructKeywords(StructKeywords structKeywords);
+
+    /**
+     * Consume a particular Cif category.
+     * @param structNcsOper data
+     */
+    void consumeStructNcsOper(StructNcsOper structNcsOper);
+
+    /**
+     * Consume a particular Cif category.
+     * @param structRef data
+     */
+    void consumeStructRef(StructRef structRef);
+
+    /**
+     * Consume a particular Cif category.
+     * @param structRefSeq data
+     */
+    void consumeStructRefSeq(StructRefSeq structRefSeq);
+
+    /**
+     * Consume a particular Cif category.
+     * @param structRefSeqDif data
+     */
+    void consumeStructRefSeqDif(StructRefSeqDif structRefSeqDif);
+
+    /**
+     * Consume a particular Cif category.
+     * @param structSheetRange data
+     */
+    void consumeStructSheetRange(StructSheetRange structSheetRange);
+
+    /**
+     * Consume a particular Cif category.
+     * @param structSite data
+     */
+    void consumeStructSite(StructSite structSite);
+
+    /**
+     * Consume a particular Cif category.
+     * @param structSiteGen data
+     */
+    void consumeStructSiteGen(StructSiteGen structSiteGen);
+
+    /**
+     * Consume a particular Cif category.
+     * @param symmetry data
+     */
+    void consumeSymmetry(Symmetry symmetry);
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
similarity index 89%
rename from biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumerImpl.java
rename to biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
index a3af75fc91..d858536847 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
@@ -7,7 +7,6 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.ChainImpl;
 import org.biojava.nbio.structure.DBRef;
-import org.biojava.nbio.structure.DatabasePdbRevRecord;
 import org.biojava.nbio.structure.Element;
 import org.biojava.nbio.structure.EntityInfo;
 import org.biojava.nbio.structure.EntityType;
@@ -25,12 +24,12 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureImpl;
 import org.biojava.nbio.structure.StructureTools;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.biojava.nbio.structure.io.BondMaker;
 import org.biojava.nbio.structure.io.ChargeAdder;
 import org.biojava.nbio.structure.io.EntityFinder;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.SeqRes2AtomAligner;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyBuilder;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyTransformation;
@@ -99,15 +98,12 @@
 
 /**
  * An implementation of a CifFileConsumer for BioJava. Will process the information provided by a CifFile instance and
- * use it to build up a {@link Structure} object. The implementation is for the most part really close to that in
- * {@link org.biojava.nbio.structure.io.mmcif.SimpleMMcifConsumer} and associated classes. The main difference is that
- * all internally used model classes are generated from the MMCIF schema and a standardized interface to CifFile data is
- * provided. This allows to readily parse files in CIF format as well as binary CIF (BCIF) format.
+ * use it to build up a {@link Structure} object.
  * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
- * @since 5.3.0
+ * @since 6.0.0
  */
-class CifFileConsumerImpl implements CifFileConsumer<Structure> {
-    private static final Logger logger = LoggerFactory.getLogger(CifFileConsumerImpl.class);
+public class StructureConsumerImpl implements StructureConsumer {
+    private static final Logger logger = LoggerFactory.getLogger(StructureConsumerImpl.class);
     private static final DateTimeFormatter DATE_FORMAT = new DateTimeFormatterBuilder()
             .parseCaseInsensitive()
             .appendPattern("yyyy-MM-dd")
@@ -144,7 +140,7 @@ class CifFileConsumerImpl implements CifFileConsumer<Structure> {
 
     private final FileParsingParameters params;
 
-    public CifFileConsumerImpl(FileParsingParameters params) {
+    public StructureConsumerImpl(FileParsingParameters params) {
         this.params = params;
     }
 
@@ -575,7 +571,7 @@ public void consumeChemCompBond(ChemCompBond chemCompBond) {
     }
 
     @Override
-    public void consumeDatabasePDBremark(DatabasePDBRemark databasePDBremark) {
+    public void consumeDatabasePDBRemark(DatabasePDBRemark databasePDBremark) {
         for (int rowIndex = 0; rowIndex < databasePDBremark.getRowCount(); rowIndex++) {
             int id = databasePDBremark.getId().get(rowIndex);
             if (id == 2) {
@@ -603,7 +599,7 @@ private Date convert(LocalDate localDate) {
     }
 
     @Override
-    public void consumeDatabasePDBrev(DatabasePDBRev databasePDBrev) {
+    public void consumeDatabasePDBRev(DatabasePDBRev databasePDBrev) {
         logger.debug("got a database revision:" + databasePDBrev);
 
         for (int rowIndex = 0; rowIndex < databasePDBrev.getRowCount(); rowIndex++) {
@@ -621,26 +617,16 @@ public void consumeDatabasePDBrev(DatabasePDBRev databasePDBrev) {
     }
 
     @Override
-    public void consumeDatabasePDBrevRecord(DatabasePDBRevRecord databasePDBrevRecord) {
-        List<DatabasePdbRevRecord> revRecords = pdbHeader.getRevisionRecords();
+    public void consumeDatabasePDBRevRecord(DatabasePDBRevRecord databasePDBrevRecord) {
+        List<org.biojava.nbio.structure.DatabasePDBRevRecord> revRecords = pdbHeader.getRevisionRecords();
         if (revRecords == null) {
             revRecords = new ArrayList<>();
             pdbHeader.setRevisionRecords(revRecords);
         }
 
-        revRecords.addAll(convert(databasePDBrevRecord));
-    }
-
-    private List<DatabasePdbRevRecord> convert(DatabasePDBRevRecord databasePDBrevRecord) {
-        List<DatabasePdbRevRecord> revRecords = new ArrayList<>();
-        for (int rowIndex = 0; rowIndex < databasePDBrevRecord.getRowCount(); rowIndex++) {
-            DatabasePdbRevRecord revRecord = new DatabasePdbRevRecord();
-            revRecord.setDetails(databasePDBrevRecord.getDetails().get(rowIndex));
-            revRecord.setRev_num(databasePDBrevRecord.getRevNum().getStringData(rowIndex));
-            revRecord.setType(databasePDBrevRecord.getType().get(rowIndex));
-            revRecords.add(revRecord);
+        for (int i = 0; i < databasePDBrevRecord.getRowCount(); i++) {
+            revRecords.add(new org.biojava.nbio.structure.DatabasePDBRevRecord(databasePDBrevRecord, i));
         }
-        return revRecords;
     }
 
     @Override
@@ -1183,25 +1169,24 @@ public void finish() {
             // the more detailed mapping of chains to rotation operations happens in StructureIO...
 
             Map<Integer, BioAssemblyInfo> bioAssemblies = new LinkedHashMap<>();
-            List<org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssembly> structAssemblies = convert(structAssembly);
-            List<org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssemblyGen> structAssemblyGens = convert(structAssemblyGen);
-
-            for (org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssembly pdbxStructAssembly : structAssemblies) {
-                List<org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssemblyGen> pdbxStructAssemblyGens = structAssemblyGens.stream()
-                        .filter(sag -> sag.getAssembly_id().equals(pdbxStructAssembly.getId()))
-                        .collect(Collectors.toList());
-
+            for (int i = 0; i < structAssembly.getRowCount(); i++) {
+                String assemblyId = structAssembly.getId().get(i);
+                List<Integer> structAssemblyGenIndices = new ArrayList<>();
+                for (int j = 0; j < structAssemblyGen.getRowCount(); j++) {
+                    if (structAssemblyGen.getAssemblyId().get(j).equals(assemblyId)) {
+                        structAssemblyGenIndices.add(j);
+                    }
+                }
                 BiologicalAssemblyBuilder builder = new BiologicalAssemblyBuilder();
-
                 // these are the transformations that need to be applied to our model
-                List<BiologicalAssemblyTransformation> transformations = builder.getBioUnitTransformationList(pdbxStructAssembly,
-                        pdbxStructAssemblyGens, convert(structOpers));
+                List<BiologicalAssemblyTransformation> transformations = builder.getBioUnitTransformationList(structAssembly,
+                        i, structAssemblyGen, structOpers);
 
                 int bioAssemblyId = -1;
                 try {
-                    bioAssemblyId = Integer.parseInt(pdbxStructAssembly.getId());
+                    bioAssemblyId = Integer.parseInt(assemblyId);
                 } catch (NumberFormatException e) {
-                    logger.info("Could not parse a numerical bio assembly id from '{}'", pdbxStructAssembly.getId());
+                    logger.info("Could not parse a numerical bio assembly id from '{}'", assemblyId);
                 }
 
                 // if bioassembly id is not numerical we throw it away
@@ -1418,68 +1403,6 @@ private void setStructNcsOps() {
         }
     }
 
-    private List<org.biojava.nbio.structure.io.mmcif.model.PdbxStructOperList> convert(PdbxStructOperList structOpers) {
-        List<org.biojava.nbio.structure.io.mmcif.model.PdbxStructOperList> re = new ArrayList<>();
-        for (int rowIndex = 0; rowIndex < structOpers.getRowCount(); rowIndex++) {
-            org.biojava.nbio.structure.io.mmcif.model.PdbxStructOperList pdbxStructOperList =
-                    new org.biojava.nbio.structure.io.mmcif.model.PdbxStructOperList();
-
-            pdbxStructOperList.setId(structOpers.getId().get(rowIndex));
-            pdbxStructOperList.setName(structOpers.getName().get(rowIndex));
-            pdbxStructOperList.setSymmetry_operation(structOpers.getSymmetryOperation().get(rowIndex));
-            pdbxStructOperList.setType(structOpers.getType().get(rowIndex));
-
-            pdbxStructOperList.setMatrix11(String.valueOf(structOpers.getMatrix11().get(rowIndex)));
-            pdbxStructOperList.setMatrix12(String.valueOf(structOpers.getMatrix12().get(rowIndex)));
-            pdbxStructOperList.setMatrix13(String.valueOf(structOpers.getMatrix13().get(rowIndex)));
-            pdbxStructOperList.setMatrix21(String.valueOf(structOpers.getMatrix21().get(rowIndex)));
-            pdbxStructOperList.setMatrix22(String.valueOf(structOpers.getMatrix22().get(rowIndex)));
-            pdbxStructOperList.setMatrix23(String.valueOf(structOpers.getMatrix23().get(rowIndex)));
-            pdbxStructOperList.setMatrix31(String.valueOf(structOpers.getMatrix31().get(rowIndex)));
-            pdbxStructOperList.setMatrix32(String.valueOf(structOpers.getMatrix32().get(rowIndex)));
-            pdbxStructOperList.setMatrix33(String.valueOf(structOpers.getMatrix33().get(rowIndex)));
-
-            pdbxStructOperList.setVector1(String.valueOf(structOpers.getVector1().get(rowIndex)));
-            pdbxStructOperList.setVector2(String.valueOf(structOpers.getVector2().get(rowIndex)));
-            pdbxStructOperList.setVector3(String.valueOf(structOpers.getVector3().get(rowIndex)));
-
-            re.add(pdbxStructOperList);
-        }
-        return re;
-    }
-
-    private List<org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssemblyGen> convert(PdbxStructAssemblyGen structAssemblyGen) {
-        List<org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssemblyGen> re = new ArrayList<>();
-        for (int rowIndex = 0; rowIndex < structAssemblyGen.getRowCount(); rowIndex++) {
-            org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssemblyGen pdbxStructAssemblyGen =
-                    new org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssemblyGen();
-
-            pdbxStructAssemblyGen.setAssembly_id(structAssemblyGen.getAssemblyId().get(rowIndex));
-            pdbxStructAssemblyGen.setAsym_id_list(structAssemblyGen.getAsymIdList().get(rowIndex));
-            pdbxStructAssemblyGen.setOper_expression(structAssemblyGen.getOperExpression().get(rowIndex));
-
-            re.add(pdbxStructAssemblyGen);
-        }
-        return re;
-    }
-
-    private List<org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssembly> convert(PdbxStructAssembly structAssembly) {
-        List<org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssembly> re = new ArrayList<>();
-        for (int rowIndex = 0; rowIndex < structAssembly.getRowCount(); rowIndex++) {
-            org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssembly pdbxStructAssembly =
-                    new org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssembly();
-
-            pdbxStructAssembly.setDetails(structAssembly.getDetails().get(rowIndex));
-            pdbxStructAssembly.setId(structAssembly.getId().get(rowIndex));
-            pdbxStructAssembly.setMethod_details(structAssembly.getMethodDetails().get(rowIndex));
-            pdbxStructAssembly.setOligomeric_count(structAssembly.getOligomericCount().getStringData(rowIndex));
-            pdbxStructAssembly.setOligomeric_details(structAssembly.getOligomericDetails().get(rowIndex));
-
-            re.add(pdbxStructAssembly);
-        }
-        return re;
-    }
-
     private void setCrystallographicInfoMetadata() {
         if (parsedScaleMatrix != null) {
             PDBCrystallographicInfo crystalInfo = structure.getCrystallographicInfo();
@@ -1610,32 +1533,7 @@ private static Chain removeSeqResHeterogeneity(Chain c) {
     private void addBonds() {
         BondMaker maker = new BondMaker(structure, params);
         maker.makeBonds();
-        maker.formBondsFromStructConn(convert(structConn));
-    }
-
-    private List<org.biojava.nbio.structure.io.mmcif.model.StructConn> convert(StructConn structConn) {
-        return IntStream.range(0, structConn.getRowCount())
-                .mapToObj(rowIndex -> {
-                    org.biojava.nbio.structure.io.mmcif.model.StructConn sc =
-                            new org.biojava.nbio.structure.io.mmcif.model.StructConn();
-
-                    sc.setPdbx_ptnr1_PDB_ins_code(structConn.getPdbxPtnr1PDBInsCode().get(rowIndex));
-                    sc.setPdbx_ptnr2_PDB_ins_code(structConn.getPdbxPtnr2PDBInsCode().get(rowIndex));
-                    sc.setPtnr1_auth_seq_id(structConn.getPtnr1AuthSeqId().getStringData(rowIndex));
-                    sc.setPtnr2_auth_seq_id(structConn.getPtnr2AuthSeqId().getStringData(rowIndex));
-                    sc.setPtnr1_label_comp_id(structConn.getPtnr1LabelCompId().get(rowIndex));
-                    sc.setPtnr2_label_comp_id(structConn.getPtnr2LabelCompId().get(rowIndex));
-                    sc.setPtnr1_label_atom_id(structConn.getPtnr1LabelAtomId().get(rowIndex));
-                    sc.setPtnr2_label_atom_id(structConn.getPtnr2LabelAtomId().get(rowIndex));
-                    sc.setPdbx_ptnr1_label_alt_id(structConn.getPdbxPtnr1LabelAltId().get(rowIndex));
-                    sc.setPdbx_ptnr2_label_alt_id(structConn.getPdbxPtnr2LabelAltId().get(rowIndex));
-                    sc.setPtnr1_symmetry(structConn.getPtnr1Symmetry().get(rowIndex));
-                    sc.setPtnr2_symmetry(structConn.getPtnr2Symmetry().get(rowIndex));
-                    sc.setConn_type_id(structConn.getConnTypeId().get(rowIndex));
-
-                    return sc;
-                })
-                .collect(Collectors.toList());
+        maker.formBondsFromStructConn(structConn);
     }
 
     private void alignSeqRes() {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureSupplierImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureSupplierImpl.java
new file mode 100644
index 0000000000..ef377ad52a
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureSupplierImpl.java
@@ -0,0 +1,28 @@
+package org.biojava.nbio.structure.io.cif;
+
+import org.biojava.nbio.structure.Chain;
+import org.biojava.nbio.structure.Structure;
+import org.rcsb.cif.model.CifFile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StructureSupplierImpl extends AbstractCifFileSupplier<Structure> {
+    @Override
+    public CifFile get(Structure container) {
+        return getInternal(container, collectWrappedAtoms(container));
+    }
+
+    private List<WrappedAtom> collectWrappedAtoms(Structure structure) {
+        List<WrappedAtom> wrappedAtoms = new ArrayList<>();
+
+        for (int modelIndex = 0; modelIndex < structure.nrModels(); modelIndex++) {
+            final int model = modelIndex + 1;
+            for (Chain chain : structure.getChains(modelIndex)) {
+                handleChain(chain, model, wrappedAtoms);
+            }
+        }
+
+        return wrappedAtoms;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/AllChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/AllChemCompProvider.java
deleted file mode 100644
index b2b3222d58..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/AllChemCompProvider.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
-
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.structure.io.LocalPDBDirectory;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
-import org.biojava.nbio.core.util.InputStreamProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.*;
-import java.net.URL;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * A ChemComp provider that downloads and caches the components.cif file from the wwPDB site. It then loads
- * all chemical components at startup and keeps them in memory. This provider is not used as a default
- * since it is slower at startup and requires more memory than the {@link DownloadChemCompProvider} that is used by default.
- *
- * @author Andreas Prlic
- *
- */
-public class AllChemCompProvider implements ChemCompProvider, Runnable{
-
-	private static final Logger logger = LoggerFactory.getLogger(AllChemCompProvider.class);
-
-	public static final String COMPONENTS_FILE_LOCATION = "pub/pdb/data/monomers/components.cif.gz";
-
-
-	private static String path;
-
-	private static String serverName;
-
-
-	// there will be only one copy of the dictionary across all instances
-	// to reduce memory impact
-	static ChemicalComponentDictionary dict;
-
-	// flags to make sure there is only one thread running that is loading the dictionary
-	static AtomicBoolean loading       = new AtomicBoolean(false);
-	static AtomicBoolean isInitialized = new AtomicBoolean(false);
-
-	public AllChemCompProvider(){
-
-		if ( loading.get()) {
-			logger.warn("other thread is already loading all chemcomps, no need to init twice");
-			return;
-		}
-		if ( isInitialized.get())
-			return;
-
-		loading.set(true);
-
-		Thread t = new Thread(this);
-		t.start();
-
-	}
-
-
-	/** make sure all paths are initialized correctly
-	 *
-	 */
-	private static void initPath(){
-
-		if (path==null) {
-			UserConfiguration config = new UserConfiguration();
-			path = config.getCacheFilePath();
-		}
-	}
-
-	private static void initServerName() {
-
-		if (serverName==null) {
-			serverName = LocalPDBDirectory.getServerName();
-		}
-	}
-
-	private void ensureFileExists() {
-
-
-		String fileName = getLocalFileName();
-		File f = new File(fileName);
-
-		if ( ! f.exists()) {
-			try {
-			downloadFile();
-			} catch (IOException e) {
-				logger.error("Caught IOException",e);
-			}
-		}
-
-
-
-	}
-
-	/** Downloads the components.cif.gz file from the wwPDB site.
-	 *
-	 */
-	public static void downloadFile() throws IOException {
-
-		initPath();
-
-		initServerName();
-
-		String localName = getLocalFileName();
-
-		String u = serverName + "/" + COMPONENTS_FILE_LOCATION;
-
-		downloadFileFromRemote(new URL(u), new File(localName));
-
-
-	}
-
-
-	private static  void downloadFileFromRemote(URL remoteURL, File localFile) throws FileNotFoundException, IOException{
-		logger.info("Downloading " + remoteURL + " to: " + localFile);
-		FileOutputStream out = new FileOutputStream(localFile);
-
-		InputStream in = remoteURL.openStream();
-		byte[] buf = new byte[4 * 1024]; // 4K buffer
-		int bytesRead;
-		while ((bytesRead = in.read(buf)) != -1) {
-			out.write(buf, 0, bytesRead);
-		}
-		in.close();
-		out.close();
-
-
-	}
-
-
-	private static String getLocalFileName(){
-
-		File dir = new File(path, DownloadChemCompProvider.CHEM_COMP_CACHE_DIRECTORY);
-
-		if (! dir.exists()){
-			logger.info("Creating directory {}", dir.toString());
-			dir.mkdir();
-		}
-
-		String fileName = new File(dir, "components.cif.gz").toString();
-
-		return fileName;
-	}
-
-	/** Load all {@link ChemComp} definitions into memory.
-	 *
-	 */
-	private void loadAllChemComps() throws IOException {
-		String fileName = getLocalFileName();
-		logger.debug("Loading " + fileName);
-		InputStreamProvider isp = new InputStreamProvider();
-
-
-		InputStream inStream = isp.getInputStream(fileName);
-
-		MMcifParser parser = new SimpleMMcifParser();
-
-		ChemCompConsumer consumer = new ChemCompConsumer();
-
-		// The Consumer builds up the BioJava - structure object.
-		// you could also hook in your own and build up you own data model.
-		parser.addMMcifConsumer(consumer);
-
-		parser.parse(new BufferedReader(new InputStreamReader(inStream)));
-
-		dict = consumer.getDictionary();
-
-		inStream.close();
-
-	}
-
-
-	/** {@inheritDoc}
-	 *
-	 */
-	@Override
-	public ChemComp getChemComp(String recordName) {
-
-		while ( loading.get()) {
-
-			// another thread is still initializing the definitions
-			try {
-				// wait half a second
-
-				Thread.sleep(500);
-			} catch (InterruptedException e) {
-				logger.error("Interrepted thread while waiting: "+e.getMessage());
-				//e.printStackTrace();
-			}
-		}
-
-
-
-		return dict.getChemComp(recordName);
-	}
-
-
-	/** Do the actual loading of the dictionary in a thread.
-	 *
-	 */
-	@Override
-	public void run() {
-		long timeS = System.currentTimeMillis();
-
-		initPath();
-
-		ensureFileExists();
-
-		try {
-			loadAllChemComps();
-
-			long timeE = System.currentTimeMillis();
-			logger.debug("Time to init chem comp dictionary: " + (timeE - timeS) / 1000 + " sec.");
-
-
-		} catch (IOException e) {
-			logger.error("Could not load chemical components definition file {}. Error: {}", getLocalFileName(), e.getMessage());
-
-		} finally {
-			loading.set(false);
-			isInitialized.set(true);
-		}
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemCompConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemCompConsumer.java
deleted file mode 100644
index f2d043a5b9..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemCompConsumer.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.mmcif.chem.ResidueType;
-import org.biojava.nbio.structure.io.mmcif.model.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-
-public class ChemCompConsumer implements MMcifConsumer {
-
-	private static final Logger logger = LoggerFactory.getLogger(ChemCompConsumer.class);
-
-	ChemicalComponentDictionary dictionary;
-
-	String latestChemCompId;
-	public ChemCompConsumer(){
-		dictionary = new ChemicalComponentDictionary();
-	}
-
-	@Override
-	public void documentStart() {
-
-
-	}
-
-	public ChemicalComponentDictionary getDictionary(){
-		return dictionary;
-	}
-
-	@Override
-	public void newChemComp(ChemComp c) {
-
-		if ( c.getId() == null)
-			logger.warn("chem comp ID == null " + c);
-
-		latestChemCompId = c.getId();
-		dictionary.addChemComp(c);
-		if ( c.getResidueType() == ResidueType.nonPolymer)
-			return;
-
-		if ( c.getResidueType() == ResidueType.saccharide)
-			return;
-
-		if ( c.getResidueType() == ResidueType.dSaccharide)
-			return;
-
-		//if ( c.isStandard())
-		//	System.out.println(c);
-	}
-
-	@Override
-	public void documentEnd() {
-
-
-	}
-
-	@Override
-	public void newAtomSite(AtomSite atom) {
-
-
-	}
-
-	@Override
-	public void newDatabasePDBremark(DatabasePDBremark remark) {
-
-
-	}
-
-	@Override
-	public void newDatabasePDBrev(DatabasePDBrev dbrev) {
-
-
-	}
-
-	@Override
-	public void newDatabasePDBrevRecord(DatabasePdbrevRecord dbrev) {
-
-	}
-
-	@Override
-	public void newEntity(Entity entity) {
-
-
-	}
-
-	@Override
-	public void newEntityPolySeq(EntityPolySeq epolseq) {
-
-
-	}
-
-	@Override
-	public void newExptl(Exptl exptl) {
-
-
-	}
-
-	@Override
-	public void newCell(Cell cell) {
-
-	}
-
-	@Override
-	public void newSymmetry(Symmetry symmetry) {
-
-	}
-
-	@Override
-	public void newStructNcsOper(StructNcsOper sNcsOper) {
-
-	}
-
-	@Override
-	public void newAtomSites(AtomSites atomSites) {
-
-	}
-
-	@Override
-	public void newPdbxEntityNonPoly(PdbxEntityNonPoly pen) {
-
-
-	}
-
-	@Override
-	public void newPdbxNonPolyScheme(PdbxNonPolyScheme ppss) {
-
-
-	}
-
-	@Override
-	public void newPdbxPolySeqScheme(PdbxPolySeqScheme ppss) {
-
-
-	}
-
-	@Override
-	public void newRefine(Refine r) {
-
-
-	}
-
-	@Override
-	public void newStructAsym(StructAsym sasym) {
-
-
-	}
-
-	@Override
-	public void newStructKeywords(StructKeywords kw) {
-
-
-	}
-
-	@Override
-	public void newStructRef(StructRef sref) {
-
-
-	}
-
-	@Override
-	public void newStructRefSeq(StructRefSeq sref) {
-
-
-	}
-
-	@Override
-	public void newStructRefSeqDif(StructRefSeqDif sref) {
-
-
-	}
-
-	@Override
-	public void setStruct(Struct struct) {
-
-
-	}
-
-	@Override
-	public void newGenericData(String category, List<String> loopFields,
-			List<String> lineData) {
-		//System.out.println("unhandled category: " + category);
-
-	}
-
-
-	@Override
-	public void newAuditAuthor(AuditAuthor aa)
-	{
-
-
-	}
-
-	@Override
-	public FileParsingParameters getFileParsingParameters()
-	{
-		// can be ingored in this case...
-		return null;
-	}
-
-	@Override
-	public void setFileParsingParameters(FileParsingParameters params)
-	{
-
-
-	}
-
-	@Override
-	public void newChemCompDescriptor(ChemCompDescriptor ccd) {
-		ChemComp cc = dictionary.getChemComp(latestChemCompId);
-		cc.getDescriptors().add(ccd);
-
-	}
-
-	@Override
-	public void newPdbxStructOperList(PdbxStructOperList structOper) {
-
-
-	}
-
-	@Override
-	public void newPdbxStrucAssembly(PdbxStructAssembly strucAssembly) {
-
-
-	}
-
-	@Override
-	public void newPdbxStrucAssemblyGen(PdbxStructAssemblyGen strucAssembly) {
-
-
-	}
-
-	@Override
-	public void newChemCompAtom(ChemCompAtom atom) {
-		dictionary.getChemComp(latestChemCompId).getAtoms().add(atom);
-	}
-
-	@Override
-	public void newPdbxChemCompIndentifier(PdbxChemCompIdentifier id) {
-
-
-	}
-
-	@Override
-	public void newChemCompBond(ChemCompBond bond) {
-		dictionary.getChemComp(latestChemCompId).getBonds().add(bond);
-	}
-
-	@Override
-	public void newPdbxChemCompDescriptor(PdbxChemCompDescriptor desc) {
-
-
-	}
-
-	@Override
-	public void newEntitySrcGen(EntitySrcGen entitySrcGen) {
-
-
-	}
-	@Override
-	public void newEntitySrcNat(EntitySrcNat entitySrcNat) {
-
-
-	}
-
-	@Override
-	public void newEntitySrcSyn(EntitySrcSyn entitySrcSyn) {
-
-
-	}
-
-	@Override
-	public void newStructConn(StructConn structConn) {
-
-
-	}
-
-	@Override
-	public void newStructSiteGen(StructSiteGen gen) {
-
-	}
-
-	@Override
-	public void newStructSite(StructSite site) {
-
-	}
-
-	@Override
-	public void newEntityPoly(EntityPoly entityPoly) {
-
-
-	}
-
-	@Override
-	public void newPdbxAuditRevisionHistory(PdbxAuditRevisionHistory history) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void newPdbxDatabaseStatus(PdbxDatabaseStatus status) {
-		// TODO Auto-generated method stub
-
-	}
-}
-
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemCompGroupFactory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemCompGroupFactory.java
deleted file mode 100644
index 87f6408e86..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemCompGroupFactory.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * Created on May 23, 2010
- *
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-import org.biojava.nbio.core.util.SoftHashMap;
-import org.biojava.nbio.structure.AminoAcid;
-import org.biojava.nbio.structure.AminoAcidImpl;
-import org.biojava.nbio.structure.Group;
-import org.biojava.nbio.structure.HetatomImpl;
-import org.biojava.nbio.structure.NucleotideImpl;
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class ChemCompGroupFactory {
-
-	private static final Logger logger = LoggerFactory.getLogger(ChemCompGroupFactory.class);
-
-	private static ChemCompProvider chemCompProvider = new DownloadChemCompProvider();
-
-	private static SoftHashMap<String, ChemComp> cache = new SoftHashMap<String, ChemComp>(0);
-
-	public static ChemComp getChemComp(String recordName){
-
-		recordName = recordName.toUpperCase().trim();
-
-		// we are using the cache, to avoid hitting the file system too often.
-		ChemComp cc = cache.get(recordName);
-		if ( cc != null) {
-			logger.debug("Chem comp "+cc.getThree_letter_code()+" read from cache");
-			return cc;
-		}
-
-		// not cached, get the chem comp from the provider
-		logger.debug("Chem comp "+recordName+" read from provider "+chemCompProvider.getClass().getCanonicalName());
-		cc = chemCompProvider.getChemComp(recordName);
-
-		// Note that this also caches null or empty responses
-		cache.put(recordName, cc);
-		return cc;
-	}
-
-	/**
-	 * The new ChemCompProvider will be set in the static variable,
-	 * so this provider will be used from now on until it is changed
-	 * again. Note that this change can have unexpected behavior of
-	 * code executed afterwards.
-	 * <p>
-	 * Changing the provider also resets the cache, so any groups
-	 * previously accessed will be reread or re-downloaded.
-	 *
-	 * @param provider
-	 */
-	public static void setChemCompProvider(ChemCompProvider provider) {
-		logger.debug("Setting new chem comp provider to "+provider.getClass().getCanonicalName());
-		chemCompProvider = provider;
-		// clear cache
-		cache.clear();
-	}
-
-	public static ChemCompProvider getChemCompProvider(){
-		return chemCompProvider;
-	}
-
-	/**
-	 * Force the in-memory cache to be reset.
-	 *
-	 * Note that the ChemCompProvider may have additional memory or disk caches that need to be cleared too.
-	 */
-	public static void clearCache() {
-		cache.clear();
-	}
-
-	public static Group getGroupFromChemCompDictionary(String recordName) {
-
-		// make sure we work with upper case records
-		recordName = recordName.toUpperCase().trim();
-
-		Group g = null;
-
-
-		ChemComp cc =  getChemComp(recordName);
-
-		if ( cc == null)
-			return null;
-
-		if ( PolymerType.PROTEIN_ONLY.contains( cc.getPolymerType() ) ){
-			AminoAcid aa = new AminoAcidImpl();
-
-			String one_letter = cc.getOne_letter_code();
-			if ( one_letter == null || one_letter.equals("X") || one_letter.equals("?") || one_letter.length()==0){
-				String parent = cc.getMon_nstd_parent_comp_id();
-				if ( parent != null && parent.length() == 3){
-					String parentid = cc.getMon_nstd_parent_comp_id() ;
-					ChemComp parentCC = getChemComp(parentid);
-					one_letter = parentCC.getOne_letter_code();
-				}
-			}
-
-			if ( one_letter == null || one_letter.length()==0 || one_letter.equals("?")) {
-				// e.g. problem with PRR, which probably should have a parent of ALA, but as of 20110127 does not.
-				logger.warn("Problem with chemical component: " + recordName + "  Did not find one letter code! Setting it to 'X'");
-				aa.setAminoType('X');
-
-			} else  {
-				aa.setAminoType(one_letter.charAt(0));
-			}
-
-
-			g = aa;
-		} else if ( PolymerType.POLYNUCLEOTIDE_ONLY.contains(cc.getPolymerType())) {
-			NucleotideImpl nuc = new NucleotideImpl();
-
-			g = nuc;
-
-
-		} else {
-
-			g = new HetatomImpl();
-		}
-
-		g.setChemComp(cc);
-
-
-		return g;
-	}
-
-
-	public  static String getOneLetterCode(ChemComp cc){
-		String oneLetter = cc.getOne_letter_code();
-		if ( oneLetter == null || oneLetter.equals("X") || oneLetter.equals("?")) {
-			String parentId = cc.getMon_nstd_parent_comp_id() ;
-			if ( parentId == null)
-				return oneLetter;
-			// cases like OIM have multiple parents (comma separated), we shouldn't try grab a chemcomp for those strings
-			if (parentId.length()>3)
-				return oneLetter;
-			ChemComp parentCC = ChemCompGroupFactory.getChemComp(parentId);
-			if ( parentCC == null)
-				return oneLetter;
-			oneLetter = parentCC.getOne_letter_code();
-		}
-		return oneLetter;
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemCompProvider.java
deleted file mode 100644
index a31affeaae..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemCompProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
-
-/** Interface that is implemented by all classes that can provide {@link ChemComp} definitions.
- *
- * @author Andreas Prlic
- * @since 3.0
- */
-public interface ChemCompProvider {
-
-	/** Returns a new instance of a chemical component definition.
-	 *
-	 * @param recordName the ID of the {@link ChemComp}
-	 * @return a new {@link ChemComp} definition.
-	 */
-	ChemComp getChemComp(String recordName) ;
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemicalComponentDictionary.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemicalComponentDictionary.java
deleted file mode 100644
index 19c97f9aed..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ChemicalComponentDictionary.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- *
- */
-
-package org.biojava.nbio.structure.io.mmcif;
-
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/** A representation of the Chemical Component Dictionary.
- *
- * @author Andreas Prlic
- * @since 1.7
- * @see <a href="http://mmcif.rcsb.org/dictionaries/">link into mmCIF dictionary</a>
- *
- */
-public class ChemicalComponentDictionary {
-
-	private Map<String, ChemComp> dictionary;
-	private Map<String,String> replaces;
-	private Map<String,String> isreplacedby;
-
-	public ChemicalComponentDictionary(){
-		dictionary = new HashMap<String, ChemComp>();
-		replaces   = new HashMap<String, String>();
-		isreplacedby = new HashMap<String, String>();
-	}
-
-	public boolean isReplaced(ChemComp c){
-		return isReplaced(c.getId());
-
-	}
-	public boolean isReplaced(String id){
-		if ( isreplacedby.containsKey(id))
-			return true;
-		return false;
-	}
-	public boolean isReplacer(ChemComp c){
-		return isReplacer(c.getId());
-	}
-	public boolean isReplacer(String id){
-		if ( replaces.containsKey(id) )
-			return true;
-		return false;
-	}
-
-	/** if ChemComp is replaced by another one, get the newer version
-	 * otherwise return the same ChemComp again.
-	 * @param c
-	 * @return get the component that replaced ChemComp.
-	 */
-	public ChemComp getReplacer(ChemComp c){
-		return getReplacer(c.getId());
-	}
-	public ChemComp getReplacer(String id){
-		if (isReplaced(id)){
-			return dictionary.get(isreplacedby.get(id));
-		}
-		return dictionary.get(id);
-	}
-
-	/** if ChemComp is replacing another one, get the old version
-	 * otherwise return the same ChemComp again.
-	 * @param  c the ChemComp for which older versions should be looked up.
-	 */
-
-	public ChemComp getReplaced(ChemComp c){
-		return getReplaced(c.getId());
-	}
-	public ChemComp getReplaced(String id){
-		if (isReplacer(id)){
-			return dictionary.get(replaces.get(id));
-		}
-		return dictionary.get(id);
-	}
-
-	/** Get the parent of a component. If component has no parent, return null
-	 *
-	 * @param c
-	 * @return get the parent component or null if ChemComp has no parent.
-	 */
-	public ChemComp getParent(ChemComp c){
-
-		if (c.hasParent()){
-			return dictionary.get(c.getMon_nstd_parent_comp_id());
-		}
-		return null;
-	}
-
-
-
-	/** add a new component to the dictionary
-	 *
-	 * @param comp
-	 */
-	public void addChemComp(ChemComp comp){
-
-		dictionary.put(comp.getId(),comp);
-		String rep = comp.getPdbx_replaces();
-		if ( (rep != null) && ( ! rep.equals("?"))){
-			replaces.put(comp.getId(),rep);
-		}
-
-		String isrep = comp.getPdbx_replaced_by();
-		if ( (isrep != null) && ( ! isrep.equals("?"))){
-			isreplacedby.put(comp.getId(),isrep);
-		}
-	}
-
-	/** Returns the number of ChemComps in this dictionary
-	 *
-	 * @return nr. of ChemComps
-	 */
-	public int size(){
-
-		return dictionary.size();
-
-	}
-
-	public ChemComp getChemComp(String id){
-		return dictionary.get(id);
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/DownloadChemCompProvider.java
deleted file mode 100644
index 86355e40b6..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/DownloadChemCompProvider.java
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.zip.GZIPOutputStream;
-
-import org.biojava.nbio.core.util.InputStreamProvider;
-import org.biojava.nbio.structure.align.util.URLConnectionTools;
-import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.structure.io.LocalPDBDirectory;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-
-/**
- * This provider of chemical components can download and cache chemical component definition files from the RCSB PDB web site.
- *  It is the default way to access these definitions.
- *  If this provider is called he first time, it will download and install all chemical
- *  component definitions in a local directory.
- *  Once the definition files have been installed, it has quick startup time and low memory requirements.
- *
- *  An alternative provider, that keeps all definitions in memory is the {@link AllChemCompProvider}. Another provider, that
- *  does not require any network access, but only can support a limited set of chemical component definitions, is the {@link ReducedChemCompProvider}.
- *
- *
- * @author Andreas Prlic
- *
- */
-public class DownloadChemCompProvider implements ChemCompProvider {
-
-	private static final Logger logger = LoggerFactory.getLogger(DownloadChemCompProvider.class);
-
-	public static final String CHEM_COMP_CACHE_DIRECTORY = "chemcomp";
-
-	public static final String DEFAULT_SERVER_URL = "http://files.rcsb.org/ligands/download/";
-
-	public static String serverBaseUrl = DEFAULT_SERVER_URL;
-
-	/**
-	 * Use default RCSB server layout (true) or internal RCSB server layout (false)
-	 */
-	public static boolean useDefaultUrlLayout = true;
-
-
-	private static File path;
-	//private static final String FILE_SEPARATOR = System.getProperty("file.separator");
-	private static final String NEWLINE = System.getProperty("line.separator");
-
-
-	// flags to make sure there is only one thread running that is loading the dictionary
-	static AtomicBoolean loading = new AtomicBoolean(false);
-
-	static final List<String> protectedIDs = new ArrayList<String> ();
-	static {
-		protectedIDs.add("CON");
-		protectedIDs.add("PRN");
-		protectedIDs.add("AUX");
-		protectedIDs.add("NUL");
-	}
-
-	private static ChemCompProvider fallback = null; // Fallback provider if the download fails
-
-	/** by default we will download only some of the files. User has to request that all files should be downloaded...
-	 *
-	 */
-	boolean downloadAll = false;
-
-	public DownloadChemCompProvider(){
-		this(null);
-	}
-
-	public DownloadChemCompProvider(String cacheFilePath){
-		logger.debug("Initialising DownloadChemCompProvider");
-
-		// note that path is static, so this is just to make sure that all non-static methods will have path initialised
-		if(cacheFilePath != null) {
-			path = new File(cacheFilePath);
-		}
-	}
-
-	/**
-	 * Get this provider's cache path
-	 * @return
-	 */
-	public static File getPath(){
-		if (path==null) {
-			UserConfiguration config = new UserConfiguration();
-			path = new File(config.getCacheFilePath());
-		}
-		return path;
-	}
-
-	/**
-	 * Checks if the chemical components already have been installed into the PDB directory.
-	 * If not, will download the chemical components definitions file and split it up into small
-	 * subfiles.
-	 */
-	public void checkDoFirstInstall(){
-
-		if ( ! downloadAll ) {
-			return;
-		}
-
-
-		// this makes sure there is a file separator between every component,
-		// if path has a trailing file separator or not, it will work for both cases
-		File dir = new File(getPath(), CHEM_COMP_CACHE_DIRECTORY);
-		File f = new File(dir, "components.cif.gz");
-
-		if ( ! f.exists()) {
-
-			downloadAllDefinitions();
-
-		} else {
-			// file exists.. did it get extracted?
-
-			FilenameFilter filter =new FilenameFilter() {
-
-				@Override
-				public boolean accept(File dir, String file) {
-					return file.endsWith(".cif.gz");
-				}
-			};
-			String[] files = dir.list(filter);
-			if ( files.length < 500) {
-				// not all did get unpacked
-				try {
-					split();
-				} catch (IOException e) {
-					logger.error("Could not split file {} into individual chemical component files. Error: {}",
-							f.toString(), e.getMessage());
-				}
-			}
-		}
-	}
-
-	private void split() throws IOException {
-
-		logger.info("Installing individual chem comp files ...");
-
-		File dir = new File(getPath(), CHEM_COMP_CACHE_DIRECTORY);
-		File f = new File(dir, "components.cif.gz");
-
-
-		int counter = 0;
-		InputStreamProvider prov = new InputStreamProvider();
-
-		try( BufferedReader buf = new BufferedReader (new InputStreamReader (prov.getInputStream(f)));
-				) {
-			String line = null;
-			line = buf.readLine ();
-			StringWriter writer = new StringWriter();
-
-			String currentID = null;
-			while (line != null){
-
-				if ( line.startsWith("data_")) {
-					// a new record found!
-
-					if ( currentID != null) {
-						writeID(writer.toString(), currentID);
-						counter++;
-					}
-
-					currentID = line.substring(5);
-					writer = new StringWriter();
-				}
-
-				writer.append(line);
-				writer.append(NEWLINE);
-
-				line = buf.readLine ();
-			}
-
-			// write the last record...
-			writeID(writer.toString(),currentID);
-			counter++;
-
-		}
-
-		logger.info("Created " + counter + " chemical component files.");
-	}
-
-	/**
-	 * Output chemical contents to a file
-	 * @param contents File contents
-	 * @param currentID Chemical ID, used to determine the filename
-	 * @throws IOException
-	 */
-	private void writeID(String contents, String currentID) throws IOException{
-
-		String localName = getLocalFileName(currentID);
-
-		try ( PrintWriter pw = new PrintWriter(new GZIPOutputStream(new FileOutputStream(localName))) ) {
-
-			pw.print(contents);
-			pw.flush();
-		}
-	}
-
-	/**
-	 * Loads the definitions for this {@link ChemComp} from a local file and instantiates a new object.
-	 *
-	 * @param recordName the ID of the {@link ChemComp}
-	 * @return a new {@link ChemComp} definition.
-	 */
-	@Override
-	public  ChemComp getChemComp(String recordName) {
-
-		// make sure we work with upper case records
-		recordName = recordName.toUpperCase().trim();
-
-		boolean haveFile = true;
-		if ( recordName.equals("?")){
-			return null;
-		}
-
-		if ( ! fileExists(recordName)) {
-			// check if we should install all components
-			checkDoFirstInstall();
-		}
-		if ( ! fileExists(recordName)) {
-			// we previously have installed already the definitions,
-			// just do an incrememntal update
-			haveFile = downloadChemCompRecord(recordName);
-		}
-
-		// Added check that download was successful and chemical component is available.
-		if (haveFile) {
-			String filename = getLocalFileName(recordName);
-			InputStream inStream = null;
-			try {
-
-				InputStreamProvider isp = new InputStreamProvider();
-
-				inStream = isp.getInputStream(filename);
-
-				MMcifParser parser = new SimpleMMcifParser();
-
-				ChemCompConsumer consumer = new ChemCompConsumer();
-
-				// The Consumer builds up the BioJava - structure object.
-				// you could also hook in your own and build up you own data model.
-				parser.addMMcifConsumer(consumer);
-
-				parser.parse(new BufferedReader(new InputStreamReader(inStream)));
-
-				ChemicalComponentDictionary dict = consumer.getDictionary();
-
-				ChemComp chemComp = dict.getChemComp(recordName);
-
-				// May be null if the file was corrupt. Fall back on ReducedChemCompProvider in that case
-				if(chemComp != null) {
-					return chemComp;
-				}
-
-			} catch (IOException e) {
-
-				logger.warn(
-						"Could not download chemical component file {} for {}. Error: {}. Now trying to use the local chemical component definitions.",
-						filename, recordName, e.getMessage());
-
-			}
-			finally{
-				// Now close it
-				if(inStream!=null){
-					try {
-						inStream.close();
-					} catch (IOException e) {
-						// This would be weird...
-						logger.error("Could not close chemical component file {}. A resource leak could occur!!", filename);
-					}
-				}
-
-			}
-		}
-
-		// see https://github.com/biojava/biojava/issues/315
-		// probably a network error happened. Try to use the ReducedChemCOmpProvider
-		if( fallback == null) {
-			fallback = new ReducedChemCompProvider();
-		}
-
-		logger.warn("Falling back to ReducedChemCompProvider for {}. This could indicate a network error.", recordName);
-		return fallback.getChemComp(recordName);
-
-	}
-
-	/**
-	 * Returns the file name that contains the definition for this {@link ChemComp}
-	 *
-	 * @param recordName the ID of the {@link ChemComp}
-	 * @return full path to the file
-	 */
-	public static String getLocalFileName(String recordName){
-
-		if ( protectedIDs.contains(recordName)){
-			recordName = "_" + recordName;
-		}
-
-		File f = new File(getPath(), CHEM_COMP_CACHE_DIRECTORY);
-		if (! f.exists()){
-			logger.info("Creating directory " + f);
-
-			boolean success = f.mkdir();
-			// we've checked in initPath that path is writable, so there's no need to check if it succeeds
-			// in the unlikely case that in the meantime it isn't writable at least we log an error
-			if (!success)
-				logger.error("Directory {} could not be created",f);
-
-		}
-
-		File theFile = new File(f,recordName + ".cif.gz");
-
-		return theFile.toString();
-	}
-
-	private static  boolean fileExists(String recordName){
-
-		String fileName = getLocalFileName(recordName);
-
-		File f = new File(fileName);
-
-		// delete files that are too short to have contents
-		if( f.length() < LocalPDBDirectory.MIN_PDB_FILE_SIZE ) {
-			// Delete defensively.
-			// Note that if delete is unsuccessful, we re-download the file anyways
-			f.delete();
-			return false;
-		}
-
-		return f.exists();
-
-	}
-
-	/**
-	 * @param recordName : three-letter name
-	 * @return true if successful download
-	 */
-	private static boolean downloadChemCompRecord(String recordName) {
-
-		String localName = getLocalFileName(recordName);
-		File newFile;
-		try{
-			newFile = File.createTempFile("chemcomp"+recordName, "cif");
-			logger.debug("Will write chem comp file to temp file {}", newFile.toString());
-		}
-		catch(IOException e){
-			logger.error("Could not write to temp directory {} to create the chemical component download temp file", System.getProperty("java.io.tmpdir"));
-			return false;
-		}
-		String u;
-		if(useDefaultUrlLayout){
-			u = serverBaseUrl + recordName + ".cif";
-		}
-		else{
-			u = serverBaseUrl + recordName.charAt(0) + "/"  + recordName +"/" + recordName + ".cif";
-		}
-
-		logger.debug("downloading " + u);
-
-		URL url = null;
-
-
-		try {
-			url = new URL(u);
-			URLConnection uconn = URLConnectionTools.openURLConnection(url);
-
-			try( PrintWriter pw = new PrintWriter(new GZIPOutputStream(new FileOutputStream(newFile)));
-					BufferedReader fileBuffer = new BufferedReader(new InputStreamReader(uconn.getInputStream()));
-					) {
-
-				String line;
-
-				while ((line = fileBuffer.readLine()) != null) {
-					pw.println(line);
-				}
-
-				pw.flush();
-			}
-			// Now we move this across to where it actually wants to be
-			Files.move(newFile.toPath(), Paths.get(localName), StandardCopyOption.REPLACE_EXISTING);
-
-			return true;
-		}  catch (IOException e){
-			logger.error("Could not download "+url.toString()+" OR store locally to "+localName+" Error ="+e.getMessage());
-			newFile.delete();
-		}
-		return false;
-	}
-
-	private void downloadAllDefinitions() {
-
-		if ( loading.get()){
-			logger.info("Waiting for other thread to install chemical components...");
-		}
-
-		while ( loading.get() ) {
-
-			// another thread is already downloading the components definitions
-			// wait for the other thread to finish...
-
-			try {
-				// wait half a second
-
-				Thread.sleep(500);
-			} catch (InterruptedException e) {
-				//e.printStackTrace();
-				logger.error("Thread interrupted "+e.getMessage());
-			}
-
-			logger.info("Another thread installed the chemical components.");
-			return;
-
-		}
-
-		loading.set(true);
-		long timeS = System.currentTimeMillis();
-
-		logger.info("Performing first installation of chemical components.");
-		logger.info("Downloading components.cif.gz ...");
-
-
-		try {
-			AllChemCompProvider.downloadFile();
-		} catch (IOException e){
-			logger.error("Could not download the all chemical components file. Error: {}. "
-					+ "Chemical components information won't be available", e.getMessage());
-			// no point in trying to split if the file could not be downloaded
-			loading.set(false);
-			return;
-		}
-		try {
-			split();
-		} catch (IOException e) {
-			logger.error("Could not split all chem comp file into individual chemical component files. Error: {}",
-				 e.getMessage());
-			// no point in reporting time
-			loading.set(false);
-			return;
-		}
-		long timeE = System.currentTimeMillis();
-		logger.info("time to install chem comp dictionary: " + (timeE - timeS) / 1000 + " sec.");
-		loading.set(false);
-
-	}
-
-	/** By default this provider will download only some of the {@link ChemComp} files.
-	 * The user has to request that all files should be downloaded by setting this parameter to true.
-	 *
-	 *  @return flag if the all components should be downloaded and installed at startup. (default: false)
-	 */
-	public boolean isDownloadAll() {
-		return downloadAll;
-	}
-
-	/** By default this provider will download only some of the {@link ChemComp} files.
-	 * The user has to request that all files should be downloaded by setting this parameter to true.
-	 *
-	 * @param  flag if the all components should be downloaded and installed at startup. (default: false)
-	 */
-	public void setDownloadAll(boolean downloadAll) {
-		this.downloadAll = downloadAll;
-	}
-
-
-
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MMCIFFileTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MMCIFFileTools.java
deleted file mode 100644
index 14fdac7d3e..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MMCIFFileTools.java
+++ /dev/null
@@ -1,575 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-
-import java.lang.reflect.Field;
-import java.util.*;
-
-import org.biojava.nbio.structure.Atom;
-import org.biojava.nbio.structure.Chain;
-import org.biojava.nbio.structure.Element;
-import org.biojava.nbio.structure.EntityType;
-import org.biojava.nbio.structure.Group;
-import org.biojava.nbio.structure.GroupType;
-import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.io.FileConvert;
-import org.biojava.nbio.structure.io.mmcif.model.AbstractBean;
-import org.biojava.nbio.structure.io.mmcif.model.AtomSite;
-import org.biojava.nbio.structure.io.mmcif.model.CIFLabel;
-import org.biojava.nbio.structure.io.mmcif.model.Cell;
-import org.biojava.nbio.structure.io.mmcif.model.IgnoreField;
-import org.biojava.nbio.structure.io.mmcif.model.Symmetry;
-import org.biojava.nbio.structure.xtal.CrystalCell;
-import org.biojava.nbio.structure.xtal.SpaceGroup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Some tools for mmCIF file writing.
- *
- * See http://www.iucr.org/__data/assets/pdf_file/0019/22618/cifguide.pdf
- *
- * CIF categories are represented as a simple bean, typically extending {@link AbstractBean}.
- * By default, all fields from the bean are taken as the CIF labels. Fields
- * may be omitted by annotating them as {@link IgnoreField @IgnoreField}.
- * The CIF label for a field may be changed (for instance, for fields that
- * are not valid Java identifiers) by defining a function
- * <tt>static Map<String,String> getCIFLabelMap()</tt>
- * mapping from the field's name to the correct label.
- *
- * @author Jose Duarte
- * @author Spencer Bliven
- */
-public class MMCIFFileTools {
-
-	private static final Logger logger = LoggerFactory.getLogger(MMCIFFileTools.class);
-
-	private static final String newline = System.getProperty("line.separator");
-
-	/**
-	 * The character to be printed out in cases where a value is not assigned in mmCIF files
-	 */
-	public static final String MMCIF_MISSING_VALUE = "?";
-
-	/**
-	 * The character to be printed out as a default value in mmCIF files, e.g. for the default alt_locs
-	 */
-	public static final String MMCIF_DEFAULT_VALUE = ".";
-
-
-	/**
-	 * Produces a mmCIF loop header string for the given categoryName and className.
-	 * className must be one of the beans in the {@link org.biojava.nbio.structure.io.mmcif.model} package
-	 * @param categoryName
-	 * @param className
-	 * @return
-	 * @throws ClassNotFoundException if the given className can not be found
-	 */
-	public static String toLoopMmCifHeaderString(String categoryName, String className) throws ClassNotFoundException {
-		StringBuilder str = new StringBuilder();
-
-		str.append(SimpleMMcifParser.LOOP_START+newline);
-
-		Class<?> c = Class.forName(className);
-
-		for (Field f : getFields(c)) {
-			str.append(categoryName+"."+f.getName()+newline);
-		}
-
-		return str.toString();
-	}
-
-	/**
-	 * Converts a mmCIF bean (see {@link org.biojava.nbio.structure.io.mmcif.model} to
-	 * a String representing it in mmCIF (single-record) format.
-	 * @param categoryName
-	 * @param o
-	 * @return
-	 */
-	public static String toMMCIF(String categoryName, Object o) {
-
-		StringBuilder sb = new StringBuilder();
-
-		Class<?> c = o.getClass();
-
-
-		Field[] fields = getFields(c);
-		String[] names = getFieldNames(fields);
-
-		int maxFieldNameLength = getMaxStringLength(names);
-
-		for (int i=0;i<fields.length;i++) {
-			Field f = fields[i];
-			String name = names[i];
-
-			sb.append(categoryName).append(".").append(name);
-
-			int spacing = maxFieldNameLength - name.length() + 3;
-
-			try {
-				Object obj = f.get(o);
-				String val;
-				if (obj==null) {
-					logger.debug("Field {} is null, will write it out as {}",name,MMCIF_MISSING_VALUE);
-					val = MMCIF_MISSING_VALUE;
-				} else {
-					val = (String) obj;
-				}
-				for (int j=0;j<spacing;j++) sb.append(' ');
-				sb.append(addMmCifQuoting(val));
-				sb.append(newline);
-
-			} catch (IllegalAccessException e) {
-				logger.warn("Field {} is inaccessible", name);
-				continue;
-			} catch (ClassCastException e) {
-				logger.warn("Could not cast value to String for field {}",name);
-				continue;
-			}
-
-		}
-
-		sb.append(SimpleMMcifParser.COMMENT_CHAR+newline);
-
-		return sb.toString();
-	}
-
-	/**
-	 * Gets all fields for a particular class, filtering fields annotated
-	 * with {@link IgnoreField @IgnoreField}.
-	 *
-	 * As a side effect, calls {@link Field#setAccessible(boolean) setAccessible(true)}
-	 * on all fields.
-	 * @param c
-	 * @return
-	 */
-	public static Field[] getFields(Class<?> c) {
-		Field[] allFields = c.getDeclaredFields();
-		Field[] fields = new Field[allFields.length];
-		int n = 0;
-		for(Field f : allFields) {
-			f.setAccessible(true);
-			IgnoreField anno = f.getAnnotation(IgnoreField.class);
-			if(anno == null) {
-				fields[n] = f;
-				n++;
-			}
-		}
-		return Arrays.copyOf(fields, n);
-	}
-
-	/**
-	 * Gets the mmCIF record name for each field. This is generally just
-	 * the name of the field or the value specified by the {@link CIFLabel @CIFLabel} annotation.
-	 *
-	 * As a side effect, calls {@link Field#setAccessible(boolean) setAccessible(true)}
-	 * on all fields.
-	 * @param fields
-	 * @return
-	 */
-	public static String[] getFieldNames(Field[] fields) {
-		String[] names = new String[fields.length];
-		for(int i=0;i<fields.length;i++) {
-			Field f = fields[i];
-			f.setAccessible(true);
-			String rawName = fields[i].getName();
-			CIFLabel cifLabel = f.getAnnotation(CIFLabel.class);
-			if(cifLabel != null) {
-				names[i] = cifLabel.label();
-			} else {
-				names[i] = rawName;
-			}
-		}
-		return names;
-	}
-
-	/**
-	 * Converts a list of mmCIF beans (see {@link org.biojava.nbio.structure.io.mmcif.model} to
-	 * a String representing them in mmCIF loop format with one record per line.
-	 * @param list
-	 * @return
-	 */
-	public static <T> String toMMCIF(List<T> list, Class<T> klass) {
-		if (list.isEmpty()) throw new IllegalArgumentException("List of beans is empty!");
-
-		Field[] fields = getFields(klass);
-		int[] sizes = getFieldSizes(list,fields);
-
-		StringBuilder sb = new StringBuilder();
-
-		for (T o:list) {
-			sb.append(toSingleLoopLineMmCifString(o, fields, sizes));
-		}
-
-		sb.append(SimpleMMcifParser.COMMENT_CHAR+newline);
-
-		return sb.toString();
-	}
-
-	/**
-	 * Given a mmCIF bean produces a String representing it in mmCIF loop format as a single record line
-	 * @param record
-	 * @param fields Set of fields for the record. If null, will be calculated from the class of the record
-	 * @param sizes the size of each of the fields
-	 * @return
-	 */
-	private static String toSingleLoopLineMmCifString(Object record, Field[] fields, int[] sizes) {
-
-		StringBuilder str = new StringBuilder();
-
-		Class<?> c = record.getClass();
-
-		if(fields == null)
-			fields = getFields(c);
-
-		if (sizes.length!=fields.length)
-			throw new IllegalArgumentException("The given sizes of fields differ from the number of declared fields");
-
-		int i = -1;
-		for (Field f : fields) {
-			i++;
-			f.setAccessible(true);
-
-			try {
-				Object obj = f.get(record);
-				String val;
-				if (obj==null) {
-					logger.debug("Field {} is null, will write it out as {}",f.getName(),MMCIF_MISSING_VALUE);
-					val = MMCIF_MISSING_VALUE;
-				} else {
-					val = (String) obj;
-				}
-
-				str.append(String.format("%-"+sizes[i]+"s ", addMmCifQuoting(val)));
-
-
-			} catch (IllegalAccessException e) {
-				logger.warn("Field {} is inaccessible", f.getName());
-				continue;
-			} catch (ClassCastException e) {
-				logger.warn("Could not cast value to String for field {}",f.getName());
-				continue;
-			}
-		}
-
-		str.append(newline);
-
-		return str.toString();
-
-	}
-
-	/**
-	 * Adds quoting to a String according to the STAR format (mmCIF) rules
-	 * @param val
-	 * @return
-	 */
-	private static String addMmCifQuoting(String val) {
-		String newval;
-
-		if (val.contains("'")) {
-			// double quoting for strings containing single quotes (not strictly necessary but it's what the PDB usually does)
-			newval = "\""+val+"\"";
-		} else if (val.contains(" ")) {
-			// single quoting for stings containing spaces
-			newval = "'"+val+"'";
-		} else {
-			if (val.contains(" ") && val.contains("'")) {
-				// TODO deal with this case
-				logger.warn("Value contains both spaces and single quotes, won't format it: {}. CIF ouptut will likely be invalid.",val);
-			}
-			newval = val;
-		}
-		// TODO deal with all the other cases: e.g. multi-line quoting with ;;
-
-		return newval;
-	}
-
-	/**
-	 * Converts a SpaceGroup object to a {@link Symmetry} object.
-	 * @param sg
-	 * @return
-	 */
-	public static Symmetry convertSpaceGroupToSymmetry(SpaceGroup sg) {
-		Symmetry sym = new Symmetry();
-		sym.setSpace_group_name_H_M(sg.getShortSymbol());
-		// TODO do we need to fill any of the other values?
-		return sym;
-	}
-
-	/**
-	 * Converts a CrystalCell object to a {@link Cell} object.
-	 * @param c
-	 * @return
-	 */
-	public static Cell convertCrystalCellToCell(CrystalCell c) {
-		Cell cell = new Cell();
-		cell.setLength_a(String.format("%.3f",c.getA()));
-		cell.setLength_b(String.format("%.3f",c.getB()));
-		cell.setLength_c(String.format("%.3f",c.getC()));
-		cell.setAngle_alpha(String.format("%.3f",c.getAlpha()));
-		cell.setAngle_beta(String.format("%.3f",c.getBeta()));
-		cell.setAngle_gamma(String.format("%.3f",c.getGamma()));
-
-		return cell;
-	}
-
-	/**
-	 * Converts an Atom object to an {@link AtomSite} object.
-	 * @param a
-	 * @param model the model number for the output AtomSites
-	 * @param chainName the chain identifier (author id) for the output AtomSites
-	 * @param chainId the internal chain identifier (asym id) for the output AtomSites
-	 * @return
-	 */
-	public static AtomSite convertAtomToAtomSite(Atom a, int model, String chainName, String chainId) {
-		return convertAtomToAtomSite(a, model, chainName, chainId, a.getPDBserial());
-	}
-
-	/**
-	 * Converts an Atom object to an {@link AtomSite} object.
-	 * @param a the atom
-	 * @param model the model number for the output AtomSites
-	 * @param chainName the chain identifier (author id) for the output AtomSites
-	 * @param chainId the internal chain identifier (asym id) for the output AtomSites
-	 * @param atomId the atom id to be written to AtomSite
-	 * @return
-	 */
-	public static AtomSite convertAtomToAtomSite(Atom a, int model, String chainName, String chainId, int atomId) {
-
-		/*
-		ATOM 7    C CD  . GLU A 1 24  ? -10.109 15.374 38.853 1.00 50.05 ? ? ? ? ? ? 24  GLU A CD  1
-		ATOM 8    O OE1 . GLU A 1 24  ? -9.659  14.764 37.849 1.00 49.80 ? ? ? ? ? ? 24  GLU A OE1 1
-		ATOM 9    O OE2 . GLU A 1 24  ? -11.259 15.171 39.310 1.00 50.51 ? ? ? ? ? ? 24  GLU A OE2 1
-		ATOM 10   N N   . LEU A 1 25  ? -5.907  18.743 37.412 1.00 41.55 ? ? ? ? ? ? 25  LEU A N   1
-		ATOM 11   C CA  . LEU A 1 25  ? -5.168  19.939 37.026 1.00 37.55 ? ? ? ? ? ? 25  LEU A CA  1
-		*/
-
-		Group g = a.getGroup();
-
-		String record ;
-		if ( g.getType().equals(GroupType.HETATM) ) {
-			record = "HETATM";
-		} else {
-			record = "ATOM";
-		}
-
-		String entityId = "0";
-		String labelSeqId = Integer.toString(g.getResidueNumber().getSeqNum());
-		if (g.getChain()!=null && g.getChain().getEntityInfo()!=null) {
-			entityId = Integer.toString(g.getChain().getEntityInfo().getMolId());
-			if (g.getChain().getEntityInfo().getType() == EntityType.POLYMER) {
-				// this only makes sense for polymeric chains, non-polymer chains will never have seqres groups and there's no point in calling getAlignedResIndex
-				labelSeqId = Integer.toString(g.getChain().getEntityInfo().getAlignedResIndex(g, g.getChain()));
-			}
-		}
-
-		Character  altLoc = a.getAltLoc();
-		String altLocStr;
-		if (altLoc==null || altLoc == ' ') {
-			altLocStr = MMCIF_DEFAULT_VALUE;
-		} else {
-			altLocStr = altLoc.toString();
-		}
-
-		Element e = a.getElement();
-		String eString = e.toString().toUpperCase();
-		if ( e.equals(Element.R)) {
-			eString = "X";
-		}
-
-		String insCode = MMCIF_MISSING_VALUE;
-		if (g.getResidueNumber().getInsCode()!=null ) {
-			insCode = Character.toString(g.getResidueNumber().getInsCode());
-		}
-
-		AtomSite atomSite = new AtomSite();
-		atomSite.setGroup_PDB(record);
-		atomSite.setId(Integer.toString(atomId));
-		atomSite.setType_symbol(eString);
-		atomSite.setLabel_atom_id(a.getName());
-		atomSite.setLabel_alt_id(altLocStr);
-		atomSite.setLabel_comp_id(g.getPDBName());
-		atomSite.setLabel_asym_id(chainId);
-		atomSite.setLabel_entity_id(entityId);
-		atomSite.setLabel_seq_id(labelSeqId);
-		atomSite.setPdbx_PDB_ins_code(insCode);
-		atomSite.setCartn_x(FileConvert.d3.format(a.getX()));
-		atomSite.setCartn_y(FileConvert.d3.format(a.getY()));
-		atomSite.setCartn_z(FileConvert.d3.format(a.getZ()));
-		atomSite.setOccupancy(FileConvert.d2.format(a.getOccupancy()));
-		atomSite.setB_iso_or_equiv(FileConvert.d2.format(a.getTempFactor()));
-		atomSite.setAuth_seq_id(Integer.toString(g.getResidueNumber().getSeqNum()));
-		atomSite.setAuth_comp_id(g.getPDBName());
-		atomSite.setAuth_asym_id(chainName);
-		atomSite.setAuth_atom_id(a.getName());
-		atomSite.setPdbx_PDB_model_num(Integer.toString(model));
-
-		return atomSite;
-	}
-
-	/**
-	 * Converts a Group into a List of {@link AtomSite} objects.
-	 * Atoms in other altloc groups (different from the main group) are also included, removing possible duplicates
-	 * via using the atom identifier to assess uniqueness.
-	 * @param g the group
-	 * @param model the model number for the output AtomSites
-	 * @param chainName the chain identifier (author id) for the output AtomSites
-	 * @param chainId the internal chain identifier (asym id) for the output AtomSites
-	 * @return
-	 */
-	public static List<AtomSite> convertGroupToAtomSites(Group g, int model, String chainName, String chainId) {
-
-		// The alt locs can have duplicates, since at parsing time we make sure that all alt loc groups have
-		// all atoms (see StructureTools#cleanUpAltLocs)
-		// Thus we have to remove duplicates here by using the atom id
-		// See issue https://github.com/biojava/biojava/issues/778 and TestAltLocs.testMmcifWritingAllAltlocs/testMmcifWritingPartialAltlocs
-		Map<Integer, AtomSite> uniqueAtomSites = new LinkedHashMap<>();
-
-		int groupsize  = g.size();
-
-		for ( int atompos = 0 ; atompos < groupsize; atompos++) {
-			Atom a = g.getAtom(atompos);
-			if ( a == null)
-				continue ;
-
-			uniqueAtomSites.put(a.getPDBserial(), convertAtomToAtomSite(a, model, chainName, chainId));
-		}
-
-		if ( g.hasAltLoc()){
-			for (Group alt : g.getAltLocs() ) {
-				for (AtomSite atomSite : convertGroupToAtomSites(alt, model, chainName, chainId)) {
-					uniqueAtomSites.put(Integer.parseInt(atomSite.getId()), atomSite);
-				}
-			}
-		}
-		return new ArrayList<>(uniqueAtomSites.values());
-	}
-
-	/**
-	 * Converts a Chain into a List of {@link AtomSite} objects
-	 * @param c the chain
-	 * @param model the model number for the output AtomSites
-	 * @param chainName the chain identifier (author id) for the output AtomSites
-	 * @param chainId the internal chain identifier (asym id) for the output AtomSites
-	 * @return
-	 */
-	public static List<AtomSite> convertChainToAtomSites(Chain c, int model, String chainName, String chainId) {
-
-		List<AtomSite> list = new ArrayList<>();
-
-		if (c.getEntityInfo()==null) {
-			logger.warn("No entity found for chain {}: entity_id will be set to 0, label_seq_id will be the same as auth_seq_id", c.getName());
-		}
-
-		for ( int h=0; h<c.getAtomLength();h++){
-
-			Group g= c.getAtomGroup(h);
-
-			list.addAll(convertGroupToAtomSites(g, model, chainName, chainId));
-
-		}
-
-		return list;
-	}
-
-	/**
-	 * Converts a Structure into a List of {@link AtomSite} objects
-	 * @param s
-	 * @return
-	 */
-	public static List<AtomSite> convertStructureToAtomSites(Structure s) {
-		List<AtomSite> list = new ArrayList<AtomSite>();
-
-		for (int m=0;m<s.nrModels();m++) {
-			for (Chain c:s.getChains(m)) {
-				list.addAll(convertChainToAtomSites(c, m+1, c.getName(), c.getId()));
-			}
-		}
-		return list;
-	}
-
-	/**
-	 * Finds the max length of each of the String values contained in each of the fields of the given list of beans.
-	 * Useful for producing mmCIF loop data that is aligned for all columns.
-	 * @param list list of objects. All objects should have the same class.
-	 * @param fields Set of fields for the record. If null, will be calculated from the class of the first record
-	 * @return
-	 * @see #toMMCIF(List, Class)
-	 */
-	private static <T> int[] getFieldSizes(List<T> list, Field[] fields) {
-
-		if (list.isEmpty()) throw new IllegalArgumentException("List of beans is empty!");
-
-		if(fields == null)
-			fields = getFields(list.get(0).getClass());
-
-		int[] sizes = new int [fields.length];
-
-
-		for (T a:list) {
-			int i = -1;
-			for (Field f : fields) {
-				i++;
-
-				f.setAccessible(true);
-
-				try {
-					Object obj = f.get(a);
-					int length;
-					if (obj==null) {
-						length = MMCIF_MISSING_VALUE.length();
-					} else {
-						String val = (String) obj;
-						length = addMmCifQuoting(val).length();
-					}
-
-					if (length>sizes[i]) sizes[i] = length;
-
-				} catch (IllegalAccessException e) {
-					logger.warn("Field {} is inaccessible", f.getName());
-					continue;
-				} catch (ClassCastException e) {
-					logger.warn("Could not cast value to String for field {}",f.getName());
-					continue;
-				}
-			}
-		}
-		return sizes;
-	}
-
-	/**
-	 * Finds the max length of a list of strings
-	 * Useful for producing mmCIF single-record data that is aligned for all values.
-	 * @param names
-	 * @return
-	 * @see #toMMCIF(String, Object)
-	 */
-	private static int getMaxStringLength(String[] names) {
-		int size = 0;
-		for(String s : names) {
-			if(s.length()>size) {
-				size = s.length();
-			}
-		}
-		return size;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MMcifConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MMcifConsumer.java
deleted file mode 100644
index 9284c2ad31..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MMcifConsumer.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Mar 4, 2008
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.mmcif.model.*;
-
-import java.util.List;
-
-/** An interface for the events triggered by a MMcifParser.
- * The Consumer listens to the events and builds up the protein structure.
- *
- * @author Andreas Prlic
- *  @since 1.7
- *
- */
-public interface MMcifConsumer {
-	/** called at start of document
-	 *
-	 */
-	public void documentStart();
-
-	/** called at end of document
-	 *
-	 */
-	public void documentEnd();
-
-
-	/** A new AtomSite record has been read. Contains the Atom data
-	 *
-	 * @param atom
-	 */
-	public void newAtomSite(AtomSite atom);
-	public void newEntity(Entity entity);
-	public void newEntityPoly(EntityPoly entityPoly);
-	public void newEntityPolySeq(EntityPolySeq epolseq);
-	public void newStructAsym(StructAsym sasym);
-	public void setStruct(Struct struct);
-	public void newDatabasePDBrev(DatabasePDBrev dbrev);
-	public void newDatabasePDBrevRecord(DatabasePdbrevRecord dbrev);
-	public void newDatabasePDBremark(DatabasePDBremark remark);
-	public void newExptl(Exptl exptl);
-	public void newCell(Cell cell);
-	public void newSymmetry(Symmetry symmetry);
-	public void newStructNcsOper(StructNcsOper sNcsOper);
-	public void newAtomSites(AtomSites atomSites);
-	public void newStructRef(StructRef sref);
-	public void newStructRefSeq(StructRefSeq sref);
-	public void newStructRefSeqDif(StructRefSeqDif sref);
-	public void newStructSite(StructSite sref);
-	public void newStructSiteGen(StructSiteGen sref);
-	public void newPdbxAuditRevisionHistory(PdbxAuditRevisionHistory history);
-	public void newPdbxDatabaseStatus(PdbxDatabaseStatus status);
-	public void newPdbxPolySeqScheme(PdbxPolySeqScheme ppss);
-	public void newPdbxNonPolyScheme(PdbxNonPolyScheme ppss);
-	public void newPdbxEntityNonPoly(PdbxEntityNonPoly pen);
-	public void newStructKeywords(StructKeywords kw);
-	public void newRefine(Refine r);
-	public void newChemComp(ChemComp c);
-	public void newChemCompDescriptor(ChemCompDescriptor ccd);
-	public void newPdbxStructOperList(PdbxStructOperList structOper);
-	public void newPdbxStrucAssembly(PdbxStructAssembly strucAssembly);
-	public void newPdbxStrucAssemblyGen(PdbxStructAssemblyGen strucAssembly);
-	public void newChemCompAtom(ChemCompAtom atom);
-	public void newPdbxChemCompIndentifier(PdbxChemCompIdentifier id);
-	public void newChemCompBond(ChemCompBond bond);
-	public void newPdbxChemCompDescriptor(PdbxChemCompDescriptor desc);
-	public void newEntitySrcGen(EntitySrcGen entitySrcGen);
-	public void newEntitySrcNat(EntitySrcNat entitySrcNat);
-	public void newEntitySrcSyn(EntitySrcSyn entitySrcSyn);
-	public void newStructConn(StructConn structConn);
-
-	/** AuditAuthor contains the info from the PDB-AUTHOR records.
-	 *
-	 * @param aa
-	 */
-	public void newAuditAuthor(AuditAuthor aa);
-
-	/** This method is called if no particular handler for the provided cif category
-	 * has been implemented so far.
-	 * @param category The category that is being processed.
-	 * @param loopFields the fields of this category.
-	 * @param lineData the data that is being provided.
-	 */
-	public void newGenericData(String category, List<String> loopFields, List<String> lineData);
-
-	public void setFileParsingParameters(FileParsingParameters params);
-	public FileParsingParameters getFileParsingParameters();
-
-
-
-
-
-
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MMcifParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MMcifParser.java
deleted file mode 100644
index e20a35d87c..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MMcifParser.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Mar 4, 2008
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-
-/** Interface that needs to be implemented by an MMcifParser
- *
- * @author Andreas Prlic
- * @since 1.7
- */
-public interface MMcifParser {
-
-	/** Add a MMcifConsumer that listens to even being triggered by the parser and processes the data into a backend provided by the Consumer.
-	 *
-	 * @param consumer a consumer object.
-	 */
-	public void addMMcifConsumer(MMcifConsumer consumer);
-
-	/** Remove all consumers from the parser.
-	 *
-	 */
-	public void clearConsumers();
-
-	/** remove a single consumer from the parser
-	 *
-	 * @param consumer
-	 */
-	public void removeMMcifConsumer(MMcifConsumer consumer);
-
-
-	/** Start the actual parsing. The parser will trigger events that are defined by the MMcifConsumer class.
-	 *
-	 * @param buf a BufferedReader.
-	 */
-	public void parse(BufferedReader buf) throws IOException;
-
-	/** Start the actual parsing. The parser will trigger events that are defined by the MMcifConsumer class.
-	 *
-	 * @param inStream InputStream to parse from.
-	 */
-	public void parse(InputStream inStream) throws IOException;
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MetalBondConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MetalBondConsumer.java
deleted file mode 100644
index dbb91bd71f..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MetalBondConsumer.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.mmcif.chem.MetalBondDistance;
-import org.biojava.nbio.structure.io.mmcif.model.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by andreas on 6/9/16.
- */
-public class MetalBondConsumer implements MMcifConsumer{
-
-
-	Map<String,List<MetalBondDistance>> definitions = new HashMap<>();
-
-	@Override
-	public void documentStart() {
-		definitions.clear();
-	}
-
-	@Override
-	public void documentEnd() {
-
-		// minimize memory consumption
-
-		for  (List<MetalBondDistance> d : definitions.values()){
-			ArrayList<MetalBondDistance> a = (ArrayList<MetalBondDistance>)d;
-
-			a.trimToSize();
-		}
-
-	}
-
-	@Override
-	public void newAtomSite(AtomSite atom) {
-
-	}
-
-	@Override
-	public void newEntity(Entity entity) {
-
-	}
-
-	@Override
-	public void newEntityPoly(EntityPoly entityPoly) {
-
-	}
-
-	@Override
-	public void newEntityPolySeq(EntityPolySeq epolseq) {
-
-	}
-
-	@Override
-	public void newStructAsym(StructAsym sasym) {
-
-	}
-
-	@Override
-	public void setStruct(Struct struct) {
-
-	}
-
-	@Override
-	public void newDatabasePDBrev(DatabasePDBrev dbrev) {
-
-	}
-
-	@Override
-	public void newDatabasePDBrevRecord(DatabasePdbrevRecord dbrev) {
-
-	}
-
-	@Override
-	public void newDatabasePDBremark(DatabasePDBremark remark) {
-
-	}
-
-	@Override
-	public void newExptl(Exptl exptl) {
-
-	}
-
-	@Override
-	public void newCell(Cell cell) {
-
-	}
-
-	@Override
-	public void newSymmetry(Symmetry symmetry) {
-
-	}
-
-	@Override
-	public void newStructNcsOper(StructNcsOper sNcsOper) {
-
-	}
-
-	@Override
-	public void newAtomSites(AtomSites atomSites) {
-
-	}
-
-	@Override
-	public void newStructRef(StructRef sref) {
-
-	}
-
-	@Override
-	public void newStructRefSeq(StructRefSeq sref) {
-
-	}
-
-	@Override
-	public void newStructRefSeqDif(StructRefSeqDif sref) {
-
-	}
-
-	@Override
-	public void newStructSite(StructSite sref) {
-
-	}
-
-	@Override
-	public void newStructSiteGen(StructSiteGen sref) {
-
-	}
-
-	@Override
-	public void newPdbxPolySeqScheme(PdbxPolySeqScheme ppss) {
-
-	}
-
-	@Override
-	public void newPdbxNonPolyScheme(PdbxNonPolyScheme ppss) {
-
-	}
-
-	@Override
-	public void newPdbxEntityNonPoly(PdbxEntityNonPoly pen) {
-
-	}
-
-	@Override
-	public void newStructKeywords(StructKeywords kw) {
-
-	}
-
-	@Override
-	public void newRefine(Refine r) {
-
-	}
-
-	@Override
-	public void newChemComp(ChemComp c) {
-
-	}
-
-	@Override
-	public void newChemCompDescriptor(ChemCompDescriptor ccd) {
-
-	}
-
-	@Override
-	public void newPdbxStructOperList(PdbxStructOperList structOper) {
-
-	}
-
-	@Override
-	public void newPdbxStrucAssembly(PdbxStructAssembly strucAssembly) {
-
-	}
-
-	@Override
-	public void newPdbxStrucAssemblyGen(PdbxStructAssemblyGen strucAssembly) {
-
-	}
-
-	@Override
-	public void newChemCompAtom(ChemCompAtom atom) {
-
-	}
-
-	@Override
-	public void newPdbxChemCompIndentifier(PdbxChemCompIdentifier id) {
-
-	}
-
-	@Override
-	public void newChemCompBond(ChemCompBond bond) {
-
-	}
-
-	@Override
-	public void newPdbxChemCompDescriptor(PdbxChemCompDescriptor desc) {
-
-	}
-
-	@Override
-	public void newEntitySrcGen(EntitySrcGen entitySrcGen) {
-
-	}
-
-	@Override
-	public void newEntitySrcNat(EntitySrcNat entitySrcNat) {
-
-	}
-
-	@Override
-	public void newEntitySrcSyn(EntitySrcSyn entitySrcSyn) {
-
-	}
-
-	@Override
-	public void newStructConn(StructConn structConn) {
-
-	}
-
-	@Override
-	public void newAuditAuthor(AuditAuthor aa) {
-
-	}
-
-	@Override
-	public void newGenericData(String category, List<String> loopFields, List<String> lineData) {
-
-		MetalBondDistance d = new MetalBondDistance();
-
-		d.setAtomType1(lineData.get(0));
-		d.setAtomType2(lineData.get(1));
-		d.setLowerLimit(Float.parseFloat(lineData.get(2)));
-		d.setUpperLimit(Float.parseFloat(lineData.get(3)));
-
-		List<MetalBondDistance> defs = definitions.get(d.getAtomType1());
-
-		if ( defs == null){
-			defs = new ArrayList<>();
-			definitions.put(d.getAtomType1(),defs);
-		}
-
-		defs.add(d);
-
-	}
-
-	@Override
-	public void setFileParsingParameters(FileParsingParameters params) {
-
-	}
-
-	@Override
-	public FileParsingParameters getFileParsingParameters() {
-		return null;
-	}
-
-	public Map<String,List<MetalBondDistance>> getDefinitions(){
-		return definitions;
-	}
-
-	@Override
-	public void newPdbxAuditRevisionHistory(PdbxAuditRevisionHistory history) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void newPdbxDatabaseStatus(PdbxDatabaseStatus status) {
-		// TODO Auto-generated method stub
-
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MetalBondParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MetalBondParser.java
deleted file mode 100644
index 03d6789c5c..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/MetalBondParser.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-import org.biojava.nbio.structure.io.mmcif.chem.MetalBondDistance;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.InputStream;
-import java.util.*;
-
-import java.util.zip.GZIPInputStream;
-
-/**
- * Created by andreas on 6/6/16.
- */
-public class MetalBondParser  {
-
-	private static final Logger logger = LoggerFactory.getLogger(MetalBondParser.class);
-
-	private static final String BONDS_FILE = "org/biojava/nbio/structure/bond_distance_limits.cif.gz";
-
-
-	static Map<String,List<MetalBondDistance>> definitions;
-
-	static {
-		 definitions = init();
-	}
-
-
-	public static Map<String,List<MetalBondDistance>> getMetalBondDefinitions(){
-		return definitions;
-
-	}
-
-
-	private static Map<String,List<MetalBondDistance>> init(){
-
-		InputStream inputStream = MetalBondParser.class.getClassLoader().getResourceAsStream(BONDS_FILE);
-
-		if (inputStream == null) {
-			throw new RuntimeException("Could not find resource "+BONDS_FILE+".  This probably means that your biojava.jar file is corrupt or incorrectly built.");
-		}
-
-		try {
-			GZIPInputStream gzIS = new GZIPInputStream(inputStream);
-
-			SimpleMMcifParser parser = new SimpleMMcifParser();
-
-			MetalBondConsumer consumer = new MetalBondConsumer();
-			parser.addMMcifConsumer(consumer);
-
-			parser.parse(gzIS);
-
-			Map<String,List<MetalBondDistance>> defs = consumer.getDefinitions();
-
-			return defs;
-
-		} catch ( Exception e){
-			logger.error(e.getMessage(),e);
-
-		}
-		return null;
-	}
-
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ReducedChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ReducedChemCompProvider.java
deleted file mode 100644
index 0d752cea04..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ReducedChemCompProvider.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.zip.GZIPInputStream;
-
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/** Unlike the {@link DownloadChemCompProvider}, this  {@link ChemCompProvider} does not download any chem comp definitions.
- * It has access to a limited set of files that are part of the biojava distribution.
- *
- * @author Andreas Prlic
- * @since 3.0
- */
-public class ReducedChemCompProvider implements ChemCompProvider {
-
-	private static final Logger logger = LoggerFactory.getLogger(ReducedChemCompProvider.class);
-
-	public ReducedChemCompProvider(){
-		logger.debug("Initialising ReducedChemCompProvider");
-	}
-
-
-	@Override
-	public ChemComp getChemComp(String recordName) {
-		String name = recordName.toUpperCase().trim();
-		try(InputStream inStream = this.getClass().getResourceAsStream("/chemcomp/"+name + ".cif.gz")) {
-
-			logger.debug("Reading chemcomp/"+name+".cif.gz");
-
-			if ( inStream == null){
-				//System.out.println("Could not find chem comp: " + name + " ... using generic Chem Comp");
-				// could not find the chem comp definition for this in the jar file
-				logger.debug("Getting empty chem comp for {}",name);
-				ChemComp cc = ChemComp.getEmptyChemComp();
-				cc.setId(name);
-				return cc;
-			}
-
-			MMcifParser parser = new SimpleMMcifParser();
-
-			ChemCompConsumer consumer = new ChemCompConsumer();
-
-			// The Consumer builds up the BioJava - structure object.
-			// you could also hook in your own and build up you own data model.
-			parser.addMMcifConsumer(consumer);
-
-			parser.parse(new BufferedReader(new InputStreamReader(new GZIPInputStream(inStream))));
-
-			ChemicalComponentDictionary dict = consumer.getDictionary();
-
-			ChemComp chemComp = dict.getChemComp(name);
-
-			return chemComp;
-
-		} catch (IOException e){
-			logger.error("IOException caught while reading chem comp {}.",name,e);
-		}
-		logger.warn("Problem when loading chem comp {}, will use an empty chem comp for it", name);
-		ChemComp cc = ChemComp.getEmptyChemComp();
-		cc.setId(name);
-		return cc;
-	}
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifConsumer.java
deleted file mode 100644
index b0cdecdc14..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifConsumer.java
+++ /dev/null
@@ -1,2167 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Apr 26, 2008
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.vecmath.Matrix4d;
-
-import org.biojava.nbio.structure.AminoAcid;
-import org.biojava.nbio.structure.AminoAcidImpl;
-import org.biojava.nbio.structure.Atom;
-import org.biojava.nbio.structure.AtomImpl;
-import org.biojava.nbio.structure.Chain;
-import org.biojava.nbio.structure.ChainImpl;
-import org.biojava.nbio.structure.EntityInfo;
-import org.biojava.nbio.structure.EntityType;
-import org.biojava.nbio.structure.DBRef;
-import org.biojava.nbio.structure.Element;
-import org.biojava.nbio.structure.Group;
-import org.biojava.nbio.structure.GroupType;
-import org.biojava.nbio.structure.HetatomImpl;
-import org.biojava.nbio.structure.NucleotideImpl;
-import org.biojava.nbio.structure.PDBCrystallographicInfo;
-import org.biojava.nbio.structure.PDBHeader;
-import org.biojava.nbio.structure.ResidueNumber;
-import org.biojava.nbio.structure.SeqMisMatch;
-import org.biojava.nbio.structure.SeqMisMatchImpl;
-import org.biojava.nbio.structure.Site;
-import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureImpl;
-import org.biojava.nbio.structure.StructureTools;
-import org.biojava.nbio.structure.io.BondMaker;
-import org.biojava.nbio.structure.io.ChargeAdder;
-import org.biojava.nbio.structure.io.EntityFinder;
-import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.SeqRes2AtomAligner;
-import org.biojava.nbio.structure.io.mmcif.model.AtomSite;
-import org.biojava.nbio.structure.io.mmcif.model.AtomSites;
-import org.biojava.nbio.structure.io.mmcif.model.AuditAuthor;
-import org.biojava.nbio.structure.io.mmcif.model.Cell;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
-import org.biojava.nbio.structure.io.mmcif.model.ChemCompAtom;
-import org.biojava.nbio.structure.io.mmcif.model.ChemCompBond;
-import org.biojava.nbio.structure.io.mmcif.model.ChemCompDescriptor;
-import org.biojava.nbio.structure.io.mmcif.model.DatabasePDBremark;
-import org.biojava.nbio.structure.io.mmcif.model.DatabasePDBrev;
-import org.biojava.nbio.structure.io.mmcif.model.DatabasePdbrevRecord;
-import org.biojava.nbio.structure.io.mmcif.model.Entity;
-import org.biojava.nbio.structure.io.mmcif.model.EntityPoly;
-import org.biojava.nbio.structure.io.mmcif.model.EntityPolySeq;
-import org.biojava.nbio.structure.io.mmcif.model.EntitySrcGen;
-import org.biojava.nbio.structure.io.mmcif.model.EntitySrcNat;
-import org.biojava.nbio.structure.io.mmcif.model.EntitySrcSyn;
-import org.biojava.nbio.structure.io.mmcif.model.Exptl;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxAuditRevisionHistory;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxChemCompDescriptor;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxChemCompIdentifier;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxDatabaseStatus;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxEntityNonPoly;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxNonPolyScheme;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxPolySeqScheme;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssembly;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssemblyGen;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxStructOperList;
-import org.biojava.nbio.structure.io.mmcif.model.Refine;
-import org.biojava.nbio.structure.io.mmcif.model.Struct;
-import org.biojava.nbio.structure.io.mmcif.model.StructAsym;
-import org.biojava.nbio.structure.io.mmcif.model.StructConn;
-import org.biojava.nbio.structure.io.mmcif.model.StructKeywords;
-import org.biojava.nbio.structure.io.mmcif.model.StructNcsOper;
-import org.biojava.nbio.structure.io.mmcif.model.StructRef;
-import org.biojava.nbio.structure.io.mmcif.model.StructRefSeq;
-import org.biojava.nbio.structure.io.mmcif.model.StructRefSeqDif;
-import org.biojava.nbio.structure.io.mmcif.model.StructSite;
-import org.biojava.nbio.structure.io.mmcif.model.StructSiteGen;
-import org.biojava.nbio.structure.io.mmcif.model.Symmetry;
-import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
-import org.biojava.nbio.structure.quaternary.BiologicalAssemblyBuilder;
-import org.biojava.nbio.structure.quaternary.BiologicalAssemblyTransformation;
-import org.biojava.nbio.structure.xtal.CrystalCell;
-import org.biojava.nbio.structure.xtal.SpaceGroup;
-import org.biojava.nbio.structure.xtal.SymoplibParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A MMcifConsumer implementation that builds an in-memory representation of the
- * content of a mmcif file as a BioJava Structure object.
- *
- * @author Andreas Prlic
- * @since 1.7
- */
-
-public class SimpleMMcifConsumer implements MMcifConsumer {
-
-	private static final Logger logger = LoggerFactory.getLogger(SimpleMMcifConsumer.class);
-
-	private Structure structure;
-	private Chain currentChain;
-	private Group currentGroup;
-
-	/**
-	 * A temporary data structure to hold all parsed chains
-	 */
-	private ArrayList<List<Chain>> allModels;
-	/**
-	 * The current set of chains per model
-	 */
-	private List<Chain>      currentModel;
-	private List<Entity>     entities;
-	/**
-	 * Needed in header only mode to get mapping between asym ids and author ids
-	 */
-	private List<EntityPoly> entityPolys;
-	private List<StructRef>  strucRefs;
-	private List<Chain>      seqResChains;
-	private List<Chain>      entityChains; // needed to link entities, chains and compounds...
-	private List<StructAsym> structAsyms;  // needed to link entities, chains and compounds...
-	private List<PdbxStructOperList> structOpers ; //
-	private List<PdbxStructAssembly> strucAssemblies;
-	private List<PdbxStructAssemblyGen> strucAssemblyGens;
-	private List<EntitySrcGen> entitySrcGens;
-	private List<EntitySrcNat> entitySrcNats;
-	private List<EntitySrcSyn> entitySrcSyns;
-	private List<StructConn> structConn;
-	private List<StructNcsOper> structNcsOper;
-	private List<StructRefSeqDif> sequenceDifs;
-	private List<StructSiteGen> structSiteGens;
-
-	private Matrix4d parsedScaleMatrix;
-
-
-
-	/**
-	 * A map of asym ids (internal chain ids) to entity ids extracted from
-	 * the _struct_asym category
-	 */
-	private Map<String,String> asymId2entityId;
-
-	/**
-	 * A map of asym ids (internal chain ids) to author ids extracted from
-	 * the _entity_poly category. Used in header only parsing.
-	 */
-	private Map<String,String> asymId2authorId;
-
-	private String currentNmrModelNumber ;
-
-	private FileParsingParameters params;
-
-	public  SimpleMMcifConsumer(){
-		params = new FileParsingParameters();
-		documentStart();
-
-	}
-
-	@Override
-	public void newEntity(Entity entity) {
-		logger.debug("New entity: {}",entity.toString());
-		entities.add(entity);
-	}
-
-	@Override
-	public void newEntityPoly(EntityPoly entityPoly) {
-		entityPolys.add(entityPoly);
-	}
-
-	@Override
-	public void newPdbxStructOperList(PdbxStructOperList structOper){
-
-		structOpers.add(structOper);
-	}
-
-	@Override
-	public void newStructAsym(StructAsym sasym){
-
-		structAsyms.add(sasym);
-	}
-
-	private Entity getEntity(int entity_id){
-		try {
-			for (Entity e: entities){
-				int eId = Integer.parseInt(e.getId());
-				if  (eId== entity_id){
-					return e;
-				}
-			}
-		} catch (NumberFormatException e) {
-			logger.warn("Entity id does not look like a number: {}", e.getMessage());
-		}
-		return null;
-	}
-
-	@Override
-	public void newStructKeywords(StructKeywords kw){
-		PDBHeader header = structure.getPDBHeader();
-		if ( header == null)
-			header = new PDBHeader();
-		header.setDescription(kw.getPdbx_keywords());
-		header.setClassification(kw.getPdbx_keywords());
-	}
-
-	@Override
-	public void setStruct(Struct struct) {
-
-		PDBHeader header = structure.getPDBHeader();
-		if ( header == null)
-			header = new PDBHeader();
-
-		header.setTitle(struct.getTitle());
-		header.setIdCode(struct.getEntry_id());
-		//header.setDescription(struct.getPdbx_descriptor());
-		//header.setClassification(struct.getPdbx_descriptor());
-		//header.setDescription(struct.getPdbx_descriptor());
-
-
-
-		structure.setPDBHeader(header);
-		structure.setPDBCode(struct.getEntry_id());
-	}
-
-	/** initiate new group, either Hetatom, Nucleotide, or AminoAcid */
-	private Group getNewGroup(String recordName,Character aminoCode1, long seq_id,String groupCode3) {
-
-		Group g = ChemCompGroupFactory.getGroupFromChemCompDictionary(groupCode3);
-		if ( g != null && !g.getChemComp().isEmpty()) {
-			if ( g instanceof AminoAcidImpl) {
-				AminoAcidImpl aa = (AminoAcidImpl) g;
-				aa.setId(seq_id);
-			} else if ( g instanceof NucleotideImpl) {
-				NucleotideImpl nuc =  (NucleotideImpl) g;
-				nuc.setId(seq_id);
-			} else if ( g instanceof HetatomImpl) {
-				HetatomImpl het = (HetatomImpl)g;
-				het.setId(seq_id);
-			}
-			return g;
-		}
-
-
-
-		Group group;
-		if ( recordName.equals("ATOM") ) {
-			if (StructureTools.isNucleotide(groupCode3))  {
-				// it is a nucleotide
-				NucleotideImpl nu = new NucleotideImpl();
-				group = nu;
-				nu.setId(seq_id);
-
-			} else if (aminoCode1==null || aminoCode1 == StructureTools.UNKNOWN_GROUP_LABEL){
-				HetatomImpl h = new HetatomImpl();
-				h.setId(seq_id);
-				group = h;
-
-			} else {
-				AminoAcidImpl aa = new AminoAcidImpl() ;
-				aa.setAminoType(aminoCode1);
-				aa.setId(seq_id);
-				group = aa ;
-			}
-		}
-		else {
-			if (StructureTools.isNucleotide(groupCode3))  {
-				// it is a nucleotide
-				NucleotideImpl nu = new NucleotideImpl();
-				group = nu;
-				nu.setId(seq_id);
-			}
-			else if (aminoCode1 != null ) {
-				AminoAcidImpl aa = new AminoAcidImpl() ;
-				aa.setAminoType(aminoCode1);
-				aa.setId(seq_id);
-				group = aa ;
-			} else {
-				HetatomImpl h = new HetatomImpl();
-				h.setId(seq_id);
-				group = h;
-			}
-		}
-		return  group ;
-	}
-
-	/**
-	 * Test if the given asymId is already present in the list of chains given. If yes, returns the chain
-	 * otherwise returns null.
-	 */
-	private static Chain isKnownChain(String asymId, List<Chain> chains){
-
-		for (int i = 0; i< chains.size();i++){
-			Chain testchain =  chains.get(i);
-			//System.out.println("comparing chainID >"+chainID+"< against testchain " + i+" >" +testchain.getName()+"<");
-			if (asymId.equals(testchain.getId())) {
-				//System.out.println("chain "+ chainID+" already known ...");
-				return testchain;
-			}
-		}
-
-		return null;
-	}
-
-	@Override
-	public void newAtomSite(AtomSite atom) {
-
-		if (params.isHeaderOnly()) return;
-
-		// Warning: getLabel_asym_id is not the "chain id" in the PDB file
-		// it is the internally used chain id.
-		// later on we will fix this...
-
-		// later one needs to map the asym id to the pdb_strand_id
-
-		//TODO: add support for FileParsingParams.getMaxAtoms()
-
-		boolean startOfNewChain = false;
-
-		String asymId = atom.getLabel_asym_id();
-		String authId = atom.getAuth_asym_id();
-
-		String recordName    = atom.getGroup_PDB();
-		String residueNumberS = atom.getAuth_seq_id();
-		Integer residueNrInt = Integer.parseInt(residueNumberS);
-
-		// the 3-letter name of the group:
-		String groupCode3    = atom.getLabel_comp_id();
-
-		boolean isHetAtomInFile = false;
-
-		Character aminoCode1 = null;
-		if ( recordName.equals("ATOM") )
-			aminoCode1 = StructureTools.get1LetterCodeAmino(groupCode3);
-		else {
-			aminoCode1 = StructureTools.get1LetterCodeAmino(groupCode3);
-
-			// for nucleotides this will be null..
-			if (aminoCode1 != null &&  aminoCode1.equals(StructureTools.UNKNOWN_GROUP_LABEL))
-				aminoCode1 = null;
-
-			isHetAtomInFile = true;
-		}
-		String insCodeS = atom.getPdbx_PDB_ins_code();
-		Character insCode = null;
-		if (!  insCodeS.equals("?")) {
-			insCode = insCodeS.charAt(0);
-		}
-		// we store the internal seq id in the Atom._id field
-		// this is not a PDB file field but we need this to internally assign the insertion codes later
-		// from the pdbx_poly_seq entries..
-
-		long seq_id = -1;
-		try {
-			seq_id = Long.parseLong(atom.getLabel_seq_id());
-		} catch (NumberFormatException e){
-			// non polymer chains (ligands and small molecules) will have a label_seq_id set to '.', thus it is ok to
-			// silently ignore this
-			//logger.debug("Could not parse number for _atom_site.label_seq_id: "+e.getMessage());
-		}
-
-		String nmrModelNumber = atom.getPdbx_PDB_model_num();
-
-		if ( currentNmrModelNumber == null) {
-			currentNmrModelNumber = nmrModelNumber;
-		}
-
-		if (! currentNmrModelNumber.equals(nmrModelNumber)){
-			currentNmrModelNumber = nmrModelNumber;
-
-			// add previous data
-			if ( currentChain != null ) {
-				currentChain.addGroup(currentGroup);
-				currentGroup.trimToSize();
-			}
-
-			// we came to the beginning of a new NMR model
-			allModels.add(currentModel);
-			currentModel = new ArrayList<Chain>();
-			currentChain = null;
-			currentGroup = null;
-		}
-
-
-		if (currentChain == null) {
-
-			currentChain = new ChainImpl();
-			currentChain.setName(authId);
-			currentChain.setId(asymId);
-			currentModel.add(currentChain);
-			startOfNewChain = true;
-		}
-
-		//System.out.println("BEFORE: " + chain_id + " " + current_chain.getName());
-		if ( ! asymId.equals(currentChain.getId()) ) {
-			//logger.info("unknown chain. creating new chain. authId:" + authId + " asymId: " + asymId);
-			startOfNewChain = true;
-
-			// end up old chain...
-			currentChain.addGroup(currentGroup);
-
-			// see if old chain is known ...
-			Chain testchain = isKnownChain(asymId,currentModel);
-
-			if ( testchain == null) {
-				//logger.info("unknown chain. creating new chain. authId:" + authId + " asymId: " + asymId);
-
-				currentChain = new ChainImpl();
-				currentChain.setName(authId);
-				currentChain.setId(asymId);
-
-			}   else {
-				currentChain = testchain;
-			}
-
-			if ( ! currentModel.contains(currentChain))
-				currentModel.add(currentChain);
-
-		}
-
-
-		ResidueNumber residueNumber = new ResidueNumber(authId,residueNrInt, insCode);
-
-		if (currentGroup == null) {
-
-
-			currentGroup = getNewGroup(recordName,aminoCode1,seq_id, groupCode3);
-
-			currentGroup.setResidueNumber(residueNumber);
-			currentGroup.setPDBName(groupCode3);
-			currentGroup.setHetAtomInFile(isHetAtomInFile);
-		}
-
-		// SET UP THE ALT LOC GROUP
-		Group altGroup = null;
-		String altLocS = atom.getLabel_alt_id();
-		Character altLoc = ' ';
-		if ( altLocS.length()>0) {
-			altLoc = altLocS.charAt(0);
-			if ( altLoc.equals('.') )
-				altLoc = ' ';
-
-		}
-		// If it's the start of the new chain
-		if ( startOfNewChain){
-			currentGroup = getNewGroup(recordName,aminoCode1,seq_id, groupCode3);
-			currentGroup.setResidueNumber(residueNumber);
-			currentGroup.setPDBName(groupCode3);
-			currentGroup.setHetAtomInFile(isHetAtomInFile);
-		}
-		// ANTHONY BRADLEY ADDED THIS -> WE ONLY WAN'T TO CHECK FOR ALT LOCS WHEN IT's NOT THE FIRST GROUP IN CHAIN
-		else{
-		// check if residue number is the same ...
-		// insertion code is part of residue number
-			if ( ! residueNumber.equals(currentGroup.getResidueNumber())) {
-			//System.out.println("end of residue: "+current_group.getPDBCode()+" "+residueNrInt);
-				currentChain.addGroup(currentGroup);
-				currentGroup.trimToSize();
-				currentGroup = getNewGroup(recordName,aminoCode1,seq_id,groupCode3);
-				currentGroup.setPDBName(groupCode3);
-				currentGroup.setResidueNumber(residueNumber);
-				currentGroup.setHetAtomInFile(isHetAtomInFile);
-
-
-		} else {
-			// same residueNumber, but altLocs...
-			// test altLoc
-
-			if ( ! altLoc.equals(' ') && ( ! altLoc.equals('.'))) {
-					logger.debug("found altLoc! " + altLoc + " " + currentGroup + " " + altGroup);
-				altGroup = getCorrectAltLocGroup( altLoc,recordName,aminoCode1,groupCode3, seq_id);
-				if (altGroup.getChain()==null) {
-						altGroup.setChain(currentChain);
-					}
-				}
-			}
-		}
-		//atomCount++;
-		//System.out.println("fixing atom name for  >" + atom.getLabel_atom_id() + "< >" + fullname + "<");
-
-
-		if ( params.isParseCAOnly() ){
-			// yes , user wants to get CA only
-			// only parse CA atoms...
-			if (! (atom.getLabel_atom_id().equals(StructureTools.CA_ATOM_NAME) && atom.getType_symbol().equals("C"))) {
-				//System.out.println("ignoring " + line);
-				//atomCount--;
-				return;
-			}
-		}
-
-		//see if chain_id is one of the previous chains ...
-
-		Atom a = convertAtom(atom);
-
-		//see if chain_id is one of the previous chains ...
-		if ( altGroup != null) {
-			altGroup.addAtom(a);
-			altGroup = null;
-		}
-		else {
-			currentGroup.addAtom(a);
-		}
-
-
-		String atomName = a.getName();
-		// make sure that main group has all atoms
-		// GitHub issue: #76
-		if ( ! currentGroup.hasAtom(atomName)) {
-			// Unless it's microheterogenity https://github.com/rcsb/codec-devel/issues/81
-			if (currentGroup.getPDBName().equals(a.getGroup().getPDBName())) {
-				if(!StructureTools.hasNonDeuteratedEquiv(a,currentGroup)){
-					currentGroup.addAtom(a);
-				}
-			}
-
-		}
-	}
-
-	/**
-	 * Convert a mmCIF AtomSite object to a BioJava Atom object
-	 *
-	 * @param atom the mmmcif AtomSite record
-	 * @return an Atom
-	 */
-	private Atom convertAtom(AtomSite atom){
-
-
-		Atom a = new AtomImpl();
-
-		a.setPDBserial(Integer.parseInt(atom.getId()));
-		a.setName(atom.getLabel_atom_id());
-
-		double x = Double.parseDouble (atom.getCartn_x());
-		double y = Double.parseDouble (atom.getCartn_y());
-		double z = Double.parseDouble (atom.getCartn_z());
-		a.setX(x);
-		a.setY(y);
-		a.setZ(z);
-
-		float occupancy = Float.parseFloat (atom.getOccupancy());
-		a.setOccupancy(occupancy);
-
-		float temp = Float.parseFloat (atom.getB_iso_or_equiv());
-		a.setTempFactor(temp);
-
-		String alt = atom.getLabel_alt_id();
-		if (( alt != null ) && ( alt.length() > 0) && (! alt.equals("."))){
-			a.setAltLoc(new Character(alt.charAt(0)));
-		} else {
-			a.setAltLoc(new Character(' '));
-		}
-
-		Element element = Element.R;
-		try {
-			element = Element.valueOfIgnoreCase(atom.getType_symbol());
-		}  catch (IllegalArgumentException e) {
-			logger.info("Element {} was not recognised as a BioJava-known element, the element will be represented as the generic element {}", atom.getType_symbol(), Element.R.name());
-		}
-		a.setElement(element);
-
-		return a;
-
-	}
-
-
-	private Group getCorrectAltLocGroup( Character altLoc,
-			String recordName,
-			Character aminoCode1,
-			String groupCode3,
-			long seq_id) {
-
-		// see if we know this altLoc already;
-		List<Atom> atoms = currentGroup.getAtoms();
-		if ( atoms.size() > 0) {
-			Atom a1 = atoms.get(0);
-			// we are just adding atoms to the current group
-			// probably there is a second group following later...
-			if (a1.getAltLoc().equals(altLoc)) {
-
-				return currentGroup;
-			}
-		}
-
-		List<Group> altLocs = currentGroup.getAltLocs();
-		for ( Group altLocG : altLocs ){
-			atoms = altLocG.getAtoms();
-			if ( atoms.size() > 0) {
-				for ( Atom a1 : atoms) {
-					if (a1.getAltLoc().equals( altLoc)) {
-
-						return altLocG;
-					}
-				}
-			}
-		}
-
-		// no matching altLoc group found.
-		// build it up.
-
-		if ( groupCode3.equals(currentGroup.getPDBName())) {
-			if ( currentGroup.getAtoms().size() == 0) {
-				//System.out.println("current group is empty " + current_group + " " + altLoc);
-				return currentGroup;
-			}
-			//System.out.println("cloning current group " + current_group + " " + current_group.getAtoms().get(0).getAltLoc() + " altLoc " + altLoc);
-			Group altLocG = (Group) currentGroup.clone();
-			// drop atoms from cloned group...
-			// https://redmine.open-bio.org/issues/3307
-			altLocG.setAtoms(new ArrayList<Atom>());
-			altLocG.getAltLocs().clear();
-			currentGroup.addAltLoc(altLocG);
-			return altLocG;
-		}
-
-		//	System.out.println("new  group " + recordName + " " + aminoCode1 + " " +groupCode3);
-		//String recordName,Character aminoCode1, long seq_id,String groupCode3) {
-		Group altLocG = getNewGroup(recordName,aminoCode1,seq_id,groupCode3);
-
-		altLocG.setPDBName(groupCode3);
-		altLocG.setResidueNumber(currentGroup.getResidueNumber());
-		currentGroup.addAltLoc(altLocG);
-		return altLocG;
-	}
-
-	/**
-	 * Start the parsing
-	 */
-	@Override
-	public void documentStart() {
-		structure = new StructureImpl();
-
-		currentChain        = null;
-		currentGroup 		= null;
-		currentNmrModelNumber 	= null;
-		//atomCount     		= 0;
-
-		allModels     = new ArrayList<List<Chain>>();
-		currentModel  = new ArrayList<Chain>();
-		entities      = new ArrayList<Entity>();
-		entityPolys   = new ArrayList<>();
-		strucRefs     = new ArrayList<StructRef>();
-		seqResChains  = new ArrayList<Chain>();
-		entityChains  = new ArrayList<Chain>();
-		structAsyms   = new ArrayList<StructAsym>();
-
-		asymId2entityId = new HashMap<String,String>();
-		asymId2authorId = new HashMap<>();
-		structOpers   = new ArrayList<PdbxStructOperList>();
-		strucAssemblies = new ArrayList<PdbxStructAssembly>();
-		strucAssemblyGens = new ArrayList<PdbxStructAssemblyGen>();
-		entitySrcGens = new ArrayList<EntitySrcGen>();
-		entitySrcNats = new ArrayList<EntitySrcNat>();
-		entitySrcSyns = new ArrayList<EntitySrcSyn>();
-		structConn = new ArrayList<StructConn>();
-		structNcsOper = new ArrayList<StructNcsOper>();
-		sequenceDifs = new ArrayList<StructRefSeqDif>();
-		structSiteGens = new ArrayList<StructSiteGen>();
-	}
-
-
-	@Override
-	public void documentEnd() {
-
-		// Expected that there is one current_chain that needs to be added to the model
-		// When in headerOnly mode, no Atoms are read, and there will not be an active
-		// current_chain.
-		if ( currentChain != null ) {
-
-			currentChain.addGroup(currentGroup);
-			if (isKnownChain(currentChain.getId(),currentModel) == null) {
-				currentModel.add(currentChain);
-			}
-		} else if (!params.isHeaderOnly()){
-			logger.warn("current chain is null at end of document.");
-		}
-
-		allModels.add(currentModel);
-
-		// this populates the asymId2authorId and asymId2entityId maps, needed in header only mode to get the mapping
-		// between the 2 chain identifiers.
-		initMaps();
-
-		for (StructAsym asym : structAsyms) {
-
-			logger.debug("Entity {} matches asym_id: {}", asym.getEntity_id(), asym.getId() );
-
-			Chain s = getEntityChain(asym.getEntity_id());
-			Chain seqres = (Chain)s.clone();
-			// to solve issue #160 (e.g. 3u7t)
-			seqres = removeSeqResHeterogeneity(seqres);
-			seqres.setId(asym.getId());
-			if (asymId2authorId.get(asym.getId()) !=null ){
-				seqres.setName(asymId2authorId.get(asym.getId()));
-			} else {
-				seqres.setName(asym.getId());
-			}
-
-			EntityType type = null;
-			try {
-				Entity ent = getEntity(Integer.parseInt(asym.getEntity_id()));
-				type = EntityType.entityTypeFromString(ent.getType());
-			} catch (NumberFormatException e) {
-				logger.debug("Could not parse integer from entity id field {}", asym.getEntity_id());
-			}
-
-			// we'll only add seqres chains that are polymeric or unknown
-			if (type==null || type==EntityType.POLYMER ) {
-				seqResChains.add(seqres);
-			}
-
-			logger.debug(" seqres: " + asym.getId() + " " + seqres + "<") ;
-			// adding the entities to structure
-			addEntities(asym);
-
-		}
-
-		if (structAsyms.isEmpty()) {
-			logger.warn("No _struct_asym category in file, no SEQRES groups will be added.");
-		}
-
-		// entities
-		// In addEntities above we created the entities if they were present in the file
-		// Now we need to make sure that they are linked to chains and also that if they are not present in the file we need to add them now
-		linkEntities();
-
-		// now that we know the entities, we can add all chains to structure so that they are stored
-		// properly as polymer/nonpolymer/water chains inside structure
-		for (List<Chain> model:allModels) {
-			structure.addModel(model);
-		}
-
-		// Only align if requested (default) and not when headerOnly mode with no Atoms.
-		// Otherwise, we store the empty SeqRes Groups unchanged in the right chains.
-		if ( params.isAlignSeqRes() && !params.isHeaderOnly() ){
-			logger.debug("Parsing mode align_seqres, will parse SEQRES and align to ATOM sequence");
-			alignSeqRes();
-		} else {
-			logger.debug("Parsing mode unalign_seqres, will parse SEQRES but not align it to ATOM sequence");
-			SeqRes2AtomAligner.storeUnAlignedSeqRes(structure, seqResChains, params.isHeaderOnly());
-		}
-
-
-		// Now make sure all altlocgroups have all the atoms in all the groups
-		StructureTools.cleanUpAltLocs(structure);
-
-		// NOTE bonds and charges can only be done at this point that the chain id mapping is properly sorted out
-		if (!params.isHeaderOnly()) {
-			if ( params.shouldCreateAtomBonds()) {
-				addBonds();
-			}
-
-			if ( params.shouldCreateAtomCharges()) {
-				addCharges();
-			}
-		}
-
-		if (!params.isHeaderOnly()) {
-
-			// Do structure.setSites(sites) after any chain renaming to be like PDB.
-			addSites();
-		}
-
-
-
-		// set the oligomeric state info in the header...
-		if (params.isParseBioAssembly()) {
-
-			// the more detailed mapping of chains to rotation operations happens in StructureIO...
-
-			Map<Integer,BioAssemblyInfo> bioAssemblies = new LinkedHashMap<Integer, BioAssemblyInfo>();
-
-			for ( PdbxStructAssembly psa : strucAssemblies){
-
-				List<PdbxStructAssemblyGen> psags = new ArrayList<PdbxStructAssemblyGen>(1);
-
-				for ( PdbxStructAssemblyGen psag: strucAssemblyGens ) {
-					if ( psag.getAssembly_id().equals(psa.getId())) {
-						psags.add(psag);
-					}
-				}
-
-				BiologicalAssemblyBuilder builder = new BiologicalAssemblyBuilder();
-
-				// these are the transformations that need to be applied to our model
-				List<BiologicalAssemblyTransformation> transformations = builder.getBioUnitTransformationList(psa, psags, structOpers);
-
-				int bioAssemblyId = -1;
-				try {
-					bioAssemblyId = Integer.parseInt(psa.getId());
-				} catch (NumberFormatException e) {
-					logger.info("Could not parse a numerical bio assembly id from '{}'",psa.getId());
-				}
-
-				// if bioassembly id is not numerical we throw it away
-				// this happens usually for viral capsid entries, like 1ei7
-				// see issue #230 in github
-				if (bioAssemblyId!=-1) {
-					int mmSize = 0;
-					// note that the transforms contain asym ids of both polymers and non-polymers
-					// For the mmsize, we are only interested in the polymers
-					for (BiologicalAssemblyTransformation transf:transformations) {
-						Chain c = structure.getChain(transf.getChainId());
-						if (c==null) {
-							logger.info("Could not find asym id {} specified in struct_assembly_gen", transf.getChainId());
-							continue;
-						}
-						if (c.getEntityType() == EntityType.POLYMER &&
-							// for entries like 4kro, sugars are annotated as polymers but we
-							// don't want them in the macromolecularSize count
-							!c.getEntityInfo().getDescription().contains("SUGAR") ) {
-
-								mmSize++;
-							}
-					}
-
-					BioAssemblyInfo bioAssembly = new BioAssemblyInfo();
-					bioAssembly.setId(bioAssemblyId);
-					bioAssembly.setMacromolecularSize(mmSize);
-					bioAssembly.setTransforms(transformations);
-					bioAssemblies.put(bioAssemblyId,bioAssembly);
-				}
-
-			}
-			structure.getPDBHeader().setBioAssemblies(bioAssemblies);
-		}
-
-		setStructNcsOps();
-
-		setCrystallographicInfoMetadata();
-
-
-		Map<String,List<SeqMisMatch>> misMatchMap = new HashMap<String, List<SeqMisMatch>>();
-		for (StructRefSeqDif sdif : sequenceDifs) {
-			SeqMisMatch misMatch = new SeqMisMatchImpl();
-			misMatch.setDetails(sdif.getDetails());
-
-			String insCode = sdif.getPdbx_pdb_ins_code();
-			if ( insCode != null && insCode.equals("?"))
-				insCode = null;
-			misMatch.setInsCode(insCode);
-			misMatch.setOrigGroup(sdif.getDb_mon_id());
-			misMatch.setPdbGroup(sdif.getMon_id());
-			misMatch.setPdbResNum(sdif.getPdbx_auth_seq_num());
-			misMatch.setUniProtId(sdif.getPdbx_seq_db_accession_code());
-			misMatch.setSeqNum(sdif.getSeq_num());
-
-
-			List<SeqMisMatch> mms = misMatchMap.get(sdif.getPdbx_pdb_strand_id());
-			if ( mms == null) {
-				mms = new ArrayList<SeqMisMatch>();
-				misMatchMap.put(sdif.getPdbx_pdb_strand_id(),mms);
-			}
-			mms.add(misMatch);
-
-		}
-
-		for (String chainId : misMatchMap.keySet()){
-
-			Chain chain = structure.getPolyChainByPDB(chainId);
-
-			if ( chain == null) {
-				logger.warn("Could not set mismatches for chain with author id" + chainId);
-				continue;
-			}
-
-			chain.setSeqMisMatches(misMatchMap.get(chainId));
-
-
-		}
-
-	}
-
-	/**
-	 * Here we link entities to chains.
-	 * Also if entities are not present in file, this initialises the entities with some heuristics, see {@link org.biojava.nbio.structure.io.EntityFinder}
-	 */
-	private void linkEntities() {
-
-		for (int i =0; i< allModels.size() ; i++){
-			for (Chain chain : allModels.get(i)) {
-				//logger.info("linking entities for " + chain.getId() + " "  + chain.getName());
-				String entityId = asymId2entityId.get(chain.getId());
-
-				if (entityId==null) {
-					// this can happen for instance if the cif file didn't have _struct_asym category at all
-					// and thus we have no asymId2entityId mapping at all
-					logger.info("No entity id could be found for chain {}", chain.getId());
-					continue;
-				}
-				int eId = Integer.parseInt(entityId);
-
-				// Entities are not added for non-polymeric entities, if a chain is non-polymeric its entity won't be found.
-				// TODO: add all entities and unique compounds and add methods to directly get polymer or non-polymer
-				// asyms (chains).  Either create a unique StructureImpl or modify existing for a better representation of the
-				// mmCIF internal data structures but is compatible with Structure interface.
-				// Some examples of PDB entries with this kind of problem:
-				//   - 2uub: asym_id X, chainName Z, entity_id 24: fully non-polymeric but still with its own chainName
-				//   - 3o6j: asym_id K, chainName Z, entity_id 6 : a single water molecule
-				//   - 1dz9: asym_id K, chainName K, entity_id 6 : a potassium ion alone
-
-				EntityInfo entityInfo = structure.getEntityById(eId);
-				if (entityInfo==null) {
-					// Supports the case where the only chain members were from non-polymeric entity that is missing.
-					// Solved by creating a new Compound(entity) to which this chain will belong.
-					logger.info("Could not find an Entity for entity_id {}, for chain id {}, creating a new Entity.",
-							eId, chain.getId());
-					entityInfo = new EntityInfo();
-					entityInfo.setMolId(eId);
-					entityInfo.addChain(chain);
-					if (chain.isWaterOnly()) {
-						entityInfo.setType(EntityType.WATER);
-					} else {
-						entityInfo.setType(EntityType.NONPOLYMER);
-					}
-					chain.setEntityInfo(entityInfo);
-					structure.addEntityInfo(entityInfo);
-				} else {
-					logger.debug("Adding chain with chain id {} (auth id {}) to Entity with entity_id {}",
-							chain.getId(), chain.getName(), eId);
-					entityInfo.addChain(chain);
-					chain.setEntityInfo(entityInfo);
-				}
-
-			}
-
-		}
-
-		// if no entity information was present in file we then go and find the entities heuristically with EntityFinder
-		List<EntityInfo> entityInfos = structure.getEntityInfos();
-		if (entityInfos==null || entityInfos.isEmpty()) {
-
-			List<List<Chain>> polyModels = new ArrayList<>();
-			List<List<Chain>> nonPolyModels = new ArrayList<>();
-			List<List<Chain>> waterModels = new ArrayList<>();
-
-			for (List<Chain> model:allModels) {
-
-				List<Chain> polyChains = new ArrayList<>();
-				List<Chain> nonPolyChains = new ArrayList<>();
-				List<Chain> waterChains = new ArrayList<>();
-
-				polyModels.add(polyChains);
-				nonPolyModels.add(nonPolyChains);
-				waterModels.add(waterChains);
-
-				for (Chain c:model) {
-
-					// we only have entities for polymeric chains, all others are ignored for assigning entities
-					if (c.isWaterOnly()) {
-						waterChains.add(c);
-
-					} else if (c.isPureNonPolymer()) {
-						nonPolyChains.add(c);
-
-					} else {
-						polyChains.add(c);
-					}
-				}
-			}
-
-			entityInfos = EntityFinder.findPolyEntities(polyModels);
-			EntityFinder.createPurelyNonPolyEntities(nonPolyModels, waterModels, entityInfos);
-
-
-			structure.setEntityInfos(entityInfos);
-		}
-
-		// final sanity check: it can happen that from the annotated entities some are not linked to any chains
-		// e.g. 3s26: a sugar entity does not have any chains associated to it (it seems to be happening with many sugar compounds)
-		// we simply log it, this can sign some other problems if the entities are used down the line
-		for (EntityInfo e:entityInfos) {
-			if (e.getChains().isEmpty()) {
-				logger.info("Entity {} '{}' has no chains associated to it",
-						e.getMolId()<0?"with no entity id":e.getMolId(), e.getDescription());
-			}
-		}
-
-	}
-
-	private void addCharges() {
-		ChargeAdder.addCharges(structure);
-	}
-
-	/**
-	 * The method will return a new reference to a Chain with any consecutive groups
-	 * having same residue numbers removed.
-	 * This is necessary to solve the microheterogeneity issue in entries like 3u7t (see github issue #160)
-	 * @param c
-	 * @return
-	 */
-	private static Chain removeSeqResHeterogeneity(Chain c) {
-
-		Chain trimmedChain = new ChainImpl();
-
-		ResidueNumber lastResNum = null;
-
-		for (Group g:c.getAtomGroups()) {
-
-			// note we have to deep copy this, otherwise they stay linked and would get altered in addGroup(g)
-			ResidueNumber currentResNum = new ResidueNumber(
-					g.getResidueNumber().getChainName(),
-					g.getResidueNumber().getSeqNum(),
-					g.getResidueNumber().getInsCode());
-
-			if (lastResNum == null || !lastResNum.equals(currentResNum) ) {
-				trimmedChain.addGroup(g);
-			} else {
-				logger.debug("Removing seqres group because it seems to be repeated in entity_poly_seq, most likely has hetero='y': "+g);
-			}
-
-			lastResNum = currentResNum;
-
-		}
-		return trimmedChain;
-	}
-
-	private void addBonds() {
-		BondMaker maker = new BondMaker(structure, params);
-		maker.makeBonds();
-		maker.formBondsFromStructConn(structConn);
-	}
-
-	private void alignSeqRes() {
-
-		logger.debug("Parsing mode align_seqres, will align to ATOM to SEQRES sequence");
-
-		// fix SEQRES residue numbering for all models
-
-		for (int model=0;model<structure.nrModels();model++) {
-
-			List<Chain> atomList   = structure.getModel(model);
-
-			for (Chain seqResChain: seqResChains){
-
-				// this extracts the matching atom chain from atomList
-				Chain atomChain = SeqRes2AtomAligner.getMatchingAtomRes(seqResChain, atomList, true);
-
-				if (atomChain == null) {
-					// most likely there's no observed residues at all for the seqres chain: can't map
-					// e.g. 3zyb: chains with asym_id L,M,N,O,P have no observed residues
-					logger.info("Could not map SEQRES chain with asym_id={} to any ATOM chain. Most likely there's no observed residues in the chain.",
-							seqResChain.getId());
-					continue;
-				}
-
-				//map the atoms to the seqres...
-
-				// we need to first clone the seqres so that they stay independent for different models
-				List<Group> seqResGroups = new ArrayList<Group>();
-				for (int i=0;i<seqResChain.getAtomGroups().size();i++) {
-					seqResGroups.add((Group)seqResChain.getAtomGroups().get(i).clone());
-				}
-
-				for ( int seqResPos = 0 ; seqResPos < seqResGroups.size(); seqResPos++) {
-					Group seqresG = seqResGroups.get(seqResPos);
-					boolean found = false;
-					for ( Group atomG: atomChain.getAtomGroups()) {
-
-						int internalNr = getInternalNr (atomG);
-
-						if (seqresG.getResidueNumber().getSeqNum() == internalNr ) {
-							seqResGroups.set(seqResPos, atomG);
-							found = true;
-							break;
-						}
-
-
-					}
-					if ( ! found)
-						// so far the residue number has tracked internal numbering.
-						// however there are no atom records, as such this can't be a PDB residue number...
-						seqresG.setResidueNumber(null);
-				}
-				atomChain.setSeqResGroups(seqResGroups);
-
-			}
-		}
-	}
-
-	private int getInternalNr(Group atomG) {
-		if ( atomG.getType().equals(GroupType.AMINOACID)) {
-			AminoAcidImpl aa = (AminoAcidImpl) atomG;
-			return new Long(aa.getId()).intValue();
-		} else if ( atomG.getType().equals(GroupType.NUCLEOTIDE)) {
-			NucleotideImpl nu = (NucleotideImpl) atomG;
-			return new Long(nu.getId()).intValue();
-		} else {
-			HetatomImpl he = (HetatomImpl) atomG;
-			return new Long(he.getId()).intValue();
-		}
-	}
-
-	private void addEntities(StructAsym asym) {
-		int eId = 0;
-		try {
-			eId = Integer.parseInt(asym.getEntity_id());
-		} catch (NumberFormatException e) {
-			logger.warn("Could not parse mol_id from string {}. Will use 0 for creating Entity",asym.getEntity_id());
-		}
-		Entity e = getEntity(eId);
-
-		// for some mmCIF files like 1yrm all 3 of _entity_src_gen, _entity_src_nat and _pdbx_entity_src_syn are missing
-		// we need to fill the Compounds in some other way:
-
-		EntityInfo entityInfo = structure.getEntityById(eId);
-
-		if (entityInfo==null) {
-			//logger.info("Creating new EntityInfo " + eId + " " + e.getId() + " " + e.getPdbx_description());
-			entityInfo = new EntityInfo();
-			entityInfo.setMolId(eId);
-			// we only add the compound if a polymeric one (to match what the PDB parser does)
-			if (e!=null) {
-				entityInfo.setDescription(e.getPdbx_description());
-
-				EntityType eType = EntityType.entityTypeFromString(e.getType());
-				if (eType!=null) {
-					entityInfo.setType(eType);
-				} else {
-					logger.warn("Type '{}' is not recognised as a valid entity type for entity {}", e.getType(), eId);
-				}
-				addAncilliaryEntityData(asym, eId, e, entityInfo);
-				structure.addEntityInfo(entityInfo);
-				logger.debug("Adding Entity with entity id {} from _entity, with name: {}",eId, entityInfo.getDescription());
-			}
-		}
-	}
-
-
-	/**
-	 * Add any extra information to the entity information.
-	 * @param asym
-	 * @param entityId
-	 * @param entity
-	 * @param entityInfo
-	 */
-	private void addAncilliaryEntityData(StructAsym asym, int entityId, Entity entity, EntityInfo entityInfo) {
-		// Loop through each of the entity types and add the corresponding data
-		// We're assuming if data is duplicated between sources it is consistent
-		// This is a potentially huge assumption...
-
-
-		for (EntitySrcGen esg : entitySrcGens) {
-
-			if (! esg.getEntity_id().equals(asym.getEntity_id()))
-				continue;
-
-			addInformationFromESG(esg, entityId, entityInfo);
-
-		}
-
-		for (EntitySrcNat esn : entitySrcNats) {
-			if (! esn.getEntity_id().equals(asym.getEntity_id()))
-				continue;
-			addInformationFromESN(esn, entityId, entityInfo);
-
-		}
-
-		for (EntitySrcSyn ess : entitySrcSyns) {
-			if (! ess.getEntity_id().equals(asym.getEntity_id()))
-				continue;
-			addInfoFromESS(ess, entityId, entityInfo);
-
-		}
-	}
-
-	/**
-	 * Add the information from an ESG to a compound.
-	 * @param entitySrcInfo
-	 * @param entityId
-	 * @param c
-	 */
-	private void addInformationFromESG(EntitySrcGen entitySrcInfo, int entityId, EntityInfo c) {
-		c.setAtcc(entitySrcInfo.getPdbx_gene_src_atcc());
-		c.setCell(entitySrcInfo.getPdbx_gene_src_cell());
-		c.setOrganismCommon(entitySrcInfo.getGene_src_common_name());
-		c.setOrganismScientific(entitySrcInfo.getPdbx_gene_src_scientific_name());
-		c.setOrganismTaxId(entitySrcInfo.getPdbx_gene_src_ncbi_taxonomy_id());
-		c.setExpressionSystemTaxId(entitySrcInfo.getPdbx_host_org_ncbi_taxonomy_id());
-		c.setExpressionSystem(entitySrcInfo.getPdbx_host_org_scientific_name());
-	}
-
-	/**
-	 * Add the information to entity info from ESN.
-	 * @param esn
-	 * @param eId
-	 * @param c
-	 */
-	private void addInformationFromESN(EntitySrcNat esn, int eId, EntityInfo c) {
-
-		c.setAtcc(esn.getPdbx_atcc());
-		c.setCell(esn.getPdbx_cell());
-		c.setOrganismCommon(esn.getCommon_name());
-		c.setOrganismScientific(esn.getPdbx_organism_scientific());
-		c.setOrganismTaxId(esn.getPdbx_ncbi_taxonomy_id());
-
-	}
-	/**
-	 * Add the information from ESS to Entity info.
-	 * @param ess
-	 * @param eId
-	 * @param c
-	 */
-	private void addInfoFromESS(EntitySrcSyn ess, int eId, EntityInfo c) {
-		c.setOrganismCommon(ess.getOrganism_common_name());
-		c.setOrganismScientific(ess.getOrganism_scientific());
-		c.setOrganismTaxId(ess.getNcbi_taxonomy_id());
-
-	}
-
-	private void initMaps() {
-
-
-		if (structAsyms == null || structAsyms.isEmpty()) {
-			logger.info("No _struct_asym category found in file. No asym id to entity_id mapping will be available");
-			return;
-		}
-
-		Map<String, List<String>> entityId2asymId = new HashMap<>();
-
-		for (StructAsym asym : structAsyms) {
-
-			logger.debug("Entity {} matches asym_id: {}", asym.getEntity_id(), asym.getId() );
-
-			asymId2entityId.put(asym.getId(), asym.getEntity_id());
-
-			if (entityId2asymId.containsKey(asym.getEntity_id())) {
-				List<String> asymIds = entityId2asymId.get(asym.getEntity_id());
-				asymIds.add(asym.getId());
-			} else {
-				List<String> asymIds = new ArrayList<>();
-				asymIds.add(asym.getId());
-				entityId2asymId.put(asym.getEntity_id(), asymIds);
-			}
-		}
-
-		if (entityPolys==null || entityPolys.isEmpty()) {
-			logger.info("No _entity_poly category found in file. No asym id to author id mapping will be available for header only parsing");
-			return;
-		}
-
-		for (EntityPoly ep:entityPolys) {
-			if (ep.getPdbx_strand_id()==null) {
-				logger.info("_entity_poly.pdbx_strand_id is null for entity {}. Won't be able to map asym ids to author ids for this entity.", ep.getEntity_id());
-				continue;
-			}
-			String[] chainNames = ep.getPdbx_strand_id().split(",");
-			List<String> asymIds = entityId2asymId.get(ep.getEntity_id());
-			if (chainNames.length!=asymIds.size()) {
-				logger.warn("The list of asym ids (from _struct_asym) and the list of author ids (from _entity_poly) for entity {} have different lengths! Can't provide a mapping from asym ids to author chain ids", ep.getEntity_id());
-				continue;
-			}
-			for (int i=0; i<chainNames.length; i++) {
-				asymId2authorId.put(asymIds.get(i), chainNames[i]);
-			}
-		}
-	}
-
-	private void setStructNcsOps() {
-
-		ArrayList<Matrix4d> ncsOperators = new ArrayList<Matrix4d>();
-
-		for (StructNcsOper sNcsOper:structNcsOper) {
-
-			if (!sNcsOper.getCode().equals("generate")) continue;
-
-			try {
-				Matrix4d op = new Matrix4d();
-				op.setElement(3, 0, 0.0);
-				op.setElement(3, 1, 0.0);
-				op.setElement(3, 2, 0.0);
-				op.setElement(3, 3, 1.0);
-
-
-				op.setElement(0, 0, Double.parseDouble(sNcsOper.getMatrix11()));
-				op.setElement(0, 1, Double.parseDouble(sNcsOper.getMatrix12()));
-				op.setElement(0, 2, Double.parseDouble(sNcsOper.getMatrix13()));
-
-				op.setElement(1, 0, Double.parseDouble(sNcsOper.getMatrix21()));
-				op.setElement(1, 1, Double.parseDouble(sNcsOper.getMatrix22()));
-				op.setElement(1, 2, Double.parseDouble(sNcsOper.getMatrix23()));
-
-				op.setElement(2, 0, Double.parseDouble(sNcsOper.getMatrix31()));
-				op.setElement(2, 1, Double.parseDouble(sNcsOper.getMatrix32()));
-				op.setElement(2, 2, Double.parseDouble(sNcsOper.getMatrix33()));
-
-				op.setElement(0, 3, Double.parseDouble(sNcsOper.getVector1()));
-				op.setElement(1, 3, Double.parseDouble(sNcsOper.getVector2()));
-				op.setElement(2, 3, Double.parseDouble(sNcsOper.getVector3()));
-
-				ncsOperators.add(op);
-
-			} catch (NumberFormatException e) {
-				logger.warn("Error parsing doubles in NCS operator list, skipping operator {}", structNcsOper.indexOf(sNcsOper)+1);
-			}
-
-		}
-
-		// we only set it if not empty, otherwise remains null
-		if (ncsOperators.size()>0) {
-			structure.getCrystallographicInfo().setNcsOperators(
-					ncsOperators.toArray(new Matrix4d[ncsOperators.size()]));
-		}
-	}
-
-	private void setCrystallographicInfoMetadata() {
-		if (parsedScaleMatrix!=null) {
-
-			PDBCrystallographicInfo crystalInfo = structure.getCrystallographicInfo();
-
-			boolean nonStd = false;
-			if (crystalInfo.getCrystalCell()!=null && !crystalInfo.getCrystalCell().checkScaleMatrix(parsedScaleMatrix)) {
-				nonStd = true;
-			}
-
-			crystalInfo.setNonStandardCoordFrameConvention(nonStd);
-		}
-	}
-
-
-	/** This method will return the parsed protein structure, once the parsing has been finished
-	 *
-	 * @return a BioJava protein structure object
-	 */
-	public Structure getStructure() {
-
-		return structure;
-	}
-
-	@Override
-	public void newDatabasePDBrevRecord(DatabasePdbrevRecord record) {
-
-		PDBHeader header = structure.getPDBHeader();
-
-		if ( header == null) {
-			header = new PDBHeader();
-			structure.setPDBHeader(header);
-		}
-
-		List<DatabasePdbrevRecord> revRecords = header.getRevisionRecords();
-		if ( revRecords == null) {
-			revRecords = new ArrayList<DatabasePdbrevRecord>();
-			header.setRevisionRecords(revRecords);
-		}
-		revRecords.add(record);
-
-
-	}
-
-
-	@Override
-	public void newDatabasePDBrev(DatabasePDBrev dbrev) {
-
-		logger.debug("got a database revision:" + dbrev);
-
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd",Locale.US);
-		PDBHeader header = structure.getPDBHeader();
-
-		if ( header == null) {
-			header = new PDBHeader();
-		}
-
-		if (dbrev.getNum().equals("1")){
-
-			try {
-				Date dep = dateFormat.parse(dbrev.getDate_original());
-				header.setDepDate(dep);
-
-			} catch (ParseException e){
-				logger.warn("Could not parse date string '{}', deposition date will be unavailable", dbrev.getDate_original());
-			}
-
-			try {
-				Date rel = dateFormat.parse(dbrev.getDate());
-				header.setRelDate(rel);
-
-			} catch (ParseException e){
-				logger.warn("Could not parse date string '{}', modification date will be unavailable", dbrev.getDate());
-			}
-
-
-		} else {
-			try {
-
-				Date mod = dateFormat.parse(dbrev.getDate());
-				header.setModDate(mod);
-
-			} catch (ParseException e){
-				logger.warn("Could not parse date string '{}', modification date will be unavailable", dbrev.getDate());
-			}
-		}
-
-		structure.setPDBHeader(header);
-	}
-
-	@Override
-	public void newPdbxAuditRevisionHistory(PdbxAuditRevisionHistory history) {
-
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd",Locale.US);
-		PDBHeader header = structure.getPDBHeader();
-
-		if ( header == null) {
-			header = new PDBHeader();
-		}
-
-	// first entry in revision history is the release date
-		if (history.getOrdinal().equals("1")){
-			try {
-				Date releaseDate = dateFormat.parse(history.getRevision_date());
-				header.setRelDate(releaseDate);
-
-			} catch (ParseException e){
-				logger.warn("Could not parse date string '{}', release date will be unavailable", history.getRevision_date());
-			}
-		} else {
-			// all other dates are revision dates;
-			// since this method may be called multiple times,
-			// the last revision date will "stick"
-			try {
-				Date revisionDate = dateFormat.parse(history.getRevision_date());
-				header.setModDate(revisionDate);
-			} catch (ParseException e){
-				logger.warn("Could not parse date string '{}', revision date will be unavailable", history.getRevision_date());
-			}
-		}
-
-		structure.setPDBHeader(header);
-	}
-
-	@Override
-	public void newPdbxDatabaseStatus(PdbxDatabaseStatus status) {
-
-		// the deposition date field is only available in mmCIF 5.0
-
-		if (status.getRecvd_initial_deposition_date() == null) {
-			// skip this method for older mmCIF versions
-			return;
-		}
-
-		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd",Locale.US);
-		PDBHeader header = structure.getPDBHeader();
-
-		if (header == null) {
-			header = new PDBHeader();
-		}
-
-		try {
-			Date depositionDate = dateFormat.parse(status.getRecvd_initial_deposition_date());
-			header.setDepDate(depositionDate);
-		} catch (ParseException e){
-			logger.warn("Could not parse date string '{}', deposition date will be unavailable", status.getRecvd_initial_deposition_date());
-		}
-
-		structure.setPDBHeader(header);
-	}
-
-	@Override
-	public void newDatabasePDBremark(DatabasePDBremark remark) {
-		//System.out.println(remark);
-		String id = remark.getId();
-		if (id.equals("2")){
-
-			//this remark field contains the resolution information:
-			String line = remark.getText();
-
-			int i = line.indexOf("ANGSTROM");
-			if ( i > 5) {
-				// line contains ANGSTROM info...
-				String resolution = line.substring(i-5,i).trim();
-				// convert string to float
-				float res = 99 ;
-				try {
-					res = Float.parseFloat(resolution);
-
-				} catch (NumberFormatException e) {
-					logger.info("could not parse resolution from line and ignoring it " + line);
-					return ;
-
-
-				}
-				// support for old style header
-
-				PDBHeader pdbHeader = structure.getPDBHeader();
-				pdbHeader.setResolution(res);
-
-			}
-
-		}
-	}
-
-	@Override
-	public void newRefine(Refine r){
-
-		PDBHeader pdbHeader = structure.getPDBHeader();
-		// RESOLUTION
-		// in very rare cases (for instance hybrid methods x-ray + neutron diffraction, e.g. 3ins, 4n9m)
-		// there are 2 resolution values, one for each method
-		// we take the last one found so that behaviour is like in PDB file parsing
-		if (pdbHeader.getResolution()!=PDBHeader.DEFAULT_RESOLUTION) {
-			logger.warn("More than 1 resolution value present, will use last one {} and discard previous {} "
-					,r.getLs_d_res_high(), String.format("%4.2f",pdbHeader.getResolution()));
-		}
-		try {
-			pdbHeader.setResolution(Float.parseFloat(r.getLs_d_res_high()));
-		} catch (NumberFormatException e){
-			logger.info("Could not parse resolution from " + r.getLs_d_res_high() + " " + e.getMessage());
-		}
-
-
-		// RFREE
-		if (pdbHeader.getRfree()!=PDBHeader.DEFAULT_RFREE) {
-			logger.warn("More than 1 Rfree value present, will use last one {} and discard previous {} ",
-					r.getLs_R_factor_R_free(), String.format("%4.2f",pdbHeader.getRfree()));
-		}
-		if (r.getLs_R_factor_R_free()==null) {
-			// some entries like 2ifo haven't got this field at all
-			logger.info("_refine.ls_R_factor_R_free not present, not parsing Rfree value");
-		} else {
-			try {
-				pdbHeader.setRfree(Float.parseFloat(r.getLs_R_factor_R_free()));
-			} catch (NumberFormatException e){
-				// no rfree present ('?') is very usual, that's why we set it to debug
-				logger.debug("Could not parse Rfree from string '{}'", r.getLs_R_factor_R_free());
-			}
-		}
-
-		// RWORK
-		if(pdbHeader.getRwork()!=PDBHeader.DEFAULT_RFREE) {
-			logger.warn("More than 1 R work value present, will use last one {} and discard previous {} ",
-					r.getLs_R_factor_R_work(), String.format("%4.2f",pdbHeader.getRwork()));
-		}
-		if(r.getLs_R_factor_R_work()==null){
-			logger.info("_refine.ls_R_factor_R_work not present, not parsing R-work value");
-		}
-		else{
-			try{
-				pdbHeader.setRwork(Float.parseFloat(r.getLs_R_factor_R_work()));
-			}
-			catch (NumberFormatException e){
-				logger.debug("Could not parse R-work from string '{}'", r.getLs_R_factor_R_work());
-			}
-
-		}
-
-	}
-
-
-	@Override
-	public void newAuditAuthor(AuditAuthor aa){
-
-		String name =  aa.getName();
-
-		StringBuffer famName = new StringBuffer();
-		StringBuffer initials = new StringBuffer();
-		boolean afterComma = false;
-		for ( char c: name.toCharArray()) {
-			if ( c == ' ')
-				continue;
-			if ( c == ','){
-				afterComma = true;
-				continue;
-			}
-
-			if ( afterComma)
-				initials.append(c);
-			else
-				famName.append(c);
-		}
-
-		StringBuffer newaa = new StringBuffer();
-		newaa.append(initials);
-		newaa.append(famName);
-
-		PDBHeader header = structure.getPDBHeader();
-		String auth = header.getAuthors();
-		if (auth == null) {
-			header.setAuthors(newaa.toString());
-		}else {
-			auth += "," + newaa.toString();
-			header.setAuthors(auth);
-
-		}
-	}
-
-	@Override
-	public void newExptl(Exptl exptl) {
-
-		PDBHeader pdbHeader = structure.getPDBHeader();
-		String method = exptl.getMethod();
-		pdbHeader.setExperimentalTechnique(method);
-
-	}
-
-	@Override
-	public void newCell(Cell cell) {
-
-		try {
-			float a = Float.parseFloat(cell.getLength_a());
-			float b = Float.parseFloat(cell.getLength_b());
-			float c = Float.parseFloat(cell.getLength_c());
-			float alpha = Float.parseFloat(cell.getAngle_alpha());
-			float beta = Float.parseFloat(cell.getAngle_beta());
-			float gamma = Float.parseFloat(cell.getAngle_gamma());
-
-			CrystalCell xtalCell = new CrystalCell();
-			xtalCell.setA(a);
-			xtalCell.setB(b);
-			xtalCell.setC(c);
-			xtalCell.setAlpha(alpha);
-			xtalCell.setBeta(beta);
-			xtalCell.setGamma(gamma);
-
-			if (!xtalCell.isCellReasonable()) {
-				// If the entry describes a structure determined by a technique other than X-ray crystallography,
-			    // cell is (sometimes!) a = b = c = 1.0, alpha = beta = gamma = 90 degrees
-				// if so we don't add and CrystalCell will be null
-				logger.debug("The crystal cell read from file does not have reasonable dimensions (at least one dimension is below {}), discarding it.",
-						CrystalCell.MIN_VALID_CELL_SIZE);
-				return;
-			}
-
-			structure.getPDBHeader().getCrystallographicInfo().setCrystalCell(xtalCell);
-
-		} catch (NumberFormatException e){
-			structure.getPDBHeader().getCrystallographicInfo().setCrystalCell(null);
-			logger.info("could not parse some cell parameters ("+e.getMessage()+"), ignoring _cell ");
-		}
-	}
-
-	@Override
-	public void newSymmetry(Symmetry symmetry) {
-		String spaceGroup = symmetry.getSpace_group_name_H_M();
-		SpaceGroup sg = SymoplibParser.getSpaceGroup(spaceGroup);
-		if (sg==null) {
-			logger.warn("Space group '"+spaceGroup+"' not recognised as a standard space group");
-			structure.getPDBHeader().getCrystallographicInfo().setNonStandardSg(true);
-		} else {
-			structure.getPDBHeader().getCrystallographicInfo().setSpaceGroup(sg);
-			structure.getPDBHeader().getCrystallographicInfo().setNonStandardSg(false);
-		}
-	}
-
-	@Override
-	public void newStructNcsOper(StructNcsOper sNcsOper) {
-		structNcsOper.add(sNcsOper);
-	}
-
-	public void newAtomSites(AtomSites atomSites) {
-
-		try {
-			Matrix4d m = new Matrix4d(
-				Double.parseDouble(atomSites.getFract_transf_matrix11()), Double.parseDouble(atomSites.getFract_transf_matrix12()), Double.parseDouble(atomSites.getFract_transf_matrix13()), Double.parseDouble(atomSites.getFract_transf_vector1()),
-				Double.parseDouble(atomSites.getFract_transf_matrix21()), Double.parseDouble(atomSites.getFract_transf_matrix22()), Double.parseDouble(atomSites.getFract_transf_matrix23()), Double.parseDouble(atomSites.getFract_transf_vector2()),
-				Double.parseDouble(atomSites.getFract_transf_matrix31()), Double.parseDouble(atomSites.getFract_transf_matrix32()), Double.parseDouble(atomSites.getFract_transf_matrix33()), Double.parseDouble(atomSites.getFract_transf_vector3()),
-				0,0,0,1);
-
-			parsedScaleMatrix = m;
-
-		} catch (NumberFormatException e) {
-			logger.warn("Some values in _atom_sites.fract_transf_matrix or _atom_sites.fract_transf_vector could not be parsed as numbers. Can't check whether coordinate frame convention is correct! Error: {}", e.getMessage());
-			structure.getPDBHeader().getCrystallographicInfo().setNonStandardCoordFrameConvention(false);
-
-			// in this case parsedScaleMatrix stays null and can't be used in documentEnd()
-		}
-	}
-
-	@Override
-	public void newStructRef(StructRef sref) {
-		logger.debug(sref.toString());
-		strucRefs.add(sref);
-	}
-
-	private StructRef getStructRef(String ref_id){
-		for (StructRef structRef : strucRefs) {
-
-			if (structRef.getId().equals(ref_id)){
-				return structRef;
-			}
-
-		}
-		return null;
-
-	}
-
-	/**
-	 * create a DBRef record from the StrucRefSeq record:
-	 * <pre>
-	 * PDB record                    DBREF
-	 * Field Name                    mmCIF Data Item
-	 * Section                       n.a.
-	 * PDB_ID_Code                   _struct_ref_seq.pdbx_PDB_id_code
-	 * Strand_ID                     _struct_ref_seq.pdbx_strand_id
-	 * Begin_Residue_Number          _struct_ref_seq.pdbx_auth_seq_align_beg
-	 * Begin_Ins_Code                _struct_ref_seq.pdbx_seq_align_beg_ins_code
-	 * End_Residue_Number            _struct_ref_seq.pdbx_auth_seq_align_end
-	 * End_Ins_Code                  _struct_ref_seq.pdbx_seq_align_end_ins_code
-	 * Database                      _struct_ref.db_name
-	 * Database_Accession_No         _struct_ref_seq.pdbx_db_accession
-	 * Database_ID_Code              _struct_ref.db_code
-	 * Database_Begin_Residue_Number _struct_ref_seq.db_align_beg
-	 * Databaes_Begin_Ins_Code       _struct_ref_seq.pdbx_db_align_beg_ins_code
-	 * Database_End_Residue_Number   _struct_ref_seq.db_align_end
-	 * Databaes_End_Ins_Code         _struct_ref_seq.pdbx_db_align_end_ins_code
-	 * </pre>
-	 *
-	 *
-	 */
-	@Override
-	public void newStructRefSeq(StructRefSeq sref) {
-		DBRef r = new DBRef();
-
-		r.setIdCode(sref.getPdbx_PDB_id_code());
-		r.setDbAccession(sref.getPdbx_db_accession());
-		r.setDbIdCode(sref.getPdbx_db_accession());
-
-		r.setChainName(sref.getPdbx_strand_id());
-		StructRef structRef = getStructRef(sref.getRef_id());
-		if (structRef == null){
-			logger.info("could not find StructRef " + sref.getRef_id() + " for StructRefSeq " + sref);
-		} else {
-			r.setDatabase(structRef.getDb_name());
-			r.setDbIdCode(structRef.getDb_code());
-		}
-
-		int seqbegin;
-		int seqend;
-		try{
-			seqbegin = Integer.parseInt(sref.getPdbx_auth_seq_align_beg());
-			seqend   = Integer.parseInt(sref.getPdbx_auth_seq_align_end());
-		}
-		catch(NumberFormatException e){
-			// this happens in a few entries, annotation error? e.g. 6eoj
-			logger.warn("Couldn't parse pdbx_auth_seq_align_beg/end in _struct_ref_seq. Will not store dbref alignment info for accession {}. Error: {}", r.getDbAccession(), e.getMessage());
-			return;
-		}
-
-		Character begin_ins_code = ' ';
-		if (sref.getPdbx_seq_align_beg_ins_code() != null ) {
-		    begin_ins_code = new Character(sref.getPdbx_seq_align_beg_ins_code().charAt(0));
-		}
-
-		Character end_ins_code = ' ';
-		if (sref.getPdbx_seq_align_end_ins_code() != null) {
-		    end_ins_code = new Character(sref.getPdbx_seq_align_end_ins_code().charAt(0));
-		}
-
-		if (begin_ins_code == '?')
-			begin_ins_code = ' ';
-
-		if (end_ins_code == '?')
-			end_ins_code = ' ';
-
-		r.setSeqBegin(seqbegin);
-		r.setInsertBegin(begin_ins_code);
-
-		r.setSeqEnd(seqend);
-		r.setInsertEnd(end_ins_code);
-
-		int dbseqbegin = Integer.parseInt(sref.getDb_align_beg());
-		int dbseqend   = Integer.parseInt(sref.getDb_align_end());
-
-		Character db_begin_in_code = ' ';
-		if (sref.getPdbx_db_align_beg_ins_code() != null) {
-		    db_begin_in_code = new Character(sref.getPdbx_db_align_beg_ins_code().charAt(0));
-		}
-
-		Character db_end_in_code = ' ';
-		if (sref.getPdbx_db_align_end_ins_code() != null) {
-		    db_end_in_code = new Character(sref.getPdbx_db_align_end_ins_code().charAt(0));
-		}
-
-		if (db_begin_in_code == '?')
-			db_begin_in_code = ' ';
-
-		if (db_end_in_code == '?')
-			db_end_in_code = ' ';
-
-
-		r.setDbSeqBegin(dbseqbegin);
-		r.setIdbnsBegin(db_begin_in_code);
-
-		r.setDbSeqEnd(dbseqend);
-		r.setIdbnsEnd(db_end_in_code);
-
-		List<DBRef> dbrefs = structure.getDBRefs();
-		if ( dbrefs == null)
-			dbrefs = new ArrayList<DBRef>();
-		dbrefs.add(r);
-
-		logger.debug(r.toPDB());
-
-		structure.setDBRefs(dbrefs);
-
-	}
-
-	@Override
-	public void newStructRefSeqDif(StructRefSeqDif sref) {
-		sequenceDifs.add(sref);
-	}
-
-	private Chain getEntityChain(String entity_id){
-
-		for (Chain chain : entityChains) {
-			if ( chain.getId().equals(entity_id)){
-
-				return chain;
-			}
-		}
-		// does not exist yet, so create...
-
-		Chain	chain = new ChainImpl();
-		chain.setId(entity_id);
-		entityChains.add(chain);
-
-		return chain;
-
-	}
-
-	//private Chain getSeqResChain(String chainID){
-	//	return getChainFromList(seqResChains, chainID);
-	//}
-
-
-	/**
-	 * Data items in the ENTITY_SRC_GEN category record details of
-	 * the source from which the entity was obtained in cases
-	 * where the source was genetically manipulated.  The
-	 * following are treated separately:  items pertaining to the tissue
-	 * from which the gene was obtained, items pertaining to the host
-	 * organism for gene expression and items pertaining to the actual
-	 * producing organism (plasmid).
-	 */
-	@Override
-	public void newEntitySrcGen(EntitySrcGen entitySrcGen){
-
-		// add to internal list. Map to Compound object later on...
-		entitySrcGens.add(entitySrcGen);
-	}
-
-	@Override
-	public void newEntitySrcNat(EntitySrcNat entitySrcNat){
-
-		// add to internal list. Map to Compound object later on...
-		entitySrcNats.add(entitySrcNat);
-	}
-
-	@Override
-	public void newEntitySrcSyn(EntitySrcSyn entitySrcSyn){
-
-		// add to internal list. Map to Compound object later on...
-		entitySrcSyns.add(entitySrcSyn);
-	}
-
-	/**
-	 * The EntityPolySeq object provide the amino acid sequence objects for the Entities.
-	 * Later on the entities are mapped to the BioJava {@link Chain} and {@link EntityInfo} objects.
-	 * @param epolseq the EntityPolySeq record for one amino acid
-	 */
-	@Override
-	public void newEntityPolySeq(EntityPolySeq epolseq) {
-
-		logger.debug("NEW entity poly seq " + epolseq);
-
-		int eId = -1;
-		try {
-			eId = Integer.parseInt(epolseq.getEntity_id());
-		} catch (NumberFormatException e) {
-			logger.warn("Could not parse entity id from EntityPolySeq: "+e.getMessage());
-		}
-		Entity e = getEntity(eId);
-
-		if (e == null){
-			logger.info("Could not find entity "+ epolseq.getEntity_id()+". Can not match sequence to it.");
-			return;
-		}
-
-		Chain entityChain = getEntityChain(epolseq.getEntity_id());
-
-		// first we check through the chemcomp provider, if it fails we do some heuristics to guess the type of group
-		// TODO some of this code is analogous to getNewGroup() and we should try to unify them - JD 2016-03-08
-
-		Group g = ChemCompGroupFactory.getGroupFromChemCompDictionary(epolseq.getMon_id());
-		//int seqId = Integer.parseInt(epolseq.getNum());
-		if ( g != null && !g.getChemComp().isEmpty()) {
-			if ( g instanceof AminoAcidImpl) {
-				AminoAcidImpl aa = (AminoAcidImpl) g;
-				aa.setRecordType(AminoAcid.SEQRESRECORD);
-				//aa.setId(seqId);
-			}
-		} else {
-
-			if (epolseq.getMon_id().length()==3 && StructureTools.get1LetterCodeAmino(epolseq.getMon_id())!=null){
-				AminoAcidImpl a = new AminoAcidImpl();
-				a.setRecordType(AminoAcid.SEQRESRECORD);
-				Character code1 = StructureTools.get1LetterCodeAmino(epolseq.getMon_id());
-				a.setAminoType(code1);
-				g = a;
-
-			} else if ( StructureTools.isNucleotide(epolseq.getMon_id())) {
-				// the group is actually a nucleotide group...
-				NucleotideImpl n = new NucleotideImpl();
-				g = n;
-
-			} else {
-				logger.debug("Residue {} {} is not a standard aminoacid or nucleotide, will create a het group for it", epolseq.getNum(),epolseq.getMon_id());
-				HetatomImpl h = new HetatomImpl();
-				g = h;
-
-			}
-
-
-		}
-		// at this stage we don't know about author residue numbers (insertion codes)
-		// we abuse now the ResidueNumber field setting the internal residue numbers (label_seq_id, strictly sequential and follow the seqres sequence 1 to n)
-		// later the actual ResidueNumbers (author residue numbers) have to be corrected in alignSeqRes()
-		g.setResidueNumber(ResidueNumber.fromString(epolseq.getNum()));
-
-		g.setPDBName(epolseq.getMon_id());
-
-		entityChain.addGroup(g);
-
-	}
-
-	@Override
-	public void newPdbxPolySeqScheme(PdbxPolySeqScheme ppss) {
-
-		//if ( headerOnly)
-		//	return;
-
-		// replace the group asym ids with the real PDB ids!
-		// replaceGroupSeqPos(ppss);  // This might be incorrect in some pdb, to use auth_seq_id of the pdbx_poly_seq_scheme.
-
-
-	}
-
-
-	@Override
-	public void newPdbxNonPolyScheme(PdbxNonPolyScheme ppss) {
-
-		//if (headerOnly)
-		//	return;
-
-		// merge the EntityPolySeq info and the AtomSite chains into one...
-		//already known ignore:
-
-	}
-
-	@Override
-	public void newPdbxEntityNonPoly(PdbxEntityNonPoly pen){
-		// TODO: do something with them...
-		// not implemented yet...
-		logger.debug(pen.getEntity_id() + " " + pen.getName() + " " + pen.getComp_id());
-
-	}
-
-	@Override
-	public void newChemComp(ChemComp c) {
-		// TODO: do something with them...
-
-	}
-
-	@Override
-	public void newGenericData(String category, List<String> loopFields,
-			List<String> lineData) {
-
-		//logger.debug("unhandled category so far: " + category);
-	}
-
-	@Override
-	public FileParsingParameters getFileParsingParameters()
-	{
-		return params;
-	}
-
-	@Override
-	public void setFileParsingParameters(FileParsingParameters params)
-	{
-		this.params = params;
-
-	}
-
-	@Override
-	public void newChemCompDescriptor(ChemCompDescriptor ccd) {
-
-		// TODO nothing happening here yet.
-
-	}
-
-
-
-	public List<PdbxStructOperList> getStructOpers() {
-		return structOpers;
-	}
-
-	@Override
-	public void newPdbxStrucAssembly(PdbxStructAssembly strucAssembly) {
-		strucAssemblies.add(strucAssembly);
-
-	}
-
-	public List<PdbxStructAssembly> getStructAssemblies(){
-		return strucAssemblies;
-	}
-
-	@Override
-	public void newPdbxStrucAssemblyGen(PdbxStructAssemblyGen strucAssembly) {
-		strucAssemblyGens.add(strucAssembly);
-
-	}
-
-	public List<PdbxStructAssemblyGen> getStructAssemblyGens(){
-		return strucAssemblyGens;
-	}
-
-	@Override
-	public void newChemCompAtom(ChemCompAtom atom) {
-
-	}
-
-	@Override
-	public void newPdbxChemCompIndentifier(PdbxChemCompIdentifier id) {
-
-	}
-
-	@Override
-	public void newChemCompBond(ChemCompBond bond) {
-
-	}
-
-	@Override
-	public void newPdbxChemCompDescriptor(PdbxChemCompDescriptor desc) {
-
-	}
-
-	@Override
-	public void newStructConn(StructConn structConn) {
-		this.structConn.add(structConn);
-	}
-
-	@Override
-	public void newStructSiteGen(StructSiteGen siteGen) { this.structSiteGens.add(siteGen);	}
-
-	@Override
-	public void newStructSite(StructSite structSite) {
-
-		if (params.isHeaderOnly()) {
-			return;
-		}
-
-		// Simply implement the method.
-		List<Site> sites = structure.getSites();
-		if (sites == null) sites = new ArrayList<Site>();
-
-		Site site = null;
-		for (Site asite : sites) {
-			if (asite.getSiteID().equals(structSite.getId())) {
-				site = asite; 		// Prevent duplicate siteIds
-			}
-		}
-		boolean addSite = false;
-		if (site == null) { site = new Site(); addSite = true; }
-		site.setSiteID(structSite.getId());
-		site.setDescription(structSite.getDetails());
-		// site.setPdbxEvidenceCode(structSite.getPdbxEvidenceCode()); // TODO - add addition fields in Sites
-		if (addSite) sites.add(site);
-
-		structure.setSites(sites);
-	}
-
-	/**
-	 * Build sites in a BioJava Structure using the original author chain id & residue numbers.
-	 * Sites are built from struct_site_gen records that have been parsed.
-	 */
-	private void addSites() {
-		List<Site> sites = structure.getSites();
-		if (sites == null) sites = new ArrayList<Site>();
-
-		for (StructSiteGen siteGen : structSiteGens) {
-				// For each StructSiteGen, find the residues involved, if they exist then
-				String site_id = siteGen.getSite_id(); // multiple could be in same site.
-				if (site_id == null) site_id = "";
-				String comp_id = siteGen.getLabel_comp_id();  // PDBName
-
-				// Assumption: the author chain ID and residue number for the site is consistent with the original
-				// author chain id and residue numbers.
-
-			String asymId = siteGen.getLabel_asym_id(); // chain name
-			String authId = siteGen.getAuth_asym_id(); // chain Id
-				String auth_seq_id = siteGen.getAuth_seq_id(); // Res num
-
-				String insCode = siteGen.getPdbx_auth_ins_code();
-				if ( insCode != null && insCode.equals("?"))
-					insCode = null;
-
-				// Look for asymID = chainID and seqID = seq_ID.  Check that comp_id matches the resname.
-				Group g = null;
-				try {
-				Chain chain = structure.getChain(asymId);
-
-					if (null != chain) {
-						try {
-							Character insChar = null;
-							if (null != insCode && insCode.length() > 0) insChar = insCode.charAt(0);
-						g = chain.getGroupByPDB(new ResidueNumber(null, Integer.parseInt(auth_seq_id), insChar));
-						} catch (NumberFormatException e) {
-						logger.warn("Could not lookup residue : " + authId + auth_seq_id);
-						}
-					}
-				} catch (StructureException e) {
-					logger.warn("Problem finding residue in site entry " + siteGen.getSite_id() + " - " + e.getMessage(), e.getMessage());
-				}
-
-				if (g != null) {
-					// 2. find the site_id, if not existing, create anew.
-					Site site = null;
-					for (Site asite: sites) {
-						if (site_id.equals(asite.getSiteID())) site = asite;
-					}
-
-					boolean addSite = false;
-
-					// 3. add this residue to the site.
-					if (site == null) {
-						addSite = true;
-						site = new Site();
-						site.setSiteID(site_id);
-					}
-
-					List<Group> groups = site.getGroups();
-					if (groups == null) groups = new ArrayList<Group>();
-
-					// Check the self-consistency of the residue reference from auth_seq_id and chain_id
-					if (!comp_id.equals(g.getPDBName())) {
-					logger.warn("comp_id doesn't match the residue at " + authId + " " + auth_seq_id + " - skipping");
-					} else {
-						groups.add(g);
-						site.setGroups(groups);
-					}
-					if (addSite) sites.add(site);
-				}
-		}
-		structure.setSites(sites);
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifParser.java
deleted file mode 100644
index 7e9b23d3c2..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifParser.java
+++ /dev/null
@@ -1,1281 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Mar 4, 2008
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-
-import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.io.MMCIFFileReader;
-import org.biojava.nbio.structure.io.StructureIOFile;
-import org.biojava.nbio.structure.io.mmcif.model.AtomSite;
-import org.biojava.nbio.structure.io.mmcif.model.AtomSites;
-import org.biojava.nbio.structure.io.mmcif.model.AuditAuthor;
-import org.biojava.nbio.structure.io.mmcif.model.CIFLabel;
-import org.biojava.nbio.structure.io.mmcif.model.Cell;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
-import org.biojava.nbio.structure.io.mmcif.model.ChemCompAtom;
-import org.biojava.nbio.structure.io.mmcif.model.ChemCompBond;
-import org.biojava.nbio.structure.io.mmcif.model.ChemCompDescriptor;
-import org.biojava.nbio.structure.io.mmcif.model.DatabasePDBremark;
-import org.biojava.nbio.structure.io.mmcif.model.DatabasePDBrev;
-import org.biojava.nbio.structure.io.mmcif.model.DatabasePdbrevRecord;
-import org.biojava.nbio.structure.io.mmcif.model.Entity;
-import org.biojava.nbio.structure.io.mmcif.model.EntityPoly;
-import org.biojava.nbio.structure.io.mmcif.model.EntityPolySeq;
-import org.biojava.nbio.structure.io.mmcif.model.EntitySrcGen;
-import org.biojava.nbio.structure.io.mmcif.model.EntitySrcNat;
-import org.biojava.nbio.structure.io.mmcif.model.EntitySrcSyn;
-import org.biojava.nbio.structure.io.mmcif.model.Exptl;
-import org.biojava.nbio.structure.io.mmcif.model.IgnoreField;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxAuditRevisionHistory;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxChemCompDescriptor;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxChemCompIdentifier;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxDatabaseStatus;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxEntityNonPoly;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxNonPolyScheme;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxPolySeqScheme;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssembly;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssemblyGen;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxStructOperList;
-import org.biojava.nbio.structure.io.mmcif.model.Refine;
-import org.biojava.nbio.structure.io.mmcif.model.Struct;
-import org.biojava.nbio.structure.io.mmcif.model.StructAsym;
-import org.biojava.nbio.structure.io.mmcif.model.StructConn;
-import org.biojava.nbio.structure.io.mmcif.model.StructKeywords;
-import org.biojava.nbio.structure.io.mmcif.model.StructNcsOper;
-import org.biojava.nbio.structure.io.mmcif.model.StructRef;
-import org.biojava.nbio.structure.io.mmcif.model.StructRefSeq;
-import org.biojava.nbio.structure.io.mmcif.model.StructRefSeqDif;
-import org.biojava.nbio.structure.io.mmcif.model.StructSite;
-import org.biojava.nbio.structure.io.mmcif.model.StructSiteGen;
-import org.biojava.nbio.structure.io.mmcif.model.Symmetry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * A simple mmCif file parser
- *
- *
- * Usage:
- * <pre>
-String file = "path/to/mmcif/file";
-StructureIOFile pdbreader = new MMCIFFileReader();
-
-Structure s = pdbreader.getStructure(file);
-System.out.println(s);
-
-// you can convert it to a PDB file...
-System.out.println(s.toPDB());
-
- * </pre>
- * For more documentation see <a href="http://biojava.org/wiki/BioJava:CookBook#Protein_Structure">http://biojava.org/wiki/BioJava:CookBook#Protein_Structure</a>.
- *
- * @author Andreas Prlic
- * @author Jose Duarte
- * @since 1.7
- */
-public class SimpleMMcifParser implements MMcifParser {
-
-
-
-	/**
-	 * The header appearing at the beginning of a mmCIF file.
-	 * A "block code" can be added to it of no more than 32 chars.
-	 * See http://www.iucr.org/__data/assets/pdf_file/0019/22618/cifguide.pdf
-	 */
-	public static final String MMCIF_TOP_HEADER = "data_";
-
-	public static final String COMMENT_CHAR = "#";
-	public static final String LOOP_START = "loop_";
-	public static final String FIELD_LINE = "_";
-
-	// the following are the 3 valid quoting characters in CIF
-	/**
-	 * Quoting character '
-	 */
-	private static final char S1 = '\'';
-
-	/**
-	 * Quoting character "
-	 */
-	private static final char S2 = '\"';
-
-	/**
-	 * Quoting character ; (multi-line quoting)
-	 */
-	public static final String STRING_LIMIT = ";";
-
-
-	private List<MMcifConsumer> consumers ;
-
-	private Struct struct ;
-
-	private static final Logger logger = LoggerFactory.getLogger(SimpleMMcifParser.class);
-
-	public SimpleMMcifParser(){
-		consumers = new ArrayList<MMcifConsumer>();
-		struct = null;
-	}
-
-	@Override
-	public void addMMcifConsumer(MMcifConsumer consumer) {
-		consumers.add(consumer);
-
-	}
-
-	@Override
-	public void clearConsumers() {
-		consumers.clear();
-
-	}
-
-	@Override
-	public void removeMMcifConsumer(MMcifConsumer consumer) {
-		consumers.remove(consumer);
-	}
-
-	public static void main(String[] args){
-		String file = "/Users/andreas/WORK/PDB/mmCif/a9/1a9n.cif.gz";
-		//String file = "/Users/andreas/WORK/PDB/MMCIF/1gav.mmcif";
-		//String file = "/Users/andreas/WORK/PDB/MMCIF/100d.cif";
-		//String file = "/Users/andreas/WORK/PDB/MMCIF/1a4a.mmcif";
-		System.out.println("parsing " + file);
-
-		StructureIOFile pdbreader = new MMCIFFileReader();
-		try {
-			Structure s = pdbreader.getStructure(file);
-			System.out.println(s);
-			// convert it to a PDB file...
-			System.out.println(s.toPDB());
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	@Override
-	public void parse(InputStream inStream) throws IOException {
-		parse(new BufferedReader(new InputStreamReader(inStream)));
-
-	}
-
-	@Override
-	public void parse(BufferedReader buf)
-			throws IOException {
-
-		triggerDocumentStart();
-
-
-		// init container objects...
-		struct = new Struct();
-		String line = null;
-
-		boolean inLoop = false;
-		boolean inLoopData = false;
-
-
-		List<String> loopFields = new ArrayList<String>();
-		List<String> lineData   = new ArrayList<String>();
-		Set<String> loopWarnings = new HashSet<String>(); // used only to reduce logging statements
-
-		String category = null;
-
-		boolean foundHeader = false;
-
-		while ( (line = buf.readLine ()) != null ){
-
-			if (line.isEmpty() || line.startsWith(COMMENT_CHAR)) continue;
-
-			if (!foundHeader) {
-				// the first non-comment line is a data_PDBCODE line, test if this looks like a mmcif file
-				if (line.startsWith(MMCIF_TOP_HEADER)){
-					foundHeader = true;
-					continue;
-				} else {
-					triggerDocumentEnd();
-					throw new IOException("This does not look like a valid mmCIF file! The first line should start with 'data_', but is: '" + line+"'");
-				}
-			}
-
-			logger.debug(inLoop + " " + line);
-
-			if (line.startsWith(MMCIF_TOP_HEADER)){
-				// either first line in file, or beginning of new section (data block in CIF parlance)
-				if ( inLoop) {
-					//System.out.println("new data and in loop: " + line);
-					inLoop = false;
-					inLoopData = false;
-					lineData.clear();
-					loopFields.clear();
-				}
-
-			}
-
-
-			if ( inLoop) {
-
-
-				if ( line.startsWith(LOOP_START)){
-					loopFields.clear();
-					inLoop = true;
-					inLoopData = false;
-					continue;
-				}
-
-				if ( line.matches("\\s*"+FIELD_LINE+"\\w+.*")) {
-
-					if (inLoopData && line.startsWith(FIELD_LINE)) {
-						logger.debug("Found a field line after reading loop data. Toggling to inLoop=false");
-						inLoop = false;
-						inLoopData = false;
-						loopFields.clear();
-
-
-						// a boring normal line
-						List<String> data = processLine(line, buf, 2);
-
-						if ( data.size() < 1){
-							// this can happen if empty lines at end of file
-							lineData.clear();
-							continue;
-						}
-						String key = data.get(0);
-						int pos = key.indexOf(".");
-						if ( pos < 0 ) {
-							// looks like a chem_comp file
-							// line should start with data, otherwise something is wrong!
-							if (! line.startsWith(MMCIF_TOP_HEADER)){
-								logger.warn("This does not look like a valid mmCIF file! The first line should start with 'data_', but is '" + line+"'");
-								triggerDocumentEnd();
-								return;
-							}
-							// ignore the first line...
-							category=null;
-							lineData.clear();
-							continue;
-						}
-						category = key.substring(0,pos);
-						String value = data.get(1);
-						loopFields.add(key.substring(pos+1,key.length()));
-						lineData.add(value);
-
-						logger.debug("Found data for category {}: {}", key, value);
-						continue;
-					}
-
-					// found another field.
-					String txt = line.trim();
-					if ( txt.indexOf('.') > -1){
-
-						String[] spl = txt.split("\\.");
-						category = spl[0];
-						String attribute = spl[1];
-						loopFields.add(attribute);
-						logger.debug("Found category: {}, attribute: {}",category, attribute);
-						if ( spl.length > 2){
-							logger.warn("Found nested attribute in {}, not supported yet!",txt);
-						}
-
-					} else {
-						category = txt;
-						logger.debug("Found category without attribute: {}",category);
-					}
-
-
-				} else {
-
-					// in loop and we found a data line
-					lineData = processLine(line, buf, loopFields.size());
-					logger.debug("Found a loop data line with {} data fields", lineData.size());
-					logger.debug("Data fields: {}", lineData.toString());
-					if ( lineData.size() != loopFields.size()){
-						logger.warn("Expected {} data fields, but found {} in line: {}",loopFields.size(),lineData.size(),line);
-
-					}
-
-					endLineChecks(category, loopFields, lineData, loopWarnings);
-
-					lineData.clear();
-
-					inLoopData = true;
-				}
-
-			} else {
-				// not in loop
-
-				if ( line.startsWith(LOOP_START)){
-					if ( category != null)
-						endLineChecks(category, loopFields, lineData, loopWarnings);
-
-					resetBuffers(loopFields, lineData, loopWarnings);
-					category = null;
-					inLoop = true;
-					inLoopData = false;
-					logger.debug("Detected LOOP_START: '{}'. Toggling to inLoop=true", LOOP_START);
-					continue;
-				} else {
-					logger.debug("Normal line ");
-					inLoop = false;
-
-					// a boring normal line
-					List<String> data = processLine(line, buf, 2);
-
-					if ( data.size() < 1){
-						// this can happen if empty lines at end of file
-						lineData.clear();
-						continue;
-					}
-					String key = data.get(0);
-					int pos = key.indexOf(".");
-					if ( pos < 0 ) {
-						// looks like a chem_comp file
-						// line should start with data, otherwise something is wrong!
-						if (! line.startsWith(MMCIF_TOP_HEADER)){
-							logger.warn("This does not look like a valid mmCIF file! The first line should start with 'data_', but is '" + line+"'");
-							triggerDocumentEnd();
-							return;
-						}
-						// ignore the first line...
-						category=null;
-						lineData.clear();
-						continue;
-					}
-
-					if (category!=null && !key.substring(0,pos).equals(category)) {
-						// we've changed category: need to flush the previous one
-						endLineChecks(category, loopFields, lineData, loopWarnings);
-						resetBuffers(loopFields, lineData, loopWarnings);
-					}
-
-					category = key.substring(0,pos);
-
-					String value = data.get(1);
-					loopFields.add(key.substring(pos+1,key.length()));
-					lineData.add(value);
-
-					logger.debug("Found data for category {}: {}", key, value);
-
-				}
-			}
-		}
-
-		if (category!=null && lineData.size()>0 && lineData.size()==loopFields.size()) {
-			// the last category in the file will still be missing, we add it now
-			endLineChecks(category, loopFields, lineData, loopWarnings);
-			resetBuffers(loopFields, lineData, loopWarnings);
-		}
-
-		if (struct != null){
-			triggerStructData(struct);
-		}
-
-		triggerDocumentEnd();
-
-	}
-
-	private void resetBuffers(List<String> loopFields, List<String> lineData, Set<String> loopWarnings) {
-		loopFields.clear();
-		lineData.clear();
-		loopWarnings.clear();
-	}
-
-	private List<String> processSingleLine(String line){
-
-		List<String> data = new ArrayList<String>();
-
-		if ( line.trim().length() == 0){
-			return data;
-		}
-
-		if ( line.trim().length() == 1){
-			if ( line.startsWith(STRING_LIMIT))
-				return data;
-		}
-		boolean inString = false; // semicolon (;) quoting
-		boolean inS1     = false; // single quote (') quoting
-		boolean inS2     = false; // double quote (") quoting
-		String word 	 = "";
-
-		for (int i=0; i< line.length(); i++ ){
-
-			Character c = line.charAt(i);
-
-			Character nextC = null;
-			if (i < line.length() - 1)
-				nextC = line.charAt(i+1);
-
-			Character prevC = null;
-			if (i>0)
-				prevC = line.charAt(i-1);
-
-			if  (c == ' ') {
-
-				if ( ! inString){
-					if ( ! word.equals(""))
-						data.add(word.trim());
-					word = "";
-				} else {
-					// we are in a string, add the space
-					word += c;
-				}
-
-			} else if (c == S1 )  {
-
-				if ( inString){
-
-					boolean wordEnd = false;
-					if (! inS2) {
-						if (nextC==null || Character.isWhitespace(nextC)){
-							i++;
-							wordEnd = true;
-						}
-					}
-
-
-					if ( wordEnd ) {
-
-						// at end of string
-						if ( ! word.equals(""))
-							data.add(word.trim());
-						word     = "";
-						inString = false;
-						inS1     = false;
-					} else {
-						word += c;
-					}
-
-				} else if (prevC==null || prevC==' ') {
-					// the beginning of a new string
-					inString = true;
-					inS1     = true;
-				} else {
-					word += c;
-				}
-			} else if ( c == S2 ){
-				if ( inString){
-
-					boolean wordEnd = false;
-					if (! inS1) {
-						if (nextC==null || Character.isWhitespace(nextC)){
-							i++;
-							wordEnd = true;
-						}
-					}
-
-					if ( wordEnd ) {
-
-						// at end of string
-						if ( ! word.equals(""))
-							data.add(word.trim());
-						word     = "";
-						inString = false;
-						inS2     = false;
-					} else {
-						word += c;
-					}
-				}  else if (prevC==null || prevC==' ') {
-					// the beginning of a new string
-					inString = true;
-					inS2     = true;
-				} else {
-					word += c;
-				}
-			} else {
-				word += c;
-			}
-
-		}
-		if ( ! word.trim().equals(""))
-			data.add(word);
-
-
-		return data;
-
-	}
-
-	/**
-	 * Get the content of a cif entry
-	 *
-	 * @param line
-	 * @param buf
-	 * @return
-	 */
-	private List<String> processLine(String line,
-			BufferedReader buf,
-			int fieldLength)
-					throws IOException{
-
-		//System.out.println("XX processLine " + fieldLength + " " + line);
-		// go through the line and process each character
-		List<String> lineData = new ArrayList<String>();
-
-		boolean inString = false;
-
-		StringBuilder bigWord = null;
-
-		while ( true ){
-
-			if ( line.startsWith(STRING_LIMIT)){
-				if (! inString){
-
-					inString = true;
-					if ( line.length() > 1)
-						bigWord = new StringBuilder(line.substring(1));
-					else
-						bigWord = new StringBuilder("");
-
-
-				} else {
-					// the end of a word
-					lineData.add(bigWord.toString());
-					bigWord = null;
-					inString = false;
-
-				}
-			} else {
-				if ( inString )
-					bigWord.append(line);
-				else {
-
-					List<String> dat = processSingleLine(line);
-
-					for (String d : dat){
-						lineData.add(d);
-					}
-				}
-			}
-
-			//System.out.println("in process line : " + lineData.size() + " " + fieldLength);
-
-			if ( lineData.size() > fieldLength){
-
-				logger.warn("wrong data length ("+lineData.size()+
-						") should be ("+fieldLength+") at line " + line + " got lineData: " + lineData);
-				return lineData;
-			}
-
-			if ( lineData.size() == fieldLength)
-				return lineData;
-
-
-			line = buf.readLine();
-			if ( line == null)
-				break;
-		}
-		return lineData;
-
-	}
-
-
-
-	private void endLineChecks(String category,List<String> loopFields, List<String> lineData, Set<String> loopWarnings ) throws IOException{
-
-		logger.debug("Processing category {}, with fields: {}",category,loopFields.toString());
-		//		System.out.println("parsed the following data: " +category + " fields: "+
-		//				loopFields + " DATA: " +
-		//				lineData);
-
-		if ( loopFields.size() != lineData.size()){
-			logger.warn("looks like we got a problem with nested string quote characters:");
-			throw new IOException("data length ("+ lineData.size() +
-					") != fields length ("+loopFields.size()+
-					") category: " +category + " fields: "+
-					loopFields + " DATA: " +
-					lineData );
-		}
-
-		if ( category.equals("_entity")){
-
-			Entity e =  (Entity) buildObject(
-					Entity.class.getName(),
-					loopFields,lineData, loopWarnings);
-			triggerNewEntity(e);
-
-		} else if (category.equals("_entity_poly")) {
-			EntityPoly ep = (EntityPoly) buildObject(EntityPoly.class.getName(), loopFields, lineData, loopWarnings);
-			triggerNewEntityPoly(ep);
-
-		} else if ( category.equals("_struct")){
-
-			struct =  (Struct) buildObject(
-					Struct.class.getName(),
-					loopFields, lineData, loopWarnings);
-
-		} else if ( category.equals("_atom_site")){
-
-			AtomSite a = (AtomSite) buildObject(
-					AtomSite.class.getName(),
-					loopFields, lineData, loopWarnings);
-			triggerNewAtomSite(a);
-
-		} else if ( category.equals("_database_PDB_rev")){
-			DatabasePDBrev dbrev = (DatabasePDBrev) buildObject(
-					DatabasePDBrev.class.getName(),
-					loopFields, lineData, loopWarnings);
-
-			triggerNewDatabasePDBrev(dbrev);
-
-		} else if ( category.equals("_database_PDB_rev_record")){
-			DatabasePdbrevRecord dbrev = (DatabasePdbrevRecord) buildObject(
-					DatabasePdbrevRecord.class.getName(),
-					loopFields, lineData, loopWarnings);
-
-			triggerNewDatabasePDBrevRecord(dbrev);
-
-	// MMCIF version 5 dates
-		} else if ( category.equals("_pdbx_audit_revision_history")) {
-			PdbxAuditRevisionHistory history = (PdbxAuditRevisionHistory) buildObject(
-					PdbxAuditRevisionHistory.class.getName(),
-					loopFields, lineData, loopWarnings);
-
-			triggerNewPdbxAuditRevisionHistory(history);
-
-	// MMCIF version 5 dates
-		} else if ( category.equals("_pdbx_database_status")) {
-			PdbxDatabaseStatus status = (PdbxDatabaseStatus) buildObject(
-					PdbxDatabaseStatus.class.getName(),
-					loopFields, lineData, loopWarnings);
-
-			triggerNewPdbxDatabaseStatus(status);
-
-		}else if (  category.equals("_database_PDB_remark")){
-			DatabasePDBremark remark = (DatabasePDBremark) buildObject(
-					DatabasePDBremark.class.getName(),
-					loopFields, lineData, loopWarnings);
-
-			triggerNewDatabasePDBremark(remark);
-
-		} else if ( category.equals("_exptl")){
-			Exptl exptl  = (Exptl) buildObject(
-					Exptl.class.getName(),
-					loopFields,lineData, loopWarnings);
-
-			triggerExptl(exptl);
-
-		} else if ( category.equals("_cell")){
-			Cell cell  = (Cell) buildObject(
-					Cell.class.getName(),
-					loopFields,lineData, loopWarnings);
-
-			triggerNewCell(cell);
-
-		} else if ( category.equals("_symmetry")){
-			Symmetry symmetry  = (Symmetry) buildObject(
-					Symmetry.class.getName(),
-					loopFields,lineData, loopWarnings);
-
-			triggerNewSymmetry(symmetry);
-		} else if ( category.equals("_struct_ncs_oper")) {
-
-			StructNcsOper sNcsOper = (StructNcsOper) buildObject(
-					StructNcsOper.class.getName(),
-					loopFields, lineData, loopWarnings);
-			triggerNewStructNcsOper(sNcsOper);
-		} else if ( category.equals("_atom_sites")) {
-
-			AtomSites atomSites = (AtomSites) buildObject(
-					AtomSites.class.getName(),
-					loopFields, lineData, loopWarnings);
-			triggerNewAtomSites(atomSites);
-
-		} else if ( category.equals("_struct_ref")){
-			StructRef sref  = (StructRef) buildObject(
-					StructRef.class.getName(),
-					loopFields,lineData, loopWarnings);
-
-			triggerNewStrucRef(sref);
-
-		} else if ( category.equals("_struct_ref_seq")){
-			StructRefSeq sref  = (StructRefSeq) buildObject(
-					StructRefSeq.class.getName(),
-					loopFields,lineData, loopWarnings);
-
-			triggerNewStrucRefSeq(sref);
-		} else if ( category.equals("_struct_ref_seq_dif")) {
-			StructRefSeqDif sref = (StructRefSeqDif) buildObject(
-					StructRefSeqDif.class.getName(),
-					loopFields, lineData, loopWarnings);
-
-			triggerNewStrucRefSeqDif(sref);
-		} else if ( category.equals("_struct_site_gen")) {
-			StructSiteGen sref = (StructSiteGen) buildObject(
-					StructSiteGen.class.getName(),
-					loopFields, lineData, loopWarnings);
-
-			triggerNewStructSiteGen(sref);
-		} else if ( category.equals("_struct_site")) {
-			StructSite sref = (StructSite) buildObject(
-					StructSite.class.getName(),
-					loopFields, lineData, loopWarnings);
-			triggerNewStructSite(sref);
-		} else if ( category.equals("_entity_poly_seq")){
-			EntityPolySeq exptl  = (EntityPolySeq) buildObject(
-					EntityPolySeq.class.getName(),
-					loopFields,lineData, loopWarnings);
-
-			triggerNewEntityPolySeq(exptl);
-		} else if ( category.equals("_entity_src_gen")){
-			EntitySrcGen entitySrcGen = (EntitySrcGen) buildObject(
-					EntitySrcGen.class.getName(),
-					loopFields,lineData, loopWarnings);
-			triggerNewEntitySrcGen(entitySrcGen);
-		} else if ( category.equals("_entity_src_nat")){
-			EntitySrcNat entitySrcNat = (EntitySrcNat) buildObject(
-					EntitySrcNat.class.getName(),
-					loopFields,lineData, loopWarnings);
-			triggerNewEntitySrcNat(entitySrcNat);
-		} else if ( category.equals("_pdbx_entity_src_syn")){
-			EntitySrcSyn entitySrcSyn = (EntitySrcSyn) buildObject(
-					EntitySrcSyn.class.getName(),
-					loopFields,lineData, loopWarnings);
-			triggerNewEntitySrcSyn(entitySrcSyn);
-		} else if ( category.equals("_struct_asym")){
-			StructAsym sasym  = (StructAsym) buildObject(
-					StructAsym.class.getName(),
-					loopFields,lineData, loopWarnings);
-
-			triggerNewStructAsym(sasym);
-
-		} else if ( category.equals("_pdbx_poly_seq_scheme")){
-			PdbxPolySeqScheme ppss  = (PdbxPolySeqScheme) buildObject(
-					PdbxPolySeqScheme.class.getName(),
-					loopFields,lineData, loopWarnings);
-
-			triggerNewPdbxPolySeqScheme(ppss);
-
-		} else if ( category.equals("_pdbx_nonpoly_scheme")){
-			PdbxNonPolyScheme ppss  = (PdbxNonPolyScheme) buildObject(
-					PdbxNonPolyScheme.class.getName(),
-					loopFields,lineData, loopWarnings);
-
-			triggerNewPdbxNonPolyScheme(ppss);
-
-		} else if ( category.equals("_pdbx_entity_nonpoly")){
-			PdbxEntityNonPoly pen = (PdbxEntityNonPoly) buildObject(
-					PdbxEntityNonPoly.class.getName(),
-					loopFields,lineData, loopWarnings
-					);
-			triggerNewPdbxEntityNonPoly(pen);
-		} else if ( category.equals("_struct_keywords")){
-			StructKeywords kw = (StructKeywords)buildObject(
-					StructKeywords.class.getName(),
-					loopFields,lineData, loopWarnings
-					);
-			triggerNewStructKeywords(kw);
-		} else if (category.equals("_refine")){
-			Refine r = (Refine)buildObject(
-					Refine.class.getName(),
-					loopFields,lineData, loopWarnings
-					);
-			triggerNewRefine(r);
-		} else if (category.equals("_chem_comp")){
-			ChemComp c = (ChemComp)buildObject(
-					ChemComp.class.getName(),
-					loopFields, lineData, loopWarnings
-					);
-			triggerNewChemComp(c);
-		} else if (category.equals("_audit_author")) {
-			AuditAuthor aa = (AuditAuthor)buildObject(
-					AuditAuthor.class.getName(),
-					loopFields, lineData, loopWarnings);
-			triggerNewAuditAuthor(aa);
-		} else if (category.equals("_pdbx_chem_comp_descriptor")) {
-			ChemCompDescriptor ccd = (ChemCompDescriptor) buildObject(
-					ChemCompDescriptor.class.getName(),
-					loopFields, lineData, loopWarnings);
-			triggerNewChemCompDescriptor(ccd);
-		} else if (category.equals("_pdbx_struct_oper_list")) {
-
-			PdbxStructOperList structOper = (PdbxStructOperList) buildObject(
-					PdbxStructOperList.class.getName(),
-					loopFields, lineData, loopWarnings
-					);
-			triggerNewPdbxStructOper(structOper);
-
-		} else if (category.equals("_pdbx_struct_assembly")) {
-			PdbxStructAssembly sa = (PdbxStructAssembly) buildObject(
-					PdbxStructAssembly.class.getName(),
-					loopFields, lineData, loopWarnings);
-			triggerNewPdbxStructAssembly(sa);
-
-		} else if (category.equals("_pdbx_struct_assembly_gen")) {
-			PdbxStructAssemblyGen sa = (PdbxStructAssemblyGen) buildObject(
-					PdbxStructAssemblyGen.class.getName(),
-					loopFields, lineData, loopWarnings);
-			triggerNewPdbxStructAssemblyGen(sa);
-		} else if ( category.equals("_chem_comp_atom")){
-			ChemCompAtom atom = (ChemCompAtom)buildObject(
-					ChemCompAtom.class.getName(),
-					loopFields,lineData, loopWarnings);
-			triggerNewChemCompAtom(atom);
-
-		}else if ( category.equals("_chem_comp_bond")){
-			ChemCompBond bond = (ChemCompBond)buildObject(
-					ChemCompBond.class.getName(),
-					loopFields,lineData, loopWarnings);
-			triggerNewChemCompBond(bond);
-		} else if ( category.equals("_pdbx_chem_comp_identifier")){
-			PdbxChemCompIdentifier id = (PdbxChemCompIdentifier)buildObject(
-					PdbxChemCompIdentifier.class.getName(),
-					loopFields,lineData, loopWarnings);
-			triggerNewPdbxChemCompIdentifier(id);
-		} else if ( category.equals("_pdbx_chem_comp_descriptor")){
-			PdbxChemCompDescriptor id = (PdbxChemCompDescriptor)buildObject(
-					PdbxChemCompDescriptor.class.getName(),
-					loopFields,lineData, loopWarnings);
-			triggerNewPdbxChemCompDescriptor(id);
-		} else if ( category.equals("_struct_conn")){
-			StructConn id = (StructConn)buildObject(
-					StructConn.class.getName(),
-					loopFields,lineData, loopWarnings);
-			triggerNewStructConn(id);
-
-		} else {
-
-			logger.debug("Using a generic bean for category {}",category);
-
-			// trigger a generic bean that can deal with all missing data types...
-			triggerGeneric(category,loopFields,lineData);
-		}
-
-
-	}
-
-
-//	private PdbxStructOperList getPdbxStructOperList(List<String> loopFields,
-//			List<String> lineData) {
-//		PdbxStructOperList so = new PdbxStructOperList();
-//
-//		//System.out.println(loopFields);
-//		//System.out.println(lineData);
-//
-//		String id = lineData.get(loopFields.indexOf("id"));
-//		so.setId(id);
-//		so.setType(lineData.get(loopFields.indexOf("type")));
-//		Matrix matrix = new Matrix(3,3);
-//		for (int i = 1 ; i <=3 ; i++){
-//			for (int j =1 ; j <= 3 ; j++){
-//				String max = String.format("matrix[%d][%d]",j,i);
-//
-//				String val = lineData.get(loopFields.indexOf(max));
-//				Double d = Double.parseDouble(val);
-//				matrix.set(j-1,i-1,d);
-//				//				matrix.set(i-1,j-1,d);
-//			}
-//		}
-//
-//		double[] coords =new double[3];
-//
-//		for ( int i = 1; i <=3 ; i++){
-//			String v = String.format("vector[%d]",i);
-//			String val = lineData.get(loopFields.indexOf(v));
-//			Double d = Double.parseDouble(val);
-//			coords[i-1] = d;
-//		}
-//
-//		so.setMatrix(matrix);
-//		so.setVector(coords);
-//
-//
-//
-//		return so;
-//	}
-
-	public void triggerNewPdbxStructOper(PdbxStructOperList structOper) {
-		for(MMcifConsumer c : consumers){
-			c.newPdbxStructOperList(structOper);
-		}
-
-	}
-
-	public void triggerNewStructNcsOper(StructNcsOper sNcsOper) {
-		for(MMcifConsumer c : consumers){
-			c.newStructNcsOper(sNcsOper);
-		}
-
-	}
-
-	public void triggerNewAtomSites(AtomSites atomSites) {
-		for(MMcifConsumer c : consumers){
-			c.newAtomSites(atomSites);
-		}
-	}
-
-	/**
-	 * Populates a bean object from  the {@link org.biojava.nbio.structure.io.mmcif.model} package,
-	 * from the data read from a CIF file.
-	 * It uses reflection to lookup the field and setter method names given the category
-	 * found in the CIF file.
-	 * <p>
-	 * Due to limitations in variable names in java, not all fields can have names
-	 * exactly as defined in the CIF categories. In those cases the {@link CIFLabel} tag
-	 * can be used in the field names to give the appropriate name that corresponds to the
-	 * CIF category, which is the name that will be then looked up here.
-	 * The {@link IgnoreField} tag can also be used to exclude fields from being looked up.
-	 * @param className
-	 * @param loopFields
-	 * @param lineData
-	 * @param warnings
-	 * @return
-	 */
-	private Object buildObject(String className, List<String> loopFields, List<String> lineData, Set<String> warnings) {
-
-		Object o = null;
-		Class<?> c = null;
-
-		try {
-			// build up the Entity object from the line data...
-			c = Class.forName(className);
-
-			o = c.newInstance();
-
-		} catch (InstantiationException|ClassNotFoundException|IllegalAccessException e){
-			logger.error( "Error while constructing {}: {}", className, e.getMessage());
-			return null;
-		}
-
-		// these methods get the fields but also looking at the IgnoreField and CIFLabel annotations
-		Field[] fields = MMCIFFileTools.getFields(c);
-		String[] names = MMCIFFileTools.getFieldNames(fields);
-
-		// let's build a map of all methods so that we can look up the setter methods later
-		Method[] methods = c.getMethods();
-
-		Map<String,Method> methodMap = new HashMap<String, Method>();
-		for (Method m : methods) {
-			methodMap.put(m.getName(),m);
-		}
-
-		// and a map of all the fields so that we can lookup them up later
-		Map<String, Field> names2fields = new HashMap<>();
-		for (int i=0;i<fields.length;i++) {
-			names2fields.put(names[i], fields[i]);
-		}
-
-		int pos = -1 ;
-		for (String key: loopFields){
-			pos++;
-
-			String val = lineData.get(pos);
-
-			// we first start looking up the field which can be annotated with a CIFLabel if they
-			// need alternative names (e.g. for field _symmetry.space_group_name_H-M, since hyphen is not allowed in var names in java)
-			Field field = names2fields.get(key);
-
-			if (field == null) {
-				produceWarning(key, val, c, warnings);
-				continue;
-			}
-			// now we need to find the corresponding setter
-			// note that we can't use the field directly and then call Field.set() because many setters
-			// have more functionality than just setting the value (e.g. some setters in ChemComp)
-
-			// building up the setter method name: need to upper case the first letter, leave the rest untouched
-			String setterMethodName = "set" + field.getName().substring(0,1).toUpperCase() + field.getName().substring(1, field.getName().length());
-
-			Method setter = methodMap.get(setterMethodName);
-
-			if (setter==null) {
-				produceWarning(key, val, c, warnings);
-				continue;
-			}
-
-
-
-			// now we populate the object with the values by invoking the corresponding setter method,
-			// note that all of the mmCif container classes have only one argument (they are beans)
-			Class<?>[] pType  = setter.getParameterTypes();
-
-
-			try {
-				if ( pType[0].getName().equals(Integer.class.getName())) {
-					if ( val != null && ! val.equals("?") && !val.equals(".")) {
-
-						Integer intVal = Integer.parseInt(val);
-						setter.invoke(o, intVal);
-
-					}
-				} else {
-					// default val is a String
-					setter.invoke(o, val);
-				}
-			} catch (IllegalAccessException|InvocationTargetException e) {
-				logger.error("Could not invoke setter {} with value {} for class {}", setterMethodName, val, className);
-			}
-
-		}
-
-		return o;
-	}
-
-	private void produceWarning(String key, String val, Class<?> c, Set<String> warnings) {
-
-		String warning = "Trying to set field " + key + " in "+ c.getName() +" found in file, but no corresponding field could be found in model class (value:" + val + ")";
-		String warnkey = key+"-"+c.getName();
-		// Suppress duplicate warnings or attempts to store empty data
-		if( val.equals("?") || val.equals(".") || ( warnings != null && warnings.contains(warnkey)) ) {
-			logger.debug(warning);
-		} else {
-			logger.info(warning);
-		}
-
-		if(warnings != null) {
-			warnings.add(warnkey);
-		}
-
-	}
-
-	public void triggerGeneric(String category, List<String> loopFields, List<String> lineData){
-		for(MMcifConsumer c : consumers){
-			c.newGenericData(category, loopFields, lineData);
-		}
-	}
-
-	public void triggerNewEntity(Entity entity){
-		for(MMcifConsumer c : consumers){
-			c.newEntity(entity);
-		}
-	}
-
-	public void triggerNewEntityPoly(EntityPoly entityPoly) {
-		for(MMcifConsumer c : consumers){
-			c.newEntityPoly(entityPoly);
-		}
-	}
-
-	public void triggerNewEntityPolySeq(EntityPolySeq epolseq){
-		for(MMcifConsumer c : consumers){
-			c.newEntityPolySeq(epolseq);
-		}
-	}
-	public void triggerNewEntitySrcGen(EntitySrcGen entitySrcGen){
-		for(MMcifConsumer c : consumers){
-			c.newEntitySrcGen(entitySrcGen);
-		}
-	}
-	public void triggerNewEntitySrcNat(EntitySrcNat entitySrcNat){
-		for(MMcifConsumer c : consumers){
-			c.newEntitySrcNat(entitySrcNat);
-		}
-	}
-	public void triggerNewEntitySrcSyn(EntitySrcSyn entitySrcSyn){
-		for(MMcifConsumer c : consumers){
-			c.newEntitySrcSyn(entitySrcSyn);
-		}
-	}
-	public void triggerNewChemComp(ChemComp cc){
-
-		for(MMcifConsumer c : consumers){
-			c.newChemComp(cc);
-		}
-	}
-	public void triggerNewStructAsym(StructAsym sasym){
-		for(MMcifConsumer c : consumers){
-			c.newStructAsym(sasym);
-		}
-	}
-
-	private void triggerStructData(Struct struct){
-		for(MMcifConsumer c : consumers){
-			c.setStruct(struct);
-		}
-	}
-
-	private void triggerNewAtomSite(AtomSite atom){
-		for(MMcifConsumer c : consumers){
-			c.newAtomSite(atom);
-		}
-	}
-
-	private void triggerNewAuditAuthor(AuditAuthor aa){
-		for(MMcifConsumer c : consumers){
-			c.newAuditAuthor(aa);
-		}
-	}
-
-	private void triggerNewPdbxAuditRevisionHistory(PdbxAuditRevisionHistory history) {
-		for(MMcifConsumer c : consumers){
-			c.newPdbxAuditRevisionHistory(history);
-		}
-	}
-
-	private void triggerNewPdbxDatabaseStatus(PdbxDatabaseStatus status) {
-		for(MMcifConsumer c : consumers){
-			c.newPdbxDatabaseStatus(status);
-		}
-	}
-
-	private void triggerNewDatabasePDBrev(DatabasePDBrev dbrev){
-		for(MMcifConsumer c : consumers){
-			c.newDatabasePDBrev(dbrev);
-		}
-	}
-	private void triggerNewDatabasePDBrevRecord(DatabasePdbrevRecord dbrev){
-		for(MMcifConsumer c : consumers){
-			c.newDatabasePDBrevRecord(dbrev);
-		}
-	}
-
-	private void triggerNewDatabasePDBremark(DatabasePDBremark remark){
-		for(MMcifConsumer c : consumers){
-			c.newDatabasePDBremark(remark);
-		}
-	}
-
-	private void triggerExptl(Exptl exptl){
-		for(MMcifConsumer c : consumers){
-			c.newExptl(exptl);
-		}
-	}
-
-	private void triggerNewCell(Cell cell) {
-		for(MMcifConsumer c : consumers){
-			c.newCell(cell);
-		}
-	}
-
-	private void triggerNewSymmetry(Symmetry symmetry) {
-		for(MMcifConsumer c : consumers){
-			c.newSymmetry(symmetry);
-		}
-	}
-
-	private void triggerNewStrucRef(StructRef sref){
-		for(MMcifConsumer c : consumers){
-			c.newStructRef(sref);
-		}
-	}
-
-	private void triggerNewStrucRefSeq(StructRefSeq sref){
-		for(MMcifConsumer c : consumers){
-			c.newStructRefSeq(sref);
-		}
-	}
-
-	private void triggerNewStrucRefSeqDif(StructRefSeqDif sref){
-		for(MMcifConsumer c : consumers){
-			c.newStructRefSeqDif(sref);
-		}
-	}
-
-	private void triggerNewPdbxPolySeqScheme(PdbxPolySeqScheme ppss){
-		for(MMcifConsumer c : consumers){
-			c.newPdbxPolySeqScheme(ppss);
-		}
-	}
-	private void triggerNewPdbxNonPolyScheme(PdbxNonPolyScheme ppss){
-		for(MMcifConsumer c : consumers){
-			c.newPdbxNonPolyScheme(ppss);
-		}
-	}
-	public void triggerNewPdbxEntityNonPoly(PdbxEntityNonPoly pen){
-		for (MMcifConsumer c: consumers){
-			c.newPdbxEntityNonPoly(pen);
-		}
-	}
-	public void triggerNewStructKeywords(StructKeywords kw){
-		for (MMcifConsumer c: consumers){
-			c.newStructKeywords(kw);
-		}
-	}
-	public void triggerNewRefine(Refine r){
-		for (MMcifConsumer c: consumers){
-			c.newRefine(r);
-		}
-	}
-	public void triggerDocumentStart(){
-		for(MMcifConsumer c : consumers){
-			c.documentStart();
-		}
-	}
-	public void triggerDocumentEnd(){
-		for(MMcifConsumer c : consumers){
-			c.documentEnd();
-		}
-	}
-	public void triggerNewChemCompDescriptor(ChemCompDescriptor ccd) {
-		for(MMcifConsumer c : consumers){
-			c.newChemCompDescriptor(ccd);
-		}
-	}
-	private void triggerNewPdbxStructAssembly(PdbxStructAssembly sa) {
-		for(MMcifConsumer c : consumers){
-			c.newPdbxStrucAssembly(sa);
-		}
-	}
-	private void triggerNewPdbxStructAssemblyGen(PdbxStructAssemblyGen sa) {
-		for(MMcifConsumer c : consumers){
-			c.newPdbxStrucAssemblyGen(sa);
-		}
-	}
-
-	private void triggerNewChemCompAtom(ChemCompAtom atom) {
-		for(MMcifConsumer c : consumers){
-			c.newChemCompAtom(atom);
-		}
-	}
-
-	private void triggerNewChemCompBond(ChemCompBond bond) {
-		for(MMcifConsumer c : consumers){
-			c.newChemCompBond(bond);
-		}
-	}
-
-	private void triggerNewPdbxChemCompIdentifier(PdbxChemCompIdentifier id) {
-		for(MMcifConsumer c : consumers){
-			c.newPdbxChemCompIndentifier(id);
-		}
-	}
-	private void triggerNewPdbxChemCompDescriptor(PdbxChemCompDescriptor id) {
-		for(MMcifConsumer c : consumers){
-			c.newPdbxChemCompDescriptor(id);
-		}
-	}
-	private void triggerNewStructConn(StructConn id) {
-		for(MMcifConsumer c : consumers){
-			c.newStructConn(id);
-		}
-	}
-	private void triggerNewStructSiteGen(StructSiteGen id) {
-		for (MMcifConsumer c : consumers) {
-			c.newStructSiteGen(id);
-		}
-	}
-	private void triggerNewStructSite(StructSite id) {
-		for (MMcifConsumer c : consumers) {
-			c.newStructSite(id);
-		}
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ZipChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ZipChemCompProvider.java
deleted file mode 100644
index 9475a6d036..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/ZipChemCompProvider.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
-import org.biojava.nbio.structure.io.mmcif.chem.ResidueType;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/** This chemical component provider retrieves and caches chemical component definition files from a
- * zip archive specified in its construction.  If the archive does not contain the record, an attempt is
- * made to download it using DownloadChemCompProvider. The downloaded file is then added to the archive.
- *
- * The class is thread-safe and the same ZipChemCompProvider should be used by all threads to prevent
- * simultaneous read or write to the zip archive.  A zip archive will be created if missing.
- *
- * @author edlunde
- * @author larsonm
- * @since 12/05/12
- * updated 3/5/2016 for Java 7 ZipFileSystem
- */
-public class ZipChemCompProvider implements ChemCompProvider{
-	private static final Logger s_logger = LoggerFactory.getLogger(ZipChemCompProvider.class);
-
-	private final Path m_tempDir;  // Base path where $m_zipRootDir/ will be downloaded to.
-	private final Path m_zipRootDir;
-	private final Path m_zipFile;
-	private final DownloadChemCompProvider m_dlProvider;
-
-	private boolean m_removeCif;
-
-	// Missing IDs from library that cannot be download added here to prevent delays.
-	private Set<String> unavailable = new HashSet<String>();
-
-	/**
-	 * ZipChemCompProvider is a Chemical Component provider that stores chemical components
-	 * in a zip archive.  Missing chemical components are downloaded and appended to the
-	 * archive.  If non-existent a new zip archive will be created.
-	 *
-	 * @param chemicalComponentDictionaryFile : path to zip archive for chemical components.
-	 * @param tempDir : path for temporary directory, (null) defaults to path in property "java.io.tmpdir".
-	 * @throws IOException
-	 */
-	public ZipChemCompProvider(String chemicalComponentDictionaryFile, String tempDir) throws IOException {
-		this.m_zipFile = Paths.get(chemicalComponentDictionaryFile);
-
-		// Use a default temporary directory if not passed a value.
-		if (tempDir == null || tempDir.equals("")) {
-			this.m_tempDir = Paths.get(System.getProperty("java.io.tmpdir"));
-		} else {
-			this.m_tempDir = Paths.get(tempDir);
-		}
-
-		this.m_zipRootDir = Paths.get("chemcomp");
-
-		// Setup an instance of the download chemcomp provider.
-		this.m_dlProvider = new DownloadChemCompProvider(m_tempDir.toString());
-		this.m_removeCif = true;
-		initializeZip();
-	}
-
-	// See comments in addToZipFileSystem for why initialization is required with
-	// ZipFileSystems - due to URI issues in Java7.
-	private void initializeZip() throws IOException {
-		s_logger.info("Using chemical component dictionary: " + m_zipFile.toString());
-		final File f = m_zipFile.toFile();
-		if (!f.exists()) {
-			s_logger.info("Creating missing zip archive: " + m_zipFile.toString());
-			FileOutputStream fo = new FileOutputStream(f);
-			ZipOutputStream zip = new ZipOutputStream(new BufferedOutputStream(fo));
-			try {
-				zip.putNextEntry(new ZipEntry("chemcomp/"));
-				zip.closeEntry();
-			} finally {
-				zip.close();
-			}
-		}
-	}
-
-	/**
-	 * Remove downloaded .cif.gz after adding to zip archive?
-	 * Default is true.
-	 * @param doRemove
-	 */
-	public void setRemoveCif(boolean doRemove) {
-		m_removeCif = doRemove;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.biojava.nbio.structure.io.mmcif.ChemCompProvider#getChemComp(java.lang.String)
-	 *
-	 * @param recordName : three letter PDB name for a residue
-	 * @return ChemComp from .zip or ChemComp from repository.  Will return empty ChemComp when unable to find a residue and will return null if not provided a valid recordName.
-	 */
-	@Override
-	public ChemComp getChemComp(String recordName) {
-		if (null == recordName) return null;
-
-		// handle non-existent ChemComp codes and do not repeatedly attempt to add these.
-		for (String str : unavailable) {
-			if (recordName.equals(str)) return getEmptyChemComp(recordName);
-		}
-
-		// Try to pull from zip, if fail then download.
-		ChemComp cc = getFromZip(recordName);
-		if (cc == null) {
-			s_logger.info("File "+recordName+" not found in archive. Attempting download from PDB.");
-			cc = downloadAndAdd(recordName);
-		}
-
-		// If a null record or an empty chemcomp, return a default ChemComp and blacklist.
-		if (cc == null || (null == cc.getName() && cc.getAtoms().size() == 0)) {
-			s_logger.info("Unable to find or download " + recordName + " - excluding from future searches.");
-			unavailable.add(recordName);
-			return getEmptyChemComp(recordName);
-		}
-		return cc;
-	}
-
-	/** Use DownloadChemCompProvider to grab a gzipped cif record from the PDB.
-	 *  Zip all downloaded cif.gz files into the dictionary.
-	 *
-	 * @param recordName is the three-letter chemical component code (i.e. residue name).
-	 * @return ChemComp matching recordName
-	 */
-	private ChemComp downloadAndAdd(String recordName){
-		final ChemComp cc = m_dlProvider.getChemComp(recordName);
-
-		// final File [] files = finder(m_tempDir.resolve("chemcomp").toString(), "cif.gz");
-		final File [] files = new File[1];
-		Path cif = m_tempDir.resolve("chemcomp").resolve(recordName + ".cif.gz");
-		files[0] = cif.toFile();
-		if (files[0] != null) {
-			addToZipFileSystem(m_zipFile, files, m_zipRootDir);
-			if (m_removeCif) for (File f : files) f.delete();
-		}
-		return cc;
-	}
-
-	/**
-	 * Cleanup chemical component (.cif.gz) files downloaded to tmpdir.
-	 * @param tempdir : path to temporary directory for chemical components
-	 */
-	public static void purgeTempFiles(String tempdir) {
-		if (tempdir == null) return;
-
-		s_logger.info("Removing: "+tempdir);
-		Path dlPath = Paths.get(tempdir).resolve("chemcomp");
-		File[] chemCompOutFiles = finder(dlPath.toString(), "cif.gz");
-		if (null != chemCompOutFiles) for (File f : chemCompOutFiles) f.delete();
-		dlPath.toFile().delete();
-	}
-
-	/**
-	 * Return an empty ChemComp group for a three-letter resName.
-	 * @param resName
-	 * @return
-	 */
-	private ChemComp getEmptyChemComp(String resName){
-		String pdbName = ""; // Empty string is default
-		if (null != resName && resName.length() >= 3) {
-			pdbName = resName.substring(0,3);
-		}
-		final ChemComp comp = new ChemComp();
-		comp.setOne_letter_code("?");
-		comp.setThree_letter_code(pdbName);
-		comp.setPolymerType(PolymerType.unknown);
-		comp.setResidueType(ResidueType.atomn);
-		return comp;
-	}
-
-	/**
-	 * Return File(s) in dirName that match suffix.
-	 * @param dirName
-	 * @param suffix
-	 * @return
-	 */
-	static private File[] finder( String dirName, final String suffix){
-		if (null == dirName || null == suffix) {
-			return null;
-		}
-
-		final File dir = new File(dirName);
-		return dir.listFiles(new FilenameFilter() {
-			@Override
-			public boolean accept(File dir, String filename)
-			{ return filename.endsWith(suffix); }
-		} );
-	}
-
-	/**
-	 * This is synchronized, along with addToFileSystem to prevent simulatenous reading/writing.
-	 * @param recordName to find in zipfile.
-	 * @return ChemComp if found or null if missing.
-	 */
-	private synchronized ChemComp getFromZip(String recordName) {
-		ChemComp cc = null;
-		if (!m_zipFile.toFile().exists()) return cc;
-		final String filename = "chemcomp/" + recordName+".cif.gz";
-
-		// try with resources block to read from the filesystem.
-		try (FileSystem fs = FileSystems.newFileSystem(m_zipFile, (ClassLoader) null)) {
-			Path cif = fs.getPath(filename);
-
-			if (Files.exists(cif)) {
-				final InputStream zipStream = Files.newInputStream(cif);
-				final InputStream inputStream = new GZIPInputStream(zipStream);
-				s_logger.debug("reading " + recordName + " from " + m_zipFile);
-				final MMcifParser parser = new SimpleMMcifParser();
-				final ChemCompConsumer consumer = new ChemCompConsumer();
-				parser.addMMcifConsumer(consumer);
-				parser.parse(inputStream);
-				inputStream.close();
-
-				final ChemicalComponentDictionary dict = consumer.getDictionary();
-				cc = dict.getChemComp(recordName);
-			}
-		} catch (IOException e) {
-			s_logger.error("Unable to read from zip file : " + e.getMessage());
-		}
-
-		return cc;
-	}
-
-	/**
-	 * Add an array of files to a zip archive.
-	 * Synchronized to prevent simultaneous reading/writing.
-	 *
-	 * @param zipFile is a destination zip archive
-	 * @param files is an array of files to be added
-	 * @param pathWithinArchive is the path within the archive to add files to
-	 * @return true if successfully appended these files.
-	 */
-	private synchronized boolean addToZipFileSystem(Path zipFile, File[] files, Path pathWithinArchive) {
-		boolean ret = false;
-
-		/* URIs in Java 7 cannot have spaces, must use Path instead
-		 * and so, cannot use the properties map to describe need to create
-		 * a new zip archive.  ZipChemCompProvider.initilizeZip to creates the
-		 * missing zip file */
-
-		/*
-		// convert the filename to a URI
-		String uriString = "jar:file:" + zipFile.toUri().getPath();
-		final URI uri = URI.create(uriString);
-
-		// if filesystem doesn't exist, create one.
-		final Map<String, String> env = new HashMap<>();
-		// Create a new zip if one isn't present.
-		if (!zipFile.toFile().exists()) {
-			System.out.println("Need to create " + zipFile.toString());
-		}
-		env.put("create", String.valueOf(!zipFile.toFile().exists()));
-		// Specify the encoding as UTF -8
-		env.put("encoding", "UTF-8");
-		*/
-
-		// Copy in each file.
-		try (FileSystem zipfs = FileSystems.newFileSystem(zipFile, null)) {
-			Files.createDirectories(pathWithinArchive);
-			for (File f : files) {
-				if (!f.isDirectory() && f.exists()) {
-					Path externalFile = f.toPath();
-					Path pathInZipFile = zipfs.getPath(pathWithinArchive.resolve(f.getName()).toString());
-					Files.copy(externalFile, pathInZipFile,
-							StandardCopyOption.REPLACE_EXISTING);
-				}
-			}
-			ret = true;
-		} catch (IOException ex) {
-			s_logger.error("Unable to add entries to Chemical Component zip archive : " + ex.getMessage());
-			ret = false;
-		}
-		return ret;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/ChemCompTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/ChemCompTools.java
deleted file mode 100644
index d1392f5117..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/ChemCompTools.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Mar 4, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.chem;
-
-import org.biojava.nbio.structure.io.mmcif.ChemicalComponentDictionary;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
-
-import java.util.*;
-
-/** Some tools for working with chemical compounds.
- *
- * @author Andreas Prlic
- * @since 1.7
- *
- */
-public class ChemCompTools {
-
-	private static final Character UNKNOWN_ONE_LETTER_CODE = 'X';
-	private static final Character UNKNOWN_NUCLEOTIDE = 'N';
-
-	/**
-	 * Lookup table to convert standard amino acid's monomer ids to one-letter-codes
-	 */
-	private static final Map<String, Character> AMINO_ACID_LOOKUP_3TO1;
-
-	/**
-	 * Lookup table to convert standard amino acid's one-letter-codes to monomer ids
-	 */
-	private static final Map<Character, String> AMINO_ACID_LOOKUP_1TO3;
-
-	/**
-	 * Lookup table to convert standard nucleic acid's monomer ids to one-letter-codes
-	 */
-	private static final Map<String, Character> DNA_LOOKUP_2TO1;
-
-	/**
-	 * Lookup table to convert standard nucleic acid's one-letter-codes to monomer ids
-	 */
-	private static final Map<Character, String> DNA_LOOKUP_1TO2;
-
-	/**
-	 * Static block that initializes lookup maps and initializes their <tt>ResidueInfo</tt> instances
-	 */
-	static
-	{
-		Map<String, Character> foo = new HashMap<String, Character>();
-		foo.put("ALA", 'A');
-		foo.put("ASP", 'D');
-		foo.put("ASN", 'N');
-		foo.put("ASX", 'B');
-		foo.put("ARG", 'R');
-		foo.put("CYS", 'C');
-		foo.put("GLU", 'E');
-		foo.put("GLN", 'Q');
-		foo.put("GLY", 'G');
-		foo.put("GLX", 'Z');
-		foo.put("HIS", 'H');
-		foo.put("ILE", 'I');
-		foo.put("LYS", 'K');
-		foo.put("LEU", 'L');
-		foo.put("MET", 'M');
-		foo.put("PHE", 'F');
-		foo.put("PRO", 'P');
-		foo.put("SER", 'S');
-		foo.put("THR", 'T');
-		foo.put("TRP", 'W');
-		foo.put("TYR", 'Y');
-		foo.put("VAL", 'V');
-		AMINO_ACID_LOOKUP_3TO1 = Collections.unmodifiableMap((Collections.synchronizedMap(foo)));
-
-		Map<Character, String> bar = new HashMap<Character, String>();
-		bar.put('A', "ALA");
-		bar.put('D', "ASP");
-		bar.put('N', "ASN");
-		bar.put('B', "ASX");
-		bar.put('R', "ARG");
-		bar.put('C', "CYS");
-		bar.put('E', "GLU");
-		bar.put('Q', "GLN");
-		bar.put('G', "GLY");
-		bar.put('Z', "GLX");
-		bar.put('H', "HIS");
-		bar.put('I', "ILE");
-		bar.put('K', "LYS");
-		bar.put('L', "LEU");
-		bar.put('M', "MET");
-		bar.put('F', "PHE");
-		bar.put('P', "PRO");
-		bar.put('S', "SER");
-		bar.put('T', "THR");
-		bar.put('W', "TRP");
-		bar.put('Y', "TYR");
-		bar.put('V', "VAL");
-		AMINO_ACID_LOOKUP_1TO3 = Collections.unmodifiableMap(Collections.synchronizedMap(bar));
-
-		foo = new HashMap<String, Character>();
-		foo.put("DA",'A');
-		foo.put("DC",'C');
-		foo.put("DG",'G');
-		foo.put("DI",'I');
-		foo.put("DU",'U');
-		foo.put("DT",'T');
-		DNA_LOOKUP_2TO1 = Collections.unmodifiableMap((Collections.synchronizedMap(foo)));
-
-		bar = new HashMap<Character, String>();
-		bar.put('A',"DA");
-		bar.put('C',"DC");
-		bar.put('G',"DG");
-		bar.put('I',"DI");
-		bar.put('U',"DU");
-		bar.put('T',"DT");
-		DNA_LOOKUP_1TO2 = Collections.unmodifiableMap(Collections.synchronizedMap(bar));
-
-
-		// initialise standard chemical components
-		List<String> stdMonIds = new ArrayList<String>();
-		stdMonIds.addAll(AMINO_ACID_LOOKUP_3TO1.keySet());
-		stdMonIds.addAll(DNA_LOOKUP_2TO1.keySet());
-
-
-
-	}
-
-	public static Character getAminoOneLetter(String chemCompId){
-		return  AMINO_ACID_LOOKUP_3TO1.get(chemCompId);
-	}
-
-
-	public static Character getDNAOneLetter(String chemCompId){
-		return  DNA_LOOKUP_2TO1.get(chemCompId) ;
-	}
-
-	public static String getAminoThreeLetter(Character c){
-		return AMINO_ACID_LOOKUP_1TO3.get(c);
-	}
-
-	public static String getDNATwoLetter(Character c){
-		return DNA_LOOKUP_1TO2.get(c);
-	}
-
-	public static final boolean isStandardChemComp(ChemComp cc){
-
-		String pid = cc.getMon_nstd_parent_comp_id();
-		String one = cc.getOne_letter_code();
-
-		PolymerType polymerType = cc.getPolymerType();
-
-		// standard residues have no parent
-		if ((pid == null) || (pid.equals("?"))){
-
-			// and they have a one letter code
-			if ( ( one != null) && ( ! one.equals("?") )){
-
-				// peptides and dpeptides must not have X
-				if ( (polymerType == PolymerType.peptide) ||
-						( polymerType == PolymerType.dpeptide)) {
-					return performPeptideCheck(cc, one);
-
-				}
-				if (polymerType == PolymerType.rna){
-					return performRNACheck(cc);
-				}
-				if (polymerType == PolymerType.dna) {
-
-					return performDNACheck(cc);
-
-				}
-
-				//System.err.println("Non standard chem comp: " + cc);
-				return false;
-			}
-		}
-		return false;
-	}
-
-
-	private static boolean performRNACheck(ChemComp cc) {
-		if (cc.getId().length() == 1)
-			return true;
-		else
-			return false;
-	}
-
-
-	private static boolean performDNACheck(ChemComp cc) {
-		if ( cc.getId().equals(UNKNOWN_NUCLEOTIDE.toString()))
-			return false;
-
-		Character c = getDNAOneLetter(cc.getId());
-		if ( c==null){
-			// we did not find it in the list of standard nucleotides
-			return false;
-		}
-		return true;
-	}
-
-
-	private static boolean performPeptideCheck(ChemComp cc, String one) {
-		if (one.equals(UNKNOWN_ONE_LETTER_CODE.toString())) {
-			return false;
-		}
-		Character c =  getAminoOneLetter(cc.getId());
-		if ( c==null){
-			// we did not find it in the list of standard aminos
-			return false;
-		}
-		return true;
-	}
-
-
-	// TODO: component 175 has 3 chars as a one letter code...
-	// Figure out what to do with it...
-	// so does: 4F3,5ZA and others
-	public static Character getOneLetterCode(ChemComp cc, ChemicalComponentDictionary dictionary){
-		if ( cc.getResidueType() == ResidueType.nonPolymer )
-			return null;
-
-		if ( cc.isStandard())
-			return cc.getOne_letter_code().charAt(0);
-
-		ChemComp parent = dictionary.getParent(cc);
-		if ( parent == null){
-			//System.err.println("parent is null " + cc);
-			return cc.getOne_letter_code().charAt(0);
-		}
-		PolymerType poly = cc.getPolymerType();
-		if (( poly == PolymerType.peptide) || ( poly == PolymerType.dpeptide)){
-			Character c = getAminoOneLetter(parent.getId());
-			if ( c == null)
-				c = UNKNOWN_ONE_LETTER_CODE;
-			return c;
-		}
-		if ( poly == PolymerType.dna){
-			Character c = getDNAOneLetter(parent.getId());
-			if (c == null)
-				c = UNKNOWN_NUCLEOTIDE;
-			return c;
-
-		}
-		return cc.getMon_nstd_parent_comp_id().charAt(0);
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/MetalBondDistance.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/MetalBondDistance.java
deleted file mode 100644
index ab2658c7e3..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/MetalBondDistance.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.chem;
-
-/** A bean that contains cutoffs for correctly detecting metal bonds.
- * Definitions are in file bond_distance_limits.cif.gz
- *
- * Created by andreas on 6/9/16.
- */
-public class MetalBondDistance {
-
-	private String atomType1;
-	private String atomType2;
-	private float lowerLimit;
-	private float upperLimit;
-
-	public String getAtomType1() {
-		return atomType1;
-	}
-
-	public void setAtomType1(String atomType1) {
-		this.atomType1 = atomType1;
-	}
-
-	public String getAtomType2() {
-		return atomType2;
-	}
-
-	public void setAtomType2(String atomType2) {
-		this.atomType2 = atomType2;
-	}
-
-	public float getLowerLimit() {
-		return lowerLimit;
-	}
-
-	public void setLowerLimit(float lowerLimit) {
-		this.lowerLimit = lowerLimit;
-	}
-
-	public float getUpperLimit() {
-		return upperLimit;
-	}
-
-	public void setUpperLimit(float upperLimit) {
-		this.upperLimit = upperLimit;
-	}
-
-	@Override
-	public String toString() {
-		return "MetalBindDistance{" +
-				"atomType1='" + atomType1 + '\'' +
-				", atomType2='" + atomType2 + '\'' +
-				", lowerLimit=" + lowerLimit +
-				", upperLimit=" + upperLimit +
-				'}';
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/PolymerType.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/PolymerType.java
deleted file mode 100644
index d7b4853cf0..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/PolymerType.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- *
- */
-package org.biojava.nbio.structure.io.mmcif.chem;
-
-import java.io.Serializable;
-import java.util.*;
-
-/**
- * Enumerates the classification of polymers.
- * This information is derived from the mmcif dictionary
- * @author mulvaney
- * @author Andreas Prlic
- * @see <a href="http://mmcif.rcsb.org/dictionaries/mmcif_pdbx.dic/Items/_entity_poly.type.html">link into mmCIF dictionary</a>
- * @since 1.7
- */
-public enum PolymerType implements Serializable
-{
-
-	/**
-	 * polypeptide(L)
-	 */
-	peptide("polypeptide(L)"),
-
-	/**
-	 * polypeptide(D)
-	 */
-	dpeptide("polypeptide(D)"),
-
-	/**
-	 * polydeoxyribonucleotide
-	 */
-	dna("polydeoxyribonucleotide"),
-
-	/**
-	 * polyribonucleotide
-	 */
-	rna("polyribonucleotide"),
-
-	/**
-	 * polydeoxyribonucleotide/polyribonucleotide hybrid
-	 */
-	dnarna("polydeoxyribonucleotide/polyribonucleotide hybrid"),
-
-	/**
-	 * polysaccharide(D)
-	 */
-	polysaccharide("polysaccharide(D)"),
-
-	/**
-	 * polysaccharide(L)
-	 */
-	lpolysaccharide("polysaccharide(L)"),
-
-	/**
-	 * other
-	 */
-	otherPolymer("other"),
-
-	/**
-	 * cyclic peptides
-	 */
-	cyclicPeptide("cyclic-pseudo-peptide"),
-
-	/**
-	 * Peptide nucleic acids
-	 */
-	peptideNucleicAcid("peptide nucleic acid"),
-
-	/**
-	 * if all else fails...
-	 */
-	unknown(null);
-
-	static Map<String,PolymerType> lookupTable = new HashMap<>();
-
-	static {
-
-		for (PolymerType rt : PolymerType.values() ) {
-				if ( rt == unknown)
-					continue;
-				lookupTable.put(rt.entity_poly_type,rt);
-				lookupTable.put(rt.entity_poly_type.toLowerCase(),rt);
-		}
-	}
-
-
-	PolymerType(String entity_poly_type)
-	{
-		this.entity_poly_type = entity_poly_type;
-	}
-	public final String entity_poly_type;
-
-	public static PolymerType polymerTypeFromString(String polymerType)
-	{
-
-		if ( polymerType.equalsIgnoreCase(peptide.entity_poly_type))
-			return peptide;
-
-		PolymerType ptype = lookupTable.get(polymerType);
-		if ( ptype != null)
-			return ptype;
-
-		ptype = lookupTable.get(polymerType.toLowerCase());
-		if ( ptype != null)
-			return ptype;
-
-
-		for(PolymerType pt : PolymerType.values())
-		{
-			if(polymerType.equals(pt.entity_poly_type))
-			{
-				return pt;
-			}
-		}
-		return unknown;
-	}
-
-	/**
-	 * Convenience <tt>Set</tt> of polymer types classified as protein.  This only contains {@link #peptide}
-	 */
-	public static final Set<PolymerType> PROTEIN_ONLY;
-
-	/**
-	 * Convenience <tt>Set</tt> of polymer types classified as DNA.  This only contains {@link #dna}
-	 */
-	public static final Set<PolymerType> DNA_ONLY;
-
-	/**
-	 * Convenience <tt>Set</tt> of polymer types classified as RNA.  This only contains {@link #rna}
-	 */
-	public static final Set<PolymerType> RNA_ONLY;
-
-	/**
-	 * Convenience <tt>Set</tt> of polymer types classified as DNA.  This contains:
-	 * <ul>
-	 * <li>{@link #dna}</li>
-	 * <li>{@link #rna}</li>
-	 * <li>{@link #dnarna}</li>
-	 * </ul>
-	 */
-	public static final Set<PolymerType> POLYNUCLEOTIDE_ONLY;
-
-	/**
-	 * Convenience <tt>Set</tt> of all polymer types.
-	 */
-	public static final Set<PolymerType> ALL_POLYMER_TYPES;
-
-	static {
-		Set<PolymerType> tmp;
-
-		tmp = new HashSet<PolymerType>();
-		tmp.add(peptide);
-		PROTEIN_ONLY = Collections.unmodifiableSet(tmp);
-
-		tmp = new HashSet<PolymerType>();
-		tmp.add(dna);
-		DNA_ONLY = Collections.unmodifiableSet(tmp);
-
-		tmp = new HashSet<PolymerType>();
-		tmp.add(rna);
-		RNA_ONLY = Collections.unmodifiableSet(tmp);
-
-		tmp = new HashSet<PolymerType>();
-		tmp.add(dna);
-		tmp.add(rna);
-		tmp.add(dnarna);
-		POLYNUCLEOTIDE_ONLY = Collections.unmodifiableSet(tmp);
-
-		ALL_POLYMER_TYPES = Collections.unmodifiableSet(new HashSet<PolymerType>(Arrays.asList(values())));
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/ResidueType.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/ResidueType.java
deleted file mode 100644
index d6f6b0a40a..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/chem/ResidueType.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- *
- */
-package org.biojava.nbio.structure.io.mmcif.chem;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * Enumerates the possible classifications of residues. These are generally more specific than PolymerTypes
- * This information is derived from the mmcif dictionary.
- * @author mulvaney
- * @author Andreas Prlic
- * @see <a href="http://mmcif.rcsb.org/dictionaries/mmcif_pdbx.dic/Items/_chem_comp.type.html">link into mmCIF dictionary</a>
- * @since 1.7
- */
-
-public enum ResidueType implements Serializable {
-
-	atomn(null, "null"), // present in db for _chem_comp.id_ = 'CFL' but not enumerated in dictionary
-	// Peptides
-	dPeptideLinking(PolymerType.dpeptide, "D-peptide linking"),
-	lPeptideLinking(PolymerType.peptide, "L-peptide linking"),
-	glycine(PolymerType.peptide,"PEPTIDE LINKING"),
-	peptideLike(PolymerType.otherPolymer, "peptide-like"),
-	dPeptideAminoTerminus(PolymerType.dpeptide, "D-peptide NH3 amino terminus"),
-	lPeptideAminoTerminus(PolymerType.peptide, "L-peptide NH3 amino terminus"),
-	dPeptideCarboxyTerminus(PolymerType.dpeptide, "D-peptide COOH carboxy terminus"),
-	lPeptideCarboxyTerminus(PolymerType.peptide, "L-peptide COOH carboxy terminus"),
-	// Nucleotides
-	dnaLinking(PolymerType.dna, "DNA linking"),
-	rnaLinking(PolymerType.rna, "RNA linking"),
-	dna3PrimeTerminus(PolymerType.dna, "DNA OH 3 prime terminus"),
-	rna3PrimeTerminus(PolymerType.rna, "RNA OH 3 prime terminus"),
-	dna5PrimeTerminus(PolymerType.dna, "DNA OH 5 prime terminus"),
-	rna5PrimeTerminus(PolymerType.rna, "RNA OH 5 prime terminus"),
-	// Sugars
-	dSaccharide(PolymerType.polysaccharide, "D-saccharide"),
-	dSaccharide14and14linking(PolymerType.polysaccharide, "D-saccharide 1,4 and 1,4 linking"),
-	dSaccharide14and16linking(PolymerType.polysaccharide, "D-saccharide 1,4 and 1,6 linking"),
-	lSaccharide(PolymerType.lpolysaccharide, "L-saccharide"),
-	lSaccharide14and14linking(PolymerType.lpolysaccharide, "L-saccharide 1,4 and 1,4 linking"),
-	lSaccharide14and16linking(PolymerType.lpolysaccharide, "L-saccharide 1,4 and 1,6 linking"),
-	saccharide(PolymerType.polysaccharide, "saccharide"),
-	// Iso-peptides
-	dBetaPeptideCGammaLinking(PolymerType.dpeptide,"D-beta-peptide, C-gamma linking"),
-	dGammaPeptideCDeltaLinking(PolymerType.dpeptide,"D-gamma-peptide, C-delta linking"),
-	lBetaPeptideCGammaLinking(PolymerType.peptide,"L-beta-peptide, C-gamma linking"),
-	lGammaPeptideCDeltaLinking(PolymerType.peptide,"L-gamma-peptide, C-delta linking"),
-	// L nucleotides. As of 2015-04, these are only found in D-DNA hybrids, so they don't have their own PolymerType
-	lDNALinking(PolymerType.dna,"L-DNA linking"),
-	lRNALinking(PolymerType.dna,"L-RNA linking"),
-	// Other
-	nonPolymer(null, "non-polymer"),
-	otherChemComp(null, "other");
-
-
-	static Map<String,ResidueType> lookupTable = new HashMap<>();
-
-	static {
-
-		for (ResidueType rt : ResidueType.values() ) {
-				lookupTable.put(rt.chem_comp_type,rt);
-				lookupTable.put(rt.chem_comp_type.toLowerCase(),rt);
-		}
-	}
-	ResidueType(PolymerType pt, String chem_comp_type)
-	{
-		this.polymerType = pt;
-		this.chem_comp_type = chem_comp_type;
-
-	}
-
-	/**
-	 * The associated {@link PolymerType}
-	 */
-	public final PolymerType polymerType;
-
-	/**
-	 * Gets the associated PolymerType, which are less specific
-	 * @return
-	 */
-	public PolymerType getPolymerType() {return polymerType;}
-
-	/**
-	 * String value of the type
-	 */
-	public final String chem_comp_type;
-
-	/** Get ResidueType by chem_comp_type
-	 *
-	 * @param chem_comp_type e.g. L-peptide linking
-	 * @return
-	 */
-	public static ResidueType getResidueTypeFromString(String chem_comp_type)
-	{
-
-		// Almost all calls to this method are for L-peptide linking. Use this knowledge for a shortcut.
-
-		if ( chem_comp_type.equalsIgnoreCase(lPeptideLinking.chem_comp_type) )
-			return lPeptideLinking;
-
-		ResidueType rtype = lookupTable.get(chem_comp_type);
-		if ( rtype != null)
-			return rtype;
-
-		/** Unfortunately it can be guaranteed that chem_comp_type case sensitivity is preserved.
-		 * E.g. mmtf has it all upper-case. As such we need to do a second check
-		 */
-		rtype = lookupTable.get(chem_comp_type.toLowerCase());
-		if ( rtype != null)
-			return rtype;
-
-
-
-		// preserving previous behaviour. Not sure if this is really necessary?
-		for(ResidueType rt : ResidueType.values())
-		{
-			if(rt.chem_comp_type.equalsIgnoreCase(chem_comp_type))
-			{
-				return rt;
-			}
-			if ( rt.chem_comp_type.toLowerCase().startsWith(chem_comp_type.toLowerCase()))
-				return rt;
-			if ( chem_comp_type.toLowerCase().startsWith(rt.chem_comp_type.toLowerCase()))
-				return rt;
-		}
-		return null;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AbstractBean.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AbstractBean.java
deleted file mode 100644
index 7dc7b869f5..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AbstractBean.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at May 31, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-import org.biojava.nbio.structure.Chain;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.List;
-
-/** a generic class that implements the toString method for a bean
- *
- * @author Andreas Prlic
- *
- */
-public abstract class AbstractBean {
-
-	private static final Logger logger = LoggerFactory.getLogger(AbstractBean.class);
-
-	@Override
-	@SuppressWarnings({  "unchecked" })
-	public String toString(){
-		StringBuffer buf = new StringBuffer();
-		buf.append(this.getClass().getName()).append(": ");
-		/* disabled for the moment
-
-		buf.append(" chains: " );
-		Iterator<Chain> iter = chainList.iterator();
-		while (iter.hasNext()){
-			Chain c = iter.next();
-			buf.append (c.getName() + " ");
-		}
-
-		 */
-		try {
-			Class<? extends AbstractBean> c = this.getClass();
-			Method[] methods  = c.getMethods();
-
-			for (int i = 0; i < methods.length; i++) {
-				Method m = methods[i];
-
-				String name = m.getName();
-				if ( name.substring(0,3).equals("get")) {
-
-					Object o  = m.invoke(this, new Object[]{});
-					if ( o instanceof String){
-						buf.append(name.substring(3, name.length())+": "+ o + " ");
-					}
-					else if ( o instanceof List){
-						buf.append(name.substring(3, name.length())).append(": ");
-
-						List<Object>lst = (List<Object>)o;
-						for (Object obj : lst){
-							if ( obj instanceof Chain){
-								continue;
-							}
-							buf.append(obj).append(" ");
-						}
-
-					}
-					else {
-						// ignore...
-					}
-				}
-
-			}
-
-		} catch (InvocationTargetException e){
-			logger.error("Exception caught while producing toString",e);
-		} catch (IllegalAccessException e) {
-			logger.error("Exception caught while producing toString",e);
-		}
-
-
-		//if ( organismScientific != null)
-		//	buf.append(" organism scientific: " + organismScientific);
-
-
-		return buf.toString();
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AtomSite.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AtomSite.java
deleted file mode 100644
index 93ded0ca45..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AtomSite.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Apr 26, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-public class AtomSite extends AbstractBean{
-
-	String group_PDB;
-	String id;
-	String type_symbol;
-	String label_atom_id;
-	String label_alt_id;
-	String label_comp_id;
-	String label_asym_id;
-	String label_entity_id;
-	String label_seq_id;
-	String pdbx_PDB_ins_code;
-
-	String Cartn_x;
-	String Cartn_y;
-	String Cartn_z;
-	String occupancy;
-	String B_iso_or_equiv;
-
-	String Cartn_x_esd;
-	String Cartn_y_esd;
-	String Cartn_z_esd;
-	String occupancy_esd;
-	String B_iso_or_equiv_esd;
-	String pdbx_formal_charge;
-
-	String auth_seq_id;
-	String auth_comp_id;
-	String auth_asym_id;
-	String auth_atom_id;
-	String pdbx_PDB_model_num;
-
-
-	public String getGroup_PDB() {
-		return group_PDB;
-	}
-	public void setGroup_PDB(String group_PDB) {
-		this.group_PDB = group_PDB;
-	}
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getType_symbol() {
-		return type_symbol;
-	}
-	public void setType_symbol(String type_symbol) {
-		this.type_symbol = type_symbol;
-	}
-
-	public String getLabel_alt_id() {
-		return label_alt_id;
-	}
-	public void setLabel_alt_id(String label_alt_id) {
-		this.label_alt_id = label_alt_id;
-	}
-	public String getLabel_comp_id() {
-		return label_comp_id;
-	}
-	public void setLabel_comp_id(String label_comp_id) {
-		this.label_comp_id = label_comp_id;
-	}
-	public String getLabel_entity_id() {
-		return label_entity_id;
-	}
-	public void setLabel_entity_id(String label_entity_id) {
-		this.label_entity_id = label_entity_id;
-	}
-	public String getLabel_seq_id() {
-		return label_seq_id;
-	}
-	public void setLabel_seq_id(String label_seq_id) {
-		this.label_seq_id = label_seq_id;
-	}
-	public String getPdbx_PDB_ins_code() {
-		return pdbx_PDB_ins_code;
-	}
-	public void setPdbx_PDB_ins_code(String pdbx_PDB_ins_code) {
-		this.pdbx_PDB_ins_code = pdbx_PDB_ins_code;
-	}
-	public String getCartn_x() {
-		return Cartn_x;
-	}
-	public void setCartn_x(String cartn_x) {
-		Cartn_x = cartn_x;
-	}
-	public String getCartn_y() {
-		return Cartn_y;
-	}
-	public void setCartn_y(String cartn_y) {
-		Cartn_y = cartn_y;
-	}
-	public String getCartn_z() {
-		return Cartn_z;
-	}
-	public void setCartn_z(String cartn_z) {
-		Cartn_z = cartn_z;
-	}
-	public String getOccupancy() {
-		return occupancy;
-	}
-	public void setOccupancy(String occupancy) {
-		this.occupancy = occupancy;
-	}
-	public String getB_iso_or_equiv() {
-		return B_iso_or_equiv;
-	}
-	public void setB_iso_or_equiv(String b_iso_or_equiv) {
-		B_iso_or_equiv = b_iso_or_equiv;
-	}
-	public String getCartn_x_esd() {
-		return Cartn_x_esd;
-	}
-	public void setCartn_x_esd(String cartn_x_esd) {
-		Cartn_x_esd = cartn_x_esd;
-	}
-	public String getCartn_y_esd() {
-		return Cartn_y_esd;
-	}
-	public void setCartn_y_esd(String cartn_y_esd) {
-		Cartn_y_esd = cartn_y_esd;
-	}
-	public String getCartn_z_esd() {
-		return Cartn_z_esd;
-	}
-	public void setCartn_z_esd(String cartn_z_esd) {
-		Cartn_z_esd = cartn_z_esd;
-	}
-	public String getAuth_seq_id() {
-		return auth_seq_id;
-	}
-	public void setAuth_seq_id(String auth_seq_id) {
-		this.auth_seq_id = auth_seq_id;
-	}
-	public String getAuth_comp_id() {
-		return auth_comp_id;
-	}
-	public void setAuth_comp_id(String auth_comp_id) {
-		this.auth_comp_id = auth_comp_id;
-	}
-	public String getAuth_asym_id() {
-		return auth_asym_id;
-	}
-	public void setAuth_asym_id(String auth_asym_id) {
-		this.auth_asym_id = auth_asym_id;
-	}
-	public String getAuth_atom_id() {
-		return auth_atom_id;
-	}
-	public void setAuth_atom_id(String auth_atom_id) {
-		this.auth_atom_id = auth_atom_id;
-	}
-	public String getPdbx_PDB_model_num() {
-		return pdbx_PDB_model_num;
-	}
-	public void setPdbx_PDB_model_num(String pdbx_PDB_model_num) {
-		this.pdbx_PDB_model_num = pdbx_PDB_model_num;
-	}
-	public String getLabel_atom_id() {
-		return label_atom_id;
-	}
-	public void setLabel_atom_id(String label_atom_id) {
-		this.label_atom_id = label_atom_id;
-	}
-	public String getLabel_asym_id() {
-		return label_asym_id;
-	}
-	public void setLabel_asym_id(String label_asym_id) {
-		this.label_asym_id = label_asym_id;
-	}
-	public String getOccupancy_esd() {
-		return occupancy_esd;
-	}
-	public void setOccupancy_esd(String occupancy_esd) {
-		this.occupancy_esd = occupancy_esd;
-	}
-	public String getB_iso_or_equiv_esd() {
-		return B_iso_or_equiv_esd;
-	}
-	public void setB_iso_or_equiv_esd(String b_iso_or_equiv_esd) {
-		B_iso_or_equiv_esd = b_iso_or_equiv_esd;
-	}
-	public String getPdbx_formal_charge() {
-		return pdbx_formal_charge;
-	}
-	public void setPdbx_formal_charge(String pdbx_formal_charge) {
-		this.pdbx_formal_charge = pdbx_formal_charge;
-	}
-
-
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AtomSites.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AtomSites.java
deleted file mode 100644
index 9e4db8b683..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AtomSites.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/**
- * A class containing the _atom_sites data. Equivalent to the SCALE records in PDB files.
- *
- *
- * @author Jose Duarte
- *
- */
-public class AtomSites extends AbstractBean {
-
-	String entry_id;
-
-	// to my knowledge this field is not used - JD 2016-11-22
-	String Cartn_transform_axes;
-
-	@CIFLabel(label="fract_transf_matrix[1][1]")
-	String fract_transf_matrix11;
-
-	@CIFLabel(label="fract_transf_matrix[1][2]")
-	String fract_transf_matrix12;
-
-	@CIFLabel(label="fract_transf_matrix[1][3]")
-	String fract_transf_matrix13;
-
-
-	@CIFLabel(label="fract_transf_matrix[2][1]")
-	String fract_transf_matrix21;
-
-	@CIFLabel(label="fract_transf_matrix[2][2]")
-	String fract_transf_matrix22;
-
-	@CIFLabel(label="fract_transf_matrix[2][3]")
-	String fract_transf_matrix23;
-
-
-	@CIFLabel(label="fract_transf_matrix[3][1]")
-	String fract_transf_matrix31;
-
-	@CIFLabel(label="fract_transf_matrix[3][2]")
-	String fract_transf_matrix32;
-
-	@CIFLabel(label="fract_transf_matrix[3][3]")
-	String fract_transf_matrix33;
-
-
-	@CIFLabel(label="fract_transf_vector[1]")
-	String fract_transf_vector1;
-
-	@CIFLabel(label="fract_transf_vector[2]")
-	String fract_transf_vector2;
-
-	@CIFLabel(label="fract_transf_vector[3]")
-	String fract_transf_vector3;
-
-	// these fields are unusual but appear in some entries like 5e5j - JD 2016-11-22
-	@CIFLabel(label="Cartn_transf_matrix[1][1]")
-	String Cartn_transf_matrix11;
-
-	@CIFLabel(label="Cartn_transf_matrix[1][2]")
-	String Cartn_transf_matrix12;
-
-	@CIFLabel(label="Cartn_transf_matrix[1][3]")
-	String Cartn_transf_matrix13;
-
-	@CIFLabel(label="Cartn_transf_matrix[2][1]")
-	String Cartn_transf_matrix21;
-
-	@CIFLabel(label="Cartn_transf_matrix[2][2]")
-	String Cartn_transf_matrix22;
-
-	@CIFLabel(label="Cartn_transf_matrix[2][3]")
-	String Cartn_transf_matrix23;
-
-	@CIFLabel(label="Cartn_transf_matrix[3][1]")
-	String Cartn_transf_matrix31;
-
-	@CIFLabel(label="Cartn_transf_matrix[3][2]")
-	String Cartn_transf_matrix32;
-
-	@CIFLabel(label="Cartn_transf_matrix[3][3]")
-	String Cartn_transf_matrix33;
-
-	@CIFLabel(label="Cartn_transf_vector[1]")
-	String Cartn_transf_vector1;
-
-	@CIFLabel(label="Cartn_transf_vector[2]")
-	String Cartn_transf_vector2;
-
-	@CIFLabel(label="Cartn_transf_vector[3]")
-	String Cartn_transf_vector3;
-
-
-	public String getEntry_id() {
-		return entry_id;
-	}
-	public void setEntry_id(String entry_id) {
-		this.entry_id = entry_id;
-	}
-	/**
-	 * @return the cartn_transform_axes
-	 */
-	public String getCartn_transform_axes() {
-		return Cartn_transform_axes;
-	}
-	/**
-	 * @param cartn_transform_axes the cartn_transform_axes to set
-	 */
-	public void setCartn_transform_axes(String cartn_transform_axes) {
-		Cartn_transform_axes = cartn_transform_axes;
-	}
-	/**
-	 * @return the fract_transf_matrix11
-	 */
-	public String getFract_transf_matrix11() {
-		return fract_transf_matrix11;
-	}
-	/**
-	 * @param fract_transf_matrix11 the fract_transf_matrix11 to set
-	 */
-	public void setFract_transf_matrix11(String fract_transf_matrix11) {
-		this.fract_transf_matrix11 = fract_transf_matrix11;
-	}
-	/**
-	 * @return the fract_transf_matrix12
-	 */
-	public String getFract_transf_matrix12() {
-		return fract_transf_matrix12;
-	}
-	/**
-	 * @param fract_transf_matrix12 the fract_transf_matrix12 to set
-	 */
-	public void setFract_transf_matrix12(String fract_transf_matrix12) {
-		this.fract_transf_matrix12 = fract_transf_matrix12;
-	}
-	/**
-	 * @return the fract_transf_matrix13
-	 */
-	public String getFract_transf_matrix13() {
-		return fract_transf_matrix13;
-	}
-	/**
-	 * @param fract_transf_matrix13 the fract_transf_matrix13 to set
-	 */
-	public void setFract_transf_matrix13(String fract_transf_matrix13) {
-		this.fract_transf_matrix13 = fract_transf_matrix13;
-	}
-	/**
-	 * @return the fract_transf_matrix21
-	 */
-	public String getFract_transf_matrix21() {
-		return fract_transf_matrix21;
-	}
-	/**
-	 * @param fract_transf_matrix21 the fract_transf_matrix21 to set
-	 */
-	public void setFract_transf_matrix21(String fract_transf_matrix21) {
-		this.fract_transf_matrix21 = fract_transf_matrix21;
-	}
-	/**
-	 * @return the fract_transf_matrix22
-	 */
-	public String getFract_transf_matrix22() {
-		return fract_transf_matrix22;
-	}
-	/**
-	 * @param fract_transf_matrix22 the fract_transf_matrix22 to set
-	 */
-	public void setFract_transf_matrix22(String fract_transf_matrix22) {
-		this.fract_transf_matrix22 = fract_transf_matrix22;
-	}
-	/**
-	 * @return the fract_transf_matrix23
-	 */
-	public String getFract_transf_matrix23() {
-		return fract_transf_matrix23;
-	}
-	/**
-	 * @param fract_transf_matrix23 the fract_transf_matrix23 to set
-	 */
-	public void setFract_transf_matrix23(String fract_transf_matrix23) {
-		this.fract_transf_matrix23 = fract_transf_matrix23;
-	}
-	/**
-	 * @return the fract_transf_matrix31
-	 */
-	public String getFract_transf_matrix31() {
-		return fract_transf_matrix31;
-	}
-	/**
-	 * @param fract_transf_matrix31 the fract_transf_matrix31 to set
-	 */
-	public void setFract_transf_matrix31(String fract_transf_matrix31) {
-		this.fract_transf_matrix31 = fract_transf_matrix31;
-	}
-	/**
-	 * @return the fract_transf_matrix32
-	 */
-	public String getFract_transf_matrix32() {
-		return fract_transf_matrix32;
-	}
-	/**
-	 * @param fract_transf_matrix32 the fract_transf_matrix32 to set
-	 */
-	public void setFract_transf_matrix32(String fract_transf_matrix32) {
-		this.fract_transf_matrix32 = fract_transf_matrix32;
-	}
-	/**
-	 * @return the fract_transf_matrix33
-	 */
-	public String getFract_transf_matrix33() {
-		return fract_transf_matrix33;
-	}
-	/**
-	 * @param fract_transf_matrix33 the fract_transf_matrix33 to set
-	 */
-	public void setFract_transf_matrix33(String fract_transf_matrix33) {
-		this.fract_transf_matrix33 = fract_transf_matrix33;
-	}
-	/**
-	 * @return the fract_transf_vector1
-	 */
-	public String getFract_transf_vector1() {
-		return fract_transf_vector1;
-	}
-	/**
-	 * @param fract_transf_vector1 the fract_transf_vector1 to set
-	 */
-	public void setFract_transf_vector1(String fract_transf_vector1) {
-		this.fract_transf_vector1 = fract_transf_vector1;
-	}
-	/**
-	 * @return the fract_transf_vector2
-	 */
-	public String getFract_transf_vector2() {
-		return fract_transf_vector2;
-	}
-	/**
-	 * @param fract_transf_vector2 the fract_transf_vector2 to set
-	 */
-	public void setFract_transf_vector2(String fract_transf_vector2) {
-		this.fract_transf_vector2 = fract_transf_vector2;
-	}
-	/**
-	 * @return the fract_transf_vector3
-	 */
-	public String getFract_transf_vector3() {
-		return fract_transf_vector3;
-	}
-	/**
-	 * @param fract_transf_vector3 the fract_transf_vector3 to set
-	 */
-	public void setFract_transf_vector3(String fract_transf_vector3) {
-		this.fract_transf_vector3 = fract_transf_vector3;
-	}
-	/**
-	 * @return the cartn_transf_matrix11
-	 */
-	public String getCartn_transf_matrix11() {
-		return Cartn_transf_matrix11;
-	}
-	/**
-	 * @param cartn_transf_matrix11 the cartn_transf_matrix11 to set
-	 */
-	public void setCartn_transf_matrix11(String cartn_transf_matrix11) {
-		Cartn_transf_matrix11 = cartn_transf_matrix11;
-	}
-	/**
-	 * @return the cartn_transf_matrix12
-	 */
-	public String getCartn_transf_matrix12() {
-		return Cartn_transf_matrix12;
-	}
-	/**
-	 * @param cartn_transf_matrix12 the cartn_transf_matrix12 to set
-	 */
-	public void setCartn_transf_matrix12(String cartn_transf_matrix12) {
-		Cartn_transf_matrix12 = cartn_transf_matrix12;
-	}
-	/**
-	 * @return the cartn_transf_matrix13
-	 */
-	public String getCartn_transf_matrix13() {
-		return Cartn_transf_matrix13;
-	}
-	/**
-	 * @param cartn_transf_matrix13 the cartn_transf_matrix13 to set
-	 */
-	public void setCartn_transf_matrix13(String cartn_transf_matrix13) {
-		Cartn_transf_matrix13 = cartn_transf_matrix13;
-	}
-	/**
-	 * @return the cartn_transf_matrix21
-	 */
-	public String getCartn_transf_matrix21() {
-		return Cartn_transf_matrix21;
-	}
-	/**
-	 * @param cartn_transf_matrix21 the cartn_transf_matrix21 to set
-	 */
-	public void setCartn_transf_matrix21(String cartn_transf_matrix21) {
-		Cartn_transf_matrix21 = cartn_transf_matrix21;
-	}
-	/**
-	 * @return the cartn_transf_matrix22
-	 */
-	public String getCartn_transf_matrix22() {
-		return Cartn_transf_matrix22;
-	}
-	/**
-	 * @param cartn_transf_matrix22 the cartn_transf_matrix22 to set
-	 */
-	public void setCartn_transf_matrix22(String cartn_transf_matrix22) {
-		Cartn_transf_matrix22 = cartn_transf_matrix22;
-	}
-	/**
-	 * @return the cartn_transf_matrix23
-	 */
-	public String getCartn_transf_matrix23() {
-		return Cartn_transf_matrix23;
-	}
-	/**
-	 * @param cartn_transf_matrix23 the cartn_transf_matrix23 to set
-	 */
-	public void setCartn_transf_matrix23(String cartn_transf_matrix23) {
-		Cartn_transf_matrix23 = cartn_transf_matrix23;
-	}
-	/**
-	 * @return the cartn_transf_matrix31
-	 */
-	public String getCartn_transf_matrix31() {
-		return Cartn_transf_matrix31;
-	}
-	/**
-	 * @param cartn_transf_matrix31 the cartn_transf_matrix31 to set
-	 */
-	public void setCartn_transf_matrix31(String cartn_transf_matrix31) {
-		Cartn_transf_matrix31 = cartn_transf_matrix31;
-	}
-	/**
-	 * @return the cartn_transf_matrix32
-	 */
-	public String getCartn_transf_matrix32() {
-		return Cartn_transf_matrix32;
-	}
-	/**
-	 * @param cartn_transf_matrix32 the cartn_transf_matrix32 to set
-	 */
-	public void setCartn_transf_matrix32(String cartn_transf_matrix32) {
-		Cartn_transf_matrix32 = cartn_transf_matrix32;
-	}
-	/**
-	 * @return the cartn_transf_matrix33
-	 */
-	public String getCartn_transf_matrix33() {
-		return Cartn_transf_matrix33;
-	}
-	/**
-	 * @param cartn_transf_matrix33 the cartn_transf_matrix33 to set
-	 */
-	public void setCartn_transf_matrix33(String cartn_transf_matrix33) {
-		Cartn_transf_matrix33 = cartn_transf_matrix33;
-	}
-	/**
-	 * @return the cartn_transf_vector1
-	 */
-	public String getCartn_transf_vector1() {
-		return Cartn_transf_vector1;
-	}
-	/**
-	 * @param cartn_transf_vector1 the cartn_transf_vector1 to set
-	 */
-	public void setCartn_transf_vector1(String cartn_transf_vector1) {
-		Cartn_transf_vector1 = cartn_transf_vector1;
-	}
-	/**
-	 * @return the cartn_transf_vector2
-	 */
-	public String getCartn_transf_vector2() {
-		return Cartn_transf_vector2;
-	}
-	/**
-	 * @param cartn_transf_vector2 the cartn_transf_vector2 to set
-	 */
-	public void setCartn_transf_vector2(String cartn_transf_vector2) {
-		Cartn_transf_vector2 = cartn_transf_vector2;
-	}
-	/**
-	 * @return the cartn_transf_vector3
-	 */
-	public String getCartn_transf_vector3() {
-		return Cartn_transf_vector3;
-	}
-	/**
-	 * @param cartn_transf_vector3 the cartn_transf_vector3 to set
-	 */
-	public void setCartn_transf_vector3(String cartn_transf_vector3) {
-		Cartn_transf_vector3 = cartn_transf_vector3;
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AuditAuthor.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AuditAuthor.java
deleted file mode 100644
index 4cfc0962c7..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/AuditAuthor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *                    PDB web development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- *
- * Created on Jul 25, 2009
- * Created by Andreas Prlic
- *
- */
-
-package org.biojava.nbio.structure.io.mmcif.model;
-
-public class AuditAuthor
-{
-	String name;
-	String pdbx_ordinal;
-	String address;
-	public String getName()
-	{
-		return name;
-	}
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getPdbx_ordinal()
-	{
-		return pdbx_ordinal;
-	}
-	public void setPdbx_ordinal(String pdbx_ordinal)
-	{
-		this.pdbx_ordinal = pdbx_ordinal;
-	}
-	public String getAddress() {
-		return address;
-	}
-	public void setAddress(String address) {
-		this.address = address;
-	}
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/CIFLabel.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/CIFLabel.java
deleted file mode 100644
index 17775df70f..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/CIFLabel.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation indicating that a specific field of a bean should be mapped to
- * a different label
- * @author Spencer Bliven
- *
- */
-@Target(value=ElementType.FIELD)
-@Retention(value=RetentionPolicy.RUNTIME)
-public @interface CIFLabel {
-	String label();
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Cell.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Cell.java
deleted file mode 100644
index 59804fa821..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Cell.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-public class Cell extends AbstractBean {
-
-	String entry_id;
-	String length_a;
-	String length_b;
-	String length_c;
-	String angle_alpha;
-	String angle_beta;
-	String angle_gamma;
-	String Z_PDB;
-	String pdbx_unique_axis;
-
-	// some PDB entries like 1aac have the extra esd fields
-	String length_a_esd;
-	String length_b_esd;
-	String length_c_esd;
-	String angle_alpha_esd;
-	String angle_beta_esd;
-	String angle_gamma_esd;
-
-	String volume;
-
-	public String getEntry_id() {
-		return entry_id;
-	}
-	public void setEntry_id(String entry_id) {
-		this.entry_id = entry_id;
-	}
-	public String getLength_a() {
-		return length_a;
-	}
-	public void setLength_a(String length_a) {
-		this.length_a = length_a;
-	}
-	public String getLength_b() {
-		return length_b;
-	}
-	public void setLength_b(String length_b) {
-		this.length_b = length_b;
-	}
-	public String getLength_c() {
-		return length_c;
-	}
-	public void setLength_c(String length_c) {
-		this.length_c = length_c;
-	}
-	public String getAngle_alpha() {
-		return angle_alpha;
-	}
-	public void setAngle_alpha(String angle_alpha) {
-		this.angle_alpha = angle_alpha;
-	}
-	public String getAngle_beta() {
-		return angle_beta;
-	}
-	public void setAngle_beta(String angle_beta) {
-		this.angle_beta = angle_beta;
-	}
-	public String getAngle_gamma() {
-		return angle_gamma;
-	}
-	public void setAngle_gamma(String angle_gamma) {
-		this.angle_gamma = angle_gamma;
-	}
-	public String getZ_PDB() {
-		return Z_PDB;
-	}
-	public void setZ_PDB(String z_PDB) {
-		Z_PDB = z_PDB;
-	}
-	public String getPdbx_unique_axis() {
-		return pdbx_unique_axis;
-	}
-	public void setPdbx_unique_axis(String pdbx_unique_axis) {
-		this.pdbx_unique_axis = pdbx_unique_axis;
-	}
-	public String getLength_a_esd() {
-		return length_a_esd;
-	}
-	public void setLength_a_esd(String length_a_esd) {
-		this.length_a_esd = length_a_esd;
-	}
-	public String getLength_b_esd() {
-		return length_b_esd;
-	}
-	public void setLength_b_esd(String length_b_esd) {
-		this.length_b_esd = length_b_esd;
-	}
-	public String getLength_c_esd() {
-		return length_c_esd;
-	}
-	public void setLength_c_esd(String length_c_esd) {
-		this.length_c_esd = length_c_esd;
-	}
-	public String getAngle_alpha_esd() {
-		return angle_alpha_esd;
-	}
-	public void setAngle_alpha_esd(String angle_alpha_esd) {
-		this.angle_alpha_esd = angle_alpha_esd;
-	}
-	public String getAngle_beta_esd() {
-		return angle_beta_esd;
-	}
-	public void setAngle_beta_esd(String angle_beta_esd) {
-		this.angle_beta_esd = angle_beta_esd;
-	}
-	public String getAngle_gamma_esd() {
-		return angle_gamma_esd;
-	}
-	public void setAngle_gamma_esd(String angle_gamma_esd) {
-		this.angle_gamma_esd = angle_gamma_esd;
-	}
-	public String getVolume() {
-		return volume;
-	}
-	public void setVolume(String volume) {
-		this.volume = volume;
-	}
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemComp.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemComp.java
deleted file mode 100644
index cb38de1755..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemComp.java
+++ /dev/null
@@ -1,618 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-import org.biojava.nbio.structure.io.mmcif.chem.ChemCompTools;
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
-import org.biojava.nbio.structure.io.mmcif.chem.ResidueType;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/** A definition for a Chemical Component, as maintained by the wwPDB. For access to all definitions,
- * please download the components.cif.gz file from the wwPDB website.
- *
- * @author Andreas Prlic
- *
- */
-public class ChemComp implements Serializable, Comparable<ChemComp>{
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = -4736341142030215915L;
-
-	private String id ;
-	private String name;
-	private String type;
-	private String pdbx_type;
-	private String formula;
-	private String mon_nstd_parent_comp_id;
-	private String pdbx_synonyms;
-	private String pdbx_formal_charge;
-	private String pdbx_initial_date ;
-	private String pdbx_modified_date;
-	private String pdbx_ambiguous_flag;
-	private String pdbx_release_status ;
-	private String pdbx_replaced_by;
-	private String pdbx_replaces;
-	private String formula_weight;
-	private String one_letter_code;
-	private String three_letter_code;
-	private String pdbx_model_coordinates_details;
-	private String pdbx_model_coordinates_missing_flag;
-	private String pdbx_ideal_coordinates_details;
-	private String pdbx_ideal_coordinates_missing_flag;
-	private String pdbx_model_coordinates_db_code;
-	private String pdbx_subcomponent_list;
-	private String pdbx_processing_site;
-	private String mon_nstd_flag;
-
-	@IgnoreField
-	private List<ChemCompDescriptor> descriptors = new ArrayList<ChemCompDescriptor>();
-	@IgnoreField
-	private List<ChemCompBond> bonds = new ArrayList<ChemCompBond>();
-	@IgnoreField
-	private List<ChemCompAtom> atoms = new ArrayList<ChemCompAtom>();
-
-	// and some derived data for easier processing...
-	@IgnoreField
-	private ResidueType residueType;
-	@IgnoreField
-	private PolymerType polymerType;
-	@IgnoreField
-	private boolean standard;
-
-	@Override
-	public String toString(){
-		StringBuffer buf = new StringBuffer("ChemComp ");
-		buf.append(id);
-		buf.append(" ");
-		buf.append(one_letter_code);
-		buf.append(" ");
-		buf.append(three_letter_code);
-		buf.append(" poly:");
-		buf.append(getPolymerType());
-		buf.append(" resi:");
-		buf.append(getResidueType());
-		if (isStandard())
-			buf.append(" standard");
-		else
-			buf.append(" modified");
-		buf.append(" ");
-
-		buf.append(name);
-		buf.append(" ");
-		buf.append(pdbx_type);
-		buf.append(" ");
-		buf.append(formula);
-		buf.append(" parent:");
-		buf.append(mon_nstd_parent_comp_id);
-		return buf.toString();
-	}
-
-	public boolean hasParent(){
-		String pid = mon_nstd_parent_comp_id;
-		if ((pid != null ) && (! pid.equals("?"))){
-			return true;
-		}
-		return false;
-	}
-
-	public boolean isStandard(){
-		return standard;
-	}
-
-	private void setStandardFlag(){
-		standard = ChemCompTools.isStandardChemComp(this);
-	}
-
-
-
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-
-		residueType = ResidueType.getResidueTypeFromString(type);
-		if ( residueType != null){
-			polymerType = residueType.polymerType;
-		}
-
-	}
-
-
-	public ResidueType getResidueType() {
-		return residueType;
-	}
-
-	public void setResidueType(ResidueType residueType) {
-		this.residueType = residueType;
-	}
-
-	public PolymerType getPolymerType() {
-		return polymerType;
-	}
-
-	public void setPolymerType(PolymerType polymerType) {
-		this.polymerType = polymerType;
-	}
-
-	public String getPdbx_type() {
-		return pdbx_type;
-	}
-	public void setPdbx_type(String pdbx_type) {
-		this.pdbx_type = pdbx_type;
-	}
-	public String getFormula() {
-		return formula;
-	}
-	public void setFormula(String formula) {
-		this.formula = formula;
-	}
-	public String getMon_nstd_parent_comp_id() {
-		return mon_nstd_parent_comp_id;
-	}
-	public void setMon_nstd_parent_comp_id(String mon_nstd_parent_comp_id) {
-		this.mon_nstd_parent_comp_id = mon_nstd_parent_comp_id;
-		setStandardFlag();
-	}
-	public String getPdbx_synonyms() {
-		return pdbx_synonyms;
-	}
-	public void setPdbx_synonyms(String pdbx_synonyms) {
-		this.pdbx_synonyms = pdbx_synonyms;
-	}
-	public String getPdbx_formal_charge() {
-		return pdbx_formal_charge;
-	}
-	public void setPdbx_formal_charge(String pdbx_formal_charge) {
-		this.pdbx_formal_charge = pdbx_formal_charge;
-	}
-	public String getPdbx_initial_date() {
-		return pdbx_initial_date;
-	}
-	public void setPdbx_initial_date(String pdbx_initial_date) {
-		this.pdbx_initial_date = pdbx_initial_date;
-	}
-	public String getPdbx_modified_date() {
-		return pdbx_modified_date;
-	}
-	public void setPdbx_modified_date(String pdbx_modified_date) {
-		this.pdbx_modified_date = pdbx_modified_date;
-	}
-	public String getPdbx_ambiguous_flag() {
-		return pdbx_ambiguous_flag;
-	}
-	public void setPdbx_ambiguous_flag(String pdbx_ambiguous_flag) {
-		this.pdbx_ambiguous_flag = pdbx_ambiguous_flag;
-	}
-	public String getPdbx_release_status() {
-		return pdbx_release_status;
-	}
-	public void setPdbx_release_status(String pdbx_release_status) {
-		this.pdbx_release_status = pdbx_release_status;
-	}
-	public String getPdbx_replaced_by() {
-		return pdbx_replaced_by;
-	}
-	public void setPdbx_replaced_by(String pdbx_replaced_by) {
-		this.pdbx_replaced_by = pdbx_replaced_by;
-	}
-	public String getPdbx_replaces() {
-		return pdbx_replaces;
-	}
-	public void setPdbx_replaces(String pdbx_replaces) {
-		this.pdbx_replaces = pdbx_replaces;
-	}
-	public String getFormula_weight() {
-		return formula_weight;
-	}
-	public void setFormula_weight(String formula_weight) {
-		this.formula_weight = formula_weight;
-	}
-	public String getOne_letter_code() {
-		return one_letter_code;
-	}
-	public void setOne_letter_code(String one_letter_code) {
-		this.one_letter_code = one_letter_code;
-		setStandardFlag();
-	}
-	public String getThree_letter_code() {
-		return three_letter_code;
-	}
-	public void setThree_letter_code(String three_letter_code) {
-		this.three_letter_code = three_letter_code;
-	}
-	public String getPdbx_model_coordinates_details() {
-		return pdbx_model_coordinates_details;
-	}
-	public void setPdbx_model_coordinates_details(
-			String pdbx_model_coordinates_details) {
-		this.pdbx_model_coordinates_details = pdbx_model_coordinates_details;
-	}
-	public String getPdbx_model_coordinates_missing_flag() {
-		return pdbx_model_coordinates_missing_flag;
-	}
-	public void setPdbx_model_coordinates_missing_flag(
-			String pdbx_model_coordinates_missing_flag) {
-		this.pdbx_model_coordinates_missing_flag = pdbx_model_coordinates_missing_flag;
-	}
-	public String getPdbx_ideal_coordinates_details() {
-		return pdbx_ideal_coordinates_details;
-	}
-	public void setPdbx_ideal_coordinates_details(
-			String pdbx_ideal_coordinates_details) {
-		this.pdbx_ideal_coordinates_details = pdbx_ideal_coordinates_details;
-	}
-	public String getPdbx_ideal_coordinates_missing_flag() {
-		return pdbx_ideal_coordinates_missing_flag;
-	}
-	public void setPdbx_ideal_coordinates_missing_flag(
-			String pdbx_ideal_coordinates_missing_flag) {
-		this.pdbx_ideal_coordinates_missing_flag = pdbx_ideal_coordinates_missing_flag;
-	}
-	public String getPdbx_model_coordinates_db_code() {
-		return pdbx_model_coordinates_db_code;
-	}
-	public void setPdbx_model_coordinates_db_code(
-			String pdbx_model_coordinates_db_code) {
-		this.pdbx_model_coordinates_db_code = pdbx_model_coordinates_db_code;
-	}
-	public String getPdbx_subcomponent_list() {
-		return pdbx_subcomponent_list;
-	}
-	public void setPdbx_subcomponent_list(String pdbx_subcomponent_list) {
-		this.pdbx_subcomponent_list = pdbx_subcomponent_list;
-	}
-	public String getPdbx_processing_site() {
-		return pdbx_processing_site;
-	}
-	public void setPdbx_processing_site(String pdbx_processing_site) {
-		this.pdbx_processing_site = pdbx_processing_site;
-	}
-
-	public void setStandard(boolean standard) {
-		this.standard = standard;
-	}
-
-	public String getMon_nstd_flag()
-	{
-		return mon_nstd_flag;
-	}
-
-	public void setMon_nstd_flag(String mon_nstd_flag)
-	{
-		this.mon_nstd_flag = mon_nstd_flag;
-	}
-
-	public List<ChemCompDescriptor> getDescriptors() {
-		return descriptors;
-	}
-
-	public void setDescriptors(List<ChemCompDescriptor> descriptors) {
-		this.descriptors = descriptors;
-	}
-
-	public List<ChemCompBond> getBonds() {
-		return bonds;
-	}
-
-	public void setBonds(List<ChemCompBond> bonds) {
-		this.bonds = bonds;
-	}
-
-	public List<ChemCompAtom> getAtoms() {
-		return atoms;
-	}
-
-	public void setAtoms(List<ChemCompAtom> atoms) {
-		this.atoms = atoms;
-	}
-
-	@Override
-	public int compareTo(ChemComp arg0) {
-		if ( this.equals(arg0))
-			return 0;
-		return this.getId().compareTo(arg0.getId());
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result
-				+ ((descriptors == null) ? 0 : descriptors.hashCode());
-		result = prime * result + ((formula == null) ? 0 : formula.hashCode());
-		result = prime * result
-				+ ((formula_weight == null) ? 0 : formula_weight.hashCode());
-		result = prime * result + ((id == null) ? 0 : id.hashCode());
-		result = prime * result
-				+ ((mon_nstd_flag == null) ? 0 : mon_nstd_flag.hashCode());
-		result = prime
-				* result
-				+ ((mon_nstd_parent_comp_id == null) ? 0
-						: mon_nstd_parent_comp_id.hashCode());
-		result = prime * result + ((name == null) ? 0 : name.hashCode());
-		result = prime * result
-				+ ((one_letter_code == null) ? 0 : one_letter_code.hashCode());
-		result = prime
-				* result
-				+ ((pdbx_ambiguous_flag == null) ? 0 : pdbx_ambiguous_flag
-						.hashCode());
-		result = prime
-				* result
-				+ ((pdbx_formal_charge == null) ? 0 : pdbx_formal_charge
-						.hashCode());
-		result = prime
-				* result
-				+ ((pdbx_ideal_coordinates_details == null) ? 0
-						: pdbx_ideal_coordinates_details.hashCode());
-		result = prime
-				* result
-				+ ((pdbx_ideal_coordinates_missing_flag == null) ? 0
-						: pdbx_ideal_coordinates_missing_flag.hashCode());
-		result = prime
-				* result
-				+ ((pdbx_initial_date == null) ? 0 : pdbx_initial_date
-						.hashCode());
-		result = prime
-				* result
-				+ ((pdbx_model_coordinates_db_code == null) ? 0
-						: pdbx_model_coordinates_db_code.hashCode());
-		result = prime
-				* result
-				+ ((pdbx_model_coordinates_details == null) ? 0
-						: pdbx_model_coordinates_details.hashCode());
-		result = prime
-				* result
-				+ ((pdbx_model_coordinates_missing_flag == null) ? 0
-						: pdbx_model_coordinates_missing_flag.hashCode());
-		result = prime
-				* result
-				+ ((pdbx_modified_date == null) ? 0 : pdbx_modified_date
-						.hashCode());
-		result = prime
-				* result
-				+ ((pdbx_processing_site == null) ? 0 : pdbx_processing_site
-						.hashCode());
-		result = prime
-				* result
-				+ ((pdbx_release_status == null) ? 0 : pdbx_release_status
-						.hashCode());
-		result = prime
-				* result
-				+ ((pdbx_replaced_by == null) ? 0 : pdbx_replaced_by.hashCode());
-		result = prime * result
-				+ ((pdbx_replaces == null) ? 0 : pdbx_replaces.hashCode());
-		result = prime
-				* result
-				+ ((pdbx_subcomponent_list == null) ? 0
-						: pdbx_subcomponent_list.hashCode());
-		result = prime * result
-				+ ((pdbx_synonyms == null) ? 0 : pdbx_synonyms.hashCode());
-		result = prime * result
-				+ ((pdbx_type == null) ? 0 : pdbx_type.hashCode());
-		result = prime * result
-				+ ((polymerType == null) ? 0 : polymerType.hashCode());
-		result = prime * result
-				+ ((residueType == null) ? 0 : residueType.hashCode());
-		result = prime * result + (standard ? 1231 : 1237);
-		result = prime
-				* result
-				+ ((three_letter_code == null) ? 0 : three_letter_code
-						.hashCode());
-		result = prime * result + ((type == null) ? 0 : type.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		ChemComp other = (ChemComp) obj;
-		if (descriptors == null) {
-			if (other.descriptors != null)
-				return false;
-		} else if (!descriptors.equals(other.descriptors))
-			return false;
-		if (formula == null) {
-			if (other.formula != null)
-				return false;
-		} else if (!formula.equals(other.formula))
-			return false;
-		if (formula_weight == null) {
-			if (other.formula_weight != null)
-				return false;
-		} else if (!formula_weight.equals(other.formula_weight))
-			return false;
-		if (id == null) {
-			if (other.id != null)
-				return false;
-		} else if (!id.equals(other.id))
-			return false;
-		if (mon_nstd_flag == null) {
-			if (other.mon_nstd_flag != null)
-				return false;
-		} else if (!mon_nstd_flag.equals(other.mon_nstd_flag))
-			return false;
-		if (mon_nstd_parent_comp_id == null) {
-			if (other.mon_nstd_parent_comp_id != null)
-				return false;
-		} else if (!mon_nstd_parent_comp_id
-				.equals(other.mon_nstd_parent_comp_id))
-			return false;
-		if (name == null) {
-			if (other.name != null)
-				return false;
-		} else if (!name.equals(other.name))
-			return false;
-		if (one_letter_code == null) {
-			if (other.one_letter_code != null)
-				return false;
-		} else if (!one_letter_code.equals(other.one_letter_code))
-			return false;
-		if (pdbx_ambiguous_flag == null) {
-			if (other.pdbx_ambiguous_flag != null)
-				return false;
-		} else if (!pdbx_ambiguous_flag.equals(other.pdbx_ambiguous_flag))
-			return false;
-		if (pdbx_formal_charge == null) {
-			if (other.pdbx_formal_charge != null)
-				return false;
-		} else if (!pdbx_formal_charge.equals(other.pdbx_formal_charge))
-			return false;
-		if (pdbx_ideal_coordinates_details == null) {
-			if (other.pdbx_ideal_coordinates_details != null)
-				return false;
-		} else if (!pdbx_ideal_coordinates_details
-				.equals(other.pdbx_ideal_coordinates_details))
-			return false;
-		if (pdbx_ideal_coordinates_missing_flag == null) {
-			if (other.pdbx_ideal_coordinates_missing_flag != null)
-				return false;
-		} else if (!pdbx_ideal_coordinates_missing_flag
-				.equals(other.pdbx_ideal_coordinates_missing_flag))
-			return false;
-		if (pdbx_initial_date == null) {
-			if (other.pdbx_initial_date != null)
-				return false;
-		} else if (!pdbx_initial_date.equals(other.pdbx_initial_date))
-			return false;
-		if (pdbx_model_coordinates_db_code == null) {
-			if (other.pdbx_model_coordinates_db_code != null)
-				return false;
-		} else if (!pdbx_model_coordinates_db_code
-				.equals(other.pdbx_model_coordinates_db_code))
-			return false;
-		if (pdbx_model_coordinates_details == null) {
-			if (other.pdbx_model_coordinates_details != null)
-				return false;
-		} else if (!pdbx_model_coordinates_details
-				.equals(other.pdbx_model_coordinates_details))
-			return false;
-		if (pdbx_model_coordinates_missing_flag == null) {
-			if (other.pdbx_model_coordinates_missing_flag != null)
-				return false;
-		} else if (!pdbx_model_coordinates_missing_flag
-				.equals(other.pdbx_model_coordinates_missing_flag))
-			return false;
-		if (pdbx_modified_date == null) {
-			if (other.pdbx_modified_date != null)
-				return false;
-		} else if (!pdbx_modified_date.equals(other.pdbx_modified_date))
-			return false;
-		if (pdbx_processing_site == null) {
-			if (other.pdbx_processing_site != null)
-				return false;
-		} else if (!pdbx_processing_site.equals(other.pdbx_processing_site))
-			return false;
-		if (pdbx_release_status == null) {
-			if (other.pdbx_release_status != null)
-				return false;
-		} else if (!pdbx_release_status.equals(other.pdbx_release_status))
-			return false;
-		if (pdbx_replaced_by == null) {
-			if (other.pdbx_replaced_by != null)
-				return false;
-		} else if (!pdbx_replaced_by.equals(other.pdbx_replaced_by))
-			return false;
-		if (pdbx_replaces == null) {
-			if (other.pdbx_replaces != null)
-				return false;
-		} else if (!pdbx_replaces.equals(other.pdbx_replaces))
-			return false;
-		if (pdbx_subcomponent_list == null) {
-			if (other.pdbx_subcomponent_list != null)
-				return false;
-		} else if (!pdbx_subcomponent_list.equals(other.pdbx_subcomponent_list))
-			return false;
-		if (pdbx_synonyms == null) {
-			if (other.pdbx_synonyms != null)
-				return false;
-		} else if (!pdbx_synonyms.equals(other.pdbx_synonyms))
-			return false;
-		if (pdbx_type == null) {
-			if (other.pdbx_type != null)
-				return false;
-		} else if (!pdbx_type.equals(other.pdbx_type))
-			return false;
-		if (polymerType != other.polymerType)
-			return false;
-		if (residueType != other.residueType)
-			return false;
-		if (standard != other.standard)
-			return false;
-		if (three_letter_code == null) {
-			if (other.three_letter_code != null)
-				return false;
-		} else if (!three_letter_code.equals(other.three_letter_code))
-			return false;
-		if (type == null) {
-			if (other.type != null)
-				return false;
-		} else if (!type.equals(other.type))
-			return false;
-		return true;
-	}
-
-	/**
-	 * Creates a new instance of the dummy empty ChemComp.
-	 * @return
-	 */
-	public static ChemComp getEmptyChemComp(){
-		ChemComp comp = new ChemComp();
-
-		comp.setOne_letter_code("?");
-		comp.setThree_letter_code("???"); // Main signal for isEmpty()
-		comp.setPolymerType(PolymerType.unknown);
-		comp.setResidueType(ResidueType.atomn);
-		return comp;
-	}
-
-	/**
-	 * Indicates whether this compound was created with
-	 * @return
-	 */
-	public boolean isEmpty() {
-		// Is this the best flag for it being empty?
-		return id == null || getThree_letter_code() == null || getThree_letter_code().equals("???");
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemCompAtom.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemCompAtom.java
deleted file mode 100644
index 81d0f64b4b..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemCompAtom.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * Created on Feb 5, 2013
- * Created by Andreas Prlic
- *
- * @since 3.0.6
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-import java.io.Serializable;
-
-/** stores these fields:
- *
- * _chem_comp_atom.comp_id
-_chem_comp_atom.atom_id
-_chem_comp_atom.alt_atom_id
-_chem_comp_atom.type_symbol
-_chem_comp_atom.charge
-_chem_comp_atom.pdbx_align
-_chem_comp_atom.pdbx_aromatic_flag
-_chem_comp_atom.pdbx_leaving_atom_flag
-_chem_comp_atom.pdbx_stereo_config
-_chem_comp_atom.model_Cartn_x
-_chem_comp_atom.model_Cartn_y
-_chem_comp_atom.model_Cartn_z
-_chem_comp_atom.pdbx_model_Cartn_x_ideal
-_chem_comp_atom.pdbx_model_Cartn_y_ideal
-_chem_comp_atom.pdbx_model_Cartn_z_ideal
-_chem_comp_atom.pdbx_component_comp_id
-_chem_comp_atom.pdbx_residue_numbering
-_chem_comp_atom.pdbx_component_atom_id
-_chem_comp_atom.pdbx_polymer_type
-_chem_comp_atom.pdbx_ref_id
-_chem_comp_atom.pdbx_component_id
-_chem_comp_atom.pdbx_ordinal
- *
- * @author Andreas Prlic
- *
- */
-public class ChemCompAtom implements Serializable{
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 4070599340294758941L;
-	String comp_id;
-	String atom_id;
-	String alt_atom_id;
-	String type_symbol;
-	String charge;
-	String pdbx_align;
-	String pdbx_aromatic_flag;
-	String pdbx_leaving_atom_flag;
-	String pdbx_stereo_config;
-	String model_Cartn_x;
-	String model_Cartn_y;
-	String model_Cartn_z;
-	String pdbx_model_Cartn_x_ideal;
-	String pdbx_model_Cartn_y_ideal;
-	String pdbx_model_Cartn_z_ideal;
-	String pdbx_component_comp_id;
-	String pdbx_residue_numbering;
-	String pdbx_component_atom_id;
-	String pdbx_polymer_type;
-	String pdbx_ref_id;
-	String pdbx_component_id;
-	String pdbx_ordinal;
-	public String getComp_id() {
-		return comp_id;
-	}
-	public void setComp_id(String comp_id) {
-		this.comp_id = comp_id;
-	}
-	public String getAtom_id() {
-		return atom_id;
-	}
-	public void setAtom_id(String atom_id) {
-		this.atom_id = atom_id;
-	}
-	public String getAlt_atom_id() {
-		return alt_atom_id;
-	}
-	public void setAlt_atom_id(String alt_atom_id) {
-		this.alt_atom_id = alt_atom_id;
-	}
-	public String getType_symbol() {
-		return type_symbol;
-	}
-	public void setType_symbol(String type_symbol) {
-		this.type_symbol = type_symbol;
-	}
-	public String getCharge() {
-		return charge;
-	}
-	public void setCharge(String charge) {
-		this.charge = charge;
-	}
-	public String getPdbx_align() {
-		return pdbx_align;
-	}
-	public void setPdbx_align(String pdbx_align) {
-		this.pdbx_align = pdbx_align;
-	}
-	public String getPdbx_aromatic_flag() {
-		return pdbx_aromatic_flag;
-	}
-	public void setPdbx_aromatic_flag(String pdbx_aromatic_flag) {
-		this.pdbx_aromatic_flag = pdbx_aromatic_flag;
-	}
-	public String getPdbx_leaving_atom_flag() {
-		return pdbx_leaving_atom_flag;
-	}
-	public void setPdbx_leaving_atom_flag(String pdbx_leaving_atom_flag) {
-		this.pdbx_leaving_atom_flag = pdbx_leaving_atom_flag;
-	}
-	public String getPdbx_stereo_config() {
-		return pdbx_stereo_config;
-	}
-	public void setPdbx_stereo_config(String pdbx_stereo_config) {
-		this.pdbx_stereo_config = pdbx_stereo_config;
-	}
-	public String getModel_Cartn_x() {
-		return model_Cartn_x;
-	}
-	public void setModel_Cartn_x(String model_Cartn_x) {
-		this.model_Cartn_x = model_Cartn_x;
-	}
-	public String getModel_Cartn_y() {
-		return model_Cartn_y;
-	}
-	public void setModel_Cartn_y(String model_Cartn_y) {
-		this.model_Cartn_y = model_Cartn_y;
-	}
-	public String getModel_Cartn_z() {
-		return model_Cartn_z;
-	}
-	public void setModel_Cartn_z(String model_Cartn_z) {
-		this.model_Cartn_z = model_Cartn_z;
-	}
-	public String getPdbx_model_Cartn_x_ideal() {
-		return pdbx_model_Cartn_x_ideal;
-	}
-	public void setPdbx_model_Cartn_x_ideal(String pdbx_model_Cartn_x_ideal) {
-		this.pdbx_model_Cartn_x_ideal = pdbx_model_Cartn_x_ideal;
-	}
-	public String getPdbx_model_Cartn_y_ideal() {
-		return pdbx_model_Cartn_y_ideal;
-	}
-	public void setPdbx_model_Cartn_y_ideal(String pdbx_model_Cartn_y_ideal) {
-		this.pdbx_model_Cartn_y_ideal = pdbx_model_Cartn_y_ideal;
-	}
-	public String getPdbx_model_Cartn_z_ideal() {
-		return pdbx_model_Cartn_z_ideal;
-	}
-	public void setPdbx_model_Cartn_z_ideal(String pdbx_model_Cartn_z_ideal) {
-		this.pdbx_model_Cartn_z_ideal = pdbx_model_Cartn_z_ideal;
-	}
-	public String getPdbx_component_comp_id() {
-		return pdbx_component_comp_id;
-	}
-	public void setPdbx_component_comp_id(String pdbx_component_comp_id) {
-		this.pdbx_component_comp_id = pdbx_component_comp_id;
-	}
-	public String getPdbx_residue_numbering() {
-		return pdbx_residue_numbering;
-	}
-	public void setPdbx_residue_numbering(String pdbx_residue_numbering) {
-		this.pdbx_residue_numbering = pdbx_residue_numbering;
-	}
-	public String getPdbx_component_atom_id() {
-		return pdbx_component_atom_id;
-	}
-	public void setPdbx_component_atom_id(String pdbx_component_atom_id) {
-		this.pdbx_component_atom_id = pdbx_component_atom_id;
-	}
-	public String getPdbx_polymer_type() {
-		return pdbx_polymer_type;
-	}
-	public void setPdbx_polymer_type(String pdbx_polymer_type) {
-		this.pdbx_polymer_type = pdbx_polymer_type;
-	}
-	public String getPdbx_ref_id() {
-		return pdbx_ref_id;
-	}
-	public void setPdbx_ref_id(String pdbx_ref_id) {
-		this.pdbx_ref_id = pdbx_ref_id;
-	}
-	public String getPdbx_component_id() {
-		return pdbx_component_id;
-	}
-	public void setPdbx_component_id(String pdbx_component_id) {
-		this.pdbx_component_id = pdbx_component_id;
-	}
-	public String getPdbx_ordinal() {
-		return pdbx_ordinal;
-	}
-	public void setPdbx_ordinal(String pdbx_ordinal) {
-		this.pdbx_ordinal = pdbx_ordinal;
-	}
-
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemCompBond.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemCompBond.java
deleted file mode 100644
index cd49d3b116..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemCompBond.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * Created on Feb 5, 2013
- * Created by Andreas Prlic
- *
- * @since 3.0.2
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-import java.io.Serializable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/*
- * _chem_comp_bond.comp_id
-_chem_comp_bond.atom_id_1
-_chem_comp_bond.atom_id_2
-_chem_comp_bond.value_order
-_chem_comp_bond.pdbx_aromatic_flag
-_chem_comp_bond.pdbx_stereo_config
-_chem_comp_bond.pdbx_ordinal
- */
-public class ChemCompBond implements Serializable {
-
-	private static final long serialVersionUID = 5905371029161975421L;
-
-	private static final Logger logger = LoggerFactory.getLogger(ChemCompBond.class);
-
-	String comp_id;
-	String atom_id_1;
-	String atom_id_2;
-	String value_order;
-	String pdbx_aromatic_flag;
-	String pdbx_stereo_config;
-	String pdbx_ordinal;
-	public String getComp_id() {
-		return comp_id;
-	}
-	public void setComp_id(String comp_id) {
-		this.comp_id = comp_id;
-	}
-	public String getAtom_id_1() {
-		return atom_id_1;
-	}
-	public void setAtom_id_1(String atom_id_1) {
-		this.atom_id_1 = atom_id_1;
-	}
-	public String getAtom_id_2() {
-		return atom_id_2;
-	}
-	public void setAtom_id_2(String atom_id_2) {
-		this.atom_id_2 = atom_id_2;
-	}
-	public String getValue_order() {
-		return value_order;
-	}
-	public void setValue_order(String value_order) {
-		this.value_order = value_order;
-	}
-	public String getPdbx_aromatic_flag() {
-		return pdbx_aromatic_flag;
-	}
-	public void setPdbx_aromatic_flag(String pdbx_aromatic_flag) {
-		this.pdbx_aromatic_flag = pdbx_aromatic_flag;
-	}
-	public String getPdbx_stereo_config() {
-		return pdbx_stereo_config;
-	}
-	public void setPdbx_stereo_config(String pdbx_stereo_config) {
-		this.pdbx_stereo_config = pdbx_stereo_config;
-	}
-	public String getPdbx_ordinal() {
-		return pdbx_ordinal;
-	}
-	public void setPdbx_ordinal(String pdbx_ordinal) {
-		this.pdbx_ordinal = pdbx_ordinal;
-	}
-
-	/**
-	 * Converts this ChemCompBond's value_order attribute into an int using the
-	 * conversion:
-	 *
-	 * <pre>
-	 * 	SING -> 1
-	 * 	DOUB -> 2
-	 * 	TRIP -> 3
-	 * 	QUAD -> 4
-	 * </pre>
-	 *
-	 * Any other values will return -1.
-	 * <p>
-	 * (Source:
-	 * http://mmcif.rcsb.org/dictionaries/mmcif_mdb.dic/Items/_chem_comp_bond.
-	 * value_order.html)
-	 *
-	 * @return the numerical value of this ChemCompBond's bond order, or -1 if
-	 *         the value is non-numeric or unknown.
-	 */
-	public int getNumericalBondOrder() {
-		if (value_order.equals("SING")) {
-			return 1;
-		} else if (value_order.equals("DOUB")) {
-			return 2;
-		} else if (value_order.equals("TRIP")) {
-			return 3;
-		} else if (value_order.equals("QUAD")) {
-			return 4;
-		} else {
-			logger.error("Unknown or non-numeric value for value_order: "
-					+ value_order);
-			return -1;
-		}
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemCompDescriptor.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemCompDescriptor.java
deleted file mode 100644
index 7441e59a5a..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/ChemCompDescriptor.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Feb 22, 2011
- */
-
-package org.biojava.nbio.structure.io.mmcif.model;
-
-import java.io.Serializable;
-
-
-/** Container object for _pdbx_chem_comp_descriptor
- *
- * @author Andreas Prlic
- * @since 3.2
- *
- */
-public class ChemCompDescriptor implements Serializable {
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 1078685833800736278L;
-	String comp_id;
-	String type;
-	String program;
-	String program_version;
-	String descriptor;
-
-	public ChemCompDescriptor(){
-
-	}
-	public String getComp_id() {
-		return comp_id;
-	}
-	public void setComp_id(String comp_id) {
-		this.comp_id = comp_id;
-	}
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
-	public String getProgram() {
-		return program;
-	}
-	public void setProgram(String program) {
-		this.program = program;
-	}
-	public String getProgram_version() {
-		return program_version;
-	}
-	public void setProgram_version(String program_version) {
-		this.program_version = program_version;
-	}
-	public String getDescriptor() {
-		return descriptor;
-	}
-	public void setDescriptor(String descriptor) {
-		this.descriptor = descriptor;
-	}
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((comp_id == null) ? 0 : comp_id.hashCode());
-		result = prime * result
-				+ ((descriptor == null) ? 0 : descriptor.hashCode());
-		result = prime * result + ((program == null) ? 0 : program.hashCode());
-		result = prime * result
-				+ ((program_version == null) ? 0 : program_version.hashCode());
-		result = prime * result + ((type == null) ? 0 : type.hashCode());
-		return result;
-	}
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		ChemCompDescriptor other = (ChemCompDescriptor) obj;
-		if (comp_id == null) {
-			if (other.comp_id != null)
-				return false;
-		} else if (!comp_id.equals(other.comp_id))
-			return false;
-		if (descriptor == null) {
-			if (other.descriptor != null)
-				return false;
-		} else if (!descriptor.equals(other.descriptor))
-			return false;
-		if (program == null) {
-			if (other.program != null)
-				return false;
-		} else if (!program.equals(other.program))
-			return false;
-		if (program_version == null) {
-			if (other.program_version != null)
-				return false;
-		} else if (!program_version.equals(other.program_version))
-			return false;
-		if (type == null) {
-			if (other.type != null)
-				return false;
-		} else if (!type.equals(other.type))
-			return false;
-		return true;
-	}
-	@Override
-	public String toString() {
-		return "ChemCompDescriptor [comp_id=" + comp_id + ", type=" + type
-				+ ", program=" + program + ", program_version="
-				+ program_version + ", descriptor=" + descriptor + "]";
-	}
-
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/DatabasePDBremark.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/DatabasePDBremark.java
deleted file mode 100644
index cc30c0a226..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/DatabasePDBremark.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at May 31, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-public class DatabasePDBremark extends AbstractBean {
-	String id;
-	String text;
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getText() {
-		return text;
-	}
-	public void setText(String text) {
-		this.text = text;
-	}
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/DatabasePDBrev.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/DatabasePDBrev.java
deleted file mode 100644
index ef884327e3..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/DatabasePDBrev.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Apr 27, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-public class DatabasePDBrev {
-	String date;
-	String date_original;
-	String status;
-	String replaces;
-	String mod_type;
-	String num;
-
-	@Override
-	public String toString(){
-		StringBuffer buf = new StringBuffer();
-		buf.append("DatabasePDBrev ");
-		buf.append("mod_type :");
-		buf.append(mod_type);
-		buf.append(" ");
-		buf.append(this.getDate());
-		buf.append( " ");
-		buf.append( this.getDate_original());
-
-		return buf.toString();
-	}
-	public String getNum() {
-		return num;
-	}
-	public void setNum(String num) {
-		this.num = num;
-	}
-	public String getDate() {
-		return date;
-	}
-	public void setDate(String date) {
-		this.date = date;
-	}
-	public String getDate_original() {
-		return date_original;
-	}
-	public void setDate_original(String date_original) {
-		this.date_original = date_original;
-	}
-	public String getStatus() {
-		return status;
-	}
-	public void setStatus(String status) {
-		this.status = status;
-	}
-	public String getReplaces() {
-		return replaces;
-	}
-	public void setReplaces(String replaces) {
-		this.replaces = replaces;
-	}
-	public String getMod_type() {
-		return mod_type;
-	}
-	public void setMod_type(String mod_type) {
-		this.mod_type = mod_type;
-	}
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/DatabasePdbrevRecord.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/DatabasePdbrevRecord.java
deleted file mode 100644
index 72beda99c8..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/DatabasePdbrevRecord.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * Created by andreas on 10/12/15.
- */
-
-package org.biojava.nbio.structure.io.mmcif.model;
-
-import java.io.Serializable;
-
-public class DatabasePdbrevRecord implements Serializable {
-
-
-	private static final long serialVersionUID = 1L;
-
-	String rev_num;
-	String type;
-	String details;
-
-	public String getRev_num() {
-		return rev_num;
-	}
-
-	public void setRev_num(String rev_num) {
-		this.rev_num = rev_num;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getDetails() {
-		return details;
-	}
-
-	public void setDetails(String details) {
-		this.details = details;
-	}
-
-	@Override
-	public String toString() {
-		return "DatabasePdbrevRecord{" +
-				"rev_num='" + rev_num + '\'' +
-				", type='" + type + '\'' +
-				", details='" + details + '\'' +
-				'}';
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Entity.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Entity.java
deleted file mode 100644
index cae779dee2..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Entity.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Mar 4, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/** A simple class to represent Entity records in mmCif files
- *
- * @author Andreas Prlic
- *
- */
-public class Entity {
-	String id;
-
-	String type;
-	String src_method;
-	String pdbx_description;
-	String formula_weight;
-	String pdbx_number_of_molecules;
-	String details;
-	String pdbx_mutation;
-	String pdbx_fragment;
-	String pdbx_ec;
-
-	@Override
-	public String toString(){
-		StringBuffer buf = new StringBuffer();
-
-	buf.append("Entity - id:").append(id);
-
-	buf.append(" type:").append(type);
-	buf.append(" src_method:").append(src_method);
-	buf.append(" pdbx_description:").append(pdbx_description);
-	buf.append(" formula_weight:").append(formula_weight);
-	buf.append(" pdbx_number_f_molecules:").append(pdbx_number_of_molecules);
-	buf.append(" details:").append(details);
-	buf.append(" pdbx_mutation:").append(pdbx_mutation);
-	buf.append(" pdbx_fragment:").append(pdbx_fragment);
-	buf.append(" pdbx_ec:").append(pdbx_ec);
-
-		return buf.toString();
-	}
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
-	public String getSrc_method() {
-		return src_method;
-	}
-	public void setSrc_method(String src_method) {
-		this.src_method = src_method;
-	}
-	public String getPdbx_description() {
-		return pdbx_description;
-	}
-	public void setPdbx_description(String pdbx_description) {
-		this.pdbx_description = pdbx_description;
-	}
-	public String getFormula_weight() {
-		return formula_weight;
-	}
-	public void setFormula_weight(String formula_weight) {
-		this.formula_weight = formula_weight;
-	}
-	public String getPdbx_number_of_molecules() {
-		return pdbx_number_of_molecules;
-	}
-	public void setPdbx_number_of_molecules(String pdbx_number_of_molecules) {
-		this.pdbx_number_of_molecules = pdbx_number_of_molecules;
-	}
-	public String getDetails() {
-		return details;
-	}
-	public void setDetails(String details) {
-		this.details = details;
-	}
-	public String getPdbx_mutation() {
-		return pdbx_mutation;
-	}
-	public void setPdbx_mutation(String pdbx_mutation) {
-		this.pdbx_mutation = pdbx_mutation;
-	}
-	public String getPdbx_fragment() {
-		return pdbx_fragment;
-	}
-	public void setPdbx_fragment(String pdbx_fragment) {
-		this.pdbx_fragment = pdbx_fragment;
-	}
-	public String getPdbx_ec() {
-		return pdbx_ec;
-	}
-	public void setPdbx_ec(String pdbx_ec) {
-		this.pdbx_ec = pdbx_ec;
-	}
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntityPoly.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntityPoly.java
deleted file mode 100644
index 9c27e34a14..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntityPoly.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Jun 1, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-
-/**
- * Container for _entity_poly records
- *
- *
- * @since 5.0
- * @author Jose Duarte
- */
-public class EntityPoly extends AbstractBean{
-	String entity_id;
-	String type;
-	String nstd_chirality;
-	String nstd_linkage;
-	String nstd_monomer;
-	String type_details;
-	String pdbx_seq_one_letter_code;
-	String pdbx_seq_one_letter_code_can;
-	String pdbx_strand_id;
-	String pdbx_target_identifier;
-	public String getEntity_id() {
-		return entity_id;
-	}
-	public void setEntity_id(String entity_id) {
-		this.entity_id = entity_id;
-	}
-	/**
-	 * @return the type
-	 */
-	public String getType() {
-		return type;
-	}
-	/**
-	 * @param type the type to set
-	 */
-	public void setType(String type) {
-		this.type = type;
-	}
-	/**
-	 * @return the nstd_chirality
-	 */
-	public String getNstd_chirality() {
-		return nstd_chirality;
-	}
-	/**
-	 * @param nstd_chirality the nstd_chirality to set
-	 */
-	public void setNstd_chirality(String nstd_chirality) {
-		this.nstd_chirality = nstd_chirality;
-	}
-	/**
-	 * @return the nstd_linkage
-	 */
-	public String getNstd_linkage() {
-		return nstd_linkage;
-	}
-	/**
-	 * @param nstd_linkage the nstd_linkage to set
-	 */
-	public void setNstd_linkage(String nstd_linkage) {
-		this.nstd_linkage = nstd_linkage;
-	}
-	/**
-	 * @return the nstd_monomer
-	 */
-	public String getNstd_monomer() {
-		return nstd_monomer;
-	}
-	/**
-	 * @param nstd_monomer the nstd_monomer to set
-	 */
-	public void setNstd_monomer(String nstd_monomer) {
-		this.nstd_monomer = nstd_monomer;
-	}
-	/**
-	 * @return the type_details
-	 */
-	public String getType_details() {
-		return type_details;
-	}
-	/**
-	 * @param type_details the type_details to set
-	 */
-	public void setType_details(String type_details) {
-		this.type_details = type_details;
-	}
-	/**
-	 * @return the pdbx_seq_one_letter_code
-	 */
-	public String getPdbx_seq_one_letter_code() {
-		return pdbx_seq_one_letter_code;
-	}
-	/**
-	 * @param pdbx_seq_one_letter_code the pdbx_seq_one_letter_code to set
-	 */
-	public void setPdbx_seq_one_letter_code(String pdbx_seq_one_letter_code) {
-		this.pdbx_seq_one_letter_code = pdbx_seq_one_letter_code;
-	}
-	/**
-	 * @return the pdbx_seq_one_letter_code_can
-	 */
-	public String getPdbx_seq_one_letter_code_can() {
-		return pdbx_seq_one_letter_code_can;
-	}
-	/**
-	 * @param pdbx_seq_one_letter_code_can the pdbx_seq_one_letter_code_can to set
-	 */
-	public void setPdbx_seq_one_letter_code_can(String pdbx_seq_one_letter_code_can) {
-		this.pdbx_seq_one_letter_code_can = pdbx_seq_one_letter_code_can;
-	}
-	/**
-	 * @return the pdbx_strand_id
-	 */
-	public String getPdbx_strand_id() {
-		return pdbx_strand_id;
-	}
-	/**
-	 * @param pdbx_strand_id the pdbx_strand_id to set
-	 */
-	public void setPdbx_strand_id(String pdbx_strand_id) {
-		this.pdbx_strand_id = pdbx_strand_id;
-	}
-	public String getPdbx_target_identifier() {
-		return pdbx_target_identifier;
-	}
-	public void setPdbx_target_identifier(String pdbx_target_identifier) {
-		this.pdbx_target_identifier = pdbx_target_identifier;
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntityPolySeq.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntityPolySeq.java
deleted file mode 100644
index 968ab47acd..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntityPolySeq.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Jun 1, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-
-/** Container for _entity_poly_seq records
- *
-<pre>
-Field Name     mmCIF Data Item
-Section        n.a.
-Serial_No      n.a.
-Strand_ID      PDB strand ID corresponding to _entity_poly_seq.entity_id (*)
-Strand_Length  derived
-Residue_Names  _entity_poly_seq.mon_id
-</pre>
- * (*) Chemically distinct polymer strands are mapped to mmCIF entities. Two
- * instances or the same polymer molecule in the PDB data file are mapped to a
- * single mmCIF entity (eg. a homodimer). For convenience a table of monomer
- * label correspondences is stored in category   PDBX_POLY_SEQ_SCHEME
- * @author Andreas Prlic
- * @since 1.7
- */
-public class EntityPolySeq extends AbstractBean{
-	String entity_id;
-	String num;
-	String mon_id;
-	String hetero;
-	public String getEntity_id() {
-		return entity_id;
-	}
-	public void setEntity_id(String entity_id) {
-		this.entity_id = entity_id;
-	}
-	public String getNum() {
-		return num;
-	}
-	public void setNum(String num) {
-		this.num = num;
-	}
-	public String getMon_id() {
-		return mon_id;
-	}
-	public void setMon_id(String mon_id) {
-		this.mon_id = mon_id;
-	}
-	public String getHetero() {
-		return hetero;
-	}
-	public void setHetero(String hetero) {
-		this.hetero = hetero;
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntitySrcGen.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntitySrcGen.java
deleted file mode 100644
index 19082a8932..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntitySrcGen.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-
-/**
- *  Data items in the ENTITY_SRC_GEN category record details of
- *  the source from which the entity was obtained in cases
- *  where the source was genetically manipulated.  The
- *  following are treated separately:  items pertaining to the tissue
- *  from which the gene was obtained, items pertaining to the host
- *  organism for gene expression and items pertaining to the actual
- *  producing organism (plasmid).
- *
- * @author Andreas Prlic
- *
- */
-public class EntitySrcGen {
-	String  entity_id;
-	String  expression_system_id;
-	String  gene_src_common_name;
-	String  gene_src_details	;
-	String  gene_src_dev_stage	 ;
-	String  gene_src_genus	 ;
-	String  gene_src_species	;
-	String  gene_src_strain	 ;
-	String  gene_src_tissue	 ;
-	String  gene_src_tissue_fraction;
-	String  host_org_common_name	 ;
-	String  host_org_details	 ;
-	String  host_org_genus	 ;
-	String  host_org_species;
-	String  host_org_strain	 ;
-	String  pdbx_src_id;
-	String  pdbx_seq_type;
-	String  pdbx_alt_source_flag;
-	String  pdbx_beg_seq_num;
-	String  pdbx_end_seq_num;
-	String  pdbx_description;
-	String  pdbx_gene_src_atcc;
-	String  pdbx_gene_src_cell	;
-	String  pdbx_gene_src_cell_line;
-	String  pdbx_gene_src_cellular_location;
-	String  pdbx_gene_src_fragment	 ;
-	String  pdbx_gene_src_gene	 ;
-	String  pdbx_gene_src_ncbi_taxonomy_id;
-	String  pdbx_gene_src_organ	 ;
-	String  pdbx_gene_src_organelle ;
-	String  pdbx_gene_src_plasmid	 ;
-	String  pdbx_gene_src_plasmid_name	 ;
-	String  pdbx_gene_src_scientific_name;
-	String  pdbx_gene_src_variant	 ;
-	String  pdbx_host_org_atcc	 ;
-	String  pdbx_host_org_cell	 ;
-	String  pdbx_host_org_cell_line ;
-	String  pdbx_host_org_cellular_location ;
-	String  pdbx_host_org_culture_collection ;
-	String  pdbx_host_org_gene	  ;
-	String  pdbx_host_org_ncbi_taxonomy_id ;
-	String  pdbx_host_org_organ	 ;
-	String  pdbx_host_org_organelle ;
-	String  pdbx_host_org_scientific_name ;
-	String  pdbx_host_org_strain	  ;
-	String  pdbx_host_org_tissue	 ;
-	String  pdbx_host_org_tissue_fraction ;
-	String  pdbx_host_org_variant	 ;
-	String  pdbx_host_org_vector	 ;
-	String  pdbx_host_org_vector_type;
-	String  plasmid_details	 ;
-	String  plasmid_name	 ;
-	String  start_construct_id ;
-	public String getEntity_id() {
-		return entity_id;
-	}
-	public void setEntity_id(String entity_id) {
-		this.entity_id = entity_id;
-	}
-	public String getExpression_system_id() {
-		return expression_system_id;
-	}
-	public void setExpression_system_id(String expression_system_id) {
-		this.expression_system_id = expression_system_id;
-	}
-	public String getGene_src_common_name() {
-		return gene_src_common_name;
-	}
-	public void setGene_src_common_name(String gene_src_common_name) {
-		this.gene_src_common_name = gene_src_common_name;
-	}
-	public String getGene_src_details() {
-		return gene_src_details;
-	}
-	public void setGene_src_details(String gene_src_details) {
-		this.gene_src_details = gene_src_details;
-	}
-	public String getGene_src_dev_stage() {
-		return gene_src_dev_stage;
-	}
-	public void setGene_src_dev_stage(String gene_src_dev_stage) {
-		this.gene_src_dev_stage = gene_src_dev_stage;
-	}
-	public String getGene_src_genus() {
-		return gene_src_genus;
-	}
-	public void setGene_src_genus(String gene_src_genus) {
-		this.gene_src_genus = gene_src_genus;
-	}
-	public String getGene_src_species() {
-		return gene_src_species;
-	}
-	public void setGene_src_species(String gene_src_species) {
-		this.gene_src_species = gene_src_species;
-	}
-	public String getGene_src_strain() {
-		return gene_src_strain;
-	}
-	public void setGene_src_strain(String gene_src_strain) {
-		this.gene_src_strain = gene_src_strain;
-	}
-	public String getGene_src_tissue() {
-		return gene_src_tissue;
-	}
-	public void setGene_src_tissue(String gene_src_tissue) {
-		this.gene_src_tissue = gene_src_tissue;
-	}
-	public String getGene_src_tissue_fraction() {
-		return gene_src_tissue_fraction;
-	}
-	public void setGene_src_tissue_fraction(String gene_src_tissue_fraction) {
-		this.gene_src_tissue_fraction = gene_src_tissue_fraction;
-	}
-	public String getHost_org_common_name() {
-		return host_org_common_name;
-	}
-	public void setHost_org_common_name(String host_org_common_name) {
-		this.host_org_common_name = host_org_common_name;
-	}
-	public String getHost_org_details() {
-		return host_org_details;
-	}
-	public void setHost_org_details(String host_org_details) {
-		this.host_org_details = host_org_details;
-	}
-	public String getHost_org_genus() {
-		return host_org_genus;
-	}
-	public void setHost_org_genus(String host_org_genus) {
-		this.host_org_genus = host_org_genus;
-	}
-	public String getHost_org_species() {
-		return host_org_species;
-	}
-	public void setHost_org_species(String host_org_species) {
-		this.host_org_species = host_org_species;
-	}
-	public String getHost_org_strain() {
-		return host_org_strain;
-	}
-	public void setHost_org_strain(String host_org_strain) {
-		this.host_org_strain = host_org_strain;
-	}
-	public String getPdbx_src_id() {
-		return pdbx_src_id;
-	}
-	public void setPdbx_src_id(String pdbx_src_id) {
-		this.pdbx_src_id = pdbx_src_id;
-	}
-	public String getPdbx_seq_type() {
-		return pdbx_seq_type;
-	}
-	public void setPdbx_seq_type(String pdbx_seq_type) {
-		this.pdbx_seq_type = pdbx_seq_type;
-	}
-	/**
-	 * @return the pdbx_alt_source_flag
-	 */
-	public String getPdbx_alt_source_flag() {
-		return pdbx_alt_source_flag;
-	}
-	/**
-	 * @param pdbx_alt_source_flag the pdbx_alt_source_flag to set
-	 */
-	public void setPdbx_alt_source_flag(String pdbx_alt_source_flag) {
-		this.pdbx_alt_source_flag = pdbx_alt_source_flag;
-	}
-	public String getPdbx_beg_seq_num() {
-		return pdbx_beg_seq_num;
-	}
-	public void setPdbx_beg_seq_num(String pdbx_beg_seq_num) {
-		this.pdbx_beg_seq_num = pdbx_beg_seq_num;
-	}
-	public String getPdbx_end_seq_num() {
-		return pdbx_end_seq_num;
-	}
-	public void setPdbx_end_seq_num(String pdbx_end_seq_num) {
-		this.pdbx_end_seq_num = pdbx_end_seq_num;
-	}
-	public String getPdbx_description() {
-		return pdbx_description;
-	}
-	public void setPdbx_description(String pdbx_description) {
-		this.pdbx_description = pdbx_description;
-	}
-	public String getPdbx_gene_src_atcc() {
-		return pdbx_gene_src_atcc;
-	}
-	public void setPdbx_gene_src_atcc(String pdbx_gene_src_atcc) {
-		this.pdbx_gene_src_atcc = pdbx_gene_src_atcc;
-	}
-	public String getPdbx_gene_src_cell() {
-		return pdbx_gene_src_cell;
-	}
-	public void setPdbx_gene_src_cell(String pdbx_gene_src_cell) {
-		this.pdbx_gene_src_cell = pdbx_gene_src_cell;
-	}
-	public String getPdbx_gene_src_cell_line() {
-		return pdbx_gene_src_cell_line;
-	}
-	public void setPdbx_gene_src_cell_line(String pdbx_gene_src_cell_line) {
-		this.pdbx_gene_src_cell_line = pdbx_gene_src_cell_line;
-	}
-	public String getPdbx_gene_src_cellular_location() {
-		return pdbx_gene_src_cellular_location;
-	}
-	public void setPdbx_gene_src_cellular_location(
-			String pdbx_gene_src_cellular_location) {
-		this.pdbx_gene_src_cellular_location = pdbx_gene_src_cellular_location;
-	}
-	public String getPdbx_gene_src_fragment() {
-		return pdbx_gene_src_fragment;
-	}
-	public void setPdbx_gene_src_fragment(String pdbx_gene_src_fragment) {
-		this.pdbx_gene_src_fragment = pdbx_gene_src_fragment;
-	}
-	public String getPdbx_gene_src_gene() {
-		return pdbx_gene_src_gene;
-	}
-	public void setPdbx_gene_src_gene(String pdbx_gene_src_gene) {
-		this.pdbx_gene_src_gene = pdbx_gene_src_gene;
-	}
-	public String getPdbx_gene_src_ncbi_taxonomy_id() {
-		return pdbx_gene_src_ncbi_taxonomy_id;
-	}
-	public void setPdbx_gene_src_ncbi_taxonomy_id(
-			String pdbx_gene_src_ncbi_taxonomy_id) {
-		this.pdbx_gene_src_ncbi_taxonomy_id = pdbx_gene_src_ncbi_taxonomy_id;
-	}
-	public String getPdbx_gene_src_organ() {
-		return pdbx_gene_src_organ;
-	}
-	public void setPdbx_gene_src_organ(String pdbx_gene_src_organ) {
-		this.pdbx_gene_src_organ = pdbx_gene_src_organ;
-	}
-	public String getPdbx_gene_src_organelle() {
-		return pdbx_gene_src_organelle;
-	}
-	public void setPdbx_gene_src_organelle(String pdbx_gene_src_organelle) {
-		this.pdbx_gene_src_organelle = pdbx_gene_src_organelle;
-	}
-	public String getPdbx_gene_src_plasmid() {
-		return pdbx_gene_src_plasmid;
-	}
-	public void setPdbx_gene_src_plasmid(String pdbx_gene_src_plasmid) {
-		this.pdbx_gene_src_plasmid = pdbx_gene_src_plasmid;
-	}
-	public String getPdbx_gene_src_plasmid_name() {
-		return pdbx_gene_src_plasmid_name;
-	}
-	public void setPdbx_gene_src_plasmid_name(String pdbx_gene_src_plasmid_name) {
-		this.pdbx_gene_src_plasmid_name = pdbx_gene_src_plasmid_name;
-	}
-	public String getPdbx_gene_src_scientific_name() {
-		return pdbx_gene_src_scientific_name;
-	}
-	public void setPdbx_gene_src_scientific_name(
-			String pdbx_gene_src_scientific_name) {
-		this.pdbx_gene_src_scientific_name = pdbx_gene_src_scientific_name;
-	}
-	public String getPdbx_gene_src_variant() {
-		return pdbx_gene_src_variant;
-	}
-	public void setPdbx_gene_src_variant(String pdbx_gene_src_variant) {
-		this.pdbx_gene_src_variant = pdbx_gene_src_variant;
-	}
-	public String getPdbx_host_org_atcc() {
-		return pdbx_host_org_atcc;
-	}
-	public void setPdbx_host_org_atcc(String pdbx_host_org_atcc) {
-		this.pdbx_host_org_atcc = pdbx_host_org_atcc;
-	}
-	public String getPdbx_host_org_cell() {
-		return pdbx_host_org_cell;
-	}
-	public void setPdbx_host_org_cell(String pdbx_host_org_cell) {
-		this.pdbx_host_org_cell = pdbx_host_org_cell;
-	}
-	public String getPdbx_host_org_cell_line() {
-		return pdbx_host_org_cell_line;
-	}
-	public void setPdbx_host_org_cell_line(String pdbx_host_org_cell_line) {
-		this.pdbx_host_org_cell_line = pdbx_host_org_cell_line;
-	}
-	public String getPdbx_host_org_cellular_location() {
-		return pdbx_host_org_cellular_location;
-	}
-	public void setPdbx_host_org_cellular_location(
-			String pdbx_host_org_cellular_location) {
-		this.pdbx_host_org_cellular_location = pdbx_host_org_cellular_location;
-	}
-	public String getPdbx_host_org_culture_collection() {
-		return pdbx_host_org_culture_collection;
-	}
-	public void setPdbx_host_org_culture_collection(
-			String pdbx_host_org_culture_collection) {
-		this.pdbx_host_org_culture_collection = pdbx_host_org_culture_collection;
-	}
-	public String getPdbx_host_org_gene() {
-		return pdbx_host_org_gene;
-	}
-	public void setPdbx_host_org_gene(String pdbx_host_org_gene) {
-		this.pdbx_host_org_gene = pdbx_host_org_gene;
-	}
-	public String getPdbx_host_org_ncbi_taxonomy_id() {
-		return pdbx_host_org_ncbi_taxonomy_id;
-	}
-	public void setPdbx_host_org_ncbi_taxonomy_id(
-			String pdbx_host_org_ncbi_taxonomy_id) {
-		this.pdbx_host_org_ncbi_taxonomy_id = pdbx_host_org_ncbi_taxonomy_id;
-	}
-	public String getPdbx_host_org_organ() {
-		return pdbx_host_org_organ;
-	}
-	public void setPdbx_host_org_organ(String pdbx_host_org_organ) {
-		this.pdbx_host_org_organ = pdbx_host_org_organ;
-	}
-	public String getPdbx_host_org_organelle() {
-		return pdbx_host_org_organelle;
-	}
-	public void setPdbx_host_org_organelle(String pdbx_host_org_organelle) {
-		this.pdbx_host_org_organelle = pdbx_host_org_organelle;
-	}
-	public String getPdbx_host_org_scientific_name() {
-		return pdbx_host_org_scientific_name;
-	}
-	public void setPdbx_host_org_scientific_name(
-			String pdbx_host_org_scientific_name) {
-		this.pdbx_host_org_scientific_name = pdbx_host_org_scientific_name;
-	}
-	public String getPdbx_host_org_strain() {
-		return pdbx_host_org_strain;
-	}
-	public void setPdbx_host_org_strain(String pdbx_host_org_strain) {
-		this.pdbx_host_org_strain = pdbx_host_org_strain;
-	}
-	public String getPdbx_host_org_tissue() {
-		return pdbx_host_org_tissue;
-	}
-	public void setPdbx_host_org_tissue(String pdbx_host_org_tissue) {
-		this.pdbx_host_org_tissue = pdbx_host_org_tissue;
-	}
-	public String getPdbx_host_org_tissue_fraction() {
-		return pdbx_host_org_tissue_fraction;
-	}
-	public void setPdbx_host_org_tissue_fraction(
-			String pdbx_host_org_tissue_fraction) {
-		this.pdbx_host_org_tissue_fraction = pdbx_host_org_tissue_fraction;
-	}
-	public String getPdbx_host_org_variant() {
-		return pdbx_host_org_variant;
-	}
-	public void setPdbx_host_org_variant(String pdbx_host_org_variant) {
-		this.pdbx_host_org_variant = pdbx_host_org_variant;
-	}
-	public String getPdbx_host_org_vector() {
-		return pdbx_host_org_vector;
-	}
-	public void setPdbx_host_org_vector(String pdbx_host_org_vector) {
-		this.pdbx_host_org_vector = pdbx_host_org_vector;
-	}
-	public String getPdbx_host_org_vector_type() {
-		return pdbx_host_org_vector_type;
-	}
-	public void setPdbx_host_org_vector_type(String pdbx_host_org_vector_type) {
-		this.pdbx_host_org_vector_type = pdbx_host_org_vector_type;
-	}
-	public String getPlasmid_details() {
-		return plasmid_details;
-	}
-	public void setPlasmid_details(String plasmid_details) {
-		this.plasmid_details = plasmid_details;
-	}
-	public String getPlasmid_name() {
-		return plasmid_name;
-	}
-	public void setPlasmid_name(String plasmid_name) {
-		this.plasmid_name = plasmid_name;
-	}
-	public String getStart_construct_id() {
-		return start_construct_id;
-	}
-	public void setStart_construct_id(String start_construct_id) {
-		this.start_construct_id = start_construct_id;
-	}
-
-
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntitySrcNat.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntitySrcNat.java
deleted file mode 100644
index 2429751685..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntitySrcNat.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do  t have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Aug 12, 2013
- * Author: Andreas Prlic
- */
-
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/** Data items in the ENTITY_SRC_NAT category record details of
-			   the source from which the entity was obtained in cases
-			   where the entity was isolated directly from a natural tissue.
- */
-public class EntitySrcNat {
-	String  common_name	;
-	String  details	;
-	String  entity_id ;
-	String  genus	 ;
-	String  pdbx_atcc	;
-	String  pdbx_cell	 ;
-	String  pdbx_cell_line ;
-	String  pdbx_cellular_location;
-	String  pdbx_fragment	 ;
-	String  pdbx_ncbi_taxonomy_id;
-	String  pdbx_organ	 ;
-	String  pdbx_organelle;
-	String  pdbx_organism_scientific;
-	String  pdbx_plasmid_details	 ;
-	String  pdbx_plasmid_name	 ;
-	String  pdbx_secretion	 ;
-	String  pdbx_variant	 ;
-	String  pdbx_src_id;
-	String  pdbx_alt_source_flag;
-	String  pdbx_beg_seq_num;
-	String  pdbx_end_seq_num;
-	String  pdbx_leaving_atom_flag;
-	String  species	 ;
-	String  strain	 ;
-	String  tissue	 ;
-	String  tissue_fraction;
-
-	public String getCommon_name() {
-		return common_name;
-	}
-	public void setCommon_name(String common_name) {
-		this.common_name = common_name;
-	}
-	public String getDetails() {
-		return details;
-	}
-	public void setDetails(String details) {
-		this.details = details;
-	}
-	public String getEntity_id() {
-		return entity_id;
-	}
-	public void setEntity_id(String entity_id) {
-		this.entity_id = entity_id;
-	}
-	public String getGenus() {
-		return genus;
-	}
-	public void setGenus(String genus) {
-		this.genus = genus;
-	}
-	public String getPdbx_atcc() {
-		return pdbx_atcc;
-	}
-	public void setPdbx_atcc(String pdbx_atcc) {
-		this.pdbx_atcc = pdbx_atcc;
-	}
-	public String getPdbx_cell() {
-		return pdbx_cell;
-	}
-	public void setPdbx_cell(String pdbx_cell) {
-		this.pdbx_cell = pdbx_cell;
-	}
-	public String getPdbx_cell_line() {
-		return pdbx_cell_line;
-	}
-	public void setPdbx_cell_line(String pdbx_cell_line) {
-		this.pdbx_cell_line = pdbx_cell_line;
-	}
-	public String getPdbx_cellular_location() {
-		return pdbx_cellular_location;
-	}
-	public void setPdbx_cellular_location(String pdbx_cellular_location) {
-		this.pdbx_cellular_location = pdbx_cellular_location;
-	}
-	public String getPdbx_fragment() {
-		return pdbx_fragment;
-	}
-	public void setPdbx_fragment(String pdbx_fragment) {
-		this.pdbx_fragment = pdbx_fragment;
-	}
-	public String getPdbx_ncbi_taxonomy_id() {
-		return pdbx_ncbi_taxonomy_id;
-	}
-	public void setPdbx_ncbi_taxonomy_id(String pdbx_ncbi_taxonomy_id) {
-		this.pdbx_ncbi_taxonomy_id = pdbx_ncbi_taxonomy_id;
-	}
-	public String getPdbx_organ() {
-		return pdbx_organ;
-	}
-	public void setPdbx_organ(String pdbx_organ) {
-		this.pdbx_organ = pdbx_organ;
-	}
-	public String getPdbx_organelle() {
-		return pdbx_organelle;
-	}
-	public void setPdbx_organelle(String pdbx_organelle) {
-		this.pdbx_organelle = pdbx_organelle;
-	}
-	public String getPdbx_organism_scientific() {
-		return pdbx_organism_scientific;
-	}
-	public void setPdbx_organism_scientific(String pdbx_organism_scientific) {
-		this.pdbx_organism_scientific = pdbx_organism_scientific;
-	}
-	public String getPdbx_plasmid_details() {
-		return pdbx_plasmid_details;
-	}
-	public void setPdbx_plasmid_details(String pdbx_plasmid_details) {
-		this.pdbx_plasmid_details = pdbx_plasmid_details;
-	}
-	public String getPdbx_plasmid_name() {
-		return pdbx_plasmid_name;
-	}
-	public void setPdbx_plasmid_name(String pdbx_plasmid_name) {
-		this.pdbx_plasmid_name = pdbx_plasmid_name;
-	}
-	public String getPdbx_secretion() {
-		return pdbx_secretion;
-	}
-	public void setPdbx_secretion(String pdbx_secretion) {
-		this.pdbx_secretion = pdbx_secretion;
-	}
-	public String getPdbx_variant() {
-		return pdbx_variant;
-	}
-	public void setPdbx_variant(String pdbx_variant) {
-		this.pdbx_variant = pdbx_variant;
-	}
-	public String getSpecies() {
-		return species;
-	}
-	public void setSpecies(String species) {
-		this.species = species;
-	}
-	public String getStrain() {
-		return strain;
-	}
-	public void setStrain(String strain) {
-		this.strain = strain;
-	}
-	public String getTissue() {
-		return tissue;
-	}
-	public void setTissue(String tissue) {
-		this.tissue = tissue;
-	}
-	public String getTissue_fraction() {
-		return tissue_fraction;
-	}
-	public void setTissue_fraction(String tissue_fraction) {
-		this.tissue_fraction = tissue_fraction;
-	}
-
-	public String getPdbx_src_id() {
-		return pdbx_src_id;
-	}
-
-	public void setPdbx_src_id(String pdbx_src_id) {
-		this.pdbx_src_id = pdbx_src_id;
-	}
-
-	public String getPdbx_alt_source_flag() {
-		return pdbx_alt_source_flag;
-	}
-
-	public void setPdbx_alt_source_flag(String pdbx_alt_source_flag) {
-		this.pdbx_alt_source_flag = pdbx_alt_source_flag;
-	}
-
-	public String getPdbx_beg_seq_num() {
-		return pdbx_beg_seq_num;
-	}
-
-	public void setPdbx_beg_seq_num(String pdbx_beg_seq_num) {
-		this.pdbx_beg_seq_num = pdbx_beg_seq_num;
-	}
-
-	public String getPdbx_end_seq_num() {
-		return pdbx_end_seq_num;
-	}
-
-	public void setPdbx_end_seq_num(String pdbx_end_seq_num) {
-		this.pdbx_end_seq_num = pdbx_end_seq_num;
-	}
-
-	public String getPdbx_leaving_atom_flag() {
-		return pdbx_leaving_atom_flag;
-	}
-
-	public void setPdbx_leaving_atom_flag(String pdbx_leaving_atom_flag) {
-		this.pdbx_leaving_atom_flag = pdbx_leaving_atom_flag;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntitySrcSyn.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntitySrcSyn.java
deleted file mode 100644
index eb1511990f..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/EntitySrcSyn.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Aug 12, 2013
- * Author: Andreas Prlic
- */
-
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/**
- * PDBX_ENTITY_SRC_SYN records the details about each chemically
- * synthesized molecule (entity) in the asymmetric unit.
- * @author Andreas Prlic
- *
- */
-public class EntitySrcSyn {
-	String  details;
-	String  entity_id;
-	String  ncbi_taxonomy_id;
-	String  organism_common_name;
-	String  organism_scientific;
-	String  strain;
-	public String getDetails() {
-		return details;
-	}
-	public void setDetails(String details) {
-		this.details = details;
-	}
-	public String getEntity_id() {
-		return entity_id;
-	}
-	public void setEntity_id(String entity_id) {
-		this.entity_id = entity_id;
-	}
-	public String getNcbi_taxonomy_id() {
-		return ncbi_taxonomy_id;
-	}
-	public void setNcbi_taxonomy_id(String ncbi_taxonomy_id) {
-		this.ncbi_taxonomy_id = ncbi_taxonomy_id;
-	}
-	public String getOrganism_common_name() {
-		return organism_common_name;
-	}
-	public void setOrganism_common_name(String organism_common_name) {
-		this.organism_common_name = organism_common_name;
-	}
-	public String getOrganism_scientific() {
-		return organism_scientific;
-	}
-	public void setOrganism_scientific(String organism_scientific) {
-		this.organism_scientific = organism_scientific;
-	}
-	public String getStrain() {
-		return strain;
-	}
-	public void setStrain(String strain) {
-		this.strain = strain;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Exptl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Exptl.java
deleted file mode 100644
index ee6644cc34..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Exptl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at May 31, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-public class Exptl extends AbstractBean{
-	String entry_id;
-	String method;
-	String crystals_number;
-	String absorpt_coefficient_mu;
-	String absorpt_correction_T_max;
-	String absorpt_correction_T_min ;
-	String absorpt_correction_type ;
-	String absorpt_process_details ;
-	String details;
-	String method_details;
-
-	public String getEntry_id() {
-		return entry_id;
-	}
-	public void setEntry_id(String entry_id) {
-		this.entry_id = entry_id;
-	}
-	public String getMethod() {
-		return method;
-	}
-	public void setMethod(String method) {
-		this.method = method;
-	}
-	public String getCrystals_number() {
-		return crystals_number;
-	}
-	public void setCrystals_number(String crystals_number) {
-		this.crystals_number = crystals_number;
-	}
-	public String getAbsorpt_coefficient_mu() {
-		return absorpt_coefficient_mu;
-	}
-	public void setAbsorpt_coefficient_mu(String absorpt_coefficient_mu) {
-		this.absorpt_coefficient_mu = absorpt_coefficient_mu;
-	}
-	public String getAbsorpt_correction_T_max() {
-		return absorpt_correction_T_max;
-	}
-	public void setAbsorpt_correction_T_max(String absorpt_correction_T_max) {
-		this.absorpt_correction_T_max = absorpt_correction_T_max;
-	}
-	public String getAbsorpt_correction_T_min() {
-		return absorpt_correction_T_min;
-	}
-	public void setAbsorpt_correction_T_min(String absorpt_correction_T_min) {
-		this.absorpt_correction_T_min = absorpt_correction_T_min;
-	}
-	public String getAbsorpt_correction_type() {
-		return absorpt_correction_type;
-	}
-	public void setAbsorpt_correction_type(String absorpt_correction_type) {
-		this.absorpt_correction_type = absorpt_correction_type;
-	}
-	public String getAbsorpt_process_details() {
-		return absorpt_process_details;
-	}
-	public void setAbsorpt_process_details(String absorpt_process_details) {
-		this.absorpt_process_details = absorpt_process_details;
-	}
-	public String getDetails() {
-		return details;
-	}
-	public void setDetails(String details) {
-		this.details = details;
-	}
-	public String getMethod_details() {
-		return method_details;
-	}
-	public void setMethod_details(String method_details) {
-		this.method_details = method_details;
-	}
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/IgnoreField.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/IgnoreField.java
deleted file mode 100644
index 8c6db21e92..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/IgnoreField.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation indicating that a specific field of a bean should be ignored
- * @author Spencer Bliven
- *
- */
-@Target(value=ElementType.FIELD)
-@Retention(value=RetentionPolicy.RUNTIME)
-public @interface IgnoreField {
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxAuditRevisionHistory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxAuditRevisionHistory.java
deleted file mode 100644
index 8c298f84f1..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxAuditRevisionHistory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/**
- * Bean to hold data for _pdbx_audit_revision_history mmCIF category.
- *
- * @author Peter Rose
- * @since 5.0
- */
-public class PdbxAuditRevisionHistory extends AbstractBean {
-	private String ordinal;
-	private String data_content_type;
-	private String major_revision;
-	private String minor_revision;
-	private String revision_date;
-
-	public String getOrdinal() {
-		return ordinal;
-	}
-	public void setOrdinal(String ordinal) {
-		this.ordinal = ordinal;
-	}
-	public String getData_content_type() {
-		return data_content_type;
-	}
-	public void setData_content_type(String data_content_type) {
-		this.data_content_type = data_content_type;
-	}
-	public String getMajor_revision() {
-		return major_revision;
-	}
-	public void setMajor_revision(String major_revision) {
-		this.major_revision = major_revision;
-	}
-	public String getMinor_revision() {
-		return minor_revision;
-	}
-	public void setMinor_revision(String minor_revision) {
-		this.minor_revision = minor_revision;
-	}
-	public String getRevision_date() {
-		return revision_date;
-	}
-	public void setRevision_date(String revision_date) {
-		this.revision_date = revision_date;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxChemCompDescriptor.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxChemCompDescriptor.java
deleted file mode 100644
index 95eb36ce7a..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxChemCompDescriptor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * Created on 7 Feb 2013
- * Created by Andreas Prlic
- *
- * @since 3.0.2
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/*
-_pdbx_chem_comp_descriptor.comp_id
-_pdbx_chem_comp_descriptor.type
-_pdbx_chem_comp_descriptor.program
-_pdbx_chem_comp_descriptor.program_version
-_pdbx_chem_comp_descriptor.descriptor
- */
-public class PdbxChemCompDescriptor {
-	String comp_id;
-	String type;
-	String program;
-	String program_version;
-	String identifier;
-
-	public String getComp_id() {
-		return comp_id;
-	}
-	public void setComp_id(String comp_id) {
-		this.comp_id = comp_id;
-	}
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
-	public String getProgram() {
-		return program;
-	}
-	public void setProgram(String program) {
-		this.program = program;
-	}
-	public String getProgram_version() {
-		return program_version;
-	}
-	public void setProgram_version(String program_version) {
-		this.program_version = program_version;
-	}
-	public String getIdentifier() {
-		return identifier;
-	}
-	public void setIdentifier(String identifier) {
-		this.identifier = identifier;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxChemCompIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxChemCompIdentifier.java
deleted file mode 100644
index d47ee1b9d7..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxChemCompIdentifier.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * Created on Feb 5, 2013
- * Created by Andreas Prlic
- *
- * @since 3.0.2
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-
-
-/**
-_pdbx_chem_comp_identifier.comp_id
-_pdbx_chem_comp_identifier.type
-_pdbx_chem_comp_identifier.program
-_pdbx_chem_comp_identifier.program_version
-_pdbx_chem_comp_identifier.identifier
- */
-public class PdbxChemCompIdentifier {
-	String comp_id;
-	String type;
-	String program;
-	String program_version;
-	String identifier;
-
-	public String getComp_id() {
-		return comp_id;
-	}
-	public void setComp_id(String comp_id) {
-		this.comp_id = comp_id;
-	}
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
-	public String getProgram() {
-		return program;
-	}
-	public void setProgram(String program) {
-		this.program = program;
-	}
-	public String getProgram_version() {
-		return program_version;
-	}
-	public void setProgram_version(String program_version) {
-		this.program_version = program_version;
-	}
-	public String getIdentifier() {
-		return identifier;
-	}
-	public void setIdentifier(String identifier) {
-		this.identifier = identifier;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxDatabaseStatus.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxDatabaseStatus.java
deleted file mode 100644
index e96672c441..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxDatabaseStatus.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/**
- * Bean to hold data for _pdbx_database_status mmCIF category.
- *
- * @author Peter Rose
- * @since 5.0
- */
-public class PdbxDatabaseStatus extends AbstractBean {
-	private String status_code;
-	private String entry_id;
-	private String recvd_initial_deposition_date;
-	private String deposit_site;
-	private String process_site;
-	private String SG_entry;
-	private String pdb_format_compatible;
-	private String status_code_mr;
-	private String status_code_sf;
-	private String status_code_cs;
-
-	public String getStatus_code() {
-		return status_code;
-	}
-	public void setStatus_code(String status_code) {
-		this.status_code = status_code;
-	}
-	public String getEntry_id() {
-		return entry_id;
-	}
-	public void setEntry_id(String entry_id) {
-		this.entry_id = entry_id;
-	}
-	public String getRecvd_initial_deposition_date() {
-		return recvd_initial_deposition_date;
-	}
-	public void setRecvd_initial_deposition_date(String recvd_initial_deposition_date) {
-		this.recvd_initial_deposition_date = recvd_initial_deposition_date;
-	}
-	public String getDeposit_site() {
-		return deposit_site;
-	}
-	public void setDeposit_site(String deposit_site) {
-		this.deposit_site = deposit_site;
-	}
-	public String getProcess_site() {
-		return process_site;
-	}
-	public void setProcess_site(String process_site) {
-		this.process_site = process_site;
-	}
-	public String getSG_entry() {
-		return SG_entry;
-	}
-	public void setSG_entry(String sG_entry) {
-		SG_entry = sG_entry;
-	}
-	public String getPdb_format_compatible() {
-		return pdb_format_compatible;
-	}
-	public void setPdb_format_compatible(String pdb_format_compatible) {
-		this.pdb_format_compatible = pdb_format_compatible;
-	}
-	public String getStatus_code_mr() {
-		return status_code_mr;
-	}
-	public void setStatus_code_mr(String status_code_mr) {
-		this.status_code_mr = status_code_mr;
-	}
-	public String getStatus_code_sf() {
-		return status_code_sf;
-	}
-	public void setStatus_code_sf(String status_code_sf) {
-		this.status_code_sf = status_code_sf;
-	}
-	public String getStatus_code_cs() {
-		return status_code_cs;
-	}
-	public void setStatus_code_cs(String status_code_cs) {
-		this.status_code_cs = status_code_cs;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxEntityNonPoly.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxEntityNonPoly.java
deleted file mode 100644
index f3776d14e7..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxEntityNonPoly.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/** A bean for the Pdbx_entity_nonpoly category.
- *
- * @author Andreas Prlic
- * @since 1.7
- */
-public class PdbxEntityNonPoly {
-	String entity_id;
-	String name;
-	String comp_id;
-	public String getEntity_id() {
-		return entity_id;
-	}
-	public void setEntity_id(String entity_id) {
-		this.entity_id = entity_id;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getComp_id() {
-		return comp_id;
-	}
-	public void setComp_id(String comp_id) {
-		this.comp_id = comp_id;
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxNonPolyScheme.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxNonPolyScheme.java
deleted file mode 100644
index 25900b2451..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxNonPolyScheme.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/** A bean for the PDBX_NONPOLY_SCHEME category, which provides residue level nomenclature
- * mapping for non-polymer entities.
- * @author Andreas Prlic
- * @since 1.7
- */
-public class PdbxNonPolyScheme {
-	String asym_id;
-	String entity_id;
-	String seq_id;
-	String mon_id;
-	String ndb_seq_num;
-	String pdb_seq_num ;
-	String auth_seq_num ;
-	String 	pdb_mon_id;
-	String auth_mon_id;
-	String pdb_strand_id;
-	String pdb_ins_code;
-	public String getAsym_id() {
-		return asym_id;
-	}
-	public void setAsym_id(String asym_id) {
-		this.asym_id = asym_id;
-	}
-	public String getEntity_id() {
-		return entity_id;
-	}
-	public void setEntity_id(String entity_id) {
-		this.entity_id = entity_id;
-	}
-	public String getSeq_id() {
-		return seq_id;
-	}
-	public void setSeq_id(String seq_id) {
-		this.seq_id = seq_id;
-	}
-	public String getMon_id() {
-		return mon_id;
-	}
-	public void setMon_id(String mon_id) {
-		this.mon_id = mon_id;
-	}
-	public String getNdb_seq_num() {
-		return ndb_seq_num;
-	}
-	public void setNdb_seq_num(String ndb_seq_num) {
-		this.ndb_seq_num = ndb_seq_num;
-	}
-	public String getPdb_seq_num() {
-		return pdb_seq_num;
-	}
-	public void setPdb_seq_num(String pdb_seq_num) {
-		this.pdb_seq_num = pdb_seq_num;
-	}
-	public String getAuth_seq_num() {
-		return auth_seq_num;
-	}
-	public void setAuth_seq_num(String auth_seq_num) {
-		this.auth_seq_num = auth_seq_num;
-	}
-	public String getPdb_mon_id() {
-		return pdb_mon_id;
-	}
-	public void setPdb_mon_id(String pdb_mon_id) {
-		this.pdb_mon_id = pdb_mon_id;
-	}
-	public String getAuth_mon_id() {
-		return auth_mon_id;
-	}
-	public void setAuth_mon_id(String auth_mon_id) {
-		this.auth_mon_id = auth_mon_id;
-	}
-	public String getPdb_strand_id() {
-		return pdb_strand_id;
-	}
-	public void setPdb_strand_id(String pdb_strand_id) {
-		this.pdb_strand_id = pdb_strand_id;
-	}
-	public String getPdb_ins_code() {
-		return pdb_ins_code;
-	}
-	public void setPdb_ins_code(String pdb_ins_code) {
-		this.pdb_ins_code = pdb_ins_code;
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxPolySeqScheme.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxPolySeqScheme.java
deleted file mode 100644
index 42f470e0c2..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxPolySeqScheme.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Jun 5, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/** A bean for the PDBX_POLY_SEQ_SCHEME category, which provides residue level nomenclature
- * mapping for polymer entities.
- * @author Andreas Prlic
- * @since 1.7
- */
-
-public class PdbxPolySeqScheme extends AbstractBean{
-	String asym_id;
-	String entity_id;
-	String seq_id;
-	String mon_id;
-	String ndb_seq_num;
-	String pdb_seq_num ;
-	String auth_seq_num ;
-	String 	pdb_mon_id;
-	String auth_mon_id;
-	String pdb_strand_id;
-	String pdb_ins_code;
-	String hetero;
-	public String getAsym_id() {
-		return asym_id;
-	}
-	public void setAsym_id(String asym_id) {
-		this.asym_id = asym_id;
-	}
-	public String getEntity_id() {
-		return entity_id;
-	}
-	public void setEntity_id(String entity_id) {
-		this.entity_id = entity_id;
-	}
-	public String getSeq_id() {
-		return seq_id;
-	}
-	public void setSeq_id(String seq_id) {
-		this.seq_id = seq_id;
-	}
-	public String getMon_id() {
-		return mon_id;
-	}
-	public void setMon_id(String mon_id) {
-		this.mon_id = mon_id;
-	}
-	public String getNdb_seq_num() {
-		return ndb_seq_num;
-	}
-	public void setNdb_seq_num(String ndb_seq_num) {
-		this.ndb_seq_num = ndb_seq_num;
-	}
-	public String getPdb_seq_num() {
-		return pdb_seq_num;
-	}
-	public void setPdb_seq_num(String pdb_seq_num) {
-		this.pdb_seq_num = pdb_seq_num;
-	}
-	public String getAuth_seq_num() {
-		return auth_seq_num;
-	}
-	public void setAuth_seq_num(String auth_seq_num) {
-		this.auth_seq_num = auth_seq_num;
-	}
-	public String getPdb_mon_id() {
-		return pdb_mon_id;
-	}
-	public void setPdb_mon_id(String pdb_mon_id) {
-		this.pdb_mon_id = pdb_mon_id;
-	}
-	public String getAuth_mon_id() {
-		return auth_mon_id;
-	}
-	public void setAuth_mon_id(String auth_mon_id) {
-		this.auth_mon_id = auth_mon_id;
-	}
-	public String getPdb_strand_id() {
-		return pdb_strand_id;
-	}
-	public void setPdb_strand_id(String pdb_strand_id) {
-		this.pdb_strand_id = pdb_strand_id;
-	}
-	public String getPdb_ins_code() {
-		return pdb_ins_code;
-	}
-	public void setPdb_ins_code(String pdb_ins_code) {
-		this.pdb_ins_code = pdb_ins_code;
-	}
-	public String getHetero() {
-		return hetero;
-	}
-	public void setHetero(String hetero) {
-		this.hetero = hetero;
-	}
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssembly.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssembly.java
deleted file mode 100644
index 11b40c8a59..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssembly.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import java.io.Serializable;
-
-
-
-@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
-public class PdbxStructAssembly implements Serializable{
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 3104504686693887219L;
-
-	String id;
-	String details;
-	String method_details;
-	String oligomeric_details;
-	String oligomeric_count ;
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getDetails() {
-		return details;
-	}
-	public void setDetails(String details) {
-		this.details = details;
-	}
-	public String getMethod_details() {
-		return method_details;
-	}
-	public void setMethod_details(String method_details) {
-		this.method_details = method_details;
-	}
-	public String getOligomeric_details() {
-		return oligomeric_details;
-	}
-	public void setOligomeric_details(String oligomeric_details) {
-		this.oligomeric_details = oligomeric_details;
-	}
-	public String getOligomeric_count() {
-		return oligomeric_count;
-	}
-	public void setOligomeric_count(String oligomeric_count) {
-		this.oligomeric_count = oligomeric_count;
-	}
-	@Override
-	public String toString() {
-		return "PdbxStructAssembly [id=" + id + ", details=" + details
-				+ ", method_details=" + method_details
-				+ ", oligomeric_details=" + oligomeric_details
-				+ ", oligomeric_count=" + oligomeric_count + "]";
-	}
-
-
-
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssemblyGen.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssemblyGen.java
deleted file mode 100644
index d672ee9f33..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssemblyGen.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import java.io.Serializable;
-
-@XmlAccessorType(XmlAccessType.PUBLIC_MEMBER)
-public class PdbxStructAssemblyGen implements Serializable{
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 6739568389242514332L;
-	String assembly_id;
-	String oper_expression;
-	String asym_id_list;
-
-
-	public String getAssembly_id() {
-		return assembly_id;
-	}
-	public void setAssembly_id(String assembly_id) {
-		this.assembly_id = assembly_id;
-	}
-	public String getOper_expression() {
-		return oper_expression;
-	}
-	public void setOper_expression(String oper_expression) {
-		this.oper_expression = oper_expression;
-	}
-	public String getAsym_id_list() {
-		return asym_id_list;
-	}
-	public void setAsym_id_list(String asym_id_list) {
-		this.asym_id_list = asym_id_list;
-	}
-	@Override
-	public String toString() {
-		return "PdbxStructAssemblyGen [assembly_id=" + assembly_id
-				+ ", oper_expression=" + oper_expression + ", asym_id_list="
-				+ asym_id_list + "]";
-	}
-
-
-
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssemblyGenXMLContainer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssemblyGenXMLContainer.java
deleted file mode 100644
index aae7534df2..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssemblyGenXMLContainer.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.List;
-
-@XmlRootElement(name="PdbxStructAssemblyGenXMLContainer")
-public class PdbxStructAssemblyGenXMLContainer {
-
-	private List<PdbxStructAssemblyGen> data ;
-
-	static JAXBContext jaxbContext;
-	static {
-		try {
-			jaxbContext= JAXBContext.newInstance(PdbxStructAssemblyGenXMLContainer.class);
-		} catch (Exception e){
-			e.printStackTrace();
-		}
-	}
-
-	@XmlElementWrapper
-	public List<PdbxStructAssemblyGen> getPdbxStructAssemblyGens(){
-		return data;
-
-	}
-
-	public void setPdbxStructAssemblies(List<PdbxStructAssemblyGen> d){
-		data = d;
-	}
-
-	public  String toXML(){
-
-		System.out.println("converting to XML: " + data);
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-		PrintStream ps = new PrintStream(baos);
-
-		try {
-
-			Marshaller m = jaxbContext.createMarshaller();
-
-			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
-
-			m.marshal( this, ps);
-
-
-		} catch (Exception e){
-			e.printStackTrace();
-		}
-
-		return baos.toString();
-
-	}
-
-	public static PdbxStructAssemblyGenXMLContainer fromXML(String xml){
-
-		PdbxStructAssemblyGenXMLContainer job = null;
-
-		try {
-
-			Unmarshaller un = jaxbContext.createUnmarshaller();
-
-			ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
-
-			job = (PdbxStructAssemblyGenXMLContainer) un.unmarshal(bais);
-
-		} catch (Exception e){
-			e.printStackTrace();
-		}
-
-		return job;
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssemblyXMLContainer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssemblyXMLContainer.java
deleted file mode 100644
index d9cf2fb167..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructAssemblyXMLContainer.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.List;
-
-@XmlRootElement(name="PdbxStructAssemblyXMLContainer")
-public class PdbxStructAssemblyXMLContainer {
-
-	private List<PdbxStructAssembly> data ;
-
-	static JAXBContext jaxbContext;
-	static {
-		try {
-			jaxbContext= JAXBContext.newInstance(PdbxStructAssemblyXMLContainer.class);
-		} catch (Exception e){
-			e.printStackTrace();
-		}
-	}
-
-	@XmlElementWrapper
-	public List<PdbxStructAssembly> getPdbxStructAssemblies(){
-		return data;
-
-	}
-
-	public void setPdbxStructAssemblies(List<PdbxStructAssembly> d){
-		data = d;
-	}
-
-	public  String toXML(){
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-		PrintStream ps = new PrintStream(baos);
-
-		try {
-
-			Marshaller m = jaxbContext.createMarshaller();
-
-			m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
-
-			m.marshal( this, ps);
-
-
-		} catch (Exception e){
-			e.printStackTrace();
-		}
-
-		return baos.toString();
-
-	}
-
-	public static PdbxStructAssemblyXMLContainer fromXML(String xml){
-
-		PdbxStructAssemblyXMLContainer job = null;
-
-		try {
-
-			Unmarshaller un = jaxbContext.createUnmarshaller();
-
-			ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
-
-			job = (PdbxStructAssemblyXMLContainer) un.unmarshal(bais);
-
-		} catch (Exception e){
-			e.printStackTrace();
-		}
-
-		return job;
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructOperList.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructOperList.java
deleted file mode 100644
index 4d2f35e614..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructOperList.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import java.io.Serializable;
-
-/**
- * The bean for pdbx_struct_oper_list category
- * <pre>
- * _pdbx_struct_oper_list.id
- * _pdbx_struct_oper_list.type
- * _pdbx_struct_oper_list.symmetry_operation
- * _pdbx_struct_oper_list.matrix[1][1]
- * _pdbx_struct_oper_list.matrix[1][2]
- * _pdbx_struct_oper_list.matrix[1][3]
- * _pdbx_struct_oper_list.vector[1]
- * _pdbx_struct_oper_list.matrix[2][1]
- * _pdbx_struct_oper_list.matrix[2][2]
- * _pdbx_struct_oper_list.matrix[2][3]
- * _pdbx_struct_oper_list.vector[2]
- * _pdbx_struct_oper_list.matrix[3][1]
- * _pdbx_struct_oper_list.matrix[3][2]
- * _pdbx_struct_oper_list.matrix[3][3]
- * _pdbx_struct_oper_list.vector[3]
- * _pdbx_struct_oper_list.name
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public class PdbxStructOperList implements Serializable{
-
-
-	private static final long serialVersionUID = 8933552854747969787L;
-
-	@Override
-	public String toString() {
-		return "PdbxStructOperList [id=" + id + ", type=" + type + "]";
-	}
-
-
-	private String id;
-
-	private String type;
-
-	private String symmetry_operation;
-
-	@CIFLabel(label="matrix[1][1]")
-	String matrix11;
-	@CIFLabel(label="matrix[1][2]")
-	String matrix12;
-	@CIFLabel(label="matrix[1][3]")
-	String matrix13;
-
-	@CIFLabel(label="vector[1]")
-	String vector1;
-
-	@CIFLabel(label="matrix[2][1]")
-	String matrix21;
-	@CIFLabel(label="matrix[2][2]")
-	String matrix22;
-	@CIFLabel(label="matrix[2][3]")
-	String matrix23;
-
-	@CIFLabel(label="vector[2]")
-	String vector2;
-
-	@CIFLabel(label="matrix[3][1]")
-	String matrix31;
-	@CIFLabel(label="matrix[3][2]")
-	String matrix32;
-	@CIFLabel(label="matrix[3][3]")
-	String matrix33;
-
-	@CIFLabel(label="vector[3]")
-	String vector3;
-
-	String name;
-
-
-	// from here fields that are not in the cif category
-
-
-	public PdbxStructOperList(){
-
-	}
-
-	@XmlAttribute
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@XmlAttribute
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public void setMatrix11(String val){
-		this.matrix11 = val;
-	}
-	public void setMatrix21(String val){
-		this.matrix21 = val;
-	}
-	public void setMatrix31(String val){
-		this.matrix31 = val;
-	}
-
-	public void setMatrix12(String val){
-		this.matrix12 = val;
-	}
-	public void setMatrix22(String val){
-		this.matrix22 = val;
-	}
-	public void setMatrix32(String val){
-		this.matrix32 = val;
-	}
-	public void setMatrix13(String val){
-		this.matrix13 = val;
-	}
-	public void setMatrix23(String val){
-		this.matrix23 = val;
-	}
-	public void setMatrix33(String val){
-		this.matrix33 =val;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getVector1() {
-		return vector1;
-	}
-	public void setVector1(String vector1) {
-		this.vector1 = vector1;
-	}
-	public String getVector2() {
-		return vector2;
-	}
-	public void setVector2(String vector2) {
-		this.vector2 = vector2;
-	}
-	public String getVector3() {
-		return vector3;
-	}
-	public void setVector3(String vector3) {
-		this.vector3 = vector3;
-	}
-	public String getName() {
-		return name;
-	}
-	public String getSymmetry_operation() {
-		return symmetry_operation;
-	}
-	public void setSymmetry_operation(String symmetry_operation) {
-		this.symmetry_operation = symmetry_operation;
-	}
-	@XmlElement
-	public String getMatrix11(){
-		return matrix11;
-	}
-	@XmlElement
-	public String getMatrix21(){
-		return matrix21;
-	}
-	@XmlElement
-	public String getMatrix31(){
-		return matrix31;
-	}
-	@XmlElement
-	public String getMatrix12(){
-		return matrix12;
-	}
-	@XmlElement
-	public String getMatrix22(){
-		return matrix22;
-	}
-	@XmlElement
-	public String getMatrix32(){
-		return matrix32;
-	}
-	@XmlElement
-	public String getMatrix13(){
-		return matrix13;
-	}
-	@XmlElement
-	public String getMatrix23(){
-		return matrix23;
-	}
-	@XmlElement
-	public String getMatrix33(){
-		return matrix33;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructOperListXMLContainer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructOperListXMLContainer.java
deleted file mode 100644
index a1e94e4d03..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/PdbxStructOperListXMLContainer.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.List;
-
-@XmlRootElement(name="PdbxStructOperListXMLContainer")
-public class PdbxStructOperListXMLContainer {
-
-
-
-		private List<PdbxStructOperList> data ;
-
-		static JAXBContext jaxbContext;
-		static {
-			try {
-				jaxbContext= JAXBContext.newInstance(PdbxStructOperList.class);
-			} catch (Exception e){
-				e.printStackTrace();
-			}
-		}
-
-		@XmlElementWrapper
-		public List<PdbxStructOperList> getPdbxStructOperLists(){
-			return data;
-
-		}
-
-		public void setPdbxStructOperLists(List<PdbxStructOperList> d){
-			data = d;
-		}
-
-		public  String toXML(){
-
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-			PrintStream ps = new PrintStream(baos);
-
-			try {
-
-				Marshaller m = jaxbContext.createMarshaller();
-
-				m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
-
-				m.marshal( this, ps);
-
-
-			} catch (Exception e){
-				e.printStackTrace();
-			}
-
-			return baos.toString();
-
-		}
-
-		public static PdbxStructOperListXMLContainer fromXML(String xml){
-
-			PdbxStructOperListXMLContainer job = null;
-
-			try {
-
-				Unmarshaller un = jaxbContext.createUnmarshaller();
-
-				ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
-
-				job = (PdbxStructOperListXMLContainer) un.unmarshal(bais);
-
-			} catch (Exception e){
-				e.printStackTrace();
-			}
-
-			return job;
-		}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Refine.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Refine.java
deleted file mode 100644
index dceb35b5ac..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Refine.java
+++ /dev/null
@@ -1,658 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-public class Refine {
-	String entry_id;
-	String ls_number_reflns_obs;
-	String ls_number_reflns_all;
-	String pdbx_ls_sigma_I;
-	String pdbx_ls_sigma_F;
-	String pdbx_data_cutoff_high_absF;
-	String pdbx_data_cutoff_low_absF  ;
-	String pdbx_data_cutoff_high_rms_absF;
-	String ls_d_res_low  ;
-	String ls_d_res_high  ;
-	String ls_percent_reflns_obs;
-	String ls_R_factor_obs ;
-	String ls_R_factor_all  ;
-	String ls_R_factor_R_work;
-	String ls_R_factor_R_free ;
-	String ls_R_factor_R_free_error;
-	String ls_R_factor_R_free_error_details;
-	String ls_percent_reflns_R_free;
-	String ls_number_reflns_R_free;
-	String ls_number_parameters;
-	String ls_number_restraints;
-	String occupancy_min;
-	String occupancy_max;
-	String B_iso_mean;
-	@CIFLabel(label="aniso_B[1][1]")
-	String aniso_B11;
-	@CIFLabel(label="aniso_B[2][2]")
-	String aniso_B22;
-	@CIFLabel(label="aniso_B[3][3]")
-	String aniso_B33;
-	@CIFLabel(label="aniso_B[1][2]")
-	String aniso_B12;
-	@CIFLabel(label="aniso_B[1][3]")
-	String aniso_B13;
-	@CIFLabel(label="aniso_B[2][3]")
-	String aniso_B23;
-	String solvent_model_details ;
-	String solvent_model_param_ksol;
-	String solvent_model_param_bsol;
-	String pdbx_ls_cross_valid_method;
-	String details;
-	String pdbx_starting_model;
-	String pdbx_method_to_determine_struct;
-	String pdbx_isotropic_thermal_model;
-	String pdbx_stereochemistry_target_values;
-	String pdbx_stereochem_target_val_spec_case;
-	String pdbx_R_Free_selection_details;
-	String pdbx_overall_ESU_R;
-	String pdbx_overall_ESU_R_Free;
-	String overall_SU_ML;
-	String overall_SU_B;
-	String ls_redundancy_reflns_obs;
-	String pdbx_overall_phase_error   ;
-	String B_iso_min;
-	String B_iso_max;
-	String correlation_coeff_Fo_to_Fc;
-	String correlation_coeff_Fo_to_Fc_free;
-	String pdbx_solvent_vdw_probe_radii;
-	String pdbx_solvent_ion_probe_radii;
-	String pdbx_solvent_shrinkage_radii;
-	String overall_SU_R_Cruickshank_DPI;
-	String overall_SU_R_free;
-	String ls_wR_factor_R_free;
-	String ls_wR_factor_R_work;
-	String overall_FOM_free_R_set;
-	String overall_FOM_work_R_set;
-	String pdbx_refine_id;
-	String pdbx_diffrn_id;
-	String pdbx_TLS_residual_ADP_flag;
-	String pdbx_overall_SU_R_free_Cruickshank_DPI;
-	String pdbx_overall_SU_R_Blow_DPI;
-	String pdbx_overall_SU_R_free_Blow_DPI;
-	// these 2 fields are present only in some files (e.g. 4lnc, a hybrid X-RAY/NEUTRON DIFFRACTION)
-	String ls_matrix_type;
-	String ls_number_reflns_R_work;
-
-	public Refine(){
-		//aniso_B = new String[3][3];
-	}
-
-	public String getEntry_id() {
-		return entry_id;
-	}
-
-	public void setEntry_id(String entry_id) {
-		this.entry_id = entry_id;
-	}
-
-	public String getLs_number_reflns_obs() {
-		return ls_number_reflns_obs;
-	}
-
-	public void setLs_number_reflns_obs(String ls_number_reflns_obs) {
-		this.ls_number_reflns_obs = ls_number_reflns_obs;
-	}
-
-	public String getLs_number_reflns_all() {
-		return ls_number_reflns_all;
-	}
-
-	public void setLs_number_reflns_all(String ls_number_reflns_all) {
-		this.ls_number_reflns_all = ls_number_reflns_all;
-	}
-
-	public String getPdbx_ls_sigma_I() {
-		return pdbx_ls_sigma_I;
-	}
-
-	public void setPdbx_ls_sigma_I(String pdbx_ls_sigma_I) {
-		this.pdbx_ls_sigma_I = pdbx_ls_sigma_I;
-	}
-
-	public String getPdbx_ls_sigma_F() {
-		return pdbx_ls_sigma_F;
-	}
-
-	public void setPdbx_ls_sigma_F(String pdbx_ls_sigma_F) {
-		this.pdbx_ls_sigma_F = pdbx_ls_sigma_F;
-	}
-
-	public String getPdbx_data_cutoff_high_absF() {
-		return pdbx_data_cutoff_high_absF;
-	}
-
-	public void setPdbx_data_cutoff_high_absF(String pdbx_data_cutoff_high_absF) {
-		this.pdbx_data_cutoff_high_absF = pdbx_data_cutoff_high_absF;
-	}
-
-	public String getPdbx_data_cutoff_low_absF() {
-		return pdbx_data_cutoff_low_absF;
-	}
-
-	public void setPdbx_data_cutoff_low_absF(String pdbx_data_cutoff_low_absF) {
-		this.pdbx_data_cutoff_low_absF = pdbx_data_cutoff_low_absF;
-	}
-
-	public String getPdbx_data_cutoff_high_rms_absF() {
-		return pdbx_data_cutoff_high_rms_absF;
-	}
-
-	public void setPdbx_data_cutoff_high_rms_absF(
-			String pdbx_data_cutoff_high_rms_absF) {
-		this.pdbx_data_cutoff_high_rms_absF = pdbx_data_cutoff_high_rms_absF;
-	}
-
-	public String getLs_d_res_low() {
-		return ls_d_res_low;
-	}
-
-	public void setLs_d_res_low(String ls_d_res_low) {
-		this.ls_d_res_low = ls_d_res_low;
-	}
-
-	public String getLs_d_res_high() {
-		return ls_d_res_high;
-	}
-
-	public void setLs_d_res_high(String ls_d_res_high) {
-		this.ls_d_res_high = ls_d_res_high;
-	}
-
-	public String getLs_percent_reflns_obs() {
-		return ls_percent_reflns_obs;
-	}
-
-	public void setLs_percent_reflns_obs(String ls_percent_reflns_obs) {
-		this.ls_percent_reflns_obs = ls_percent_reflns_obs;
-	}
-
-	public String getLs_R_factor_obs() {
-		return ls_R_factor_obs;
-	}
-
-	public void setLs_R_factor_obs(String ls_R_factor_obs) {
-		this.ls_R_factor_obs = ls_R_factor_obs;
-	}
-
-	public String getLs_R_factor_all() {
-		return ls_R_factor_all;
-	}
-
-	public void setLs_R_factor_all(String ls_R_factor_all) {
-		this.ls_R_factor_all = ls_R_factor_all;
-	}
-
-	public String getLs_R_factor_R_work() {
-		return ls_R_factor_R_work;
-	}
-
-	public void setLs_R_factor_R_work(String ls_R_factor_R_work) {
-		this.ls_R_factor_R_work = ls_R_factor_R_work;
-	}
-
-	public String getLs_R_factor_R_free() {
-		return ls_R_factor_R_free;
-	}
-
-	public void setLs_R_factor_R_free(String ls_R_factor_R_free) {
-		this.ls_R_factor_R_free = ls_R_factor_R_free;
-	}
-
-	public String getLs_R_factor_R_free_error() {
-		return ls_R_factor_R_free_error;
-	}
-
-	public void setLs_R_factor_R_free_error(String ls_R_factor_R_free_error) {
-		this.ls_R_factor_R_free_error = ls_R_factor_R_free_error;
-	}
-
-	public String getLs_R_factor_R_free_error_details() {
-		return ls_R_factor_R_free_error_details;
-	}
-
-	public void setLs_R_factor_R_free_error_details(
-			String ls_R_factor_R_free_error_details) {
-		this.ls_R_factor_R_free_error_details = ls_R_factor_R_free_error_details;
-	}
-
-	public String getLs_percent_reflns_R_free() {
-		return ls_percent_reflns_R_free;
-	}
-
-	public void setLs_percent_reflns_R_free(String ls_percent_reflns_R_free) {
-		this.ls_percent_reflns_R_free = ls_percent_reflns_R_free;
-	}
-
-	public String getLs_number_reflns_R_free() {
-		return ls_number_reflns_R_free;
-	}
-
-	public void setLs_number_reflns_R_free(String ls_number_reflns_R_free) {
-		this.ls_number_reflns_R_free = ls_number_reflns_R_free;
-	}
-
-	public String getLs_number_parameters() {
-		return ls_number_parameters;
-	}
-
-	public void setLs_number_parameters(String ls_number_parameters) {
-		this.ls_number_parameters = ls_number_parameters;
-	}
-
-	public String getLs_number_restraints() {
-		return ls_number_restraints;
-	}
-
-	public void setLs_number_restraints(String ls_number_restraints) {
-		this.ls_number_restraints = ls_number_restraints;
-	}
-
-	public String getOccupancy_min() {
-		return occupancy_min;
-	}
-
-	public void setOccupancy_min(String occupancy_min) {
-		this.occupancy_min = occupancy_min;
-	}
-
-	public String getOccupancy_max() {
-		return occupancy_max;
-	}
-
-	public void setOccupancy_max(String occupancy_max) {
-		this.occupancy_max = occupancy_max;
-	}
-
-	public String getB_iso_mean() {
-		return B_iso_mean;
-	}
-
-	public void setB_iso_mean(String b_iso_mean) {
-		B_iso_mean = b_iso_mean;
-	}
-
-	public String getSolvent_model_details() {
-		return solvent_model_details;
-	}
-
-	public void setSolvent_model_details(String solvent_model_details) {
-		this.solvent_model_details = solvent_model_details;
-	}
-
-	public String getSolvent_model_param_ksol() {
-		return solvent_model_param_ksol;
-	}
-
-	public void setSolvent_model_param_ksol(String solvent_model_param_ksol) {
-		this.solvent_model_param_ksol = solvent_model_param_ksol;
-	}
-
-	public String getSolvent_model_param_bsol() {
-		return solvent_model_param_bsol;
-	}
-
-	public void setSolvent_model_param_bsol(String solvent_model_param_bsol) {
-		this.solvent_model_param_bsol = solvent_model_param_bsol;
-	}
-
-	public String getPdbx_ls_cross_valid_method() {
-		return pdbx_ls_cross_valid_method;
-	}
-
-	public void setPdbx_ls_cross_valid_method(String pdbx_ls_cross_valid_method) {
-		this.pdbx_ls_cross_valid_method = pdbx_ls_cross_valid_method;
-	}
-
-	public String getDetails() {
-		return details;
-	}
-
-	public void setDetails(String details) {
-		this.details = details;
-	}
-
-	public String getPdbx_starting_model() {
-		return pdbx_starting_model;
-	}
-
-	public void setPdbx_starting_model(String pdbx_starting_model) {
-		this.pdbx_starting_model = pdbx_starting_model;
-	}
-
-	public String getPdbx_method_to_determine_struct() {
-		return pdbx_method_to_determine_struct;
-	}
-
-	public void setPdbx_method_to_determine_struct(
-			String pdbx_method_to_determine_struct) {
-		this.pdbx_method_to_determine_struct = pdbx_method_to_determine_struct;
-	}
-
-	public String getPdbx_isotropic_thermal_model() {
-		return pdbx_isotropic_thermal_model;
-	}
-
-	public void setPdbx_isotropic_thermal_model(String pdbx_isotropic_thermal_model) {
-		this.pdbx_isotropic_thermal_model = pdbx_isotropic_thermal_model;
-	}
-
-	public String getPdbx_stereochemistry_target_values() {
-		return pdbx_stereochemistry_target_values;
-	}
-
-	public void setPdbx_stereochemistry_target_values(
-			String pdbx_stereochemistry_target_values) {
-		this.pdbx_stereochemistry_target_values = pdbx_stereochemistry_target_values;
-	}
-
-	public String getPdbx_stereochem_target_val_spec_case() {
-		return pdbx_stereochem_target_val_spec_case;
-	}
-
-	public void setPdbx_stereochem_target_val_spec_case(
-			String pdbx_stereochem_target_val_spec_case) {
-		this.pdbx_stereochem_target_val_spec_case = pdbx_stereochem_target_val_spec_case;
-	}
-
-	public String getPdbx_R_Free_selection_details() {
-		return pdbx_R_Free_selection_details;
-	}
-
-	public void setPdbx_R_Free_selection_details(
-			String pdbx_R_Free_selection_details) {
-		this.pdbx_R_Free_selection_details = pdbx_R_Free_selection_details;
-	}
-
-	public String getPdbx_overall_ESU_R() {
-		return pdbx_overall_ESU_R;
-	}
-
-	public void setPdbx_overall_ESU_R(String pdbx_overall_ESU_R) {
-		this.pdbx_overall_ESU_R = pdbx_overall_ESU_R;
-	}
-
-	public String getPdbx_overall_ESU_R_Free() {
-		return pdbx_overall_ESU_R_Free;
-	}
-
-	public void setPdbx_overall_ESU_R_Free(String pdbx_overall_ESU_R_Free) {
-		this.pdbx_overall_ESU_R_Free = pdbx_overall_ESU_R_Free;
-	}
-
-	public String getOverall_SU_ML() {
-		return overall_SU_ML;
-	}
-
-	public void setOverall_SU_ML(String overall_SU_ML) {
-		this.overall_SU_ML = overall_SU_ML;
-	}
-
-	public String getOverall_SU_B() {
-		return overall_SU_B;
-	}
-
-	public void setOverall_SU_B(String overall_SU_B) {
-		this.overall_SU_B = overall_SU_B;
-	}
-
-	public String getPdbx_refine_id() {
-		return pdbx_refine_id;
-	}
-
-	public void setPdbx_refine_id(String pdbx_refine_id) {
-		this.pdbx_refine_id = pdbx_refine_id;
-	}
-
-	public String getLs_redundancy_reflns_obs() {
-		return ls_redundancy_reflns_obs;
-	}
-
-	public void setLs_redundancy_reflns_obs(String ls_redundancy_reflns_obs) {
-		this.ls_redundancy_reflns_obs = ls_redundancy_reflns_obs;
-	}
-
-	public String getPdbx_overall_phase_error() {
-		return pdbx_overall_phase_error;
-	}
-
-	public void setPdbx_overall_phase_error(String pdbx_overall_phase_error) {
-		this.pdbx_overall_phase_error = pdbx_overall_phase_error;
-	}
-
-	public String getB_iso_min() {
-		return B_iso_min;
-	}
-
-	public void setB_iso_min(String b_iso_min) {
-		B_iso_min = b_iso_min;
-	}
-
-	public String getB_iso_max() {
-		return B_iso_max;
-	}
-
-	public void setB_iso_max(String b_iso_max) {
-		B_iso_max = b_iso_max;
-	}
-
-	public String getCorrelation_coeff_Fo_to_Fc() {
-		return correlation_coeff_Fo_to_Fc;
-	}
-
-	public void setCorrelation_coeff_Fo_to_Fc(String correlation_coeff_Fo_to_Fc) {
-		this.correlation_coeff_Fo_to_Fc = correlation_coeff_Fo_to_Fc;
-	}
-
-	public String getCorrelation_coeff_Fo_to_Fc_free() {
-		return correlation_coeff_Fo_to_Fc_free;
-	}
-
-	public void setCorrelation_coeff_Fo_to_Fc_free(
-			String correlation_coeff_Fo_to_Fc_free) {
-		this.correlation_coeff_Fo_to_Fc_free = correlation_coeff_Fo_to_Fc_free;
-	}
-
-	public String getPdbx_solvent_vdw_probe_radii() {
-		return pdbx_solvent_vdw_probe_radii;
-	}
-
-	public void setPdbx_solvent_vdw_probe_radii(String pdbx_solvent_vdw_probe_radii) {
-		this.pdbx_solvent_vdw_probe_radii = pdbx_solvent_vdw_probe_radii;
-	}
-
-	public String getPdbx_solvent_ion_probe_radii() {
-		return pdbx_solvent_ion_probe_radii;
-	}
-
-	public void setPdbx_solvent_ion_probe_radii(String pdbx_solvent_ion_probe_radii) {
-		this.pdbx_solvent_ion_probe_radii = pdbx_solvent_ion_probe_radii;
-	}
-
-	public String getPdbx_solvent_shrinkage_radii() {
-		return pdbx_solvent_shrinkage_radii;
-	}
-
-	public void setPdbx_solvent_shrinkage_radii(String pdbx_solvent_shrinkage_radii) {
-		this.pdbx_solvent_shrinkage_radii = pdbx_solvent_shrinkage_radii;
-	}
-
-	public String getOverall_SU_R_Cruickshank_DPI() {
-		return overall_SU_R_Cruickshank_DPI;
-	}
-
-	public void setOverall_SU_R_Cruickshank_DPI(String overall_SU_R_Cruickshank_DPI) {
-		this.overall_SU_R_Cruickshank_DPI = overall_SU_R_Cruickshank_DPI;
-	}
-
-	public String getOverall_SU_R_free() {
-		return overall_SU_R_free;
-	}
-
-	public void setOverall_SU_R_free(String overall_SU_R_free) {
-		this.overall_SU_R_free = overall_SU_R_free;
-	}
-
-	public String getLs_wR_factor_R_free() {
-		return ls_wR_factor_R_free;
-	}
-
-	public void setLs_wR_factor_R_free(String ls_wR_factor_R_free) {
-		this.ls_wR_factor_R_free = ls_wR_factor_R_free;
-	}
-
-	public String getLs_wR_factor_R_work() {
-		return ls_wR_factor_R_work;
-	}
-
-	public void setLs_wR_factor_R_work(String ls_wR_factor_R_work) {
-		this.ls_wR_factor_R_work = ls_wR_factor_R_work;
-	}
-
-	public String getOverall_FOM_free_R_set() {
-		return overall_FOM_free_R_set;
-	}
-
-	public void setOverall_FOM_free_R_set(String overall_FOM_free_R_set) {
-		this.overall_FOM_free_R_set = overall_FOM_free_R_set;
-	}
-
-	public String getOverall_FOM_work_R_set() {
-		return overall_FOM_work_R_set;
-	}
-
-	public void setOverall_FOM_work_R_set(String overall_FOM_work_R_set) {
-		this.overall_FOM_work_R_set = overall_FOM_work_R_set;
-	}
-
-	public String getPdbx_diffrn_id() {
-		return pdbx_diffrn_id;
-	}
-
-	public void setPdbx_diffrn_id(String pdbx_diffrn_id) {
-		this.pdbx_diffrn_id = pdbx_diffrn_id;
-	}
-
-	public String getPdbx_TLS_residual_ADP_flag() {
-		return pdbx_TLS_residual_ADP_flag;
-	}
-
-	public void setPdbx_TLS_residual_ADP_flag(String pdbx_TLS_residual_ADP_flag) {
-		this.pdbx_TLS_residual_ADP_flag = pdbx_TLS_residual_ADP_flag;
-	}
-
-	public String getPdbx_overall_SU_R_free_Cruickshank_DPI() {
-		return pdbx_overall_SU_R_free_Cruickshank_DPI;
-	}
-
-	public void setPdbx_overall_SU_R_free_Cruickshank_DPI(
-			String pdbx_overall_SU_R_free_Cruickshank_DPI) {
-		this.pdbx_overall_SU_R_free_Cruickshank_DPI = pdbx_overall_SU_R_free_Cruickshank_DPI;
-	}
-
-	public String getPdbx_overall_SU_R_Blow_DPI() {
-		return pdbx_overall_SU_R_Blow_DPI;
-	}
-
-	public void setPdbx_overall_SU_R_Blow_DPI(String pdbx_overall_SU_R_Blow_DPI) {
-		this.pdbx_overall_SU_R_Blow_DPI = pdbx_overall_SU_R_Blow_DPI;
-	}
-
-	public String getPdbx_overall_SU_R_free_Blow_DPI() {
-		return pdbx_overall_SU_R_free_Blow_DPI;
-	}
-
-	public void setPdbx_overall_SU_R_free_Blow_DPI(
-			String pdbx_overall_SU_R_free_Blow_DPI) {
-		this.pdbx_overall_SU_R_free_Blow_DPI = pdbx_overall_SU_R_free_Blow_DPI;
-	}
-
-	public String getLs_matrix_type() {
-		return ls_matrix_type;
-	}
-
-	public void setLs_matrix_type(String ls_matrix_type) {
-		this.ls_matrix_type = ls_matrix_type;
-	}
-
-	public String getLs_number_reflns_R_work() {
-		return ls_number_reflns_R_work;
-	}
-
-	public void setLs_number_reflns_R_work(String ls_number_reflns_R_work) {
-		this.ls_number_reflns_R_work = ls_number_reflns_R_work;
-	}
-
-	public String getAniso_B11() {
-		return aniso_B11;
-	}
-
-	public void setAniso_B11(String aniso_B11) {
-		this.aniso_B11 = aniso_B11;
-	}
-
-	public String getAniso_B22() {
-		return aniso_B22;
-	}
-
-	public void setAniso_B22(String aniso_B22) {
-		this.aniso_B22 = aniso_B22;
-	}
-
-	public String getAniso_B33() {
-		return aniso_B33;
-	}
-
-	public void setAniso_B33(String aniso_B33) {
-		this.aniso_B33 = aniso_B33;
-	}
-
-	public String getAniso_B12() {
-		return aniso_B12;
-	}
-
-	public void setAniso_B12(String aniso_B12) {
-		this.aniso_B12 = aniso_B12;
-	}
-
-	public String getAniso_B13() {
-		return aniso_B13;
-	}
-
-	public void setAniso_B13(String aniso_B13) {
-		this.aniso_B13 = aniso_B13;
-	}
-
-	public String getAniso_B23() {
-		return aniso_B23;
-	}
-
-	public void setAniso_B23(String aniso_B23) {
-		this.aniso_B23 = aniso_B23;
-	}
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Struct.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Struct.java
deleted file mode 100644
index 09a711febe..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Struct.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Apr 26, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/** a bean to contain the data of the _struct lines
- *
- * @author Andreas Prlic
- *
- */
-public class Struct {
-	String entry_id;
-	String title;
-	String pdbx_descriptor;
-	String pdbx_model_details;
-	String pdbx_model_type_details;
-	String pdbx_CASP_flag;
-
-	@Override
-	public String toString(){
-		return "entry_id:" +entry_id + " title:" + title + " pdbx_descriptor:" +pdbx_descriptor + " pdbx_model_details:"+pdbx_model_details;
-	}
-
-	public String getEntry_id() {
-		return entry_id;
-	}
-	public void setEntry_id(String entry_id) {
-		this.entry_id = entry_id;
-	}
-	public String getTitle() {
-		return title;
-	}
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	public String getPdbx_descriptor() {
-		return pdbx_descriptor;
-	}
-	public void setPdbx_descriptor(String pdbx_descriptor) {
-		this.pdbx_descriptor = pdbx_descriptor;
-	}
-	public String getPdbx_model_details() {
-		return pdbx_model_details;
-	}
-	public void setPdbx_model_details(String pdbx_model_details) {
-		this.pdbx_model_details = pdbx_model_details;
-	}
-
-	public String getPdbx_model_type_details() {
-		return pdbx_model_type_details;
-	}
-
-	public void setPdbx_model_type_details(String pdbx_model_type_details) {
-		this.pdbx_model_type_details = pdbx_model_type_details;
-	}
-
-	public String getPdbx_CASP_flag() {
-		return pdbx_CASP_flag;
-	}
-
-	public void setPdbx_CASP_flag(String pdbx_CASP_flag) {
-		this.pdbx_CASP_flag = pdbx_CASP_flag;
-	}
-
-
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructAsym.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructAsym.java
deleted file mode 100644
index f4c182b767..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructAsym.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Jun 1, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/** Contains the data for _struct_asym
- *
- * @author Andreas Prlic
- * @since 1.7
- *
- */
-public class StructAsym extends AbstractBean{
-	String id;
-	String pdbx_blank_PDB_chainid_flag;
-	String pdbx_modified;
-	String entity_id;
-	String details;
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getPdbx_blank_PDB_chainid_flag() {
-		return pdbx_blank_PDB_chainid_flag;
-	}
-	public void setPdbx_blank_PDB_chainid_flag(String pdbx_blank_PDB_chainid_flag) {
-		this.pdbx_blank_PDB_chainid_flag = pdbx_blank_PDB_chainid_flag;
-	}
-	public String getPdbx_modified() {
-		return pdbx_modified;
-	}
-	public void setPdbx_modified(String pdbx_modified) {
-		this.pdbx_modified = pdbx_modified;
-	}
-	public String getEntity_id() {
-		return entity_id;
-	}
-	public void setEntity_id(String entity_id) {
-		this.entity_id = entity_id;
-	}
-	public String getDetails() {
-		return details;
-	}
-	public void setDetails(String details) {
-		this.details = details;
-	}
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructConn.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructConn.java
deleted file mode 100644
index dbcb865dbd..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructConn.java
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
- *                    PDB web development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- *
- * Created on Mar 05, 2014
- * Created by Peter Rose
- *
- */
-
-package org.biojava.nbio.structure.io.mmcif.model;
-/**
- * A bean that stores data from the mmcif category _struct_conn
- * @author Peter Rose
- *
- */
-public class StructConn extends AbstractBean
-{
-	private String id;
-	private String conn_type_id;
-	private String pdbx_PDB_id;
-	private String ptnr1_label_asym_id;
-	private String ptnr1_label_comp_id;
-	private String ptnr1_label_seq_id;
-	private String ptnr1_label_atom_id;
-	private String pdbx_ptnr1_label_alt_id;
-	private String pdbx_ptnr1_PDB_ins_code;
-	private String pdbx_ptnr1_standard_comp_id;
-	private String ptnr1_symmetry;
-	private String ptnr2_label_asym_id;
-	private String ptnr2_label_comp_id;
-	private String ptnr2_label_seq_id;
-	private String ptnr2_label_atom_id;
-	private String pdbx_ptnr2_label_alt_id;
-	private String pdbx_ptnr2_PDB_ins_code;
-	private String ptnr1_auth_asym_id;
-	private String ptnr1_auth_comp_id;
-	private String ptnr1_auth_seq_id;
-	private String ptnr2_auth_asym_id;
-	private String ptnr2_auth_comp_id;
-	private String ptnr2_auth_seq_id;
-	private String ptnr2_symmetry;
-	private String pdbx_ptnr3_label_atom_id;
-	private String pdbx_ptnr3_label_seq_id;
-	private String pdbx_ptnr3_label_comp_id;
-	private String pdbx_ptnr3_label_asym_id;
-	private String pdbx_ptnr3_label_alt_id;
-	private String pdbx_ptnr3_PDB_ins_code;
-	private String details;
-	private String pdbx_dist_value;
-	private String pdbx_value_order;
-	private String pdbx_leaving_atom_flag;
-	/**
-	 * @return the id
-	 */
-	public String getId() {
-		return id;
-	}
-	/**
-	 * @param id the id to set
-	 */
-	public void setId(String id) {
-		this.id = id;
-	}
-	/**
-	 * @return the conn_type_id
-	 */
-	public String getConn_type_id() {
-		return conn_type_id;
-	}
-	/**
-	 * @param conn_type_id the conn_type_id to set
-	 */
-	public void setConn_type_id(String conn_type_id) {
-		this.conn_type_id = conn_type_id;
-	}
-	/**
-	 * @return the pdbx_PDB_id
-	 */
-	public String getPdbx_PDB_id() {
-		return pdbx_PDB_id;
-	}
-	/**
-	 * @param pdbx_PDB_id the pdbx_PDB_id to set
-	 */
-	public void setPdbx_PDB_id(String pdbx_PDB_id) {
-		this.pdbx_PDB_id = pdbx_PDB_id;
-	}
-	/**
-	 * @return the ptnr1_label_asym_id
-	 */
-	public String getPtnr1_label_asym_id() {
-		return ptnr1_label_asym_id;
-	}
-	/**
-	 * @param ptnr1_label_asym_id the ptnr1_label_asym_id to set
-	 */
-	public void setPtnr1_label_asym_id(String ptnr1_label_asym_id) {
-		this.ptnr1_label_asym_id = ptnr1_label_asym_id;
-	}
-	/**
-	 * @return the ptnr1_label_comp_id
-	 */
-	public String getPtnr1_label_comp_id() {
-		return ptnr1_label_comp_id;
-	}
-	/**
-	 * @param ptnr1_label_comp_id the ptnr1_label_comp_id to set
-	 */
-	public void setPtnr1_label_comp_id(String ptnr1_label_comp_id) {
-		this.ptnr1_label_comp_id = ptnr1_label_comp_id;
-	}
-	/**
-	 * @return the ptnr1_label_seq_id
-	 */
-	public String getPtnr1_label_seq_id() {
-		return ptnr1_label_seq_id;
-	}
-	/**
-	 * @param ptnr1_label_seq_id the ptnr1_label_seq_id to set
-	 */
-	public void setPtnr1_label_seq_id(String ptnr1_label_seq_id) {
-		this.ptnr1_label_seq_id = ptnr1_label_seq_id;
-	}
-	/**
-	 * @return the ptnr1_label_atom_id
-	 */
-	public String getPtnr1_label_atom_id() {
-		return ptnr1_label_atom_id;
-	}
-	/**
-	 * @param ptnr1_label_atom_id the ptnr1_label_atom_id to set
-	 */
-	public void setPtnr1_label_atom_id(String ptnr1_label_atom_id) {
-		this.ptnr1_label_atom_id = ptnr1_label_atom_id;
-	}
-	/**
-	 * @return the pdbx_ptnr1_label_alt_id
-	 */
-	public String getPdbx_ptnr1_label_alt_id() {
-		return pdbx_ptnr1_label_alt_id;
-	}
-	/**
-	 * @param pdbx_ptnr1_label_alt_id the pdbx_ptnr1_label_alt_id to set
-	 */
-	public void setPdbx_ptnr1_label_alt_id(String pdbx_ptnr1_label_alt_id) {
-		this.pdbx_ptnr1_label_alt_id = pdbx_ptnr1_label_alt_id;
-	}
-	/**
-	 * @return the pdbx_ptnr1_PDB_ins_code
-	 */
-	public String getPdbx_ptnr1_PDB_ins_code() {
-		return pdbx_ptnr1_PDB_ins_code;
-	}
-	/**
-	 * @param pdbx_ptnr1_PDB_ins_code the pdbx_ptnr1_PDB_ins_code to set
-	 */
-	public void setPdbx_ptnr1_PDB_ins_code(String pdbx_ptnr1_PDB_ins_code) {
-		this.pdbx_ptnr1_PDB_ins_code = pdbx_ptnr1_PDB_ins_code;
-	}
-	/**
-	 * @return the pdbx_ptnr1_standard_comp_id
-	 */
-	public String getPdbx_ptnr1_standard_comp_id() {
-		return pdbx_ptnr1_standard_comp_id;
-	}
-	/**
-	 * @param pdbx_ptnr1_standard_comp_id the pdbx_ptnr1_standard_comp_id to set
-	 */
-	public void setPdbx_ptnr1_standard_comp_id(String pdbx_ptnr1_standard_comp_id) {
-		this.pdbx_ptnr1_standard_comp_id = pdbx_ptnr1_standard_comp_id;
-	}
-	/**
-	 * @return the ptnr1_symmetry
-	 */
-	public String getPtnr1_symmetry() {
-		return ptnr1_symmetry;
-	}
-	/**
-	 * @param ptnr1_symmetry the ptnr1_symmetry to set
-	 */
-	public void setPtnr1_symmetry(String ptnr1_symmetry) {
-		this.ptnr1_symmetry = ptnr1_symmetry;
-	}
-	/**
-	 * @return the ptnr2_label_asym_id
-	 */
-	public String getPtnr2_label_asym_id() {
-		return ptnr2_label_asym_id;
-	}
-	/**
-	 * @param ptnr2_label_asym_id the ptnr2_label_asym_id to set
-	 */
-	public void setPtnr2_label_asym_id(String ptnr2_label_asym_id) {
-		this.ptnr2_label_asym_id = ptnr2_label_asym_id;
-	}
-	/**
-	 * @return the ptnr2_label_comp_id
-	 */
-	public String getPtnr2_label_comp_id() {
-		return ptnr2_label_comp_id;
-	}
-	/**
-	 * @param ptnr2_label_comp_id the ptnr2_label_comp_id to set
-	 */
-	public void setPtnr2_label_comp_id(String ptnr2_label_comp_id) {
-		this.ptnr2_label_comp_id = ptnr2_label_comp_id;
-	}
-	/**
-	 * @return the ptnr2_label_seq_id
-	 */
-	public String getPtnr2_label_seq_id() {
-		return ptnr2_label_seq_id;
-	}
-	/**
-	 * @param ptnr2_label_seq_id the ptnr2_label_seq_id to set
-	 */
-	public void setPtnr2_label_seq_id(String ptnr2_label_seq_id) {
-		this.ptnr2_label_seq_id = ptnr2_label_seq_id;
-	}
-	/**
-	 * @return the ptnr2_label_atom_id
-	 */
-	public String getPtnr2_label_atom_id() {
-		return ptnr2_label_atom_id;
-	}
-	/**
-	 * @param ptnr2_label_atom_id the ptnr2_label_atom_id to set
-	 */
-	public void setPtnr2_label_atom_id(String ptnr2_label_atom_id) {
-		this.ptnr2_label_atom_id = ptnr2_label_atom_id;
-	}
-	/**
-	 * @return the pdbx_ptnr2_label_alt_id
-	 */
-	public String getPdbx_ptnr2_label_alt_id() {
-		return pdbx_ptnr2_label_alt_id;
-	}
-	/**
-	 * @param pdbx_ptnr2_label_alt_id the pdbx_ptnr2_label_alt_id to set
-	 */
-	public void setPdbx_ptnr2_label_alt_id(String pdbx_ptnr2_label_alt_id) {
-		this.pdbx_ptnr2_label_alt_id = pdbx_ptnr2_label_alt_id;
-	}
-	/**
-	 * @return the pdbx_ptnr2_PDB_ins_code
-	 */
-	public String getPdbx_ptnr2_PDB_ins_code() {
-		return pdbx_ptnr2_PDB_ins_code;
-	}
-	/**
-	 * @param pdbx_ptnr2_PDB_ins_code the pdbx_ptnr2_PDB_ins_code to set
-	 */
-	public void setPdbx_ptnr2_PDB_ins_code(String pdbx_ptnr2_PDB_ins_code) {
-		this.pdbx_ptnr2_PDB_ins_code = pdbx_ptnr2_PDB_ins_code;
-	}
-	/**
-	 * @return the ptnr1_auth_asym_id
-	 */
-	public String getPtnr1_auth_asym_id() {
-		return ptnr1_auth_asym_id;
-	}
-	/**
-	 * @param ptnr1_auth_asym_id the ptnr1_auth_asym_id to set
-	 */
-	public void setPtnr1_auth_asym_id(String ptnr1_auth_asym_id) {
-		this.ptnr1_auth_asym_id = ptnr1_auth_asym_id;
-	}
-	/**
-	 * @return the ptnr1_auth_comp_id
-	 */
-	public String getPtnr1_auth_comp_id() {
-		return ptnr1_auth_comp_id;
-	}
-	/**
-	 * @param ptnr1_auth_comp_id the ptnr1_auth_comp_id to set
-	 */
-	public void setPtnr1_auth_comp_id(String ptnr1_auth_comp_id) {
-		this.ptnr1_auth_comp_id = ptnr1_auth_comp_id;
-	}
-	/**
-	 * @return the ptnr1_auth_seq_id
-	 */
-	public String getPtnr1_auth_seq_id() {
-		return ptnr1_auth_seq_id;
-	}
-	/**
-	 * @param ptnr1_auth_seq_id the ptnr1_auth_seq_id to set
-	 */
-	public void setPtnr1_auth_seq_id(String ptnr1_auth_seq_id) {
-		this.ptnr1_auth_seq_id = ptnr1_auth_seq_id;
-	}
-	/**
-	 * @return the ptnr2_auth_asym_id
-	 */
-	public String getPtnr2_auth_asym_id() {
-		return ptnr2_auth_asym_id;
-	}
-	/**
-	 * @param ptnr2_auth_asym_id the ptnr2_auth_asym_id to set
-	 */
-	public void setPtnr2_auth_asym_id(String ptnr2_auth_asym_id) {
-		this.ptnr2_auth_asym_id = ptnr2_auth_asym_id;
-	}
-	/**
-	 * @return the ptnr2_auth_comp_id
-	 */
-	public String getPtnr2_auth_comp_id() {
-		return ptnr2_auth_comp_id;
-	}
-	/**
-	 * @param ptnr2_auth_comp_id the ptnr2_auth_comp_id to set
-	 */
-	public void setPtnr2_auth_comp_id(String ptnr2_auth_comp_id) {
-		this.ptnr2_auth_comp_id = ptnr2_auth_comp_id;
-	}
-	/**
-	 * @return the ptnr2_auth_seq_id
-	 */
-	public String getPtnr2_auth_seq_id() {
-		return ptnr2_auth_seq_id;
-	}
-	/**
-	 * @param ptnr2_auth_seq_id the ptnr2_auth_seq_id to set
-	 */
-	public void setPtnr2_auth_seq_id(String ptnr2_auth_seq_id) {
-		this.ptnr2_auth_seq_id = ptnr2_auth_seq_id;
-	}
-	/**
-	 * @return the ptnr2_symmetry
-	 */
-	public String getPtnr2_symmetry() {
-		return ptnr2_symmetry;
-	}
-	/**
-	 * @param ptnr2_symmetry the ptnr2_symmetry to set
-	 */
-	public void setPtnr2_symmetry(String ptnr2_symmetry) {
-		this.ptnr2_symmetry = ptnr2_symmetry;
-	}
-	/**
-	 * @return the pdbx_ptnr3_label_atom_id
-	 */
-	public String getPdbx_ptnr3_label_atom_id() {
-		return pdbx_ptnr3_label_atom_id;
-	}
-	/**
-	 * @param pdbx_ptnr3_label_atom_id the pdbx_ptnr3_label_atom_id to set
-	 */
-	public void setPdbx_ptnr3_label_atom_id(String pdbx_ptnr3_label_atom_id) {
-		this.pdbx_ptnr3_label_atom_id = pdbx_ptnr3_label_atom_id;
-	}
-	/**
-	 * @return the pdbx_ptnr3_label_seq_id
-	 */
-	public String getPdbx_ptnr3_label_seq_id() {
-		return pdbx_ptnr3_label_seq_id;
-	}
-	/**
-	 * @param pdbx_ptnr3_label_seq_id the pdbx_ptnr3_label_seq_id to set
-	 */
-	public void setPdbx_ptnr3_label_seq_id(String pdbx_ptnr3_label_seq_id) {
-		this.pdbx_ptnr3_label_seq_id = pdbx_ptnr3_label_seq_id;
-	}
-	/**
-	 * @return the pdbx_ptnr3_label_comp_id
-	 */
-	public String getPdbx_ptnr3_label_comp_id() {
-		return pdbx_ptnr3_label_comp_id;
-	}
-	/**
-	 * @param pdbx_ptnr3_label_comp_id the pdbx_ptnr3_label_comp_id to set
-	 */
-	public void setPdbx_ptnr3_label_comp_id(String pdbx_ptnr3_label_comp_id) {
-		this.pdbx_ptnr3_label_comp_id = pdbx_ptnr3_label_comp_id;
-	}
-	/**
-	 * @return the pdbx_ptnr3_label_asym_id
-	 */
-	public String getPdbx_ptnr3_label_asym_id() {
-		return pdbx_ptnr3_label_asym_id;
-	}
-	/**
-	 * @param pdbx_ptnr3_label_asym_id the pdbx_ptnr3_label_asym_id to set
-	 */
-	public void setPdbx_ptnr3_label_asym_id(String pdbx_ptnr3_label_asym_id) {
-		this.pdbx_ptnr3_label_asym_id = pdbx_ptnr3_label_asym_id;
-	}
-	/**
-	 * @return the pdbx_ptnr3_label_alt_id
-	 */
-	public String getPdbx_ptnr3_label_alt_id() {
-		return pdbx_ptnr3_label_alt_id;
-	}
-	/**
-	 * @param pdbx_ptnr3_label_alt_id the pdbx_ptnr3_label_alt_id to set
-	 */
-	public void setPdbx_ptnr3_label_alt_id(String pdbx_ptnr3_label_alt_id) {
-		this.pdbx_ptnr3_label_alt_id = pdbx_ptnr3_label_alt_id;
-	}
-	/**
-	 * @return the pdbx_ptnr3_PDB_ins_code
-	 */
-	public String getPdbx_ptnr3_PDB_ins_code() {
-		return pdbx_ptnr3_PDB_ins_code;
-	}
-	/**
-	 * @param pdbx_ptnr3_PDB_ins_code the pdbx_ptnr3_PDB_ins_code to set
-	 */
-	public void setPdbx_ptnr3_PDB_ins_code(String pdbx_ptnr3_PDB_ins_code) {
-		this.pdbx_ptnr3_PDB_ins_code = pdbx_ptnr3_PDB_ins_code;
-	}
-	/**
-	 * @return the details
-	 */
-	public String getDetails() {
-		return details;
-	}
-	/**
-	 * @param details the details to set
-	 */
-	public void setDetails(String details) {
-		this.details = details;
-	}
-	/**
-	 * @return the pdbx_dist_value
-	 */
-	public String getPdbx_dist_value() {
-		return pdbx_dist_value;
-	}
-	/**
-	 * @param pdbx_dist_value the pdbx_dist_value to set
-	 */
-	public void setPdbx_dist_value(String pdbx_dist_value) {
-		this.pdbx_dist_value = pdbx_dist_value;
-	}
-	/**
-	 * @return the pdbx_value_order
-	 */
-	public String getPdbx_value_order() {
-		return pdbx_value_order;
-	}
-	/**
-	 * @param pdbx_value_order the pdbx_value_order to set
-	 */
-	public void setPdbx_value_order(String pdbx_value_order) {
-		this.pdbx_value_order = pdbx_value_order;
-	}
-
-	public String getPdbx_leaving_atom_flag() {
-		return pdbx_leaving_atom_flag;
-	}
-
-	public void setPdbx_leaving_atom_flag(String pdbx_leaving_atom_flag) {
-		this.pdbx_leaving_atom_flag = pdbx_leaving_atom_flag;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructKeywords.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructKeywords.java
deleted file mode 100644
index f09fa63d62..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructKeywords.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-public class StructKeywords {
-	String entry_id;
-	String pdbx_keywords;
-	String text;
-	public String getEntry_id() {
-		return entry_id;
-	}
-	public void setEntry_id(String entry_id) {
-		this.entry_id = entry_id;
-	}
-	public String getPdbx_keywords() {
-		return pdbx_keywords;
-	}
-	public void setPdbx_keywords(String pdbx_keywords) {
-		this.pdbx_keywords = pdbx_keywords;
-	}
-	public String getText() {
-		return text;
-	}
-	public void setText(String text) {
-		this.text = text;
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructNcsOper.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructNcsOper.java
deleted file mode 100644
index 2ec97bfb32..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructNcsOper.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-
-/**
- * A class containing the _struct_ncs_oper data
- *
- * <pre>
- *  _struct_ncs_oper.id
- *  _struct_ncs_oper.code
- *  _struct_ncs_oper.details
- * 	_struct_ncs_oper.matrix[1][1]
- *	_struct_ncs_oper.matrix[1][2]
- *	_struct_ncs_oper.matrix[1][3]
- *	_struct_ncs_oper.matrix[2][1]
- *	_struct_ncs_oper.matrix[2][2]
- *	_struct_ncs_oper.matrix[2][3]
- *	_struct_ncs_oper.matrix[3][1]
- *	_struct_ncs_oper.matrix[3][2]
- *	_struct_ncs_oper.matrix[3][3]
- *	_struct_ncs_oper.vector[1]
- *	_struct_ncs_oper.vector[2]
- *	_struct_ncs_oper.vector[3]
- * </pre>
- *
- * @author Jose Duarte
- */
-public class StructNcsOper extends AbstractBean {
-
-	private String id;
-	private String code;
-	private String details;
-
-	@CIFLabel(label="matrix[1][1]")
-	private String matrix11;
-
-	@CIFLabel(label="matrix[1][2]")
-	private String matrix12;
-
-	@CIFLabel(label="matrix[1][3]")
-	private String matrix13;
-
-	@CIFLabel(label="matrix[2][1]")
-	private String matrix21;
-
-	@CIFLabel(label="matrix[2][2]")
-	private String matrix22;
-
-	@CIFLabel(label="matrix[2][3]")
-	private String matrix23;
-
-	@CIFLabel(label="matrix[3][1]")
-	private String matrix31;
-
-	@CIFLabel(label="matrix[3][2]")
-	private String matrix32;
-
-	@CIFLabel(label="matrix[3][3]")
-	private String matrix33;
-
-	@CIFLabel(label="vector[1]")
-	private String vector1;
-
-	@CIFLabel(label="vector[2]")
-	private String vector2;
-
-	@CIFLabel(label="vector[3]")
-	private String vector3;
-
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getDetails() {
-		return details;
-	}
-
-	public void setDetails(String details) {
-		this.details = details;
-	}
-
-	/**
-	 * @return the matrix11
-	 */
-	public String getMatrix11() {
-		return matrix11;
-	}
-
-	/**
-	 * @param matrix11 the matrix11 to set
-	 */
-	public void setMatrix11(String matrix11) {
-		this.matrix11 = matrix11;
-	}
-
-	/**
-	 * @return the matrix12
-	 */
-	public String getMatrix12() {
-		return matrix12;
-	}
-
-	/**
-	 * @param matrix12 the matrix12 to set
-	 */
-	public void setMatrix12(String matrix12) {
-		this.matrix12 = matrix12;
-	}
-
-	/**
-	 * @return the matrix13
-	 */
-	public String getMatrix13() {
-		return matrix13;
-	}
-
-	/**
-	 * @param matrix13 the matrix13 to set
-	 */
-	public void setMatrix13(String matrix13) {
-		this.matrix13 = matrix13;
-	}
-
-	/**
-	 * @return the matrix21
-	 */
-	public String getMatrix21() {
-		return matrix21;
-	}
-
-	/**
-	 * @param matrix21 the matrix21 to set
-	 */
-	public void setMatrix21(String matrix21) {
-		this.matrix21 = matrix21;
-	}
-
-	/**
-	 * @return the matrix22
-	 */
-	public String getMatrix22() {
-		return matrix22;
-	}
-
-	/**
-	 * @param matrix22 the matrix22 to set
-	 */
-	public void setMatrix22(String matrix22) {
-		this.matrix22 = matrix22;
-	}
-
-	/**
-	 * @return the matrix23
-	 */
-	public String getMatrix23() {
-		return matrix23;
-	}
-
-	/**
-	 * @param matrix23 the matrix23 to set
-	 */
-	public void setMatrix23(String matrix23) {
-		this.matrix23 = matrix23;
-	}
-
-	/**
-	 * @return the matrix31
-	 */
-	public String getMatrix31() {
-		return matrix31;
-	}
-
-	/**
-	 * @param matrix31 the matrix31 to set
-	 */
-	public void setMatrix31(String matrix31) {
-		this.matrix31 = matrix31;
-	}
-
-	/**
-	 * @return the matrix32
-	 */
-	public String getMatrix32() {
-		return matrix32;
-	}
-
-	/**
-	 * @param matrix32 the matrix32 to set
-	 */
-	public void setMatrix32(String matrix32) {
-		this.matrix32 = matrix32;
-	}
-
-	/**
-	 * @return the matrix33
-	 */
-	public String getMatrix33() {
-		return matrix33;
-	}
-
-	/**
-	 * @param matrix33 the matrix33 to set
-	 */
-	public void setMatrix33(String matrix33) {
-		this.matrix33 = matrix33;
-	}
-
-	/**
-	 * @return the vector1
-	 */
-	public String getVector1() {
-		return vector1;
-	}
-
-	/**
-	 * @param vector1 the vector1 to set
-	 */
-	public void setVector1(String vector1) {
-		this.vector1 = vector1;
-	}
-
-	/**
-	 * @return the vector2
-	 */
-	public String getVector2() {
-		return vector2;
-	}
-
-	/**
-	 * @param vector2 the vector2 to set
-	 */
-	public void setVector2(String vector2) {
-		this.vector2 = vector2;
-	}
-
-	/**
-	 * @return the vector3
-	 */
-	public String getVector3() {
-		return vector3;
-	}
-
-	/**
-	 * @param vector3 the vector3 to set
-	 */
-	public void setVector3(String vector3) {
-		this.vector3 = vector3;
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructRef.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructRef.java
deleted file mode 100644
index 750f4c7b68..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructRef.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at May 31, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/** A class to containt the _struct_ref field data
- *
- * @author Andreas Prlic
- *
- */
-public class StructRef extends AbstractBean {
-	String id;
-	String db_name;
-	String db_code;
-	String entity_id;
-	String pdbx_db_accession;
-	String pdbx_align_begin;
-	String pdbx_seq_one_letter_code;
-	String biol_id;
-	public String getBiol_id() {
-		return biol_id;
-	}
-	public void setBiol_id(String biol_id) {
-		this.biol_id = biol_id;
-	}
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getDb_name() {
-		return db_name;
-	}
-	public void setDb_name(String db_name) {
-		this.db_name = db_name;
-	}
-	public String getDb_code() {
-		return db_code;
-	}
-	public void setDb_code(String db_code) {
-		this.db_code = db_code;
-	}
-	public String getEntity_id() {
-		return entity_id;
-	}
-	public void setEntity_id(String entity_id) {
-		this.entity_id = entity_id;
-	}
-	public String getPdbx_db_accession() {
-		return pdbx_db_accession;
-	}
-	public void setPdbx_db_accession(String pdbx_db_accession) {
-		this.pdbx_db_accession = pdbx_db_accession;
-	}
-	public String getPdbx_align_begin() {
-		return pdbx_align_begin;
-	}
-	public void setPdbx_align_begin(String pdbx_align_begin) {
-		this.pdbx_align_begin = pdbx_align_begin;
-	}
-	public String getPdbx_seq_one_letter_code() {
-		return pdbx_seq_one_letter_code;
-	}
-	public void setPdbx_seq_one_letter_code(String pdbx_seq_one_letter_code) {
-		this.pdbx_seq_one_letter_code = pdbx_seq_one_letter_code;
-	}
-
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructRefSeq.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructRefSeq.java
deleted file mode 100644
index 32d14314bf..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructRefSeq.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at May 31, 2008
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-public class StructRefSeq extends AbstractBean{
-	String align_id;
-	String ref_id;
-	String pdbx_PDB_id_code;
-	String pdbx_strand_id;
-	String seq_align_beg;
-	String pdbx_seq_align_beg_ins_code;
-	String seq_align_end;
-	String pdbx_seq_align_end_ins_code;
-	String pdbx_db_accession;
-	String db_align_beg;
-	String pdbx_db_align_beg_ins_code;
-	String db_align_end;
-	String pdbx_db_align_end_ins_code;
-	String pdbx_auth_seq_align_beg;
-	String pdbx_auth_seq_align_end;
-	String details;
-
-	public StructRefSeq(){
-		super();
-		pdbx_db_align_beg_ins_code = "?";
-		pdbx_db_align_end_ins_code = "?";
-
-	}
-
-	public String getAlign_id() {
-		return align_id;
-	}
-	public void setAlign_id(String align_id) {
-		this.align_id = align_id;
-	}
-	public String getRef_id() {
-		return ref_id;
-	}
-	public void setRef_id(String ref_id) {
-		this.ref_id = ref_id;
-	}
-	public String getPdbx_PDB_id_code() {
-		return pdbx_PDB_id_code;
-	}
-	public void setPdbx_PDB_id_code(String pdbx_PDB_id_code) {
-		this.pdbx_PDB_id_code = pdbx_PDB_id_code;
-	}
-	public String getPdbx_strand_id() {
-		return pdbx_strand_id;
-	}
-	public void setPdbx_strand_id(String pdbx_strand_id) {
-		this.pdbx_strand_id = pdbx_strand_id;
-	}
-	public String getSeq_align_beg() {
-		return seq_align_beg;
-	}
-	public void setSeq_align_beg(String seq_align_beg) {
-		this.seq_align_beg = seq_align_beg;
-	}
-	public String getPdbx_seq_align_beg_ins_code() {
-		return pdbx_seq_align_beg_ins_code;
-	}
-	public void setPdbx_seq_align_beg_ins_code(String pdbx_seq_align_beg_ins_code) {
-		this.pdbx_seq_align_beg_ins_code = pdbx_seq_align_beg_ins_code;
-	}
-	public String getSeq_align_end() {
-		return seq_align_end;
-	}
-	public void setSeq_align_end(String seq_align_end) {
-		this.seq_align_end = seq_align_end;
-	}
-	public String getPdbx_seq_align_end_ins_code() {
-		return pdbx_seq_align_end_ins_code;
-	}
-	public void setPdbx_seq_align_end_ins_code(String pdbx_seq_align_end_ins_code) {
-		this.pdbx_seq_align_end_ins_code = pdbx_seq_align_end_ins_code;
-	}
-	public String getPdbx_db_accession() {
-		return pdbx_db_accession;
-	}
-	public void setPdbx_db_accession(String pdbx_db_accession) {
-		this.pdbx_db_accession = pdbx_db_accession;
-	}
-	public String getDb_align_beg() {
-		return db_align_beg;
-	}
-	public void setDb_align_beg(String db_align_beg) {
-		this.db_align_beg = db_align_beg;
-	}
-	public String getPdbx_db_align_beg_ins_code() {
-		return pdbx_db_align_beg_ins_code;
-	}
-	public void setPdbx_db_align_beg_ins_code(String pdbx_db_align_beg_ins_code) {
-		this.pdbx_db_align_beg_ins_code = pdbx_db_align_beg_ins_code;
-	}
-	public String getDb_align_end() {
-		return db_align_end;
-	}
-	public void setDb_align_end(String db_align_end) {
-		this.db_align_end = db_align_end;
-	}
-	public String getPdbx_db_align_end_ins_code() {
-		return pdbx_db_align_end_ins_code;
-	}
-	public void setPdbx_db_align_end_ins_code(String pdbx_db_align_end_ins_code) {
-		this.pdbx_db_align_end_ins_code = pdbx_db_align_end_ins_code;
-	}
-	public String getPdbx_auth_seq_align_beg() {
-		return pdbx_auth_seq_align_beg;
-	}
-	public void setPdbx_auth_seq_align_beg(String pdbx_auth_seq_align_beg) {
-		this.pdbx_auth_seq_align_beg = pdbx_auth_seq_align_beg;
-	}
-	public String getPdbx_auth_seq_align_end() {
-		return pdbx_auth_seq_align_end;
-	}
-	public void setPdbx_auth_seq_align_end(String pdbx_auth_seq_align_end) {
-		this.pdbx_auth_seq_align_end = pdbx_auth_seq_align_end;
-	}
-	public String getDetails() {
-		return details;
-	}
-	public void setDetails(String details) {
-		this.details = details;
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructRefSeqDif.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructRefSeqDif.java
deleted file mode 100644
index 0b70bcb00e..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructRefSeqDif.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * Created by andreas on 9/11/15.
- */
-
-/** A class to store sequence mismatch annotations
- *
- */
-public class StructRefSeqDif {
-
-	String align_id;
-	String pdbx_pdb_id_code;
-	String mon_id;
-	String pdbx_pdb_strand_id;
-	Integer seq_num;
-	String pdbx_pdb_ins_code;
-	String pdbx_seq_db_name;
-	String pdbx_seq_db_accession_code;
-	String db_mon_id;
-	String pdbx_seq_db_seq_num;
-	String details;
-	String pdbx_auth_seq_num;
-	Integer pdbx_ordinal;
-
-	public String getAlign_id() {
-		return align_id;
-	}
-
-	public void setAlign_id(String align_id) {
-		this.align_id = align_id;
-	}
-
-	public String getPdbx_pdb_id_code() {
-		return pdbx_pdb_id_code;
-	}
-
-	public void setPdbx_pdb_id_code(String pdbx_pdb_id_code) {
-		this.pdbx_pdb_id_code = pdbx_pdb_id_code;
-	}
-
-	public String getMon_id() {
-		return mon_id;
-	}
-
-	public void setMon_id(String mon_id) {
-		this.mon_id = mon_id;
-	}
-
-	public String getPdbx_pdb_strand_id() {
-		return pdbx_pdb_strand_id;
-	}
-
-	public void setPdbx_pdb_strand_id(String pdbx_pdb_strand_id) {
-		this.pdbx_pdb_strand_id = pdbx_pdb_strand_id;
-	}
-
-	public Integer getSeq_num() {
-		return seq_num;
-	}
-
-	public void setSeq_num(Integer seq_num) {
-		this.seq_num = seq_num;
-	}
-
-	public String getPdbx_pdb_ins_code() {
-		return pdbx_pdb_ins_code;
-	}
-
-	public void setPdbx_pdb_ins_code(String pdbx_pdb_ins_code) {
-		this.pdbx_pdb_ins_code = pdbx_pdb_ins_code;
-	}
-
-	public String getPdbx_seq_db_name() {
-		return pdbx_seq_db_name;
-	}
-
-	public void setPdbx_seq_db_name(String pdbx_seq_db_name) {
-		this.pdbx_seq_db_name = pdbx_seq_db_name;
-	}
-
-	public String getPdbx_seq_db_accession_code() {
-		return pdbx_seq_db_accession_code;
-	}
-
-	public void setPdbx_seq_db_accession_code(String pdbx_seq_db_accession_code) {
-		this.pdbx_seq_db_accession_code = pdbx_seq_db_accession_code;
-	}
-
-	public String getDb_mon_id() {
-		return db_mon_id;
-	}
-
-	public void setDb_mon_id(String db_mon_id) {
-		this.db_mon_id = db_mon_id;
-	}
-
-	public String getPdbx_seq_db_seq_num() {
-		return pdbx_seq_db_seq_num;
-	}
-
-	public void setPdbx_seq_db_seq_num(String pdbx_seq_db_seq_num) {
-		this.pdbx_seq_db_seq_num = pdbx_seq_db_seq_num;
-	}
-
-	public String getDetails() {
-		return details;
-	}
-
-	public void setDetails(String details) {
-		this.details = details;
-	}
-
-	public String getPdbx_auth_seq_num() {
-		return pdbx_auth_seq_num;
-	}
-
-	public void setPdbx_auth_seq_num(String pdbx_auth_seq_num) {
-		this.pdbx_auth_seq_num = pdbx_auth_seq_num;
-	}
-
-	public Integer getPdbx_ordinal() {
-		return pdbx_ordinal;
-	}
-
-	public void setPdbx_ordinal(Integer pdbx_ordinal) {
-		this.pdbx_ordinal = pdbx_ordinal;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructSite.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructSite.java
deleted file mode 100644
index 21179b51f5..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructSite.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/**
- * Created by Matt on 11/1/2015.
- */
-public class StructSite {
-	String id;
-	String details;
-	String pdbx_evidence_code;
-	String pdbx_auth_asym_id;
-	String pdbx_auth_comp_id;
-	String pdbx_auth_seq_id;
-	String pdbx_num_residues;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getDetails() {
-		return details;
-	}
-
-	public void setDetails(String details) {
-		this.details = details;
-	}
-
-	public String getPdbx_evidence_code() {
-		return pdbx_evidence_code;
-	}
-
-	public void setPdbx_evidence_code(String pdbx_evidence_code) {
-		this.pdbx_evidence_code = pdbx_evidence_code;
-	}
-
-	/**
-	 * @return the pdbx_auth_asym_id
-	 */
-	public String getPdbx_auth_asym_id() {
-		return pdbx_auth_asym_id;
-	}
-
-	/**
-	 * @param pdbx_auth_asym_id the pdbx_auth_asym_id to set
-	 */
-	public void setPdbx_auth_asym_id(String pdbx_auth_asym_id) {
-		this.pdbx_auth_asym_id = pdbx_auth_asym_id;
-	}
-
-	/**
-	 * @return the pdbx_auth_comp_id
-	 */
-	public String getPdbx_auth_comp_id() {
-		return pdbx_auth_comp_id;
-	}
-
-	/**
-	 * @param pdbx_auth_comp_id the pdbx_auth_comp_id to set
-	 */
-	public void setPdbx_auth_comp_id(String pdbx_auth_comp_id) {
-		this.pdbx_auth_comp_id = pdbx_auth_comp_id;
-	}
-
-	/**
-	 * @return the pdbx_auth_seq_id
-	 */
-	public String getPdbx_auth_seq_id() {
-		return pdbx_auth_seq_id;
-	}
-
-	/**
-	 * @param pdbx_auth_seq_id the pdbx_auth_seq_id to set
-	 */
-	public void setPdbx_auth_seq_id(String pdbx_auth_seq_id) {
-		this.pdbx_auth_seq_id = pdbx_auth_seq_id;
-	}
-
-	/**
-	 * @return the pdbx_num_residues
-	 */
-	public String getPdbx_num_residues() {
-		return pdbx_num_residues;
-	}
-
-	/**
-	 * @param pdbx_num_residues the pdbx_num_residues to set
-	 */
-	public void setPdbx_num_residues(String pdbx_num_residues) {
-		this.pdbx_num_residues = pdbx_num_residues;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructSiteGen.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructSiteGen.java
deleted file mode 100644
index 8cb91fe6dc..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/StructSiteGen.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-/**
- * Created by Matt on 10/31/2015.
- */
-public class StructSiteGen extends AbstractBean {
-	String id;
-	String site_id;
-	String auth_asym_id;
-	String auth_atom_id;
-	String auth_comp_id;
-	String auth_seq_id;
-	String label_alt_id;
-	String label_asym_id;
-	String label_atom_id;
-	String label_comp_id;
-	String label_seq_id;
-	String details;
-	String pdbx_auth_ins_code;
-	String pdbx_num_res;
-	String symmetry;
-
-	public StructSiteGen() {
-		super();
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getSite_id() {
-		return site_id;
-	}
-
-	public void setSite_id(String site_id) {
-		this.site_id = site_id;
-	}
-
-	public String getAuth_asym_id() {
-		return auth_asym_id;
-	}
-
-	public void setAuth_asym_id(String auth_asym_id) {
-		this.auth_asym_id = auth_asym_id;
-	}
-
-	public String getAuth_atom_id() {
-		return auth_atom_id;
-	}
-
-	public void setAuth_atom_id(String auth_atom_id) {
-		this.auth_atom_id = auth_atom_id;
-	}
-
-	public String getAuth_comp_id() {
-		return auth_comp_id;
-	}
-
-	public void setAuth_comp_id(String auth_comp_id) {
-		this.auth_comp_id = auth_comp_id;
-	}
-
-	public String getAuth_seq_id() {
-		return auth_seq_id;
-	}
-
-	public void setAuth_seq_id(String auth_seq_id) {
-		this.auth_seq_id = auth_seq_id;
-	}
-
-	public String getLabel_alt_id() {
-		return label_alt_id;
-	}
-
-	public void setLabel_alt_id(String label_alt_id) {
-		this.label_alt_id = label_alt_id;
-	}
-
-	public String getLabel_asym_id() {
-		return label_asym_id;
-	}
-
-	public void setLabel_asym_id(String label_asym_id) {
-		this.label_asym_id = label_asym_id;
-	}
-
-	public String getLabel_atom_id() {
-		return label_atom_id;
-	}
-
-	public void setLabel_atom_id(String label_atom_id) {
-		this.label_atom_id = label_atom_id;
-	}
-
-	public String getLabel_comp_id() {
-		return label_comp_id;
-	}
-
-	public void setLabel_comp_id(String label_comp_id) {
-		this.label_comp_id = label_comp_id;
-	}
-
-	public String getLabel_seq_id() {
-		return label_seq_id;
-	}
-
-	public void setLabel_seq_id(String label_seq_id) {
-		this.label_seq_id = label_seq_id;
-	}
-
-	public String getDetails() {
-		return details;
-	}
-
-	public void setDetails(String details) {
-		this.details = details;
-	}
-
-	public String getPdbx_auth_ins_code() {
-		return pdbx_auth_ins_code;
-	}
-
-	public void setPdbx_auth_ins_code(String pdbx_auth_ins_code) {
-		this.pdbx_auth_ins_code = pdbx_auth_ins_code;
-	}
-
-	public String getPdbx_num_res() {
-		return pdbx_num_res;
-	}
-
-	public void setPdbx_num_res(String pdbx_num_res) {
-		this.pdbx_num_res = pdbx_num_res;
-	}
-
-	public String getSymmetry() {
-		return symmetry;
-	}
-
-	public void setSymmetry(String symmetry) {
-		this.symmetry = symmetry;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Symmetry.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Symmetry.java
deleted file mode 100644
index d91ef11718..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/Symmetry.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmcif.model;
-
-
-public class Symmetry extends AbstractBean {
-
-	String entry_id;
-	@CIFLabel(label="space_group_name_H-M")
-	String space_group_name_H_M;
-	@CIFLabel(label="pdbx_full_space_group_name_H-M")
-	String pdbx_full_space_group_name_H_M;
-	String cell_setting;
-	String Int_Tables_number;
-	String space_group_name_Hall;
-	public String getEntry_id() {
-		return entry_id;
-	}
-	public void setEntry_id(String entry_id) {
-		this.entry_id = entry_id;
-	}
-	public String getSpace_group_name_H_M() {
-		return space_group_name_H_M;
-	}
-	public void setSpace_group_name_H_M(String space_group_name_H_M) {
-		this.space_group_name_H_M = space_group_name_H_M;
-	}
-	public String getPdbx_full_space_group_name_H_M() {
-		return pdbx_full_space_group_name_H_M;
-	}
-	public void setPdbx_full_space_group_name_H_M(
-			String pdbx_full_space_group_name_H_M) {
-		this.pdbx_full_space_group_name_H_M = pdbx_full_space_group_name_H_M;
-	}
-	public String getCell_setting() {
-		return cell_setting;
-	}
-	public void setCell_setting(String cell_setting) {
-		this.cell_setting = cell_setting;
-	}
-	public String getInt_Tables_number() {
-		return Int_Tables_number;
-	}
-	public void setInt_Tables_number(String int_Tables_number) {
-		Int_Tables_number = int_Tables_number;
-	}
-	public String getSpace_group_name_Hall() {
-		return space_group_name_Hall;
-	}
-	public void setSpace_group_name_Hall(String space_group_name_Hall) {
-		this.space_group_name_Hall = space_group_name_Hall;
-	}
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/package-info.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/package-info.java
deleted file mode 100644
index 7f362f0d27..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/model/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-/**
- * Datamodel objects used for processing mmcif files. This are beans that can represent the data from a category in mmcif.
- */
-package org.biojava.nbio.structure.io.mmcif.model;
\ No newline at end of file
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/package-info.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/package-info.java
deleted file mode 100644
index 02a4328875..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-/**
- * Input and Output of mmcif files.
- *
- * See also the <a href="https://github.com/biojava/biojava3-tutorial/blob/master/structure/README.md">BioJava 3 tutorial</a> for more information on mmCif parsing.
- */
-package org.biojava.nbio.structure.io.mmcif;
\ No newline at end of file
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java
index 502730dcf3..083633c28f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java
@@ -25,9 +25,9 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.EntityInfo;
 import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssembly;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxStructAssemblyGen;
-import org.biojava.nbio.structure.io.mmcif.model.PdbxStructOperList;
+import org.rcsb.cif.schema.mm.PdbxStructAssembly;
+import org.rcsb.cif.schema.mm.PdbxStructAssemblyGen;
+import org.rcsb.cif.schema.mm.PdbxStructOperList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -242,121 +242,118 @@ private void addChainFlattened(Structure s, Chain newChain, String transformId)
 	 * Returns a list of transformation matrices for the generation of a macromolecular
 	 * assembly for the specified assembly Id.
 	 *
-	 * @param psa
-	 * @param psags
-	 * @param operators
+	 * @param pdbxStructAssembly
+	 * @param assemblyIndex
+	 * @param pdbxStructAssemblyGen
+	 * @param pdbxStructOperList
 	 * @return list of transformation matrices to generate macromolecular assembly
 	 */
-	public ArrayList<BiologicalAssemblyTransformation> getBioUnitTransformationList(PdbxStructAssembly psa, List<PdbxStructAssemblyGen> psags, List<PdbxStructOperList> operators) {
+	public List<BiologicalAssemblyTransformation> getBioUnitTransformationList(PdbxStructAssembly pdbxStructAssembly,
+																			   int assemblyIndex,
+																			   PdbxStructAssemblyGen pdbxStructAssemblyGen,
+																			   PdbxStructOperList pdbxStructOperList) {
 		init();
 
 		// first we populate the list of all operators from pdbx_struct_oper_list so that we can then
 		// get them from getBioUnitTransformationsListUnaryOperators() and getBioUnitTransformationsListBinaryOperators()
-		for (PdbxStructOperList oper: operators){
+		for (int i = 0; i < pdbxStructOperList.getRowCount(); i++) {
 			try {
 				Matrix4d m = new Matrix4d();
-				m.m00 = Double.parseDouble(oper.getMatrix11());
-				m.m01 = Double.parseDouble(oper.getMatrix12());
-				m.m02 = Double.parseDouble(oper.getMatrix13());
+				m.m00 = pdbxStructOperList.getMatrix11().get(i);
+				m.m01 = pdbxStructOperList.getMatrix12().get(i);
+				m.m02 = pdbxStructOperList.getMatrix13().get(i);
 
-				m.m10 = Double.parseDouble(oper.getMatrix21());
-				m.m11 = Double.parseDouble(oper.getMatrix22());
-				m.m12 = Double.parseDouble(oper.getMatrix23());
+				m.m10 = pdbxStructOperList.getMatrix21().get(i);
+				m.m11 = pdbxStructOperList.getMatrix22().get(i);
+				m.m12 = pdbxStructOperList.getMatrix23().get(i);
 
-				m.m20 = Double.parseDouble(oper.getMatrix31());
-				m.m21 = Double.parseDouble(oper.getMatrix32());
-				m.m22 = Double.parseDouble(oper.getMatrix33());
+				m.m20 = pdbxStructOperList.getMatrix31().get(i);
+				m.m21 = pdbxStructOperList.getMatrix32().get(i);
+				m.m22 = pdbxStructOperList.getMatrix33().get(i);
 
-				m.m03 = Double.parseDouble(oper.getVector1());
-				m.m13 = Double.parseDouble(oper.getVector2());
-				m.m23 = Double.parseDouble(oper.getVector3());
+				m.m03 = pdbxStructOperList.getVector1().get(i);
+				m.m13 = pdbxStructOperList.getVector2().get(i);
+				m.m23 = pdbxStructOperList.getVector3().get(i);
 
 				m.m30 = 0;
 				m.m31 = 0;
 				m.m32 = 0;
 				m.m33 = 1;
 
-				allTransformations.put(oper.getId(), m);
-
+				allTransformations.put(pdbxStructOperList.getId().get(i), m);
 			} catch (NumberFormatException e) {
-				logger.warn("Could not parse a matrix value from pdbx_struct_oper_list for id {}. The operator id will be ignored. Error: {}", oper.getId(), e.getMessage());
+				logger.warn("Could not parse a matrix value from pdbx_struct_oper_list for id {}. The operator id will be ignored. Error: {}", pdbxStructOperList.getId().get(i), e.getMessage());
 			}
 		}
 
-		ArrayList<BiologicalAssemblyTransformation> transformations = getBioUnitTransformationsListUnaryOperators(psa.getId(), psags);
-		transformations.addAll(getBioUnitTransformationsListBinaryOperators(psa.getId(), psags));
+		String assemblyId = pdbxStructAssembly.getId().get(assemblyIndex);
+		ArrayList<BiologicalAssemblyTransformation> transformations = getBioUnitTransformationsListUnaryOperators(assemblyId, pdbxStructAssemblyGen);
+		transformations.addAll(getBioUnitTransformationsListBinaryOperators(assemblyId, pdbxStructAssemblyGen));
 		transformations.trimToSize();
 		return transformations;
 	}
 
-
-	private ArrayList<BiologicalAssemblyTransformation> getBioUnitTransformationsListBinaryOperators(String assemblyId, List<PdbxStructAssemblyGen> psags) {
-
+	private ArrayList<BiologicalAssemblyTransformation> getBioUnitTransformationsListBinaryOperators(String assemblyId, PdbxStructAssemblyGen pdbxStructAssemblyGen) {
 		ArrayList<BiologicalAssemblyTransformation> transformations = new ArrayList<>();
-
 		List<OrderedPair<String>> operators = operatorResolver.getBinaryOperators();
 
+		for (int i = 0; i < pdbxStructAssemblyGen.getRowCount(); i++) {
+			if (!pdbxStructAssemblyGen.getAssemblyId().get(i).equals(assemblyId)) {
+				continue;
+			}
 
-		for ( PdbxStructAssemblyGen psag : psags){
-			if ( psag.getAssembly_id().equals(assemblyId)) {
-
-				List<String>asymIds= Arrays.asList(psag.getAsym_id_list().split(","));
-
-				operatorResolver.parseOperatorExpressionString(psag.getOper_expression());
-
-				// apply binary operators to the specified chains
-				// Example 1M4X: generates all products of transformation matrices (1-60)(61-88)
-				for (String chainId : asymIds) {
-
-					for (OrderedPair<String> operator : operators) {
-						Matrix4d original1 = allTransformations.get(operator.getElement1());
-						Matrix4d original2 = allTransformations.get(operator.getElement2());
-						if (original1 == null || original2 == null) {
-							logger.warn("Could not find matrix operator for operator id {} or {}. Assembly id {} will not contain the composed operator.", operator.getElement1(), operator.getElement2(), assemblyId);
-							continue;
-						}
-						Matrix4d composed = new Matrix4d(original1);
-						composed.mul(original2);
-						BiologicalAssemblyTransformation transform = new BiologicalAssemblyTransformation();
-						transform.setChainId(chainId);
-						transform.setId(operator.getElement1() + COMPOSED_OPERATOR_SEPARATOR + operator.getElement2());
-						transform.setTransformationMatrix(composed);
-						transformations.add(transform);
+			String[] asymIds= pdbxStructAssemblyGen.getAsymIdList().get(i).split(",");
+			operatorResolver.parseOperatorExpressionString(pdbxStructAssemblyGen.getOperExpression().get(i));
+
+			// apply binary operators to the specified chains
+			// Example 1M4X: generates all products of transformation matrices (1-60)(61-88)
+			for (String chainId : asymIds) {
+				for (OrderedPair<String> operator : operators) {
+					Matrix4d original1 = allTransformations.get(operator.getElement1());
+					Matrix4d original2 = allTransformations.get(operator.getElement2());
+					if (original1 == null || original2 == null) {
+						logger.warn("Could not find matrix operator for operator id {} or {}. Assembly id {} will not contain the composed operator.", operator.getElement1(), operator.getElement2(), assemblyId);
+						continue;
 					}
+					Matrix4d composed = new Matrix4d(original1);
+					composed.mul(original2);
+					BiologicalAssemblyTransformation transform = new BiologicalAssemblyTransformation();
+					transform.setChainId(chainId);
+					transform.setId(operator.getElement1() + COMPOSED_OPERATOR_SEPARATOR + operator.getElement2());
+					transform.setTransformationMatrix(composed);
+					transformations.add(transform);
 				}
 			}
-
 		}
 
 		return transformations;
 	}
 
-	private ArrayList<BiologicalAssemblyTransformation> getBioUnitTransformationsListUnaryOperators(String assemblyId, List<PdbxStructAssemblyGen> psags) {
-		ArrayList<BiologicalAssemblyTransformation> transformations = new ArrayList<BiologicalAssemblyTransformation>();
-
-
-		for ( PdbxStructAssemblyGen psag : psags){
-			if ( psag.getAssembly_id().equals(assemblyId)) {
-
-				operatorResolver.parseOperatorExpressionString(psag.getOper_expression());
-				List<String> operators = operatorResolver.getUnaryOperators();
+	private ArrayList<BiologicalAssemblyTransformation> getBioUnitTransformationsListUnaryOperators(String assemblyId, PdbxStructAssemblyGen pdbxStructAssemblyGen) {
+		ArrayList<BiologicalAssemblyTransformation> transformations = new ArrayList<>();
 
-				List<String>asymIds= Arrays.asList(psag.getAsym_id_list().split(","));
+		for (int i = 0; i < pdbxStructAssemblyGen.getRowCount(); i++) {
+			if (!pdbxStructAssemblyGen.getAssemblyId().get(i).equals(assemblyId)) {
+				continue;
+			}
 
-				// apply unary operators to the specified chains
-				for (String chainId : asymIds) {
-					for (String operator : operators) {
-						Matrix4d original = allTransformations.get(operator);
-						if (original == null) {
-							logger.warn("Could not find matrix operator for operator id {}. Assembly id {} will not contain the operator.", operator, assemblyId);
-							continue;
-						}
-						BiologicalAssemblyTransformation transform = new BiologicalAssemblyTransformation();
-						transform.setChainId(chainId);
-						transform.setId(operator);
-						transform.setTransformationMatrix(original);
-						transformations.add(transform);
+			operatorResolver.parseOperatorExpressionString(pdbxStructAssemblyGen.getOperExpression().get(i));
+			List<String> operators = operatorResolver.getUnaryOperators();
+			String[] asymIds = pdbxStructAssemblyGen.getAsymIdList().get(i).split(",");
+
+			// apply unary operators to the specified chains
+			for (String chainId : asymIds) {
+				for (String operator : operators) {
+					Matrix4d original = allTransformations.get(operator);
+					if (original == null) {
+						logger.warn("Could not find matrix operator for operator id {}. Assembly id {} will not contain the operator.", operator, assemblyId);
+						continue;
 					}
+					BiologicalAssemblyTransformation transform = new BiologicalAssemblyTransformation();
+					transform.setChainId(chainId);
+					transform.setId(operator);
+					transform.setTransformationMatrix(original);
+					transformations.add(transform);
 				}
 			}
 		}
@@ -364,8 +361,8 @@ private ArrayList<BiologicalAssemblyTransformation> getBioUnitTransformationsLis
 		return transformations;
 	}
 
-	private void init(){
-		operatorResolver= new OperatorResolver();
+	private void init() {
+		operatorResolver = new OperatorResolver();
 		allTransformations = new HashMap<>();
 	}
 }
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
index bb46670bae..87fc80a314 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
@@ -28,7 +28,6 @@
 import org.biojava.nbio.structure.io.LocalPDBDirectory;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.ObsoleteBehavior;
-import org.biojava.nbio.structure.io.MMCIFFileReader;
 import org.biojava.nbio.structure.io.PDBFileReader;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
index 58a2623062..6ba61088b4 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
@@ -54,7 +54,6 @@
 import org.biojava.nbio.structure.io.LocalPDBDirectory;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.ObsoleteBehavior;
-import org.biojava.nbio.structure.io.MMCIFFileReader;
 import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
 import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.mmcif.model.ChemComp;

From 993665a74da8e35e27641eebdf6ac0b506455e30 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Thu, 14 Jan 2021 09:48:15 -0800
Subject: [PATCH 016/599] wip (TODO chemcomp parsing)

---
 .../java/demo/DemoChangeChemCompProvider.java |   4 -
 .../src/main/java/demo/DemoMMCIFReader.java   |   3 +-
 .../nbio/structure/AtomPositionMap.java       |   1 +
 .../org/biojava/nbio/structure/ChainImpl.java |   2 +-
 .../nbio/structure/DatabasePDBRevRecord.java  |   3 -
 .../biojava/nbio/structure/HetatomImpl.java   |   7 +-
 .../nbio/structure/align/ce/CECalculator.java |   4 +-
 .../align/ce/CeCalculatorEnhanced.java        |   6 +-
 .../structure/chem/AllChemCompProvider.java   | 185 --------
 .../biojava/nbio/structure/chem/ChemComp.java |  38 +-
 .../structure/chem/ChemCompContainer.java     |  13 -
 .../structure/chem/ChemCompGroupFactory.java  | 131 ------
 .../nbio/structure/chem/ChemCompProvider.java |  15 -
 .../nbio/structure/chem/ChemCompTools.java    |  32 +-
 .../chem/ChemicalComponentDictionary.java     |  54 ++-
 .../chem/DownloadChemCompProvider.java        | 420 ------------------
 .../chem/ReducedChemCompProvider.java         |  56 ---
 .../biojava/nbio/structure/io/BondMaker.java  |   6 +-
 .../nbio/structure/io/ChargeAdder.java        |  48 +-
 .../nbio/structure/io/FileConvert.java        |   5 +-
 .../nbio/structure/io/PDBFileParser.java      |   6 +-
 .../nbio/structure/io/SeqRes2AtomAligner.java |   8 +-
 .../structure/io/cif/ChemCompConsumer.java    |  14 -
 .../io/cif/ChemCompConsumerImpl.java          |  70 ---
 .../structure/io/cif/CifFileConsumer.java     |  48 --
 .../structure/io/cif/CifFileConverter.java    |   4 +-
 .../io/cif/StructureConsumerImpl.java         |   1 -
 .../io/mmtf/MmtfStructureReader.java          |  22 +-
 .../io/mmtf/MmtfStructureWriter.java          |   8 +-
 .../nbio/structure/io/mmtf/MmtfUtils.java     |  12 +-
 30 files changed, 135 insertions(+), 1091 deletions(-)
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/AllChemCompProvider.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompContainer.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompProvider.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ReducedChemCompProvider.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java

diff --git a/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java b/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
index b8e4eb5430..1285d8488b 100644
--- a/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
+++ b/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
@@ -23,10 +23,6 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.chem.AllChemCompProvider;
-import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
-import org.biojava.nbio.structure.chem.ChemCompProvider;
-import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.PDBFileReader;
 
diff --git a/biojava-structure/src/main/java/demo/DemoMMCIFReader.java b/biojava-structure/src/main/java/demo/DemoMMCIFReader.java
index d5ae3fea58..b94dbd2e19 100644
--- a/biojava-structure/src/main/java/demo/DemoMMCIFReader.java
+++ b/biojava-structure/src/main/java/demo/DemoMMCIFReader.java
@@ -26,6 +26,7 @@
 
 import org.biojava.nbio.structure.*;
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.io.CifFileReader;
 import org.biojava.nbio.structure.io.StructureProvider;
 
 import java.util.List;
@@ -79,7 +80,7 @@ public void loadSimple(){
 	public void loadFromDirectAccess(){
 		String pdbId = "1A4W";
 
-		StructureProvider pdbreader = new MMCIFFileReader();
+		StructureProvider pdbreader = new CifFileReader();
 
 		try {
 			Structure s = pdbreader.getStructureById(pdbId);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomPositionMap.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomPositionMap.java
index d6d6f778ff..efe8822397 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomPositionMap.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomPositionMap.java
@@ -32,6 +32,7 @@
 import java.util.NavigableMap;
 import java.util.TreeMap;
 
+import org.biojava.nbio.structure.chem.ChemComp;
 import org.biojava.nbio.structure.chem.PolymerType;
 import org.biojava.nbio.structure.chem.ResidueType;
 import org.slf4j.Logger;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
index 7275fb07a9..8f548be835 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
@@ -24,7 +24,7 @@
 package org.biojava.nbio.structure;
 
 
-import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.ChemComp;
 import org.biojava.nbio.structure.chem.PolymerType;
 import org.biojava.nbio.structure.io.FileConvert;
 import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePDBRevRecord.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePDBRevRecord.java
index e14ef16776..039c2f0cc4 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePDBRevRecord.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePDBRevRecord.java
@@ -2,9 +2,6 @@
 
 import org.biojava.nbio.structure.io.cif.CifBean;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class DatabasePDBRevRecord implements CifBean<org.rcsb.cif.schema.mm.DatabasePDBRevRecord> {
     private static final long serialVersionUID = 1L;
     private String revNum;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
index ddc4f2f636..c9c05a704c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
@@ -23,11 +23,10 @@
  */
 package org.biojava.nbio.structure;
 
-import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.ChemComp;
 import org.biojava.nbio.structure.chem.PolymerType;
 import org.biojava.nbio.structure.chem.ResidueType;
 import org.biojava.nbio.structure.io.GroupToSDF;
-import org.rcsb.cif.schema.mm.ChemComp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -336,7 +335,7 @@ public boolean isAminoAcid() {
 			return getType().equals(GroupType.AMINOACID);
 
 
-		ResidueType rt = ResidueType.getResidueTypeFromString(cc.getType().get(0));
+		ResidueType rt = ResidueType.getResidueTypeFromString(cc.getType());
 
 		if (ResidueType.nonPolymer.equals(rt))
 			return false;
@@ -355,7 +354,7 @@ public boolean isNucleotide() {
 		if ( cc == null)
 			return  getType().equals(GroupType.NUCLEOTIDE);
 
-		ResidueType rt = ResidueType.getResidueTypeFromString(cc.getType().get(0));
+		ResidueType rt = ResidueType.getResidueTypeFromString(cc.getType());
 
 		if (ResidueType.nonPolymer.equals(rt))
 			return false;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java
index e70efd5183..2fb8b1184d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java
@@ -1545,9 +1545,9 @@ public static double[][] updateMatrixWithSequenceConservation(double[][] max, At
 				Atom a2 = ca2[j];
 
 				AminoAcidCompound ac1 =
-					set.getCompoundForString(a1.getGroup().getChemComp().getOne_letter_code());
+					set.getCompoundForString(a1.getGroup().getChemComp().getOneLetterCode());
 				AminoAcidCompound ac2 =
-					set.getCompoundForString(a2.getGroup().getChemComp().getOne_letter_code());
+					set.getCompoundForString(a2.getGroup().getChemComp().getOneLetterCode());
 
 
 				if ( ac1 == null || ac2 == null)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java
index 8610b10d0b..940111d3c8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java
@@ -1442,7 +1442,7 @@ private int optimizeSuperposition(AFPChain afpChain, int nse1, int nse2, int str
 			for ( int i =0 ; i < strBuf1.length; i++){
 				if ( strBuf1[i] == null)
 					break;
-				System.out.print(strBuf1[i].getGroup().getChemComp().getOne_letter_code());
+				System.out.print(strBuf1[i].getGroup().getChemComp().getOneLetterCode());
 			}
 			System.out.println();
 
@@ -1551,9 +1551,9 @@ public static double[][] updateMatrixWithSequenceConservation(double[][] max, At
 				Atom a2 = ca2[j];
 
 				AminoAcidCompound ac1 =
-						set.getCompoundForString(a1.getGroup().getChemComp().getOne_letter_code());
+						set.getCompoundForString(a1.getGroup().getChemComp().getOneLetterCode());
 				AminoAcidCompound ac2 =
-						set.getCompoundForString(a2.getGroup().getChemComp().getOne_letter_code());
+						set.getCompoundForString(a2.getGroup().getChemComp().getOneLetterCode());
 
 
 				if ( ac1 == null || ac2 == null)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/AllChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/AllChemCompProvider.java
deleted file mode 100644
index ef3b7414b8..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/AllChemCompProvider.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package org.biojava.nbio.structure.chem;
-
-import org.biojava.nbio.core.util.InputStreamProvider;
-import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.structure.io.LocalPDBDirectory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * A ChemComp provider that downloads and caches the components.cif file from the wwPDB site. It then loads
- * all chemical components at startup and keeps them in memory. This provider is not used as a default
- * since it is slower at startup and requires more memory than the {@link DownloadChemCompProvider} that is used by default.
- *
- * @author Andreas Prlic
- *
- */
-public class AllChemCompProvider implements ChemCompProvider, Runnable{
-    private static final Logger logger = LoggerFactory.getLogger(AllChemCompProvider.class);
-    public static final String COMPONENTS_FILE_LOCATION = "pub/pdb/data/monomers/components.cif.gz";
-
-    private static String path;
-    private static String serverName;
-
-    // there will be only one copy of the dictionary across all instances
-    // to reduce memory impact
-    static ChemicalComponentDictionary dict;
-
-    // flags to make sure there is only one thread running that is loading the dictionary
-    static AtomicBoolean loading = new AtomicBoolean(false);
-    static AtomicBoolean isInitialized = new AtomicBoolean(false);
-
-    public AllChemCompProvider(){
-        if (loading.get()) {
-            logger.warn("other thread is already loading all chemcomps, no need to init twice");
-            return;
-        }
-        if (isInitialized.get()) {
-            return;
-        }
-
-        loading.set(true);
-
-        Thread t = new Thread(this);
-        t.start();
-    }
-
-    /**
-     * make sure all paths are initialized correctly
-     */
-    private static void initPath(){
-        if (path == null) {
-            UserConfiguration config = new UserConfiguration();
-            path = config.getCacheFilePath();
-        }
-    }
-
-    private static void initServerName() {
-        if (serverName == null) {
-            serverName = LocalPDBDirectory.getServerName();
-        }
-    }
-
-    private void ensureFileExists() {
-        String fileName = getLocalFileName();
-        File f = new File(fileName);
-
-        if (!f.exists()) {
-            try {
-                downloadFile();
-            } catch (IOException e) {
-                logger.error("Caught IOException", e);
-            }
-        }
-    }
-
-    /**
-     * Downloads the components.cif.gz file from the wwPDB site.
-     */
-    public static void downloadFile() throws IOException {
-        initPath();
-        initServerName();
-
-        String localName = getLocalFileName();
-        String u = serverName + "/" + COMPONENTS_FILE_LOCATION;
-
-        downloadFileFromRemote(new URL(u), new File(localName));
-    }
-
-    private static void downloadFileFromRemote(URL remoteURL, File localFile) throws IOException {
-        logger.info("Downloading " + remoteURL + " to: " + localFile);
-        FileOutputStream out = new FileOutputStream(localFile);
-
-        InputStream in = remoteURL.openStream();
-        byte[] buf = new byte[4 * 1024]; // 4K buffer
-        int bytesRead;
-        while ((bytesRead = in.read(buf)) != -1) {
-            out.write(buf, 0, bytesRead);
-        }
-        in.close();
-        out.close();
-    }
-
-    private static String getLocalFileName(){
-        File dir = new File(path, DownloadChemCompProvider.CHEM_COMP_CACHE_DIRECTORY);
-
-        if (!dir.exists()) {
-            logger.info("Creating directory {}", dir.toString());
-            dir.mkdir();
-        }
-
-        return new File(dir, "components.cif.gz").toString();
-    }
-
-    /**
-     * Load all {@link ChemComp} definitions into memory.
-     */
-    private void loadAllChemComps() throws IOException {
-        String fileName = getLocalFileName();
-        logger.debug("Loading " + fileName);
-        InputStreamProvider isp = new InputStreamProvider();
-
-        InputStream inStream = isp.getInputStream(fileName);
-        MMcifParser parser = new SimpleMMcifParser();
-        ChemCompConsumer consumer = new ChemCompConsumer();
-
-        // The Consumer builds up the BioJava - structure object.
-        // you could also hook in your own and build up you own data model.
-        parser.addMMcifConsumer(consumer);
-        parser.parse(new BufferedReader(new InputStreamReader(inStream)));
-        dict = consumer.getDictionary();
-        inStream.close();
-    }
-
-    /**
-     *  {@inheritDoc}
-     */
-    @Override
-    public ChemComp getChemComp(String recordName) {
-        while (loading.get()) {
-            // another thread is still initializing the definitions
-            try {
-                // wait half a second
-                Thread.sleep(500);
-            } catch (InterruptedException e) {
-                logger.error("Interrupted thread while waiting: " + e.getMessage());
-                //e.printStackTrace();
-            }
-        }
-
-        return dict.getChemComp(recordName);
-    }
-
-
-    /**
-     * Do the actual loading of the dictionary in a thread.
-     */
-    @Override
-    public void run() {
-        long timeS = System.currentTimeMillis();
-        initPath();
-        ensureFileExists();
-
-        try {
-            loadAllChemComps();
-
-            long timeE = System.currentTimeMillis();
-            logger.debug("Time to init chem comp dictionary: " + (timeE - timeS) / 1000 + " sec.");
-        } catch (IOException e) {
-            logger.error("Could not load chemical components definition file {}. Error: {}", getLocalFileName(), e.getMessage());
-        } finally {
-            loading.set(false);
-            isInitialized.set(true);
-        }
-    }
-}
-
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
index 96631fe736..52aa39c604 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
@@ -49,26 +49,24 @@ public class ChemComp implements CifBean<org.rcsb.cif.schema.mm.ChemComp>, Compa
 
     @Override
     public String toString(){
-        StringBuffer buf = new StringBuffer("ChemComp ");
-        buf.append(id)
-                .append(" ")
-                .append(oneLetterCode)
-                .append(" ")
-                .append(threeLetterCode)
-                .append(" poly:")
-                .append(getPolymerType())
-                .append(" resi:")
-                .append(getResidueType())
-                .append(isStandard() ? " standard" : " modified")
-                .append(" ")
-                .append(name)
-                .append(" ")
-                .append(pdbxType)
-                .append(" ")
-                .append(formula)
-                .append(" parent:")
-                .append(monNstdParentCompId);
-        return buf.toString();
+        return "ChemComp " + id +
+                " " +
+                oneLetterCode +
+                " " +
+                threeLetterCode +
+                " poly:" +
+                getPolymerType() +
+                " resi:" +
+                getResidueType() +
+                (isStandard() ? " standard" : " modified") +
+                " " +
+                name +
+                " " +
+                pdbxType +
+                " " +
+                formula +
+                " parent:" +
+                monNstdParentCompId;
     }
 
     public boolean hasParent(){
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompContainer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompContainer.java
deleted file mode 100644
index 322f927895..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompContainer.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.biojava.nbio.structure.chem;
-
-import org.rcsb.cif.schema.mm.ChemComp;
-
-public class ChemCompContainer {
-    private final ChemComp delegate;
-
-    public ChemCompContainer(ChemComp chemComp) {
-        this.delegate = chemComp;
-    }
-
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java
deleted file mode 100644
index cad709223f..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.biojava.nbio.structure.chem;
-
-import org.biojava.nbio.core.util.SoftHashMap;
-import org.biojava.nbio.structure.AminoAcid;
-import org.biojava.nbio.structure.AminoAcidImpl;
-import org.biojava.nbio.structure.Group;
-import org.biojava.nbio.structure.HetatomImpl;
-import org.biojava.nbio.structure.NucleotideImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Map;
-
-public class ChemCompGroupFactory {
-    private static final Logger logger = LoggerFactory.getLogger(ChemCompGroupFactory.class);
-    private static ChemCompProvider chemCompProvider = new DownloadChemCompProvider();
-    private static Map<String, ChemComp> cache = new SoftHashMap<>(0);
-
-    public static ChemComp getChemComp(String recordName) {
-        recordName = recordName.toUpperCase().trim();
-
-        // we are using the cache, to avoid hitting the file system too often.
-        ChemComp chemComp = cache.get(recordName);
-        if (chemComp != null) {
-            logger.debug("Chem comp " + chemComp.getThreeLetterCode() + " read from cache");
-            return chemComp;
-        }
-
-        // not cached, get the chem comp from the provider
-        logger.debug("Chem comp " + recordName + " read from provider " + chemCompProvider.getClass().getCanonicalName());
-        chemComp = chemCompProvider.getChemComp(recordName);
-
-        // Note that this also caches null or empty responses
-        cache.put(recordName, chemComp);
-        return chemComp;
-    }
-
-    /**
-     * The new ChemCompProvider will be set in the static variable,
-     * so this provider will be used from now on until it is changed
-     * again. Note that this change can have unexpected behavior of
-     * code executed afterwards.
-     * <p>
-     * Changing the provider also resets the cache, so any groups
-     * previously accessed will be reread or re-downloaded.
-     *
-     * @param provider
-     */
-    public static void setChemCompProvider(ChemCompProvider provider) {
-        logger.debug("Setting new chem comp provider to " + provider.getClass().getCanonicalName());
-        chemCompProvider = provider;
-        // clear cache
-        cache.clear();
-    }
-
-    public static ChemCompProvider getChemCompProvider(){
-        return chemCompProvider;
-    }
-
-    /**
-     * Force the in-memory cache to be reset.
-     *
-     * Note that the ChemCompProvider may have additional memory or disk caches that need to be cleared too.
-     */
-    public static void clearCache() {
-        cache.clear();
-    }
-
-    public static Group getGroupFromChemCompDictionary(String recordName) {
-        // make sure we work with upper case records
-        recordName = recordName.toUpperCase().trim();
-        ChemComp chemComp = getChemComp(recordName);
-        Group group;
-
-        if (chemComp == null) {
-            return null;
-        }
-
-        PolymerType polymerType = PolymerType.polymerTypeFromString(chemComp.getType());
-        if (PolymerType.PROTEIN_ONLY.contains(polymerType)) {
-            AminoAcid aminoAcid = new AminoAcidImpl();
-
-            String oneLetterCode = chemComp.getOneLetterCode();
-            if (oneLetterCode == null || oneLetterCode.equals("X") || oneLetterCode.equals("?") || oneLetterCode.length() == 0) {
-                String parent = chemComp.getMonNstdParentCompId();
-                if (parent != null && parent.length() == 3) {
-                    String parentId = chemComp.getMonNstdParentCompId();
-                    ChemComp parentChemComp = getChemComp(parentId);
-                    oneLetterCode = parentChemComp.getOneLetterCode();
-                }
-            }
-
-            if (oneLetterCode == null || oneLetterCode.length() == 0 || oneLetterCode.equals("?")) {
-                // e.g. problem with PRR, which probably should have a parent of ALA, but as of 20110127 does not.
-                logger.warn("Problem with chemical component: " + recordName + "  Did not find one letter code! Setting it to 'X'");
-                aminoAcid.setAminoType('X');
-            } else {
-                aminoAcid.setAminoType(oneLetterCode.charAt(0));
-            }
-
-            group = aminoAcid;
-        } else if (PolymerType.POLYNUCLEOTIDE_ONLY.contains(polymerType)) {
-            group = new NucleotideImpl();
-        } else {
-            group = new HetatomImpl();
-        }
-
-        group.setChemComp(chemComp);
-        return group;
-    }
-
-    public static String getOneLetterCode(ChemComp chemComp) {
-        String oneLetterCode = chemComp.getOneLetterCode();
-        if (oneLetterCode == null || oneLetterCode.equals("X") || oneLetterCode.equals("?")) {
-            String parentId = chemComp.getMonNstdParentCompId();
-            if (parentId == null) {
-                return oneLetterCode;
-            }
-            // cases like OIM have multiple parents (comma separated), we shouldn't try grab a chemcomp for those strings
-            if (parentId.length() > 3) {
-                return oneLetterCode;
-            }
-            ChemComp parentChemComp = ChemCompGroupFactory.getChemComp(parentId);
-            if (parentChemComp == null) {
-                return oneLetterCode;
-            }
-            oneLetterCode = parentChemComp.getOneLetterCode();
-        }
-        return oneLetterCode;
-    }
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompProvider.java
deleted file mode 100644
index 936f5ef8cf..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompProvider.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.biojava.nbio.structure.chem;
-
-/**
- * Interface that is implemented by all classes that can provide {@link ChemComp} definitions.
- * @author Andreas Prlic
- * @since 3.0
- */
-public interface ChemCompProvider {
-    /**
-     * Returns a new instance of a chemical component definition.
-     * @param recordName the ID of the {@link ChemComp}
-     * @return a new {@link ChemComp} definition.
-     */
-    ChemComp getChemComp(String recordName);
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java
index b24fd5d51a..6b8f74dbd8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java
@@ -1,9 +1,7 @@
 package org.biojava.nbio.structure.chem;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class ChemCompTools {
@@ -96,40 +94,42 @@ public class ChemCompTools {
         bar.put('U',"DU");
         bar.put('T',"DT");
         DNA_LOOKUP_1TO2 = Collections.unmodifiableMap(Collections.synchronizedMap(bar));
-
-
-        // initialise standard chemical components
-        List<String> stdMonIds = new ArrayList<>();
-        stdMonIds.addAll(AMINO_ACID_LOOKUP_3TO1.keySet());
-        stdMonIds.addAll(DNA_LOOKUP_2TO1.keySet());
     }
 
-    public static Character getAminoOneLetter(String chemCompId){
+    public static Character getAminoOneLetter(String chemCompId) {
         return AMINO_ACID_LOOKUP_3TO1.get(chemCompId);
     }
 
-    public static Character getDNAOneLetter(String chemCompId){
+    public static Character getDNAOneLetter(String chemCompId) {
         return DNA_LOOKUP_2TO1.get(chemCompId);
     }
 
-    public static String getAminoThreeLetter(Character c){
+    public static String getAminoThreeLetter(Character c) {
         return AMINO_ACID_LOOKUP_1TO3.get(c);
     }
 
-    public static String getDNATwoLetter(Character c){
+    public static String getDNATwoLetter(Character c) {
         return DNA_LOOKUP_1TO2.get(c);
     }
 
-    public static boolean isStandardChemComp(ChemComp cc){
+    public static PolymerType getPolymerType(ResidueType residueType) {
+        if (residueType != null) {
+            return residueType.polymerType;
+        }
+        return null;
+    }
+
+    public static boolean isStandardChemComp(ChemComp cc) {
         String pid = cc.getMonNstdParentCompId();
         String one = cc.getOneLetterCode();
 
-        PolymerType polymerType = cc.getPolymerType();
+        ResidueType residueType = ResidueType.getResidueTypeFromString(cc.getType());
+        PolymerType polymerType = getPolymerType(residueType);
 
         // standard residues have no parent
-        if ((pid == null) || (pid.equals("?"))) {
+        if (pid == null || pid.equals("?")) {
             // and they have a one letter code
-            if ((one != null) && (!one.equals("?"))) {
+            if (one != null && !one.equals("?")) {
                 // peptides and dpeptides must not have X
                 if (polymerType == PolymerType.peptide || polymerType == PolymerType.dpeptide) {
                     return performPeptideCheck(cc, one);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java
index 2f48e612d7..63b38ed2e2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java
@@ -3,15 +3,23 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * A representation of the Chemical Component Dictionary.
+ *
+ * @author Andreas Prlic
+ * @since 1.7
+ * @see <a href="http://mmcif.rcsb.org/dictionaries/">link into mmCIF dictionary</a>
+ *
+ */
 public class ChemicalComponentDictionary {
-    private final Map<String, ChemComp> dictionary;
-    private final Map<String, String> replaces;
-    private final Map<String, String> isReplacedBy;
-
-    public ChemicalComponentDictionary() {
-        this.dictionary = new HashMap<>();
-        this.replaces = new HashMap<>();
-        this.isReplacedBy = new HashMap<>();
+    private Map<String, ChemComp> dictionary;
+    private Map<String,String> replaces;
+    private Map<String,String> isReplacedBy;
+
+    public ChemicalComponentDictionary(){
+        dictionary = new HashMap<>();
+        replaces  = new HashMap<>();
+        isReplacedBy = new HashMap<>();
     }
 
     public boolean isReplaced(ChemComp c) {
@@ -22,7 +30,7 @@ public boolean isReplaced(String id) {
         return isReplacedBy.containsKey(id);
     }
 
-    public boolean isReplacer(ChemComp c){
+    public boolean isReplacer(ChemComp c) {
         return isReplacer(c.getId());
     }
 
@@ -30,27 +38,27 @@ public boolean isReplacer(String id) {
         return replaces.containsKey(id);
     }
 
-    /** if ChemComp is replaced by another one, get the newer version
-     * otherwise return the same ChemComp again.
+    /**
+     * If ChemComp is replaced by another one, get the newer version otherwise return the same ChemComp again.
      * @param c
      * @return get the component that replaced ChemComp.
      */
-    public ChemComp getReplacer(ChemComp c){
+    public ChemComp getReplacer(ChemComp c) {
         return getReplacer(c.getId());
     }
 
-    public ChemComp getReplacer(String id){
+    public ChemComp getReplacer(String id) {
         if (isReplaced(id)) {
             return dictionary.get(isReplacedBy.get(id));
         }
         return dictionary.get(id);
     }
 
-    /** if ChemComp is replacing another one, get the old version
-     * otherwise return the same ChemComp again.
+    /**
+     * If ChemComp is replacing another one, get the old version otherwise return the same ChemComp again.
      * @param  c the ChemComp for which older versions should be looked up.
      */
-    public ChemComp getReplaced(ChemComp c){
+    public ChemComp getReplaced(ChemComp c) {
         return getReplaced(c.getId());
     }
 
@@ -78,15 +86,15 @@ public ChemComp getParent(ChemComp c) {
      * @param comp
      */
     public void addChemComp(ChemComp comp) {
-        dictionary.put(comp.getId(), comp);
+        dictionary.put(comp.getId(),comp);
         String rep = comp.getPdbxReplaces();
         if (rep != null && !rep.equals("?")) {
-            replaces.put(comp.getId(), rep);
+            replaces.put(comp.getId(),rep);
         }
 
-        String isRep = comp.getPdbxReplacedBy();
-        if (isRep != null && !isRep.equals("?")) {
-            isReplacedBy.put(comp.getId(), isRep);
+        String isrep = comp.getPdbxReplacedBy();
+        if (isrep != null && !isrep.equals("?")) {
+            isReplacedBy.put(comp.getId(), isrep);
         }
     }
 
@@ -94,11 +102,11 @@ public void addChemComp(ChemComp comp) {
      * Returns the number of ChemComps in this dictionary
      * @return nr. of ChemComps
      */
-    public int size(){
+    public int size() {
         return dictionary.size();
     }
 
-    public ChemComp getChemComp(String id){
+    public ChemComp getChemComp(String id) {
         return dictionary.get(id);
     }
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
deleted file mode 100644
index 5b52bcab52..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
+++ /dev/null
@@ -1,420 +0,0 @@
-package org.biojava.nbio.structure.chem;
-
-import org.biojava.nbio.core.util.InputStreamProvider;
-import org.biojava.nbio.structure.align.util.URLConnectionTools;
-import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.structure.io.LocalPDBDirectory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.zip.GZIPOutputStream;
-
-/**
- * This provider of chemical components can download and cache chemical component definition files from the RCSB PDB web
- * site. It is the default way to access these definitions. If this provider is called he first time, it will download
- * and install all chemical component definitions in a local directory. Once the definition files have been installed,
- * it has quick startup time and low memory requirements.
- *
- * An alternative provider, that keeps all definitions in memory is the {@link AllChemCompProvider}. Another provider,
- * that does not require any network access, but only can support a limited set of chemical component definitions, is
- * the {@link ReducedChemCompProvider}.
- *
- * @author Andreas Prlic
- */
-public class DownloadChemCompProvider implements ChemCompProvider {
-    private static final Logger logger = LoggerFactory.getLogger(DownloadChemCompProvider.class);
-    public static final String CHEM_COMP_CACHE_DIRECTORY = "chemcomp";
-    public static final String DEFAULT_SERVER_URL = "http://files.rcsb.org/ligands/download/";
-    public static String serverBaseUrl = DEFAULT_SERVER_URL;
-
-    /**
-     * Use default RCSB server layout (true) or internal RCSB server layout (false)
-     */
-    public static boolean useDefaultUrlLayout = true;
-
-    private static File path;
-    private static final String NEWLINE = System.getProperty("line.separator");
-
-    // flags to make sure there is only one thread running that is loading the dictionary
-    static AtomicBoolean loading = new AtomicBoolean(false);
-
-    static final List<String> protectedIDs = new ArrayList<>();
-    static {
-        protectedIDs.add("CON");
-        protectedIDs.add("PRN");
-        protectedIDs.add("AUX");
-        protectedIDs.add("NUL");
-    }
-
-    private static ChemCompProvider fallback = null; // Fallback provider if the download fails
-    /**
-     * by default we will download only some of the files. User has to request that all files should be downloaded...
-     */
-    boolean downloadAll = false;
-
-    public DownloadChemCompProvider() {
-        this(null);
-    }
-
-    public DownloadChemCompProvider(String cacheFilePath) {
-        logger.debug("Initialising DownloadChemCompProvider");
-
-        // note that path is static, so this is just to make sure that all non-static methods will have path initialised
-        if (cacheFilePath != null) {
-            path = new File(cacheFilePath);
-        }
-    }
-
-    /**
-     * Get this provider's cache path
-     * @return
-     */
-    public static File getPath(){
-        if (path == null) {
-            UserConfiguration config = new UserConfiguration();
-            path = new File(config.getCacheFilePath());
-        }
-        return path;
-    }
-
-    /**
-     * Checks if the chemical components already have been installed into the PDB directory.
-     * If not, will download the chemical components definitions file and split it up into small
-     * subfiles.
-     */
-    public void checkDoFirstInstall(){
-        if (!downloadAll) {
-            return;
-        }
-
-        // this makes sure there is a file separator between every component,
-        // if path has a trailing file separator or not, it will work for both cases
-        File dir = new File(getPath(), CHEM_COMP_CACHE_DIRECTORY);
-        File f = new File(dir, "components.cif.gz");
-
-        if (!f.exists()) {
-            downloadAllDefinitions();
-        } else {
-            // file exists.. did it get extracted?
-            FilenameFilter filter = (dir1, file) -> file.endsWith(".cif.gz");
-            String[] files = dir.list(filter);
-            if (files.length < 500) {
-                // not all did get unpacked
-                try {
-                    split();
-                } catch (IOException e) {
-                    logger.error("Could not split file {} into individual chemical component files. Error: {}",
-                            f.toString(), e.getMessage());
-                }
-            }
-        }
-    }
-
-    private void split() throws IOException {
-        logger.info("Installing individual chem comp files ...");
-
-        File dir = new File(getPath(), CHEM_COMP_CACHE_DIRECTORY);
-        File f = new File(dir, "components.cif.gz");
-
-        int counter = 0;
-        InputStreamProvider prov = new InputStreamProvider();
-
-        try (BufferedReader buf = new BufferedReader(new InputStreamReader(prov.getInputStream(f)))) {
-            String line;
-            line = buf.readLine();
-            StringWriter writer = new StringWriter();
-
-            String currentID = null;
-            while (line != null) {
-                if (line.startsWith("data_")) {
-                    // a new record found!
-                    if (currentID != null) {
-                        writeID(writer.toString(), currentID);
-                        counter++;
-                    }
-
-                    currentID = line.substring(5);
-                    writer = new StringWriter();
-                }
-
-                writer.append(line);
-                writer.append(NEWLINE);
-
-                line = buf.readLine ();
-            }
-
-            // write the last record...
-            writeID(writer.toString(), currentID);
-            counter++;
-        }
-
-        logger.info("Created " + counter + " chemical component files.");
-    }
-
-    /**
-     * Output chemical contents to a file
-     * @param contents File contents
-     * @param currentID Chemical ID, used to determine the filename
-     * @throws IOException
-     */
-    private void writeID(String contents, String currentID) throws IOException {
-        String localName = getLocalFileName(currentID);
-
-        try (PrintWriter pw = new PrintWriter(new GZIPOutputStream(new FileOutputStream(localName)))) {
-            pw.print(contents);
-            pw.flush();
-        }
-    }
-
-    /**
-     * Loads the definitions for this {@link ChemComp} from a local file and instantiates a new object.
-     *
-     * @param recordName the ID of the {@link ChemComp}
-     * @return a new {@link ChemComp} definition.
-     */
-    @Override
-    public ChemComp getChemComp(String recordName) {
-        // make sure we work with upper case records
-        recordName = recordName.toUpperCase().trim();
-
-        boolean haveFile = true;
-        if (recordName.equals("?")) {
-            return null;
-        }
-
-        if (fileIsAbsent(recordName)) {
-            // check if we should install all components
-            checkDoFirstInstall();
-        }
-        if (fileIsAbsent(recordName)) {
-            // we previously have installed already the definitions,
-            // just do an incrememntal update
-            haveFile = downloadChemCompRecord(recordName);
-        }
-
-        // Added check that download was successful and chemical component is available.
-        if (haveFile) {
-            String filename = getLocalFileName(recordName);
-            InputStream inStream = null;
-            try {
-                InputStreamProvider isp = new InputStreamProvider();
-                inStream = isp.getInputStream(filename);
-
-                MMcifParser parser = new SimpleMMcifParser();
-                ChemCompConsumer consumer = new ChemCompConsumer();
-
-                // The Consumer builds up the BioJava - structure object.
-                // you could also hook in your own and build up you own data model.
-                parser.addMMcifConsumer(consumer);
-                parser.parse(new BufferedReader(new InputStreamReader(inStream)));
-
-                ChemicalComponentDictionary dict = consumer.getDictionary();
-                ChemComp chemComp = dict.getChemComp(recordName);
-
-                // May be null if the file was corrupt. Fall back on ReducedChemCompProvider in that case
-                if (chemComp != null) {
-                    return chemComp;
-                }
-            } catch (IOException e) {
-                logger.warn("Could not download chemical component file {} for {}. Error: {}. Now trying to use the " +
-                                "local chemical component definitions.",
-                        filename, recordName, e.getMessage());
-            } finally {
-                // Now close it
-                if (inStream != null) {
-                    try {
-                        inStream.close();
-                    } catch (IOException e) {
-                        // This would be weird...
-                        logger.error("Could not close chemical component file {}. A resource leak could occur!!", filename);
-                    }
-                }
-            }
-        }
-
-        // see https://github.com/biojava/biojava/issues/315
-        // probably a network error happened. Try to use the ReducedChemCOmpProvider
-        if (fallback == null) {
-            fallback = new ReducedChemCompProvider();
-        }
-
-        logger.warn("Falling back to ReducedChemCompProvider for {}. This could indicate a network error.", recordName);
-        return fallback.getChemComp(recordName);
-
-    }
-
-    /**
-     * Returns the file name that contains the definition for this {@link ChemComp}
-     *
-     * @param recordName the ID of the {@link ChemComp}
-     * @return full path to the file
-     */
-    public static String getLocalFileName(String recordName) {
-        if (protectedIDs.contains(recordName)) {
-            recordName = "_" + recordName;
-        }
-
-        File f = new File(getPath(), CHEM_COMP_CACHE_DIRECTORY);
-        if (!f.exists()) {
-            logger.info("Creating directory " + f);
-            boolean success = f.mkdir();
-            // we've checked in initPath that path is writable, so there's no need to check if it succeeds
-            // in the unlikely case that in the meantime it isn't writable at least we log an error
-            if (!success) {
-                logger.error("Directory {} could not be created", f);
-            }
-        }
-
-        File theFile = new File(f,recordName + ".cif.gz");
-        return theFile.toString();
-    }
-
-    private static boolean fileIsAbsent(String recordName){
-        String fileName = getLocalFileName(recordName);
-        File f = new File(fileName);
-
-        // delete files that are too short to have contents
-        if (f.length() < LocalPDBDirectory.MIN_PDB_FILE_SIZE) {
-            // Delete defensively.
-            // Note that if delete is unsuccessful, we re-download the file anyways
-            f.delete();
-            return true;
-        }
-
-        return !f.exists();
-    }
-
-    /**
-     * @param recordName three-letter name
-     * @return true if successful download
-     */
-    private static boolean downloadChemCompRecord(String recordName) {
-        String localName = getLocalFileName(recordName);
-        File newFile;
-        try {
-            newFile = File.createTempFile("chemcomp" + recordName, "cif");
-            logger.debug("Will write chem comp file to temp file {}", newFile.toString());
-        } catch (IOException e) {
-            logger.error("Could not write to temp directory {} to create the chemical component download temp file",
-                    System.getProperty("java.io.tmpdir"));
-            return false;
-        }
-        String u;
-        if (useDefaultUrlLayout) {
-            u = serverBaseUrl + recordName + ".cif";
-        } else {
-            u = serverBaseUrl + recordName.charAt(0) + "/"  + recordName +"/" + recordName + ".cif";
-        }
-
-        logger.debug("downloading " + u);
-        URL url = null;
-        try {
-            url = new URL(u);
-            URLConnection uconn = URLConnectionTools.openURLConnection(url);
-
-            try (PrintWriter pw = new PrintWriter(new GZIPOutputStream(new FileOutputStream(newFile)));
-                 BufferedReader fileBuffer = new BufferedReader(new InputStreamReader(uconn.getInputStream()))) {
-
-                String line;
-                while ((line = fileBuffer.readLine()) != null) {
-                    pw.println(line);
-                }
-                pw.flush();
-            }
-            // Now we move this across to where it actually wants to be
-            Files.move(newFile.toPath(), Paths.get(localName), StandardCopyOption.REPLACE_EXISTING);
-
-            return true;
-        } catch (IOException e) {
-            logger.error("Could not download " + url.toString() + " OR store locally to " + localName + " Error =" + e.getMessage());
-            newFile.delete();
-        }
-        return false;
-    }
-
-    private void downloadAllDefinitions() {
-        if (loading.get()) {
-            logger.info("Waiting for other thread to install chemical components...");
-        }
-
-        while (loading.get()) {
-            // another thread is already downloading the components definitions
-            // wait for the other thread to finish...
-            try {
-                // wait half a second
-                Thread.sleep(500);
-            } catch (InterruptedException e) {
-                //e.printStackTrace();
-                logger.error("Thread interrupted "+e.getMessage());
-            }
-
-            logger.info("Another thread installed the chemical components.");
-            return;
-        }
-
-        loading.set(true);
-        long timeS = System.currentTimeMillis();
-
-        logger.info("Performing first installation of chemical components.");
-        logger.info("Downloading components.cif.gz ...");
-
-        try {
-            AllChemCompProvider.downloadFile();
-        } catch (IOException e) {
-            logger.error("Could not download the all chemical components file. Error: {}. "
-                    + "Chemical components information won't be available", e.getMessage());
-            // no point in trying to split if the file could not be downloaded
-            loading.set(false);
-            return;
-        }
-
-        try {
-            split();
-        } catch (IOException e) {
-            logger.error("Could not split all chem comp file into individual chemical component files. Error: {}",
-                    e.getMessage());
-            // no point in reporting time
-            loading.set(false);
-            return;
-        }
-
-        long timeE = System.currentTimeMillis();
-        logger.info("time to install chem comp dictionary: " + (timeE - timeS) / 1000 + " sec.");
-        loading.set(false);
-    }
-
-    /**
-     * By default this provider will download only some of the {@link ChemComp} files.
-     * The user has to request that all files should be downloaded by setting this parameter to true.
-     *  @return flag if the all components should be downloaded and installed at startup. (default: false)
-     */
-    public boolean isDownloadAll() {
-        return downloadAll;
-    }
-
-    /**
-     * By default this provider will download only some of the {@link ChemComp} files.
-     * The user has to request that all files should be downloaded by setting this parameter to true.
-     * @param downloadAll if the all components should be downloaded and installed at startup. (default: false)
-     */
-    public void setDownloadAll(boolean downloadAll) {
-        this.downloadAll = downloadAll;
-    }
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ReducedChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ReducedChemCompProvider.java
deleted file mode 100644
index 9841fdc161..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ReducedChemCompProvider.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.biojava.nbio.structure.chem;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.zip.GZIPInputStream;
-
-/**
- * Unlike the {@link DownloadChemCompProvider}, this {@link ChemCompProvider} does not download any chem comp
- * definitions. It has access to a limited set of files that are part of the biojava distribution.
- * @author Andreas Prlic
- * @since 3.0
- */
-public class ReducedChemCompProvider implements ChemCompProvider {
-    private static final Logger logger = LoggerFactory.getLogger(ReducedChemCompProvider.class);
-
-    public ReducedChemCompProvider(){
-        logger.debug("Initialising ReducedChemCompProvider");
-    }
-
-    @Override
-    public ChemComp getChemComp(String recordName) {
-        String name = recordName.toUpperCase().trim();
-        try (InputStream inStream = this.getClass().getResourceAsStream("/chemcomp/" + name + ".cif.gz")) {
-            logger.debug("Reading chemcomp/{}.cif.gz", name);
-
-            if (inStream == null) {
-                // could not find the chem comp definition for this in the jar file
-                logger.debug("Getting empty chem comp for {}", name);
-                ChemComp cc = ChemComp.getEmptyChemComp();
-                cc.setId(name);
-                return cc;
-            }
-
-            MMcifParser parser = new SimpleMMcifParser();
-            ChemCompConsumer consumer = new ChemCompConsumer();
-            // The Consumer builds up the BioJava - structure object.
-            // you could also hook in your own and build up you own data model.
-            parser.addMMcifConsumer(consumer);
-            parser.parse(new BufferedReader(new InputStreamReader(new GZIPInputStream(inStream))));
-
-            ChemicalComponentDictionary dict = consumer.getDictionary();
-            return dict.getChemComp(name);
-        } catch (IOException e){
-            logger.error("IOException caught while reading chem comp {}.", name, e);
-        }
-        logger.warn("Problem when loading chem comp {}, will use an empty chem comp for it", name);
-        ChemComp cc = ChemComp.getEmptyChemComp();
-        cc.setId(name);
-        return cc;
-    }
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
index aee22b0767..df077cde9b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
@@ -23,6 +23,8 @@
 package org.biojava.nbio.structure.io;
 
 import org.biojava.nbio.structure.*;
+import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.ChemCompBond;
 import org.biojava.nbio.structure.io.util.PDBTemporaryStorageUtils.LinkRecord;
 import org.rcsb.cif.model.ValueKind;
 import org.rcsb.cif.schema.mm.StructConn;
@@ -177,8 +179,8 @@ private void formIntraResidueBonds() {
 
 						for (ChemCompBond chemCompBond : aminoChemComp.getBonds()) {
 							// note we don't check distance to make this call not too expensive
-							formBondAltlocAware(group, chemCompBond.getAtom_id_1(),
-									group, chemCompBond.getAtom_id_2(), -1, chemCompBond.getNumericalBondOrder());
+							formBondAltlocAware(group, chemCompBond.getAtomId1(),
+									group, chemCompBond.getAtomId2(), -1, chemCompBond.getNumericalBondOrder());
 						}
 					}
 				}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/ChargeAdder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/ChargeAdder.java
index 28fbddb9a9..311414f9da 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/ChargeAdder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/ChargeAdder.java
@@ -28,19 +28,17 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.ChemCompAtom;
 import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
-import org.biojava.nbio.structure.io.mmcif.model.ChemCompAtom;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * A class to add appropriate charge information to a structure.
  * @author Anthony Bradley
- *
  */
 public class ChargeAdder {
-
 	private static final Logger logger = LoggerFactory.getLogger(ChargeAdder.class);
 
 	/**
@@ -48,44 +46,44 @@ public class ChargeAdder {
 	 */
 	public static void addCharges(Structure structure) {
 		// Loop through the models
-		for(int i=0; i<structure.nrModels(); i++){
-			for(Chain c: structure.getChains(i)){
-				for(Group g: c.getAtomGroups()){
+		for (int i = 0; i < structure.nrModels(); i++) {
+			for (Chain c : structure.getChains(i)) {
+				for (Group g : c.getAtomGroups()) {
 					ChemComp thisChemComp = ChemCompGroupFactory.getChemComp(g.getPDBName());
 					List<ChemCompAtom> chemAtoms = thisChemComp.getAtoms();
-					for(ChemCompAtom chemCompAtom : chemAtoms) {
-						Atom atom = g.getAtom(chemCompAtom.getAtom_id());
+					for (ChemCompAtom chemCompAtom : chemAtoms) {
+						Atom atom = g.getAtom(chemCompAtom.getAtomId());
 						String stringCharge = chemCompAtom.getCharge();
 						short shortCharge = 0;
-						if (stringCharge!=null){
-							if(!stringCharge.equals("?")){
-								try{
+						if (stringCharge != null) {
+							if (!stringCharge.equals("?")) {
+								try {
 									shortCharge = Short.parseShort(stringCharge);
+								} catch(NumberFormatException e) {
+									logger.warn("Number format exception. Parsing '{}' to short", stringCharge);
 								}
-								catch(NumberFormatException e){
-									logger.warn("Number format exception. Parsing '"+stringCharge+"' to short");
-								}
+							} else {
+								logger.warn("? charge on atom {} in group {}",
+										chemCompAtom.getAtomId(),
+										thisChemComp.getId());
 							}
-							else{
-								logger.warn("? charge on atom "+chemCompAtom.getAtom_id()+" in group "+thisChemComp.getId());
-							}
-						}
-						else{
-							logger.warn("Null charge on atom "+chemCompAtom.getAtom_id()+" in group "+thisChemComp.getId());
+						} else {
+							logger.warn("Null charge on atom {} in group {}",
+									chemCompAtom.getAtomId(),
+									thisChemComp.getId());
 						}
-						if(atom!=null){
+						if (atom != null) {
 							atom.setCharge(shortCharge);
 						}
 						// Now do the same for alt locs
 						for (Group altLoc : g.getAltLocs()) {
-							Atom altAtom = altLoc.getAtom(chemCompAtom.getAtom_id());
-							if(altAtom!=null){
+							Atom altAtom = altLoc.getAtom(chemCompAtom.getAtomId());
+							if (altAtom != null) {
 								altAtom.setCharge(shortCharge);
 							}
 						}
 					}
 				}
-
 			}
 		}
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
index 7cb62beffc..d6da021e63 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
@@ -593,10 +593,7 @@ else if (name.length()==1)
 
 
 	public String toMMCIF() {
-		return CifFileConverter.toText(this.structure);	}
-
-	public static String toMMCIF(Chain chain, String authId, String asymId) {
-		return CifFileConverter.toText(chain, authId, asymId);
+		return CifFileConverter.toText(this.structure);
 	}
 
 	public static String toMMCIF(Chain chain) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index 41014e1ec4..6200c90b1a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -69,8 +69,8 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureImpl;
 import org.biojava.nbio.structure.StructureTools;
+import org.biojava.nbio.structure.chem.ChemCompAtom;
 import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.model.ChemCompAtom;
 import org.biojava.nbio.structure.io.util.PDBTemporaryStorageUtils.LinkRecord;
 import org.biojava.nbio.structure.secstruc.SecStrucInfo;
 import org.biojava.nbio.structure.secstruc.SecStrucType;
@@ -1878,8 +1878,8 @@ private void  pdb_ATOM_Handler(String line)	{
 			String elementSymbol = null;
 			if (currentGroup.getChemComp() != null) {
 				for (ChemCompAtom a : currentGroup.getChemComp().getAtoms()) {
-					if (a.getAtom_id().equals(fullname.trim())) {
-						elementSymbol = a.getType_symbol();
+					if (a.getAtomId().equals(fullname.trim())) {
+						elementSymbol = a.getTypeSymbol();
 						break;
 					}
 				}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
index 580a8af158..0d677a4161 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
@@ -60,9 +60,9 @@
 import org.biojava.nbio.structure.NucleotideImpl;
 import org.biojava.nbio.structure.ResidueNumber;
 import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
-import org.biojava.nbio.structure.io.mmcif.chem.ResidueType;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
+import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.PolymerType;
+import org.biojava.nbio.structure.chem.ResidueType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -410,7 +410,7 @@ public static String getFullAtomSequence(List<Group> groups, Map<Integer, Intege
 						PolymerType.POLYNUCLEOTIDE_ONLY.contains(cc.getPolymerType())
 						) {
 					//System.out.println(cc.getOne_letter_code());
-					String c = cc.getOne_letter_code();
+					String c = cc.getOneLetterCode();
 					if ( c.equals("?")) {
 						if (isNucleotideChain && PolymerType.POLYNUCLEOTIDE_ONLY.contains(cc.getPolymerType())) {
 							// the way to represent unknown nucleotides is with 'N', see https://en.wikipedia.org/wiki/Nucleic_acid_notation
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java
deleted file mode 100644
index c8553b21c7..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.biojava.nbio.structure.io.cif;
-
-import org.biojava.nbio.structure.chem.ChemComp;
-import org.rcsb.cif.schema.mm.ChemCompAtom;
-import org.rcsb.cif.schema.mm.ChemCompBond;
-import org.rcsb.cif.schema.mm.PdbxChemCompDescriptor;
-
-public interface ChemCompConsumer extends CifFileConsumer<ChemComp> {
-    void consumeChemCompAtom(ChemCompAtom chemCompAtom);
-
-    void consumeChemCompBond(ChemCompBond chemCompBond);
-
-    void consumePdbxChemCompDescriptor(PdbxChemCompDescriptor pdbxChemCompDescriptor);
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java
deleted file mode 100644
index f97a89d271..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.biojava.nbio.structure.io.cif;
-
-import org.biojava.nbio.structure.chem.ChemComp;
-import org.biojava.nbio.structure.chem.ChemicalComponentDictionary;
-import org.biojava.nbio.structure.chem.ResidueType;
-import org.rcsb.cif.schema.mm.ChemCompAtom;
-import org.rcsb.cif.schema.mm.ChemCompBond;
-import org.rcsb.cif.schema.mm.PdbxChemCompDescriptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ChemCompConsumerImpl implements ChemCompConsumer<ChemComp> {
-    private static final Logger logger = LoggerFactory.getLogger(ChemCompConsumerImpl.class);
-    private ChemicalComponentDictionary dictionary;
-    private String latestChemCompId;
-
-    public ChemCompConsumerImpl(){
-        dictionary = new ChemicalComponentDictionary();
-    }
-
-    @Override
-    public void prepare() {
-
-    }
-
-    public ChemicalComponentDictionary getDictionary(){
-        return dictionary;
-    }
-
-    @Override
-    public void consumeChemCompAtom(ChemCompAtom chemCompAtom) {
-        dictionary.getChemComp(latestChemCompId).getAtoms().add(chemCompAtom);
-    }
-
-    @Override
-    public void consumeChemCompBond(ChemCompBond chemCompBond) {
-        dictionary.getChemComp(latestChemCompId).getBonds().add(chemCompBond);
-    }
-
-    @Override
-    public void consumePdbxChemCompDescriptor(PdbxChemCompDescriptor pdbxChemCompDescriptor) {
-        ChemComp cc = dictionary.getChemComp(latestChemCompId);
-        cc.getDescriptors().add(pdbxChemCompDescriptor);
-    }
-
-    @Override
-    public void finish() {
-
-    }
-
-    @Override
-    public ChemComp getContainer() {
-        if (c.getId() == null)
-            logger.warn("chem comp ID == null " + c);
-
-        latestChemCompId = c.getId();
-        dictionary.addChemComp(c);
-        if (c.getResidueType() == ResidueType.nonPolymer) {
-            return;
-        }
-
-        if (c.getResidueType() == ResidueType.saccharide) {
-            return;
-        }
-
-        if (c.getResidueType() == ResidueType.dSaccharide) {
-            return;
-        }
-    }
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumer.java
index 198f288305..d95f7b9422 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumer.java
@@ -1,53 +1,5 @@
 package org.biojava.nbio.structure.io.cif;
 
-import org.biojava.nbio.structure.chem.ChemCompAtom;
-import org.biojava.nbio.structure.chem.ChemCompDescriptor;
-import org.rcsb.cif.schema.mm.AtomSite;
-import org.rcsb.cif.schema.mm.AtomSites;
-import org.rcsb.cif.schema.mm.AuditAuthor;
-import org.rcsb.cif.schema.mm.Cell;
-import org.rcsb.cif.schema.mm.ChemComp;
-import org.rcsb.cif.schema.mm.ChemCompBond;
-import org.rcsb.cif.schema.mm.DatabasePDBRemark;
-import org.rcsb.cif.schema.mm.DatabasePDBRev;
-import org.rcsb.cif.schema.mm.DatabasePDBRevRecord;
-import org.rcsb.cif.schema.mm.Entity;
-import org.rcsb.cif.schema.mm.EntityPoly;
-import org.rcsb.cif.schema.mm.EntityPolySeq;
-import org.rcsb.cif.schema.mm.EntitySrcGen;
-import org.rcsb.cif.schema.mm.EntitySrcNat;
-import org.rcsb.cif.schema.mm.Exptl;
-import org.rcsb.cif.schema.mm.PdbxAuditRevisionHistory;
-import org.rcsb.cif.schema.mm.PdbxChemCompIdentifier;
-import org.rcsb.cif.schema.mm.PdbxDatabaseStatus;
-import org.rcsb.cif.schema.mm.PdbxEntityBranchDescriptor;
-import org.rcsb.cif.schema.mm.PdbxEntitySrcSyn;
-import org.rcsb.cif.schema.mm.PdbxMolecule;
-import org.rcsb.cif.schema.mm.PdbxMoleculeFeatures;
-import org.rcsb.cif.schema.mm.PdbxNonpolyScheme;
-import org.rcsb.cif.schema.mm.PdbxReferenceEntityLink;
-import org.rcsb.cif.schema.mm.PdbxReferenceEntityList;
-import org.rcsb.cif.schema.mm.PdbxReferenceEntityPolyLink;
-import org.rcsb.cif.schema.mm.PdbxStructAssembly;
-import org.rcsb.cif.schema.mm.PdbxStructAssemblyGen;
-import org.rcsb.cif.schema.mm.PdbxStructModResidue;
-import org.rcsb.cif.schema.mm.PdbxStructOperList;
-import org.rcsb.cif.schema.mm.Refine;
-import org.rcsb.cif.schema.mm.Struct;
-import org.rcsb.cif.schema.mm.StructAsym;
-import org.rcsb.cif.schema.mm.StructConf;
-import org.rcsb.cif.schema.mm.StructConn;
-import org.rcsb.cif.schema.mm.StructConnType;
-import org.rcsb.cif.schema.mm.StructKeywords;
-import org.rcsb.cif.schema.mm.StructNcsOper;
-import org.rcsb.cif.schema.mm.StructRef;
-import org.rcsb.cif.schema.mm.StructRefSeq;
-import org.rcsb.cif.schema.mm.StructRefSeqDif;
-import org.rcsb.cif.schema.mm.StructSheetRange;
-import org.rcsb.cif.schema.mm.StructSite;
-import org.rcsb.cif.schema.mm.StructSiteGen;
-import org.rcsb.cif.schema.mm.Symmetry;
-
 /**
  * Defines a rather generic interface which allows to populate some data structure with data parsed from a CIF file.
  *
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConverter.java
index 30e5682b69..2a53746297 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConverter.java
@@ -226,7 +226,7 @@ public static String toText(Chain chain) {
      * @return the target
      */
     public static CifFile toCifFile(Structure structure) {
-        return new AbstractCifFileSupplier().getStructure(structure);
+        return new StructureSupplierImpl().get(structure);
     }
 
     /**
@@ -235,6 +235,6 @@ public static CifFile toCifFile(Structure structure) {
      * @return the target
      */
     public static CifFile toCifFile(Chain chain) {
-        return new AbstractCifFileSupplier().getChain(chain);
+        return new ChainSupplierImpl().get(chain);
     }
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
index d858536847..6a952029ee 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
@@ -24,7 +24,6 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureImpl;
 import org.biojava.nbio.structure.StructureTools;
-import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.biojava.nbio.structure.io.BondMaker;
 import org.biojava.nbio.structure.io.ChargeAdder;
 import org.biojava.nbio.structure.io.EntityFinder;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
index 09d8ca58a8..bc5c93cb2c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
@@ -50,9 +50,9 @@
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureImpl;
 import org.biojava.nbio.structure.StructureTools;
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
-import org.biojava.nbio.structure.io.mmcif.chem.ResidueType;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
+import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.PolymerType;
+import org.biojava.nbio.structure.chem.ResidueType;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyTransformation;
 import org.biojava.nbio.structure.xtal.CrystalCell;
@@ -69,7 +69,7 @@
  *
  * @author Anthony Bradley
  * @since 5.0
- * 
+ *
  */
 public class MmtfStructureReader implements StructureAdapterInterface, Serializable {
 
@@ -234,7 +234,7 @@ public void setGroupInfo(String groupName, int groupNumber,
 		}
 		atomsInGroup = new ArrayList<>();
 		ChemComp chemComp = new ChemComp();
-		chemComp.setOne_letter_code(String.valueOf(singleLetterCode));
+		chemComp.setOneLetterCode(String.valueOf(singleLetterCode));
 		chemComp.setType(chemCompType.toUpperCase());
 		chemComp.setResidueType(residueType);
 		chemComp.setPolymerType(residueType.polymerType);
@@ -333,14 +333,14 @@ public void setAtomInfo(String atomName,
 	 */
 	@Override
 	public void setGroupBond(int indOne, int indTwo, int bondOrder) {
-		
+
 		// Get the atoms
 		Atom atomOne = atomsInGroup.get(indOne);
 		Atom atomTwo = atomsInGroup.get(indTwo);
-		
+
 		// set the new bond
 		new BondImpl(atomOne, atomTwo, bondOrder);
-		
+
 	}
 
 	/* (non-Javadoc)
@@ -349,12 +349,12 @@ public void setGroupBond(int indOne, int indTwo, int bondOrder) {
 	 */
 	@Override
 	public void setInterGroupBond(int indOne, int indTwo, int bondOrder) {
-		
+
 		// Get the atoms
 		Atom atomOne = allAtoms[indOne];
 		Atom atomTwo = allAtoms[indTwo];
-		
-		// set the new bond (this 
+
+		// set the new bond (this
 		new BondImpl(atomOne, atomTwo, bondOrder);
 	}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureWriter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureWriter.java
index 47e4fb3d69..c55e67da30 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureWriter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureWriter.java
@@ -33,7 +33,7 @@
 import org.biojava.nbio.structure.PDBCrystallographicInfo;
 import org.biojava.nbio.structure.PDBHeader;
 import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
+import org.biojava.nbio.structure.chem.ChemComp;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.rcsb.mmtf.api.StructureAdapterInterface;
 import org.rcsb.mmtf.dataholders.MmtfStructure;
@@ -43,7 +43,7 @@
 /**
  * Class to take Biojava structure data and covert to the DataApi for encoding.
  * Must implement all the functions in {@link StructureAdapterInterface}.
- * 
+ *
  * @author Anthony Bradley
  * @since 5.0
  *
@@ -103,8 +103,8 @@ public MmtfStructureWriter(Structure structure, StructureAdapterInterface dataTr
 						insCode=MmtfStructure.UNAVAILABLE_CHAR_VALUE;
 					}
 					char singleLetterCode = 'X';
-					if (chemComp.getOne_letter_code().length()==1){
-						singleLetterCode = chemComp.getOne_letter_code().charAt(0);
+					if (chemComp.getOneLetterCode().length()==1){
+						singleLetterCode = chemComp.getOneLetterCode().charAt(0);
 					}
 					mmtfDecoderInterface.setGroupInfo(group.getPDBName(), group.getResidueNumber().getSeqNum(), insCode.charValue(),
 							chemComp.getType().toUpperCase(), atomsInGroup.size(), MmtfUtils.getNumBondsInGroup(atomsInGroup), singleLetterCode,
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
index bbd34c9610..0a6cd9739c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
@@ -47,11 +47,11 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.ChemCompTools;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
 import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.chem.ChemCompTools;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyTransformation;
 import org.biojava.nbio.structure.secstruc.DSSPParser;
@@ -499,12 +499,12 @@ public static void insertSeqResGroup(Chain chain, Group group, int sequenceIndex
 	 * @param sequence the sequence of the construct
 	 */
 	public static void addSeqRes(Chain modelChain, String sequence) {
-		
+
 		List<Group> seqResGroups = modelChain.getSeqResGroups();
 		GroupType chainType = getChainType(modelChain.getAtomGroups());
-		
+
 		for(int i=0; i<sequence.length(); i++){
-			
+
 			char singleLetterCode = sequence.charAt(i);
 			Group group = null;
 			if (seqResGroups.size() > i) {
@@ -513,7 +513,7 @@ public static void addSeqRes(Chain modelChain, String sequence) {
 			if(group!=null){
 				continue;
 			}
-			
+
 			group = getSeqResGroup(singleLetterCode, chainType);
 			addGroupAtId(seqResGroups, group, i);
 		}

From 1b164a99720e8b48c928883bb2d471dd994ea46e Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Wed, 20 Jan 2021 15:35:47 -0800
Subject: [PATCH 017/599] compiling

---
 .../nbio/structure/test/MMcifTest.java        | 295 -------------
 .../structure/test/StructureToolsTest.java    |   6 +-
 .../biojava/nbio/structure/test/Test1a4w.java |  17 +-
 .../cif/CifFileSupplierIntegrationTest.java   |  10 +-
 .../nbio/protmod/structure/StructureUtil.java |  18 +-
 .../src/main/java/demo/DemoCE.java            |   4 +-
 .../structure/gui/util/PDBUploadPanel.java    |   3 +-
 .../main/java/demo/ChemCompDistribution.java  |   5 +-
 .../java/demo/DemoChangeChemCompProvider.java |   4 +
 .../java/demo/DemoMmcifToPdbConverter.java    |  11 +-
 .../org/biojava/nbio/structure/ChainImpl.java |   1 +
 .../biojava/nbio/structure/HetatomImpl.java   |   7 +-
 .../biojava/nbio/structure/URLIdentifier.java |   4 +-
 .../structure/chem/AllChemCompProvider.java   | 167 ++++++++
 .../biojava/nbio/structure/chem/ChemComp.java |  12 +-
 .../nbio/structure/chem/ChemCompAtom.java     |  54 +--
 .../nbio/structure/chem/ChemCompBond.java     |   6 +-
 .../structure/chem/ChemCompGroupFactory.java  | 129 ++++++
 .../nbio/structure/chem/ChemCompProvider.java |  15 +
 .../nbio/structure/chem/ChemCompTools.java    |  24 +-
 .../chem/ChemicalComponentDictionary.java     |   6 +-
 .../chem/DownloadChemCompProvider.java        | 403 ++++++++++++++++++
 .../structure/chem/MetalBondDistance.java     |  56 +++
 .../chem/ReducedChemCompProvider.java         |  58 +++
 .../structure/chem/ZipChemCompProvider.java   | 275 ++++++++++++
 .../structure/contact/StructureInterface.java |  69 +--
 .../nbio/structure/io/BcifFileReader.java     |   4 +-
 .../biojava/nbio/structure/io/BondMaker.java  |   1 +
 .../nbio/structure/io/ChargeAdder.java        |  22 +-
 .../nbio/structure/io/CifFileReader.java      |   4 +-
 .../nbio/structure/io/FileConvert.java        |   6 +-
 .../nbio/structure/io/PDBFileParser.java      |   4 +-
 .../structure/io/cif/ChemCompConsumer.java    |  16 +
 .../io/cif/ChemCompConsumerImpl.java          | 108 +++++
 .../structure/io/cif/ChemCompConverter.java   |  79 ++++
 .../structure/io/cif/MetalBondConsumer.java   |  11 +
 .../io/cif/MetalBondConsumerImpl.java         |  55 +++
 .../structure/io/cif/MetalBondConverter.java  |  60 +++
 .../io/cif/StructureConsumerImpl.java         |   1 +
 ...Converter.java => StructureConverter.java} |   8 +-
 .../nbio/structure/io/mmtf/MmtfUtils.java     |   4 +-
 .../biojava/nbio/structure/ChemCompTest.java  |  24 +-
 .../nbio/structure/PdbFileFormat30Test.java   |   4 +-
 .../org/biojava/nbio/structure/Test4hhb.java  |  12 +-
 .../biojava/nbio/structure/TestAltLocs.java   |  72 +---
 .../biojava/nbio/structure/TestAtomCache.java |   3 +-
 .../org/biojava/nbio/structure/TestBond.java  |   4 +-
 .../TestDownloadChemCompProvider.java         |   4 +-
 .../nbio/structure/TestNucleotides.java       |   8 +-
 .../structure/align/util/AtomCacheTest.java   |   9 +-
 .../nbio/structure/asa/TestAsaCalc.java       |   6 +-
 .../structure/io/TestDifficultMmCIFFiles.java |  18 +-
 .../nbio/structure/io/TestHeaderOnly.java     |  18 +-
 .../nbio/structure/io/TestMMCIFWriting.java   |  61 +--
 .../structure/io/TestMmCIFSpecialCases.java   |  82 ----
 .../structure/io/TestNonDepositedFiles.java   |  37 +-
 .../structure/io/TestParseMmCIFLigands.java   |   6 +-
 .../io/mmcif/TestChemCompProvider.java        |   2 +
 .../io/mmcif/TestEntityNameAndType.java       |   2 +
 .../structure/io/mmtf/TestBondFinding.java    |   4 +-
 .../structure/io/mmtf/TestMmtfRoundTrip.java  |  26 +-
 .../io/mmtf/TestMmtfStructureReader.java      |  36 +-
 .../io/mmtf/TestMmtfStructureWriter.java      |   4 +-
 .../structure/redmine/Test1DARSeqAlign.java   |   8 +-
 .../structure/test/util/GlobalsHelper.java    |   6 +-
 65 files changed, 1689 insertions(+), 809 deletions(-)
 delete mode 100644 biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/MMcifTest.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/AllChemCompProvider.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompProvider.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/MetalBondDistance.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ReducedChemCompProvider.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConverter.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumer.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConverter.java
 rename biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/{CifFileConverter.java => StructureConverter.java} (97%)
 delete mode 100644 biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMmCIFSpecialCases.java

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/MMcifTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/MMcifTest.java
deleted file mode 100644
index 4947e0077a..0000000000
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/MMcifTest.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * created at Apr 26, 2008
- */
-package org.biojava.nbio.structure.test;
-
-import org.biojava.nbio.structure.*;
-import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.PDBFileParser;
-import org.biojava.nbio.structure.io.mmcif.MMcifParser;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifConsumer;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.List;
-
-public class MMcifTest {
-
-	private static boolean headerOnly;
-
-	@Test
-	public void testLoad() throws IOException {
-
-		headerOnly = false;
-
-		doTestLoad();
-
-	}
-
-	@Test
-	public void testLoadHeaderOnly() throws IOException {
-
-		headerOnly = true;
-
-		doTestLoad();
-
-	}
-
-	private void doTestLoad() throws IOException {
-		// a structure with microheterogeneity
-		//comparePDB2cif("2CI1","A");
-
-		// test a simple protein
-		comparePDB2cif("5pti","A");
-
-		// test a protein with modified residues
-		comparePDB2cif("1a4w","L");
-		comparePDB2cif("1a4w","H");
-		comparePDB2cif("1a4w","I");
-		//non-standard encoded amino acid
-		comparePDB2cif("1fdo","A");
-
-		// test a DNA binding protein
-		comparePDB2cif("1j59","A");
-		//comparePDB2cif("1j59","B");
-		//comparePDB2cif("1j59","C");
-		//comparePDB2cif("1j59","D");
-		comparePDB2cif("1j59","E");
-		//comparePDB2cif("1j59","F");
-
-		// test a NMR protein
-		comparePDB2cif("2kc9","A");
-	}
-
-	private void comparePDB2cif(String id, String chainId) throws IOException {
-		String fileName = "/"+id+".cif";
-		InputStream inStream = this.getClass().getResourceAsStream(fileName);
-		assertNotNull("Could not find file " + fileName + ". Config problem?" , inStream);
-
-		MMcifParser parser = new SimpleMMcifParser();
-
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-		FileParsingParameters params = new FileParsingParameters();
-		params.setHeaderOnly(headerOnly);
-		consumer.setFileParsingParameters(params);
-
-
-		parser.addMMcifConsumer(consumer);
-		parser.parse(new BufferedReader(new InputStreamReader(inStream)));
-		// remove to avoid memory leaks
-		parser.clearConsumers();
-		Structure cifStructure = consumer.getStructure();
-		assertNotNull(cifStructure);
-
-
-		// load the PDB file via the PDB parser
-		Structure pdbStructure = null;
-		InputStream pinStream = this.getClass().getResourceAsStream("/"+id+".pdb");
-		assertNotNull(inStream);
-
-		PDBFileParser pdbpars = new PDBFileParser();
-		pdbpars.setFileParsingParameters(params);
-
-
-		pdbStructure = pdbpars.parsePDBFile(pinStream) ;
-
-
-		assertNotNull(pdbStructure);
-
-		// now compare the results
-
-
-		// chech NMR data
-		assertEquals(id + ": the isNMR flag is not the same!", pdbStructure.isNmr(), cifStructure.isNmr());
-
-		if ( pdbStructure.isNmr()){
-			assertEquals(id + ": the nr of NMR models is not the same!", pdbStructure.nrModels(), pdbStructure.nrModels());
-			checkNMR(pdbStructure);
-			checkNMR(cifStructure);
-		}
-
-		//System.out.println(pdbStructure);
-		//System.out.println(cifStructure);
-
-		// compare amino acids in chain 1:
-		Chain a_pdb = pdbStructure.getPolyChainByPDB(chainId);
-		Chain a_cif = cifStructure.getPolyChainByPDB(chainId);
-		//System.out.println(a_pdb.getAtomGroups());
-
-		//System.out.println(id + "_" + chainName + " pdb atom groups: " + a_pdb.getAtomGroups(GroupType.AMINOACID).size());
-		//System.out.println(id + "_" + chainName + " cif atom groups: " + a_cif.getAtomGroups(GroupType.AMINOACID).size());
-
-		//for (Group g: a_cif.getAtomGroups()){
-		//	System.out.println(g);
-		//}
-		//System.out.println("--");
-		String pdb_SEQseq = a_pdb.getSeqResSequence();
-
-		String cif_SEQseq = a_cif.getSeqResSequence();
-
-		//                        System.out.println(id + "_" + chainName + " pdbSEQ: " + pdb_SEQseq);
-		//                        System.out.println(id + "_" + chainName + " cifSEQ: " + cif_SEQseq);
-
-		assertEquals(id + ": the SEQRES sequences don't match!", pdb_SEQseq,cif_SEQseq);
-
-		assertEquals(id + ":  The nr of ATOM groups does not match!",a_pdb.getAtomGroups(GroupType.AMINOACID).size(),a_cif.getAtomGroups(GroupType.AMINOACID).size()  );
-
-		// actually this check not necessarily works, since there can be waters in PDB that we don;t deal with yet in cif...
-		//assertEquals("the nr of ATOM record groups is not the same!" , a_pdb.getAtomLength(),a_cif.getAtomLength());
-		for (int i = 0 ; i < a_pdb.getAtomGroups(GroupType.AMINOACID).size(); i++){
-			Group gp = a_pdb.getAtomGroups(GroupType.AMINOACID).get(i);
-
-			List<Group> cifGroups = a_cif.getAtomGroups(GroupType.AMINOACID);
-			Group gc = cifGroups.get(i);
-			checkGroups(gp, gc);
-		}
-
-
-
-		String pdb_seq = a_pdb.getAtomSequence();
-		String cif_seq = a_cif.getAtomSequence();
-
-		//System.out.println(pdb_seq);
-		//System.out.println(cif_seq);
-
-		assertEquals("the sequences obtained from PDB and mmCif don't match!",pdb_seq, cif_seq);
-
-		List<DBRef> pdb_dbrefs= pdbStructure.getDBRefs();
-		List<DBRef> cif_dbrefs= cifStructure.getDBRefs();
-
-		assertEquals("nr of DBrefs found does not match!", pdb_dbrefs.size(),cif_dbrefs.size());
-
-		DBRef p = pdb_dbrefs.get(0);
-		DBRef c = cif_dbrefs.get(0);
-
-		//System.out.println(p.toPDB());
-		//System.out.println(c.toPDB());
-		String pdb_dbref = p.toPDB();
-		String cif_dbref = c.toPDB();
-		assertEquals("DBRef is not equal",pdb_dbref,cif_dbref);
-
-		PDBHeader h1 = pdbStructure.getPDBHeader();
-		PDBHeader h2 = cifStructure.getPDBHeader();
-
-		//compareString(h1.toPDB() ,h2.toPDB());
-		//System.out.println(h1.toPDB());
-		//System.out.println(h2.toPDB());
-		if ( ! h1.toPDB().toUpperCase().equals(h2.toPDB().toUpperCase()) ){
-			System.err.println(h1.toPDB());
-			System.err.println(h2.toPDB());
-			compareString(h1.toPDB(), h2.toPDB());
-		}
-		assertEquals("the PDBHeader.toPDB representation is not equivalent", h1.toPDB().toUpperCase(),h2.toPDB().toUpperCase());
-
-		// and the ultimate test!
-		// but we are not there yet...
-		// TODO: still need to parse SSBOND equivalent info from cif files...
-		//assertEquals("the Structure.toPDB representation is not equivalent", pdbStructure.toPDB(),cifStructure.toPDB());
-
-
-
-	}
-
-	private void checkGroups(Group g1, Group g2){
-
-		//System.out.print("comparing " +g1 + " " + g2);
-		String pdbId1 = g1.getChain().getStructure().getPDBCode();
-		String pdbId2 = g1.getChain().getStructure().getPDBCode();
-		assertEquals(pdbId1, pdbId2);
-
-		assertEquals(g1.getType(),g2.getType());
-		assertEquals(g1.getResidueNumber().getSeqNum(),g2.getResidueNumber().getSeqNum());
-		assertEquals(g1.getResidueNumber().getInsCode(),g2.getResidueNumber().getInsCode());
-		assertEquals(g1.getPDBName(),g2.getPDBName());
-		assertEquals(g1.has3D(),g2.has3D());
-
-		assertEquals(g1.hasAltLoc(), g2.hasAltLoc());
-
-		assertEquals(pdbId1 + ":" + g1 + " - " + pdbId2+":"+ g2,g1.getAltLocs().size(), g2.getAltLocs().size());
-
-		assertEquals(pdbId1 + ":" + g1 + " - " + pdbId2+":"+ g2 , g1.getAtoms().size(), g2.getAtoms().size());
-		if ( g1.has3D()){
-
-			Atom a1 = g1.getAtom(0);
-			Atom a2 = g2.getAtom(0);
-			if ( a1 == null)
-				fail("could not get atom for group " + g1);
-			if (a2 == null)
-				fail("could not get atom for group " + g2);
-			assertEquals(a1.getX(),a2.getX(), 0.0001);
-			assertEquals(a1.getOccupancy(),a2.getOccupancy(), 0.0001);
-			assertEquals(a1.getTempFactor(),a2.getTempFactor(), 0.0001);
-			assertEquals(a1.getName(),a2.getName());
-
-
-		}
-		//System.out.println(" ... done");
-
-	}
-
-	private void checkNMR(Structure s){
-		assertTrue(s.isNmr());
-
-		int models = s.nrModels();
-		assertTrue(models > 0);
-
-		List<Chain> model0 = s.getModel(0);
-
-		// compare with all others
-		for (int i = 1 ; i < models; i++){
-			List<Chain> modelX = s.getModel(i);
-
-			assertEquals(model0.size(),modelX.size());
-
-			// compare lengths:
-			for (int j=0 ; j< model0.size();j++){
-				Chain c1 = model0.get(j);
-				Chain cx = modelX.get(j);
-				assertEquals(c1.getAtomLength(),cx.getAtomLength());
-				// can;t compare seq res, since this is only done for 1st...
-				//assertEquals("c1.getSeqResLength(),cx.getSeqResLength());
-				assertEquals(c1.getAtomSequence(),cx.getAtomSequence());
-				assertEquals(c1.getAtomGroups(GroupType.AMINOACID).size(),cx.getAtomGroups(GroupType.AMINOACID).size());
-				assertEquals(c1.getAtomGroups(GroupType.NUCLEOTIDE).size(),cx.getAtomGroups(GroupType.NUCLEOTIDE).size());
-				assertEquals(c1.getAtomGroups(GroupType.HETATM).size(),cx.getAtomGroups(GroupType.HETATM).size());
-			}
-
-
-		}
-	}
-
-	private void compareString(String t, String pdb){
-		for (int i =0 ; i < t.length() ; i++){
-			System.out.println(">"+t.charAt(i)+":"+ pdb.charAt(i)+"<");
-			if ( Character.toUpperCase(t.charAt(i)) != Character.toUpperCase(pdb.charAt(i))){
-				System.out.println("Mismatch!");
-				break;
-			}
-		}
-	}
-
-
-}
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/StructureToolsTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/StructureToolsTest.java
index b2ae39611c..170694a6e2 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/StructureToolsTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/StructureToolsTest.java
@@ -24,11 +24,11 @@
 
 import org.biojava.nbio.structure.*;
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.ChemCompProvider;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.PDBFileParser;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.ChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1a4w.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1a4w.java
index 870c74a13a..ba6266cb2b 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1a4w.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1a4w.java
@@ -26,14 +26,13 @@
 
 import org.biojava.nbio.structure.*;
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.io.CifFileReader;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.PDBFileParser;
-import org.biojava.nbio.structure.io.mmcif.MMcifParser;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifConsumer;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.rcsb.cif.model.CifFile;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -87,17 +86,11 @@ public void test1a4wPDBFile() throws IOException
 		InputStream inStream = this.getClass().getResourceAsStream("/1a4w.cif");
 		Assert.assertNotNull(inStream);
 
-		MMcifParser pdbpars = new SimpleMMcifParser();
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
 		FileParsingParameters params = new FileParsingParameters();
 		params.setAlignSeqRes(true);
-		consumer.setFileParsingParameters(params);
-		pdbpars.addMMcifConsumer(consumer);
-
-		pdbpars.parse(inStream) ;
-		structure2 = consumer.getStructure();
-
-
+		CifFileReader reader = new CifFileReader();
+		reader.setFileParsingParameters(params);
+		structure2 = reader.getStructure(inStream);
 
 		Assert.assertNotNull(structure2);
 
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
index 03e2f6f060..8e59c8a931 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
@@ -12,7 +12,7 @@
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureImpl;
 import org.biojava.nbio.structure.StructureTools;
-import org.biojava.nbio.structure.io.cif.CifFileConverter;
+import org.biojava.nbio.structure.io.cif.StructureConverter;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
@@ -49,10 +49,10 @@ public void test1A2C() throws IOException {
 
     private static void testRoundTrip(String pdbId) throws IOException {
         URL url = new URL("https://files.rcsb.org/download/" + pdbId + ".cif");
-        Structure originalStruct = CifFileConverter.fromURL(url);
+        Structure originalStruct = StructureConverter.fromURL(url);
 
-        InputStream inputStream = new ByteArrayInputStream(CifFileConverter.toText(originalStruct).getBytes());
-        Structure readStruct = CifFileConverter.fromInputStream(inputStream);
+        InputStream inputStream = new ByteArrayInputStream(StructureConverter.toText(originalStruct).getBytes());
+        Structure readStruct = StructureConverter.fromInputStream(inputStream);
 
         assertNotNull(readStruct);
         assertEquals(originalStruct.getChains().size(), readStruct.getChains().size());
@@ -113,7 +113,7 @@ private static void testRoundTrip(String pdbId) throws IOException {
     @Test
     public void testBiounitWriting() throws IOException {
         Structure s = createDummyStructure();
-        String mmcif = CifFileConverter.toText(s);
+        String mmcif = StructureConverter.toText(s);
         String[] lines = mmcif.split("\n");
         long atomLines = Arrays.stream(lines).filter(l -> l.startsWith("ATOM")).count();
         assertNotNull(mmcif);
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/StructureUtil.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/StructureUtil.java
index 0245018ca2..4842864b2d 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/StructureUtil.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/StructureUtil.java
@@ -25,8 +25,8 @@
 package org.biojava.nbio.protmod.structure;
 
 import org.biojava.nbio.structure.*;
-import org.biojava.nbio.structure.io.mmcif.MetalBondParser;
-import org.biojava.nbio.structure.io.mmcif.chem.MetalBondDistance;
+import org.biojava.nbio.structure.chem.MetalBondDistance;
+import org.biojava.nbio.structure.io.cif.MetalBondConverter;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -279,18 +279,14 @@ public static Atom[] findLinkage(final Group group1, final Group group2,
 	}
 
 	private static boolean hasMetalBond(Atom a1, Atom a2, MetalBondDistance definition) {
-
-		double distance = Calc.getDistance(a1,a2);
-
-		Float min = definition.getLowerLimit();
-		Float max = definition.getUpperLimit();
-
-		return ( min < distance && max > distance);
-
+		double distance = Calc.getDistance(a1, a2);
+		float min = definition.getLowerLimit();
+		float max = definition.getUpperLimit();
+		return (min < distance && max > distance);
 	}
 
 	private static MetalBondDistance getMetalDistanceCutoff(String name1, String name2) {
-		Map<String,List<MetalBondDistance>> defs= MetalBondParser.getMetalBondDefinitions();
+		Map<String,List<MetalBondDistance>> defs = MetalBondConverter.getMetalBondDefinitions();
 
 		List<MetalBondDistance> distances = defs.get(name1);
 
diff --git a/biojava-structure-gui/src/main/java/demo/DemoCE.java b/biojava-structure-gui/src/main/java/demo/DemoCE.java
index 5e2bb0aabb..88c5c8f307 100644
--- a/biojava-structure-gui/src/main/java/demo/DemoCE.java
+++ b/biojava-structure-gui/src/main/java/demo/DemoCE.java
@@ -36,8 +36,8 @@
 import org.biojava.nbio.structure.align.model.AfpChainWriter;
 import org.biojava.nbio.structure.align.util.AFPChainScorer;
 import org.biojava.nbio.structure.align.util.AtomCache;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 
 public class DemoCE
 {
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
index 92efbeaf36..0e36624830 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
@@ -26,6 +26,7 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.align.util.UserConfiguration;
+import org.biojava.nbio.structure.io.CifFileReader;
 import org.biojava.nbio.structure.io.PDBFileReader;
 import org.biojava.nbio.structure.io.StructureIOFile;
 import org.slf4j.Logger;
@@ -133,7 +134,7 @@ private Structure getStructure(JTextField filePath,JTextField chainId) throws St
 		if ( fileFormat.equals(UserConfiguration.PDB_FORMAT)){
 			reader = new PDBFileReader();
 		} else if ( fileFormat.equals(UserConfiguration.MMCIF_FORMAT)){
-			reader = new MMCIFFileReader();
+			reader = new CifFileReader();
 		} else {
 			throw new StructureException("Unkown file format " + fileFormat);
 		}
diff --git a/biojava-structure/src/main/java/demo/ChemCompDistribution.java b/biojava-structure/src/main/java/demo/ChemCompDistribution.java
index 7e4e847e52..a1ae74166b 100644
--- a/biojava-structure/src/main/java/demo/ChemCompDistribution.java
+++ b/biojava-structure/src/main/java/demo/ChemCompDistribution.java
@@ -20,15 +20,12 @@
  */
 package demo;
 
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 
 public class ChemCompDistribution {
-
 	public static void main(String[] args){
-
 		DownloadChemCompProvider c = new DownloadChemCompProvider();
 		c.setDownloadAll(true);
 		c.checkDoFirstInstall();
-
 	}
 }
diff --git a/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java b/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
index 1285d8488b..b8e4eb5430 100644
--- a/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
+++ b/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
@@ -23,6 +23,10 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.chem.AllChemCompProvider;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.ChemCompProvider;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.PDBFileReader;
 
diff --git a/biojava-structure/src/main/java/demo/DemoMmcifToPdbConverter.java b/biojava-structure/src/main/java/demo/DemoMmcifToPdbConverter.java
index bd84ae8f1e..67de1031c0 100644
--- a/biojava-structure/src/main/java/demo/DemoMmcifToPdbConverter.java
+++ b/biojava-structure/src/main/java/demo/DemoMmcifToPdbConverter.java
@@ -23,12 +23,10 @@
 
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.io.cif.StructureConverter;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
 
 /**
@@ -44,13 +42,8 @@ public static void main(String[] args) throws Exception {
 	}
 
 	public static void convert(File inFile, File outFile) throws IOException {
-		MMcifParser parser = new SimpleMMcifParser();
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-		parser.addMMcifConsumer(consumer);
-		parser.parse(new BufferedReader(new InputStreamReader(new FileInputStream(inFile))));
-
 		// now get the protein structure.
-		Structure cifStructure = consumer.getStructure();
+		Structure cifStructure = StructureConverter.fromPath(inFile.toPath());
 
 		// and write it out as PDB format
 		PrintWriter pr = new PrintWriter(outFile);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
index 8f548be835..5a395ee417 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
@@ -25,6 +25,7 @@
 
 
 import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.biojava.nbio.structure.chem.PolymerType;
 import org.biojava.nbio.structure.io.FileConvert;
 import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
index c9c05a704c..27a7e6a3a5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
@@ -24,6 +24,7 @@
 package org.biojava.nbio.structure;
 
 import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.biojava.nbio.structure.chem.PolymerType;
 import org.biojava.nbio.structure.chem.ResidueType;
 import org.biojava.nbio.structure.io.GroupToSDF;
@@ -466,9 +467,11 @@ public void setId(long id) {
 
 	@Override
 	public ChemComp getChemComp() {
-		if  ( chemComp == null ) {
+		if (chemComp == null) {
 			chemComp = ChemCompGroupFactory.getChemComp(pdb_name);
-			if (chemComp == null) logger.info("getChemComp: " + pdb_name);
+			if (chemComp == null) {
+				logger.info("getChemComp: {}", pdb_name);
+			}
 		}
 		return chemComp;
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
index 91cccd6a38..a36e93b508 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
@@ -23,7 +23,7 @@
 import org.biojava.nbio.structure.StructureIO.StructureFiletype;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.PDBFileReader;
-import org.biojava.nbio.structure.io.cif.CifFileConverter;
+import org.biojava.nbio.structure.io.cif.StructureConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -153,7 +153,7 @@ public Structure loadStructure(AtomCache cache) throws StructureException,
 
 		switch(format) {
 		case CIF:
-			return CifFileConverter.fromURL(url);
+			return StructureConverter.fromURL(url);
 		default:
 		case PDB:
 			// pdb file based parsing
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/AllChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/AllChemCompProvider.java
new file mode 100644
index 0000000000..77881edb44
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/AllChemCompProvider.java
@@ -0,0 +1,167 @@
+package org.biojava.nbio.structure.chem;
+
+import org.biojava.nbio.structure.align.util.UserConfiguration;
+import org.biojava.nbio.structure.io.LocalPDBDirectory;
+import org.biojava.nbio.structure.io.cif.ChemCompConverter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Paths;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * A ChemComp provider that downloads and caches the components.cif file from the wwPDB site. It then loads all chemical
+ * components at startup and keeps them in memory. This provider is not used as a default since it is slower at startup
+ * and requires more memory than the {@link DownloadChemCompProvider} that is used by default.
+ *
+ * @author Andreas Prlic
+ */
+public class AllChemCompProvider implements ChemCompProvider, Runnable {
+    private static final Logger logger = LoggerFactory.getLogger(AllChemCompProvider.class);
+    public static final String COMPONENTS_FILE_LOCATION = "pub/pdb/data/monomers/components.cif.gz";
+    private static String path;
+    private static String serverName;
+
+    // there will be only one copy of the dictionary across all instances
+    // to reduce memory impact
+    static ChemicalComponentDictionary dict;
+
+    // flags to make sure there is only one thread running that is loading the dictionary
+    static AtomicBoolean loading = new AtomicBoolean(false);
+    static AtomicBoolean isInitialized = new AtomicBoolean(false);
+
+    public AllChemCompProvider() {
+        if (loading.get()) {
+            logger.warn("other thread is already loading all chemcomps, no need to init twice");
+            return;
+        }
+        if (isInitialized.get()) {
+            return;
+        }
+
+        loading.set(true);
+
+        Thread t = new Thread(this);
+        t.start();
+    }
+
+    /**
+     * make sure all paths are initialized correctly
+     */
+    private static void initPath() {
+        if (path == null) {
+            UserConfiguration config = new UserConfiguration();
+            path = config.getCacheFilePath();
+        }
+    }
+
+    private static void initServerName() {
+        if (serverName == null) {
+            serverName = LocalPDBDirectory.getServerName();
+        }
+    }
+
+    private void ensureFileExists() {
+        String fileName = getLocalFileName();
+        File f = new File(fileName);
+
+        if (!f.exists()) {
+            try {
+                downloadFile();
+            } catch (IOException e) {
+                logger.error("Caught IOException", e);
+            }
+        }
+    }
+
+    /**
+     * Downloads the components.cif.gz file from the wwPDB site.
+     */
+    public static void downloadFile() throws IOException {
+        initPath();
+        initServerName();
+        String localName = getLocalFileName();
+        String u = serverName + "/" + COMPONENTS_FILE_LOCATION;
+        downloadFileFromRemote(new URL(u), new File(localName));
+    }
+
+    private static  void downloadFileFromRemote(URL remoteURL, File localFile) throws IOException {
+        logger.info("Downloading {} to: {}", remoteURL, localFile);
+        FileOutputStream out = new FileOutputStream(localFile);
+
+        InputStream in = remoteURL.openStream();
+        byte[] buf = new byte[4 * 1024]; // 4K buffer
+        int bytesRead;
+        while ((bytesRead = in.read(buf)) != -1) {
+            out.write(buf, 0, bytesRead);
+        }
+        in.close();
+        out.close();
+    }
+
+    private static String getLocalFileName(){
+        File dir = new File(path, DownloadChemCompProvider.CHEM_COMP_CACHE_DIRECTORY);
+
+        if (!dir.exists()) {
+            logger.info("Creating directory {}", dir.toString());
+            dir.mkdir();
+        }
+
+        return new File(dir, "components.cif.gz").toString();
+    }
+
+    /**
+     * Load all {@link ChemComp} definitions into memory.
+     */
+    private void loadAllChemComps() throws IOException {
+        String fileName = getLocalFileName();
+        logger.debug("Loading {}", fileName);
+        dict = ChemCompConverter.fromPath(Paths.get(fileName));
+    }
+
+    /**
+     *  {@inheritDoc}
+     */
+    @Override
+    public ChemComp getChemComp(String recordName) {
+        while (loading.get()) {
+            // another thread is still initializing the definitions
+            try {
+                // wait half a second
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+                logger.error("Interrepted thread while waiting: {}", e.getMessage());
+                //e.printStackTrace();
+            }
+        }
+
+        return dict.getChemComp(recordName);
+    }
+
+    /**
+     * Do the actual loading of the dictionary in a thread.
+     */
+    @Override
+    public void run() {
+        long timeS = System.currentTimeMillis();
+        initPath();
+        ensureFileExists();
+
+        try {
+            loadAllChemComps();
+            long timeE = System.currentTimeMillis();
+            logger.debug("Time to init chem comp dictionary: {} sec.", (timeE - timeS) / 1000);
+        } catch (IOException e) {
+            logger.error("Could not load chemical components definition file {}. Error: {}", getLocalFileName(), e.getMessage());
+        } finally {
+            loading.set(false);
+            isInitialized.set(true);
+        }
+    }
+}
+
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
index 52aa39c604..7109d60204 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
@@ -19,14 +19,14 @@ public class ChemComp implements CifBean<org.rcsb.cif.schema.mm.ChemComp>, Compa
     private String formula;
     private String monNstdParentCompId;
     private String pdbxSynonyms;
-    private String pdbxFormalCharge;
+    private int pdbxFormalCharge;
     private String pdbxInitialDate;
     private String pdbxModifiedDate;
     private String pdbxAmbiguousFlag;
     private String pdbxReleaseStatus;
     private String pdbxReplacedBy;
     private String pdbxReplaces;
-    private String formulaWeight;
+    private double formulaWeight;
     private String oneLetterCode;
     private String threeLetterCode;
     private String pdbxModelCoordinatesDetails;
@@ -159,11 +159,11 @@ public void setPdbxSynonyms(String pdbxSynonyms) {
         this.pdbxSynonyms = pdbxSynonyms;
     }
 
-    public String getPdbxFormalCharge() {
+    public int getPdbxFormalCharge() {
         return pdbxFormalCharge;
     }
 
-    public void setPdbxFormalCharge(String pdbxFormalCharge) {
+    public void setPdbxFormalCharge(int pdbxFormalCharge) {
         this.pdbxFormalCharge = pdbxFormalCharge;
     }
 
@@ -215,11 +215,11 @@ public void setPdbxReplaces(String pdbxReplaces) {
         this.pdbxReplaces = pdbxReplaces;
     }
 
-    public String getFormulaWeight() {
+    public double getFormulaWeight() {
         return formulaWeight;
     }
 
-    public void setFormulaWeight(String formulaWeight) {
+    public void setFormulaWeight(double formulaWeight) {
         this.formulaWeight = formulaWeight;
     }
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompAtom.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompAtom.java
index cad290820e..d87a51e720 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompAtom.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompAtom.java
@@ -8,24 +8,24 @@ public class ChemCompAtom implements CifBean<org.rcsb.cif.schema.mm.ChemCompAtom
     private String atomId;
     private String altAtomId;
     private String typeSymbol;
-    private String charge;
-    private String pdbxAlign;
+    private int charge;
+    private int pdbxAlign;
     private String pdbxAromaticFlag;
     private String pdbxLeavingAtomFlag;
     private String pdbxStereoConfig;
-    private String modelCartnX;
-    private String modelCartnY;
-    private String modelCartnZ;
-    private String pdbxModelCartnXIdeal;
-    private String pdbxModelCartnYIdeal;
-    private String pdbxModelCartnZIdeal;
+    private double modelCartnX;
+    private double modelCartnY;
+    private double modelCartnZ;
+    private double pdbxModelCartnXIdeal;
+    private double pdbxModelCartnYIdeal;
+    private double pdbxModelCartnZIdeal;
     private String pdbxComponentCompId;
     private String pdbxResidueNumbering;
     private String pdbxComponentAtomId;
     private String pdbxPolymerType;
     private String pdbxRefId;
     private String pdbxComponentId;
-    private String pdbxOrdinal;
+    private int pdbxOrdinal;
 
     public String getCompId() {
         return compId;
@@ -59,19 +59,19 @@ public void setTypeSymbol(String typeSymbol) {
         this.typeSymbol = typeSymbol;
     }
 
-    public String getCharge() {
+    public int getCharge() {
         return charge;
     }
 
-    public void setCharge(String charge) {
+    public void setCharge(int charge) {
         this.charge = charge;
     }
 
-    public String getPdbxAlign() {
+    public int getPdbxAlign() {
         return pdbxAlign;
     }
 
-    public void setPdbxAlign(String pdbxAlign) {
+    public void setPdbxAlign(int pdbxAlign) {
         this.pdbxAlign = pdbxAlign;
     }
 
@@ -99,51 +99,51 @@ public void setPdbxStereoConfig(String pdbxStereoConfig) {
         this.pdbxStereoConfig = pdbxStereoConfig;
     }
 
-    public String getModelCartnX() {
+    public double getModelCartnX() {
         return modelCartnX;
     }
 
-    public void setModelCartnX(String modelCartnX) {
+    public void setModelCartnX(double modelCartnX) {
         this.modelCartnX = modelCartnX;
     }
 
-    public String getModelCartnY() {
+    public double getModelCartnY() {
         return modelCartnY;
     }
 
-    public void setModelCartnY(String modelCartnY) {
+    public void setModelCartnY(double modelCartnY) {
         this.modelCartnY = modelCartnY;
     }
 
-    public String getModelCartnZ() {
+    public double getModelCartnZ() {
         return modelCartnZ;
     }
 
-    public void setModelCartnZ(String modelCartnZ) {
+    public void setModelCartnZ(double modelCartnZ) {
         this.modelCartnZ = modelCartnZ;
     }
 
-    public String getPdbxModelCartnXIdeal() {
+    public double getPdbxModelCartnXIdeal() {
         return pdbxModelCartnXIdeal;
     }
 
-    public void setPdbxModelCartnXIdeal(String pdbxModelCartnXIdeal) {
+    public void setPdbxModelCartnXIdeal(double pdbxModelCartnXIdeal) {
         this.pdbxModelCartnXIdeal = pdbxModelCartnXIdeal;
     }
 
-    public String getPdbxModelCartnYIdeal() {
+    public double getPdbxModelCartnYIdeal() {
         return pdbxModelCartnYIdeal;
     }
 
-    public void setPdbxModelCartnYIdeal(String pdbxModelCartnYIdeal) {
+    public void setPdbxModelCartnYIdeal(double pdbxModelCartnYIdeal) {
         this.pdbxModelCartnYIdeal = pdbxModelCartnYIdeal;
     }
 
-    public String getPdbxModelCartnZIdeal() {
+    public double getPdbxModelCartnZIdeal() {
         return pdbxModelCartnZIdeal;
     }
 
-    public void setPdbxModelCartnZIdeal(String pdbxModelCartnZIdeal) {
+    public void setPdbxModelCartnZIdeal(double pdbxModelCartnZIdeal) {
         this.pdbxModelCartnZIdeal = pdbxModelCartnZIdeal;
     }
 
@@ -195,11 +195,11 @@ public void setPdbxComponentId(String pdbxComponentId) {
         this.pdbxComponentId = pdbxComponentId;
     }
 
-    public String getPdbxOrdinal() {
+    public int getPdbxOrdinal() {
         return pdbxOrdinal;
     }
 
-    public void setPdbxOrdinal(String pdbxOrdinal) {
+    public void setPdbxOrdinal(int pdbxOrdinal) {
         this.pdbxOrdinal = pdbxOrdinal;
     }
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompBond.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompBond.java
index b5a4d4e7f4..6ac2ea25fd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompBond.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompBond.java
@@ -14,7 +14,7 @@ public class ChemCompBond implements CifBean<org.rcsb.cif.schema.mm.ChemCompBond
     private String valueOrder;
     private String pdbxAromaticFlag;
     private String pdbxStereoConfig;
-    private String pdbxOrdinal;
+    private int pdbxOrdinal;
 
     public static Logger getLogger() {
         return logger;
@@ -68,11 +68,11 @@ public void setPdbxStereoConfig(String pdbxStereoConfig) {
         this.pdbxStereoConfig = pdbxStereoConfig;
     }
 
-    public String getPdbxOrdinal() {
+    public int getPdbxOrdinal() {
         return pdbxOrdinal;
     }
 
-    public void setPdbxOrdinal(String pdbxOrdinal) {
+    public void setPdbxOrdinal(int pdbxOrdinal) {
         this.pdbxOrdinal = pdbxOrdinal;
     }
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java
new file mode 100644
index 0000000000..a7aa84a138
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java
@@ -0,0 +1,129 @@
+package org.biojava.nbio.structure.chem;
+
+import org.biojava.nbio.core.util.SoftHashMap;
+import org.biojava.nbio.structure.AminoAcid;
+import org.biojava.nbio.structure.AminoAcidImpl;
+import org.biojava.nbio.structure.Group;
+import org.biojava.nbio.structure.HetatomImpl;
+import org.biojava.nbio.structure.NucleotideImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ChemCompGroupFactory {
+    private static final Logger logger = LoggerFactory.getLogger(ChemCompGroupFactory.class);
+    private static ChemCompProvider chemCompProvider = new DownloadChemCompProvider();
+    private static final SoftHashMap<String, ChemComp> cache = new SoftHashMap<>(0);
+
+    public static ChemComp getChemComp(String recordName) {
+        recordName = recordName.toUpperCase().trim();
+
+        // we are using the cache, to avoid hitting the file system too often.
+        ChemComp cc = cache.get(recordName);
+        if (cc != null) {
+            logger.debug("Chem comp {} read from cache", cc.getThreeLetterCode());
+            return cc;
+        }
+
+        // not cached, get the chem comp from the provider
+        logger.debug("Chem comp {} read from provider {}", recordName, chemCompProvider.getClass().getCanonicalName());
+        cc = chemCompProvider.getChemComp(recordName);
+
+        // Note that this also caches null or empty responses
+        cache.put(recordName, cc);
+        return cc;
+    }
+
+    /**
+     * The new ChemCompProvider will be set in the static variable,
+     * so this provider will be used from now on until it is changed
+     * again. Note that this change can have unexpected behavior of
+     * code executed afterwards.
+     * <p>
+     * Changing the provider also resets the cache, so any groups
+     * previously accessed will be reread or re-downloaded.
+     *
+     * @param provider
+     */
+    public static void setChemCompProvider(ChemCompProvider provider) {
+        logger.debug("Setting new chem comp provider to {}", provider.getClass().getCanonicalName());
+        chemCompProvider = provider;
+        // clear cache
+        cache.clear();
+    }
+
+    public static ChemCompProvider getChemCompProvider(){
+        return chemCompProvider;
+    }
+
+    /**
+     * Force the in-memory cache to be reset.
+     *
+     * Note that the ChemCompProvider may have additional memory or disk caches that need to be cleared too.
+     */
+    public static void clearCache() {
+        cache.clear();
+    }
+
+    public static Group getGroupFromChemCompDictionary(String recordName) {
+        // make sure we work with upper case records
+        recordName = recordName.toUpperCase().trim();
+        Group g;
+        ChemComp cc =  getChemComp(recordName);
+
+        if (cc == null) {
+            return null;
+        }
+
+        if (PolymerType.PROTEIN_ONLY.contains(cc.getPolymerType())) {
+            AminoAcid aa = new AminoAcidImpl();
+
+            String one_letter = cc.getOneLetterCode();
+            if (one_letter == null || one_letter.equals("X") || one_letter.equals("?") || one_letter.length() == 0) {
+                String parent = cc.getMonNstdParentCompId();
+                if (parent != null && parent.length() == 3) {
+                    String parentid = cc.getMonNstdParentCompId();
+                    ChemComp parentCC = getChemComp(parentid);
+                    one_letter = parentCC.getOneLetterCode();
+                }
+            }
+
+            if (one_letter == null || one_letter.length() == 0 || one_letter.equals("?")) {
+                // e.g. problem with PRR, which probably should have a parent of ALA, but as of 20110127 does not.
+                logger.warn("Problem with chemical component: {} Did not find one letter code! Setting it to 'X'",
+                        recordName);
+                aa.setAminoType('X');
+            } else  {
+                aa.setAminoType(one_letter.charAt(0));
+            }
+
+            g = aa;
+        } else if (PolymerType.POLYNUCLEOTIDE_ONLY.contains(cc.getPolymerType())) {
+            g = new NucleotideImpl();
+        } else {
+            g = new HetatomImpl();
+        }
+
+        g.setChemComp(cc);
+        return g;
+    }
+
+    public static String getOneLetterCode(ChemComp cc) {
+        String oneLetter = cc.getOneLetterCode();
+        if (oneLetter == null || oneLetter.equals("X") || oneLetter.equals("?")) {
+            String parentId = cc.getMonNstdParentCompId();
+            if (parentId == null) {
+                return oneLetter;
+            }
+            // cases like OIM have multiple parents (comma separated), we shouldn't try grab a chemcomp for those strings
+            if (parentId.length() > 3) {
+                return oneLetter;
+            }
+            ChemComp parentCC = ChemCompGroupFactory.getChemComp(parentId);
+            if (parentCC == null) {
+                return oneLetter;
+            }
+            oneLetter = parentCC.getOneLetterCode();
+        }
+        return oneLetter;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompProvider.java
new file mode 100644
index 0000000000..936f5ef8cf
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompProvider.java
@@ -0,0 +1,15 @@
+package org.biojava.nbio.structure.chem;
+
+/**
+ * Interface that is implemented by all classes that can provide {@link ChemComp} definitions.
+ * @author Andreas Prlic
+ * @since 3.0
+ */
+public interface ChemCompProvider {
+    /**
+     * Returns a new instance of a chemical component definition.
+     * @param recordName the ID of the {@link ChemComp}
+     * @return a new {@link ChemComp} definition.
+     */
+    ChemComp getChemComp(String recordName);
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java
index 6b8f74dbd8..929223040a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java
@@ -78,21 +78,21 @@ public class ChemCompTools {
         AMINO_ACID_LOOKUP_1TO3 = Collections.unmodifiableMap(Collections.synchronizedMap(bar));
 
         foo = new HashMap<>();
-        foo.put("DA",'A');
-        foo.put("DC",'C');
-        foo.put("DG",'G');
-        foo.put("DI",'I');
-        foo.put("DU",'U');
-        foo.put("DT",'T');
+        foo.put("DA", 'A');
+        foo.put("DC", 'C');
+        foo.put("DG", 'G');
+        foo.put("DI", 'I');
+        foo.put("DU", 'U');
+        foo.put("DT", 'T');
         DNA_LOOKUP_2TO1 = Collections.unmodifiableMap((Collections.synchronizedMap(foo)));
 
         bar = new HashMap<>();
-        bar.put('A',"DA");
-        bar.put('C',"DC");
-        bar.put('G',"DG");
-        bar.put('I',"DI");
-        bar.put('U',"DU");
-        bar.put('T',"DT");
+        bar.put('A', "DA");
+        bar.put('C', "DC");
+        bar.put('G', "DG");
+        bar.put('I', "DI");
+        bar.put('U', "DU");
+        bar.put('T', "DT");
         DNA_LOOKUP_1TO2 = Collections.unmodifiableMap(Collections.synchronizedMap(bar));
     }
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java
index 63b38ed2e2..c191e67118 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java
@@ -12,9 +12,9 @@
  *
  */
 public class ChemicalComponentDictionary {
-    private Map<String, ChemComp> dictionary;
-    private Map<String,String> replaces;
-    private Map<String,String> isReplacedBy;
+    private final Map<String, ChemComp> dictionary;
+    private final Map<String,String> replaces;
+    private final Map<String,String> isReplacedBy;
 
     public ChemicalComponentDictionary(){
         dictionary = new HashMap<>();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
new file mode 100644
index 0000000000..71a17b7292
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -0,0 +1,403 @@
+package org.biojava.nbio.structure.chem;
+
+import org.biojava.nbio.core.util.InputStreamProvider;
+import org.biojava.nbio.structure.align.util.URLConnectionTools;
+import org.biojava.nbio.structure.align.util.UserConfiguration;
+import org.biojava.nbio.structure.io.LocalPDBDirectory;
+import org.biojava.nbio.structure.io.cif.ChemCompConverter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.zip.GZIPOutputStream;
+
+/**
+ * This provider of chemical components can download and cache chemical component definition files from the RCSB PDB web
+ * site. It is the default way to access these definitions. If this provider is called he first time, it will download
+ * and install all chemical component definitions in a local directory. Once the definition files have been installed,
+ * it has quick startup time and low memory requirements.
+ *
+ * An alternative provider, that keeps all definitions in memory is the {@link AllChemCompProvider}. Another provider,
+ * that does not require any network access, but only can support a limited set of chemical component definitions, is
+ * the {@link ReducedChemCompProvider}.
+ *
+ * @author Andreas Prlic
+ */
+public class DownloadChemCompProvider implements ChemCompProvider {
+    private static final Logger logger = LoggerFactory.getLogger(DownloadChemCompProvider.class);
+
+    public static final String CHEM_COMP_CACHE_DIRECTORY = "chemcomp";
+    public static final String DEFAULT_SERVER_URL = "http://files.rcsb.org/ligands/download/";
+    public static String serverBaseUrl = DEFAULT_SERVER_URL;
+    /**
+     * Use default RCSB server layout (true) or internal RCSB server layout (false)
+     */
+    public static boolean useDefaultUrlLayout = true;
+
+    private static File path;
+    //private static final String FILE_SEPARATOR = System.getProperty("file.separator");
+    private static final String NEWLINE = System.getProperty("line.separator");
+
+
+    // flags to make sure there is only one thread running that is loading the dictionary
+    static AtomicBoolean loading = new AtomicBoolean(false);
+
+    static final List<String> protectedIDs = new ArrayList<>();
+    static {
+        protectedIDs.add("CON");
+        protectedIDs.add("PRN");
+        protectedIDs.add("AUX");
+        protectedIDs.add("NUL");
+    }
+
+    private static ChemCompProvider fallback = null; // Fallback provider if the download fails
+
+    /**
+     * by default we will download only some of the files. User has to request that all files should be downloaded...
+     */
+    boolean downloadAll = false;
+
+    public DownloadChemCompProvider() {
+        this(null);
+    }
+
+    public DownloadChemCompProvider(String cacheFilePath) {
+        logger.debug("Initialising DownloadChemCompProvider");
+
+        // note that path is static, so this is just to make sure that all non-static methods will have path initialised
+        if (cacheFilePath != null) {
+            path = new File(cacheFilePath);
+        }
+    }
+
+    /**
+     * Get this provider's cache path
+     * @return
+     */
+    public static File getPath() {
+        if (path == null) {
+            UserConfiguration config = new UserConfiguration();
+            path = new File(config.getCacheFilePath());
+        }
+        return path;
+    }
+
+    /**
+     * Checks if the chemical components already have been installed into the PDB directory.
+     * If not, will download the chemical components definitions file and split it up into small
+     * subfiles.
+     */
+    public void checkDoFirstInstall() {
+        if (!downloadAll) {
+            return;
+        }
+
+        // this makes sure there is a file separator between every component,
+        // if path has a trailing file separator or not, it will work for both cases
+        File dir = new File(getPath(), CHEM_COMP_CACHE_DIRECTORY);
+        File f = new File(dir, "components.cif.gz");
+
+        if (!f.exists()) {
+            downloadAllDefinitions();
+        } else {
+            // file exists.. did it get extracted?
+            FilenameFilter filter = (dir1, file) -> file.endsWith(".cif.gz");
+            String[] files = dir.list(filter);
+            if (files.length < 500) {
+                // not all did get unpacked
+                try {
+                    split();
+                } catch (IOException e) {
+                    logger.error("Could not split file {} into individual chemical component files. Error: {}",
+                            f.toString(), e.getMessage());
+                }
+            }
+        }
+    }
+
+    private void split() throws IOException {
+        logger.info("Installing individual chem comp files ...");
+
+        File dir = new File(getPath(), CHEM_COMP_CACHE_DIRECTORY);
+        File f = new File(dir, "components.cif.gz");
+
+        int counter = 0;
+        InputStreamProvider prov = new InputStreamProvider();
+
+        try (BufferedReader buf = new BufferedReader (new InputStreamReader(prov.getInputStream(f)))) {
+            String line;
+            line = buf.readLine ();
+            StringWriter writer = new StringWriter();
+
+            String currentID = null;
+            while (line != null) {
+                if (line.startsWith("data_")) {
+                    // a new record found!
+
+                    if (currentID != null) {
+                        writeID(writer.toString(), currentID);
+                        counter++;
+                    }
+
+                    currentID = line.substring(5);
+                    writer = new StringWriter();
+                }
+
+                writer.append(line);
+                writer.append(NEWLINE);
+
+                line = buf.readLine();
+            }
+
+            // write the last record...
+            writeID(writer.toString(), currentID);
+            counter++;
+        }
+
+        logger.info("Created {} chemical component files.", counter);
+    }
+
+    /**
+     * Output chemical contents to a file
+     * @param contents File contents
+     * @param currentID Chemical ID, used to determine the filename
+     * @throws IOException
+     */
+    private void writeID(String contents, String currentID) throws IOException {
+        String localName = getLocalFileName(currentID);
+        try (PrintWriter pw = new PrintWriter(new GZIPOutputStream(new FileOutputStream(localName)))) {
+            pw.print(contents);
+            pw.flush();
+        }
+    }
+
+    /**
+     * Loads the definitions for this {@link ChemComp} from a local file and instantiates a new object.
+     *
+     * @param recordName the ID of the {@link ChemComp}
+     * @return a new {@link ChemComp} definition.
+     */
+    @Override
+    public ChemComp getChemComp(String recordName) {
+        // make sure we work with upper case records
+        recordName = recordName.toUpperCase().trim();
+
+        boolean haveFile = true;
+        if (recordName.equals("?")) {
+            return null;
+        }
+
+        if (fileIsAbsent(recordName)) {
+            // check if we should install all components
+            checkDoFirstInstall();
+        }
+        if (fileIsAbsent(recordName)) {
+            // we previously have installed already the definitions,
+            // just do an incrememntal update
+            haveFile = downloadChemCompRecord(recordName);
+        }
+
+        // Added check that download was successful and chemical component is available.
+        if (haveFile) {
+            String filename = getLocalFileName(recordName);
+            try {
+                ChemicalComponentDictionary dict = ChemCompConverter.fromPath(Paths.get(filename));
+                ChemComp chemComp = dict.getChemComp(recordName);
+
+                // May be null if the file was corrupt. Fall back on ReducedChemCompProvider in that case
+                if (chemComp != null) {
+                    return chemComp;
+                }
+            } catch (IOException e) {
+                logger.warn("Could not download chemical component file {} for {}. Error: {}. Now trying to use the " +
+                                "local chemical component definitions.", filename, recordName, e.getMessage());
+            }
+        }
+
+        // see https://github.com/biojava/biojava/issues/315
+        // probably a network error happened. Try to use the ReducedChemCOmpProvider
+        if (fallback == null) {
+            fallback = new ReducedChemCompProvider();
+        }
+
+        logger.warn("Falling back to ReducedChemCompProvider for {}. This could indicate a network error.", recordName);
+        return fallback.getChemComp(recordName);
+    }
+
+    /**
+     * Returns the file name that contains the definition for this {@link ChemComp}
+     *
+     * @param recordName the ID of the {@link ChemComp}
+     * @return full path to the file
+     */
+    public static String getLocalFileName(String recordName) {
+        if (protectedIDs.contains(recordName)) {
+            recordName = "_" + recordName;
+        }
+
+        File f = new File(getPath(), CHEM_COMP_CACHE_DIRECTORY);
+        if (!f.exists()) {
+            logger.info("Creating directory {}", f);
+
+            boolean success = f.mkdir();
+            // we've checked in initPath that path is writable, so there's no need to check if it succeeds
+            // in the unlikely case that in the meantime it isn't writable at least we log an error
+            if (!success) {
+                logger.error("Directory {} could not be created", f);
+            }
+        }
+
+        File theFile = new File(f, recordName + ".cif.gz");
+        return theFile.toString();
+    }
+
+    private static boolean fileIsAbsent(String recordName) {
+        String fileName = getLocalFileName(recordName);
+        File f = new File(fileName);
+
+        // delete files that are too short to have contents
+        if (f.length() < LocalPDBDirectory.MIN_PDB_FILE_SIZE) {
+            // Delete defensively.
+            // Note that if delete is unsuccessful, we re-download the file anyways
+            f.delete();
+            return true;
+        }
+
+        return !f.exists();
+    }
+
+    /**
+     * @param recordName : three-letter name
+     * @return true if successful download
+     */
+    private static boolean downloadChemCompRecord(String recordName) {
+        String localName = getLocalFileName(recordName);
+        File newFile;
+        try {
+            newFile = File.createTempFile("chemcomp" + recordName, "cif");
+            logger.debug("Will write chem comp file to temp file {}", newFile.toString());
+        } catch(IOException e) {
+            logger.error("Could not write to temp directory {} to create the chemical component download temp file", System.getProperty("java.io.tmpdir"));
+            return false;
+        }
+        String u;
+        if (useDefaultUrlLayout) {
+            u = serverBaseUrl + recordName + ".cif";
+        } else {
+            u = serverBaseUrl + recordName.charAt(0) + "/"  + recordName + "/" + recordName + ".cif";
+        }
+
+        logger.debug("downloading {}", u);
+
+        URL url = null;
+        try {
+            url = new URL(u);
+            URLConnection uconn = URLConnectionTools.openURLConnection(url);
+
+            try (PrintWriter pw = new PrintWriter(new GZIPOutputStream(new FileOutputStream(newFile)));
+                 BufferedReader fileBuffer = new BufferedReader(new InputStreamReader(uconn.getInputStream()))) {
+                String line;
+                while ((line = fileBuffer.readLine()) != null) {
+                    pw.println(line);
+                }
+
+                pw.flush();
+            }
+            // Now we move this across to where it actually wants to be
+            Files.move(newFile.toPath(), Paths.get(localName), StandardCopyOption.REPLACE_EXISTING);
+
+            return true;
+        } catch (IOException e) {
+            logger.error("Could not download {} OR store locally to {} Error ={}",
+                    url,
+                    localName,
+                    e.getMessage());
+            newFile.delete();
+        }
+        return false;
+    }
+
+    private void downloadAllDefinitions() {
+        if (loading.get()) {
+            logger.info("Waiting for other thread to install chemical components...");
+        }
+
+        while (loading.get()) {
+            // another thread is already downloading the components definitions
+            // wait for the other thread to finish...
+            try {
+                // wait half a second
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+                //e.printStackTrace();
+                logger.error("Thread interrupted "+e.getMessage());
+            }
+
+            logger.info("Another thread installed the chemical components.");
+            return;
+        }
+
+        loading.set(true);
+        long timeS = System.currentTimeMillis();
+
+        logger.info("Performing first installation of chemical components.");
+        logger.info("Downloading components.cif.gz ...");
+
+        try {
+            AllChemCompProvider.downloadFile();
+        } catch (IOException e) {
+            logger.error("Could not download the all chemical components file. Error: {}. "
+                    + "Chemical components information won't be available", e.getMessage());
+            // no point in trying to split if the file could not be downloaded
+            loading.set(false);
+            return;
+        }
+        try {
+            split();
+        } catch (IOException e) {
+            logger.error("Could not split all chem comp file into individual chemical component files. Error: {}",
+                    e.getMessage());
+            // no point in reporting time
+            loading.set(false);
+            return;
+        }
+        long timeE = System.currentTimeMillis();
+        logger.info("time to install chem comp dictionary: " + (timeE - timeS) / 1000 + " sec.");
+        loading.set(false);
+    }
+
+    /**
+     * By default this provider will download only some of the {@link ChemComp} files.
+     * The user has to request that all files should be downloaded by setting this parameter to true.
+     *
+     *  @return flag if the all components should be downloaded and installed at startup. (default: false)
+     */
+    public boolean isDownloadAll() {
+        return downloadAll;
+    }
+
+    /** By default this provider will download only some of the {@link ChemComp} files.
+     * The user has to request that all files should be downloaded by setting this parameter to true.
+     *
+     * @param downloadAll if the all components should be downloaded and installed at startup. (default: false)
+     */
+    public void setDownloadAll(boolean downloadAll) {
+        this.downloadAll = downloadAll;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/MetalBondDistance.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/MetalBondDistance.java
new file mode 100644
index 0000000000..1b64b73b35
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/MetalBondDistance.java
@@ -0,0 +1,56 @@
+package org.biojava.nbio.structure.chem;
+
+/**
+ * A bean that contains cutoffs for correctly detecting metal bonds.
+ * Definitions are in file bond_distance_limits.cif.gz
+ *
+ * Created by andreas on 6/9/16.
+ */
+public class MetalBondDistance {
+    private String atomType1;
+    private String atomType2;
+    private float lowerLimit;
+    private float upperLimit;
+
+    public String getAtomType1() {
+        return atomType1;
+    }
+
+    public void setAtomType1(String atomType1) {
+        this.atomType1 = atomType1;
+    }
+
+    public String getAtomType2() {
+        return atomType2;
+    }
+
+    public void setAtomType2(String atomType2) {
+        this.atomType2 = atomType2;
+    }
+
+    public float getLowerLimit() {
+        return lowerLimit;
+    }
+
+    public void setLowerLimit(float lowerLimit) {
+        this.lowerLimit = lowerLimit;
+    }
+
+    public float getUpperLimit() {
+        return upperLimit;
+    }
+
+    public void setUpperLimit(float upperLimit) {
+        this.upperLimit = upperLimit;
+    }
+
+    @Override
+    public String toString() {
+        return "MetalBindDistance{" +
+                "atomType1='" + atomType1 + '\'' +
+                ", atomType2='" + atomType2 + '\'' +
+                ", lowerLimit=" + lowerLimit +
+                ", upperLimit=" + upperLimit +
+                '}';
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ReducedChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ReducedChemCompProvider.java
new file mode 100644
index 0000000000..5321869139
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ReducedChemCompProvider.java
@@ -0,0 +1,58 @@
+package org.biojava.nbio.structure.chem;
+
+import org.biojava.nbio.structure.io.cif.ChemCompConsumer;
+import org.biojava.nbio.structure.io.cif.ChemCompConsumerImpl;
+import org.biojava.nbio.structure.io.cif.ChemCompConverter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.zip.GZIPInputStream;
+
+/**
+ * Unlike the {@link DownloadChemCompProvider}, this  {@link ChemCompProvider} does not download any chem comp
+ * definitions. It has access to a limited set of files that are part of the biojava distribution.
+ *
+ * @author Andreas Prlic
+ * @since 3.0
+ */
+public class ReducedChemCompProvider implements ChemCompProvider {
+    private static final Logger logger = LoggerFactory.getLogger(ReducedChemCompProvider.class);
+
+    public ReducedChemCompProvider(){
+        logger.debug("Initialising ReducedChemCompProvider");
+    }
+
+    @Override
+    public ChemComp getChemComp(String recordName) {
+        String name = recordName.toUpperCase().trim();
+        try (InputStream inStream = this.getClass().getResourceAsStream("/chemcomp/" + name + ".cif.gz")) {
+            logger.debug("Reading chemcomp/{}.cif.gz", recordName);
+
+            if (inStream == null) {
+                //System.out.println("Could not find chem comp: " + name + " ... using generic Chem Comp");
+                // could not find the chem comp definition for this in the jar file
+                logger.debug("Getting empty chem comp for {}", name);
+                ChemComp cc = ChemComp.getEmptyChemComp();
+                cc.setId(name);
+                return cc;
+            }
+
+            // The Consumer builds up the BioJava - structure object.
+            // you could also hook in your own and build up you own data model.
+            ChemicalComponentDictionary dict = ChemCompConverter.fromInputStream(inStream);
+
+            return dict.getChemComp(name);
+        } catch (IOException e) {
+            logger.error("IOException caught while reading chem comp {}.", name, e);
+        }
+        logger.warn("Problem when loading chem comp {}, will use an empty chem comp for it", name);
+        ChemComp cc = ChemComp.getEmptyChemComp();
+        cc.setId(name);
+        return cc;
+    }
+}
+
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java
new file mode 100644
index 0000000000..34d7eea4db
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java
@@ -0,0 +1,275 @@
+package org.biojava.nbio.structure.chem;
+
+import org.biojava.nbio.structure.io.cif.ChemCompConverter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * This chemical component provider retrieves and caches chemical component definition files from a
+ * zip archive specified in its construction.  If the archive does not contain the record, an attempt is
+ * made to download it using DownloadChemCompProvider. The downloaded file is then added to the archive.
+ *
+ * The class is thread-safe and the same ZipChemCompProvider should be used by all threads to prevent
+ * simultaneous read or write to the zip archive.  A zip archive will be created if missing.
+ *
+ * @author edlunde
+ * @author larsonm
+ * @since 12/05/12
+ * updated 3/5/2016 for Java 7 ZipFileSystem
+ */
+public class ZipChemCompProvider implements ChemCompProvider{
+    private static final Logger s_logger = LoggerFactory.getLogger(ZipChemCompProvider.class);
+
+    private final Path m_tempDir;  // Base path where $m_zipRootDir/ will be downloaded to.
+    private final Path m_zipRootDir;
+    private final Path m_zipFile;
+    private final DownloadChemCompProvider m_dlProvider;
+
+    private boolean m_removeCif;
+
+    // Missing IDs from library that cannot be download added here to prevent delays.
+    private Set<String> unavailable = new HashSet<>();
+
+    /**
+     * ZipChemCompProvider is a Chemical Component provider that stores chemical components
+     * in a zip archive.  Missing chemical components are downloaded and appended to the
+     * archive.  If non-existent a new zip archive will be created.
+     *
+     * @param chemicalComponentDictionaryFile : path to zip archive for chemical components.
+     * @param tempDir : path for temporary directory, (null) defaults to path in property "java.io.tmpdir".
+     * @throws IOException
+     */
+    public ZipChemCompProvider(String chemicalComponentDictionaryFile, String tempDir) throws IOException {
+        this.m_zipFile = Paths.get(chemicalComponentDictionaryFile);
+
+        // Use a default temporary directory if not passed a value.
+        if (tempDir == null || tempDir.equals("")) {
+            this.m_tempDir = Paths.get(System.getProperty("java.io.tmpdir"));
+        } else {
+            this.m_tempDir = Paths.get(tempDir);
+        }
+
+        this.m_zipRootDir = Paths.get("chemcomp");
+
+        // Setup an instance of the download chemcomp provider.
+        this.m_dlProvider = new DownloadChemCompProvider(m_tempDir.toString());
+        this.m_removeCif = true;
+        initializeZip();
+    }
+
+    // See comments in addToZipFileSystem for why initialization is required with
+    // ZipFileSystems - due to URI issues in Java7.
+    private void initializeZip() throws IOException {
+        s_logger.info("Using chemical component dictionary: {}", m_zipFile.toString());
+        final File f = m_zipFile.toFile();
+        if (!f.exists()) {
+            s_logger.info("Creating missing zip archive: {}", m_zipFile.toString());
+            FileOutputStream fo = new FileOutputStream(f);
+            try (ZipOutputStream zip = new ZipOutputStream(new BufferedOutputStream(fo))) {
+                zip.putNextEntry(new ZipEntry("chemcomp/"));
+                zip.closeEntry();
+            }
+        }
+    }
+
+    /**
+     * Remove downloaded .cif.gz after adding to zip archive?
+     * Default is true.
+     * @param doRemove
+     */
+    public void setRemoveCif(boolean doRemove) {
+        m_removeCif = doRemove;
+    }
+
+    /**
+     * (non-Javadoc)
+     * @see ChemCompProvider#getChemComp(java.lang.String)
+     *
+     * @param recordName : three letter PDB name for a residue
+     * @return ChemComp from .zip or ChemComp from repository.  Will return empty ChemComp when unable to find a residue and will return null if not provided a valid recordName.
+     */
+    @Override
+    public ChemComp getChemComp(String recordName) {
+        if (null == recordName) return null;
+
+        // handle non-existent ChemComp codes and do not repeatedly attempt to add these.
+        for (String str : unavailable) {
+            if (recordName.equals(str)) return getEmptyChemComp(recordName);
+        }
+
+        // Try to pull from zip, if fail then download.
+        ChemComp cc = getFromZip(recordName);
+        if (cc == null) {
+            s_logger.info("File {} not found in archive. Attempting download from PDB.", recordName);
+            cc = downloadAndAdd(recordName);
+        }
+
+        // If a null record or an empty chemcomp, return a default ChemComp and blacklist.
+        if (cc == null || (null == cc.getName() && cc.getAtoms().size() == 0)) {
+            s_logger.info("Unable to find or download {} - excluding from future searches.", recordName);
+            unavailable.add(recordName);
+            return getEmptyChemComp(recordName);
+        }
+        return cc;
+    }
+
+    /** Use DownloadChemCompProvider to grab a gzipped cif record from the PDB.
+     *  Zip all downloaded cif.gz files into the dictionary.
+     *
+     * @param recordName is the three-letter chemical component code (i.e. residue name).
+     * @return ChemComp matching recordName
+     */
+    private ChemComp downloadAndAdd(String recordName){
+        final ChemComp cc = m_dlProvider.getChemComp(recordName);
+
+        // final File [] files = finder(m_tempDir.resolve("chemcomp").toString(), "cif.gz");
+        final File [] files = new File[1];
+        Path cif = m_tempDir.resolve("chemcomp").resolve(recordName + ".cif.gz");
+        files[0] = cif.toFile();
+        if (files[0] != null) {
+            addToZipFileSystem(m_zipFile, files, m_zipRootDir);
+            if (m_removeCif) for (File f : files) f.delete();
+        }
+        return cc;
+    }
+
+    /**
+     * Cleanup chemical component (.cif.gz) files downloaded to tmpdir.
+     * @param tempdir : path to temporary directory for chemical components
+     */
+    public static void purgeTempFiles(String tempdir) {
+        if (tempdir == null) return;
+
+        s_logger.info("Removing: "+tempdir);
+        Path dlPath = Paths.get(tempdir).resolve("chemcomp");
+        File[] chemCompOutFiles = finder(dlPath.toString(), "cif.gz");
+        if (null != chemCompOutFiles) for (File f : chemCompOutFiles) f.delete();
+        dlPath.toFile().delete();
+    }
+
+    /**
+     * Return an empty ChemComp group for a three-letter resName.
+     * @param resName
+     * @return
+     */
+    private ChemComp getEmptyChemComp(String resName){
+        String pdbName = ""; // Empty string is default
+        if (null != resName && resName.length() >= 3) {
+            pdbName = resName.substring(0,3);
+        }
+        final ChemComp comp = new ChemComp();
+        comp.setOneLetterCode("?");
+        comp.setThreeLetterCode(pdbName);
+        comp.setPolymerType(PolymerType.unknown);
+        comp.setResidueType(ResidueType.atomn);
+        return comp;
+    }
+
+    /**
+     * Return File(s) in dirName that match suffix.
+     * @param dirName
+     * @param suffix
+     * @return
+     */
+    static private File[] finder(String dirName, final String suffix) {
+        if (null == dirName || null == suffix) {
+            return null;
+        }
+
+        final File dir = new File(dirName);
+        return dir.listFiles((dir1, filename) -> filename.endsWith(suffix));
+    }
+
+    /**
+     * This is synchronized, along with addToFileSystem to prevent simulatenous reading/writing.
+     * @param recordName to find in zipfile.
+     * @return ChemComp if found or null if missing.
+     */
+    private synchronized ChemComp getFromZip(String recordName) {
+        ChemComp cc = null;
+        if (!m_zipFile.toFile().exists()) return cc;
+        final String filename = "chemcomp/" + recordName + ".cif.gz";
+
+        // try with resources block to read from the filesystem.
+        try (FileSystem fs = FileSystems.newFileSystem(m_zipFile, null)) {
+            Path cif = fs.getPath(filename);
+
+            if (Files.exists(cif)) {
+                s_logger.debug("reading {} from {}", recordName, m_zipFile);
+                final ChemicalComponentDictionary dict = ChemCompConverter.fromPath(cif);
+                cc = dict.getChemComp(recordName);
+            }
+        } catch (IOException e) {
+            s_logger.error("Unable to read from zip file : {}", e.getMessage());
+        }
+
+        return cc;
+    }
+
+    /**
+     * Add an array of files to a zip archive.
+     * Synchronized to prevent simultaneous reading/writing.
+     *
+     * @param zipFile is a destination zip archive
+     * @param files is an array of files to be added
+     * @param pathWithinArchive is the path within the archive to add files to
+     * @return true if successfully appended these files.
+     */
+    private synchronized boolean addToZipFileSystem(Path zipFile, File[] files, Path pathWithinArchive) {
+        boolean ret = false;
+
+        /* URIs in Java 7 cannot have spaces, must use Path instead
+         * and so, cannot use the properties map to describe need to create
+         * a new zip archive.  ZipChemCompProvider.initilizeZip to creates the
+         * missing zip file */
+
+		/*
+		// convert the filename to a URI
+		String uriString = "jar:file:" + zipFile.toUri().getPath();
+		final URI uri = URI.create(uriString);
+
+		// if filesystem doesn't exist, create one.
+		final Map<String, String> env = new HashMap<>();
+		// Create a new zip if one isn't present.
+		if (!zipFile.toFile().exists()) {
+			System.out.println("Need to create " + zipFile.toString());
+		}
+		env.put("create", String.valueOf(!zipFile.toFile().exists()));
+		// Specify the encoding as UTF -8
+		env.put("encoding", "UTF-8");
+		*/
+
+        // Copy in each file.
+        try (FileSystem zipfs = FileSystems.newFileSystem(zipFile, null)) {
+            Files.createDirectories(pathWithinArchive);
+            for (File f : files) {
+                if (!f.isDirectory() && f.exists()) {
+                    Path externalFile = f.toPath();
+                    Path pathInZipFile = zipfs.getPath(pathWithinArchive.resolve(f.getName()).toString());
+                    Files.copy(externalFile, pathInZipFile,
+                            StandardCopyOption.REPLACE_EXISTING);
+                }
+            }
+            ret = true;
+        } catch (IOException ex) {
+            s_logger.error("Unable to add entries to Chemical Component zip archive : {}", ex.getMessage());
+            ret = false;
+        }
+        return ret;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
index b8e10ffbb8..de50722b34 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
@@ -750,40 +750,41 @@ public String toPDB() {
 	public String toMMCIF() {
 		StringBuilder sb = new StringBuilder();
 
-		String molecId1 = getMoleculeIds().getFirst();
-		String molecId2 = getMoleculeIds().getSecond();
-
-		if (isSymRelated()) {
-			// if both chains are named equally we want to still named them differently in the output mmcif file
-			// so that molecular viewers can handle properly the 2 chains as separate entities
-			molecId2 = molecId2 + "_" +getTransforms().getSecond().getTransformId();
-		}
-
-		sb.append(SimpleMMcifParser.MMCIF_TOP_HEADER).append("BioJava_interface_").append(getId()).append(System.getProperty("line.separator"));
-
-		sb.append(FileConvert.getAtomSiteHeader());
-
-		// we reassign atom ids if sym related (otherwise atom ids would be duplicated and some molecular viewers can't cope with that)
-		int atomId = 1;
-		List<AtomSite> atomSites = new ArrayList<>();
-		for (Atom atom:this.molecules.getFirst()) {
-			if (isSymRelated()) {
-				atomSites.add(MMCIFFileTools.convertAtomToAtomSite(atom, 1, molecId1, molecId1, atomId));
-			} else {
-				atomSites.add(MMCIFFileTools.convertAtomToAtomSite(atom, 1, molecId1, molecId1));
-			}
-			atomId++;
-		}
-		for (Atom atom:this.molecules.getSecond()) {
-			if (isSymRelated()) {
-				atomSites.add(MMCIFFileTools.convertAtomToAtomSite(atom, 1, molecId2, molecId2, atomId));
-			} else {
-				atomSites.add(MMCIFFileTools.convertAtomToAtomSite(atom, 1, molecId2, molecId2));
-			}
-			atomId++;
-		}
-
-		sb.append(MMCIFFileTools.toMMCIF(atomSites,AtomSite.class));
+		// TODO impl
+//		String molecId1 = getMoleculeIds().getFirst();
+//		String molecId2 = getMoleculeIds().getSecond();
+//
+//		if (isSymRelated()) {
+//			// if both chains are named equally we want to still named them differently in the output mmcif file
+//			// so that molecular viewers can handle properly the 2 chains as separate entities
+//			molecId2 = molecId2 + "_" +getTransforms().getSecond().getTransformId();
+//		}
+//
+//		sb.append(SimpleMMcifParser.MMCIF_TOP_HEADER).append("BioJava_interface_").append(getId()).append(System.getProperty("line.separator"));
+//
+//		sb.append(FileConvert.getAtomSiteHeader());
+//
+//		// we reassign atom ids if sym related (otherwise atom ids would be duplicated and some molecular viewers can't cope with that)
+//		int atomId = 1;
+//		List<AtomSite> atomSites = new ArrayList<>();
+//		for (Atom atom:this.molecules.getFirst()) {
+//			if (isSymRelated()) {
+//				atomSites.add(MMCIFFileTools.convertAtomToAtomSite(atom, 1, molecId1, molecId1, atomId));
+//			} else {
+//				atomSites.add(MMCIFFileTools.convertAtomToAtomSite(atom, 1, molecId1, molecId1));
+//			}
+//			atomId++;
+//		}
+//		for (Atom atom:this.molecules.getSecond()) {
+//			if (isSymRelated()) {
+//				atomSites.add(MMCIFFileTools.convertAtomToAtomSite(atom, 1, molecId2, molecId2, atomId));
+//			} else {
+//				atomSites.add(MMCIFFileTools.convertAtomToAtomSite(atom, 1, molecId2, molecId2));
+//			}
+//			atomId++;
+//		}
+//
+//		sb.append(MMCIFFileTools.toMMCIF(atomSites,AtomSite.class));
 
 		return sb.toString();
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BcifFileReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BcifFileReader.java
index f0325b5b3e..a122158aee 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BcifFileReader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BcifFileReader.java
@@ -2,7 +2,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.structure.io.cif.CifFileConverter;
+import org.biojava.nbio.structure.io.cif.StructureConverter;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,7 +38,7 @@ public BcifFileReader(String path) {
 
     @Override
     public Structure getStructure(InputStream inStream) throws IOException {
-        return CifFileConverter.fromInputStream(inStream, getFileParsingParameters());
+        return StructureConverter.fromInputStream(inStream, getFileParsingParameters());
     }
 
     @Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
index df077cde9b..7c4fe74144 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
@@ -25,6 +25,7 @@
 import org.biojava.nbio.structure.*;
 import org.biojava.nbio.structure.chem.ChemComp;
 import org.biojava.nbio.structure.chem.ChemCompBond;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.biojava.nbio.structure.io.util.PDBTemporaryStorageUtils.LinkRecord;
 import org.rcsb.cif.model.ValueKind;
 import org.rcsb.cif.schema.mm.StructConn;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/ChargeAdder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/ChargeAdder.java
index 311414f9da..607cf8e150 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/ChargeAdder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/ChargeAdder.java
@@ -30,7 +30,7 @@
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.chem.ChemComp;
 import org.biojava.nbio.structure.chem.ChemCompAtom;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,25 +53,7 @@ public static void addCharges(Structure structure) {
 					List<ChemCompAtom> chemAtoms = thisChemComp.getAtoms();
 					for (ChemCompAtom chemCompAtom : chemAtoms) {
 						Atom atom = g.getAtom(chemCompAtom.getAtomId());
-						String stringCharge = chemCompAtom.getCharge();
-						short shortCharge = 0;
-						if (stringCharge != null) {
-							if (!stringCharge.equals("?")) {
-								try {
-									shortCharge = Short.parseShort(stringCharge);
-								} catch(NumberFormatException e) {
-									logger.warn("Number format exception. Parsing '{}' to short", stringCharge);
-								}
-							} else {
-								logger.warn("? charge on atom {} in group {}",
-										chemCompAtom.getAtomId(),
-										thisChemComp.getId());
-							}
-						} else {
-							logger.warn("Null charge on atom {} in group {}",
-									chemCompAtom.getAtomId(),
-									thisChemComp.getId());
-						}
+						short shortCharge = (short) chemCompAtom.getCharge();
 						if (atom != null) {
 							atom.setCharge(shortCharge);
 						}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CifFileReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CifFileReader.java
index a5977931c2..edfe601b8d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CifFileReader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CifFileReader.java
@@ -2,7 +2,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.structure.io.cif.CifFileConverter;
+import org.biojava.nbio.structure.io.cif.StructureConverter;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,7 +40,7 @@ public CifFileReader(String path) {
 
     @Override
     public Structure getStructure(InputStream inStream) throws IOException{
-        return CifFileConverter.fromInputStream(inStream, getFileParsingParameters());
+        return StructureConverter.fromInputStream(inStream, getFileParsingParameters());
     }
 
     @Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
index d6da021e63..8264fb2b3f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
@@ -40,7 +40,7 @@
 import org.biojava.nbio.structure.PDBHeader;
 import org.biojava.nbio.structure.Site;
 import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.io.cif.CifFileConverter;
+import org.biojava.nbio.structure.io.cif.StructureConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -593,10 +593,10 @@ else if (name.length()==1)
 
 
 	public String toMMCIF() {
-		return CifFileConverter.toText(this.structure);
+		return StructureConverter.toText(this.structure);
 	}
 
 	public static String toMMCIF(Chain chain) {
-		return CifFileConverter.toText(chain);
+		return StructureConverter.toText(chain);
 	}
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index 6200c90b1a..a1f16e27b6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -70,7 +70,7 @@
 import org.biojava.nbio.structure.StructureImpl;
 import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.chem.ChemCompAtom;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.biojava.nbio.structure.io.util.PDBTemporaryStorageUtils.LinkRecord;
 import org.biojava.nbio.structure.secstruc.SecStrucInfo;
 import org.biojava.nbio.structure.secstruc.SecStrucType;
@@ -301,7 +301,7 @@ public PDBFileParser() {
 	/** initiate new resNum, either Hetatom, Nucleotide, or AminoAcid */
 	private Group getNewGroup(String recordName,Character aminoCode1, String aminoCode3) {
 
-		Group g =  ChemCompGroupFactory.getGroupFromChemCompDictionary(aminoCode3);
+		Group g = ChemCompGroupFactory.getGroupFromChemCompDictionary(aminoCode3);
 		if ( g != null && !g.getChemComp().isEmpty())
 			return g;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java
new file mode 100644
index 0000000000..5bbb3f7a6a
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java
@@ -0,0 +1,16 @@
+package org.biojava.nbio.structure.io.cif;
+
+import org.biojava.nbio.structure.chem.ChemCompDescriptor;
+import org.biojava.nbio.structure.chem.ChemicalComponentDictionary;
+import org.rcsb.cif.schema.mm.ChemComp;
+import org.rcsb.cif.schema.mm.ChemCompAtom;
+import org.rcsb.cif.schema.mm.ChemCompBond;
+
+public interface ChemCompConsumer extends CifFileConsumer<ChemicalComponentDictionary> {
+    void consumeChemComp(ChemComp c);
+
+    void consumeChemCompAtom(ChemCompAtom atom);
+
+    void consumeChemCompBond(ChemCompBond bond);
+}
+
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java
new file mode 100644
index 0000000000..ffe61f2d0b
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java
@@ -0,0 +1,108 @@
+package org.biojava.nbio.structure.io.cif;
+
+import org.biojava.nbio.structure.chem.ChemicalComponentDictionary;
+import org.rcsb.cif.schema.mm.ChemComp;
+import org.rcsb.cif.schema.mm.ChemCompAtom;
+import org.rcsb.cif.schema.mm.ChemCompBond;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ChemCompConsumerImpl implements ChemCompConsumer {
+    private static final Logger logger = LoggerFactory.getLogger(ChemCompConsumerImpl.class);
+    private final ChemicalComponentDictionary dictionary;
+    private String latestChemCompId;
+
+    public ChemCompConsumerImpl() {
+        this.dictionary = new ChemicalComponentDictionary();
+    }
+
+    @Override
+    public void consumeChemComp(ChemComp c) {
+        org.biojava.nbio.structure.chem.ChemComp chemComp = new org.biojava.nbio.structure.chem.ChemComp();
+        chemComp.setId(c.getId().get(0));
+        chemComp.setName(c.getName().get(0));
+        chemComp.setType(c.getType().get(0));
+        chemComp.setPdbxType(c.getPdbxType().get(0));
+        chemComp.setFormula(c.getFormula().get(0));
+        chemComp.setMonNstdParentCompId(c.getMonNstdParentCompId().get(0));
+        chemComp.setPdbxSynonyms(c.getPdbxSynonyms().get(0));
+        chemComp.setPdbxFormalCharge(c.getPdbxFormalCharge().get(0));
+        chemComp.setPdbxInitialDate(c.getPdbxInitialDate().get(0));
+        chemComp.setPdbxModifiedDate(c.getPdbxModifiedDate().get(0));
+        chemComp.setPdbxAmbiguousFlag(c.getPdbxAmbiguousFlag().get(0));
+        chemComp.setPdbxReleaseStatus(c.getPdbxReleaseStatus().get(0));
+        chemComp.setPdbxReplacedBy(c.getPdbxReplacedBy().get(0));
+        chemComp.setPdbxReplaces(c.getPdbxReplaces().get(0));
+        chemComp.setFormulaWeight(c.getFormulaWeight().get(0));
+        chemComp.setOneLetterCode(c.getOneLetterCode().get(0));
+        chemComp.setThreeLetterCode(c.getThreeLetterCode().get(0));
+        chemComp.setPdbxModelCoordinatesDetails(c.getPdbxModelCoordinatesDetails().get(0));
+        chemComp.setPdbxModelCoordinatesMissingFlag(c.getPdbxModelCoordinatesMissingFlag().get(0));
+        chemComp.setPdbxIdealCoordinatesDetails(c.getPdbxIdealCoordinatesDetails().get(0));
+        chemComp.setPdbxIdealCoordinatesMissingFlag(c.getPdbxIdealCoordinatesMissingFlag().get(0));
+        chemComp.setPdbxModelCoordinatesDbCode(c.getPdbxModelCoordinatesDbCode().get(0));
+        chemComp.setPdbxSubcomponentList(c.getPdbxSubcomponentList().get(0));
+        chemComp.setPdbxProcessingSite(c.getPdbxProcessingSite().get(0));
+        if (chemComp.getId() == null) {
+            logger.warn("chem comp ID == null {}", c);
+        }
+        latestChemCompId = chemComp.getId();
+        dictionary.addChemComp(chemComp);
+    }
+
+    @Override
+    public void consumeChemCompAtom(ChemCompAtom atom) {
+        for (int i = 0; i < atom.getRowCount(); i++) {
+            org.biojava.nbio.structure.chem.ChemCompAtom a = new org.biojava.nbio.structure.chem.ChemCompAtom();
+            a.setCompId(atom.getCompId().get(i));
+            a.setAtomId(atom.getAtomId().get(i));
+            a.setAltAtomId(atom.getAltAtomId().get(i));
+            a.setTypeSymbol(atom.getTypeSymbol().get(i));
+            a.setCharge(atom.getCharge().get(i));
+            a.setPdbxAlign(atom.getPdbxAlign().get(i));
+            a.setPdbxAromaticFlag(atom.getPdbxAromaticFlag().get(i));
+            a.setPdbxLeavingAtomFlag(atom.getPdbxLeavingAtomFlag().get(i));
+            a.setPdbxStereoConfig(atom.getPdbxStereoConfig().get(i));
+            a.setModelCartnX(atom.getModelCartnX().get(i));
+            a.setModelCartnY(atom.getModelCartnY().get(i));
+            a.setModelCartnZ(atom.getModelCartnZ().get(i));
+            a.setPdbxModelCartnXIdeal(atom.getPdbxModelCartnXIdeal().get(i));
+            a.setPdbxModelCartnYIdeal(atom.getPdbxModelCartnYIdeal().get(i));
+            a.setPdbxModelCartnZIdeal(atom.getPdbxModelCartnZIdeal().get(i));
+            a.setPdbxComponentAtomId(atom.getPdbxComponentAtomId().get(i));
+            a.setPdbxComponentCompId(atom.getPdbxComponentCompId().get(i));
+            a.setPdbxOrdinal(atom.getPdbxOrdinal().get(i));
+            dictionary.getChemComp(latestChemCompId).getAtoms().add(a);
+        }
+    }
+
+    @Override
+    public void consumeChemCompBond(ChemCompBond bond) {
+        for (int i = 0; i < bond.getRowCount(); i++) {
+            org.biojava.nbio.structure.chem.ChemCompBond b = new org.biojava.nbio.structure.chem.ChemCompBond();
+            b.setAtomId1(bond.getAtomId1().get(i));
+            b.setAtomId2(bond.getAtomId2().get(i));
+            b.setCompId(bond.getCompId().get(i));
+            b.setPdbxAromaticFlag(bond.getPdbxAromaticFlag().get(i));
+            b.setPdbxOrdinal(bond.getPdbxOrdinal().get(i));
+            b.setPdbxStereoConfig(bond.getPdbxStereoConfig().get(i));
+            b.setValueOrder(bond.getValueOrder().get(i));
+            dictionary.getChemComp(latestChemCompId).getBonds().add(b);
+        }
+    }
+
+    @Override
+    public void prepare() {
+
+    }
+
+    @Override
+    public void finish() {
+
+    }
+
+    @Override
+    public ChemicalComponentDictionary getContainer() {
+        return dictionary;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConverter.java
new file mode 100644
index 0000000000..d234d27dc4
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConverter.java
@@ -0,0 +1,79 @@
+package org.biojava.nbio.structure.io.cif;
+
+import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.chem.ChemicalComponentDictionary;
+import org.biojava.nbio.structure.io.FileParsingParameters;
+import org.rcsb.cif.CifIO;
+import org.rcsb.cif.model.CifFile;
+import org.rcsb.cif.schema.StandardSchemata;
+import org.rcsb.cif.schema.mm.MmCifBlock;
+import org.rcsb.cif.schema.mm.MmCifFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+/**
+ * Convert CifFiles to chem comps.
+ * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
+ * @since 6.0.0
+ */
+public class ChemCompConverter {
+    /**
+     * Read data from a file and convert to chem comp dictionary.
+     * @param path the source of information - can be gzipped or binary or text data
+     * @return the target
+     */
+    public static ChemicalComponentDictionary fromPath(Path path) throws IOException {
+        return fromInputStream(Files.newInputStream(path));
+    }
+
+    /**
+     * Get data from a URL and convert to chem comp dictionary.
+     * @param url the source of information - can be gzipped or binary or text data
+     * @return the target
+     * @throws IOException thrown when reading fails
+     */
+    public static ChemicalComponentDictionary fromURL(URL url) throws IOException {
+        return fromInputStream(url.openStream());
+    }
+
+    /**
+     * Convert InputStream to chem comp dictionary.
+     * @param inputStream the InputStream of information - can be gzipped or binary or text data
+     * @return the target
+     * @throws IOException thrown when reading fails
+     * @see StructureConverter#fromInputStream(InputStream, FileParsingParameters)
+     */
+    public static ChemicalComponentDictionary fromInputStream(InputStream inputStream) throws IOException {
+        return fromCifFile(CifIO.readFromInputStream(inputStream));
+    }
+
+    /**
+     * Convert CifFile to chem comp dictionary.
+     * @param cifFile the source
+     * @return the target
+     */
+    public static ChemicalComponentDictionary fromCifFile(CifFile cifFile) {
+        // initialize consumer
+        ChemCompConsumer consumer = new ChemCompConsumerImpl();
+
+        // init structure
+        consumer.prepare();
+
+        // feed individual categories to consumer
+        MmCifFile mmCifFile = cifFile.as(StandardSchemata.MMCIF);
+        for (MmCifBlock cifBlock : mmCifFile.getBlocks()) {
+            consumer.consumeChemComp(cifBlock.getChemComp());
+            consumer.consumeChemCompAtom(cifBlock.getChemCompAtom());
+            consumer.consumeChemCompBond(cifBlock.getChemCompBond());
+        }
+
+        // prepare structure to be retrieved
+        consumer.finish();
+
+        return consumer.getContainer();
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumer.java
new file mode 100644
index 0000000000..d76d91d1e7
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumer.java
@@ -0,0 +1,11 @@
+package org.biojava.nbio.structure.io.cif;
+
+import org.biojava.nbio.structure.chem.MetalBondDistance;
+import org.rcsb.cif.model.Category;
+
+import java.util.List;
+import java.util.Map;
+
+public interface MetalBondConsumer extends CifFileConsumer<Map<String,List<MetalBondDistance>>> {
+    void consume(Category category);
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java
new file mode 100644
index 0000000000..28833bc559
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java
@@ -0,0 +1,55 @@
+package org.biojava.nbio.structure.io.cif;
+
+import org.biojava.nbio.structure.chem.MetalBondDistance;
+import org.rcsb.cif.model.Category;
+import org.rcsb.cif.model.FloatColumn;
+import org.rcsb.cif.model.StrColumn;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by andreas on 6/9/16.
+ */
+public class MetalBondConsumerImpl implements MetalBondConsumer {
+    private final Map<String, List<MetalBondDistance>> definitions = new HashMap<>();
+
+    @Override
+    public void prepare() {
+        definitions.clear();
+    }
+
+    @Override
+    public void finish() {
+        // minimize memory consumption
+        for (List<MetalBondDistance> d : definitions.values()){
+            ((ArrayList<MetalBondDistance>) d).trimToSize();
+        }
+    }
+
+    @Override
+    public void consume(Category category) {
+        StrColumn atomType1 = (StrColumn) category.getColumn("");
+        StrColumn atomType2 = (StrColumn) category.getColumn("");
+        FloatColumn lowerLimit = (FloatColumn) category.getColumn("");
+        FloatColumn upperLimit = (FloatColumn) category.getColumn("");
+        for (int i = 0; i < category.getRowCount(); i++) {
+            MetalBondDistance d = new MetalBondDistance();
+
+            d.setAtomType1(atomType1.get(i));
+            d.setAtomType2(atomType2.get(i));
+            d.setLowerLimit((float) lowerLimit.get(i));
+            d.setUpperLimit((float) upperLimit.get(i));
+
+            List<MetalBondDistance> defs = definitions.computeIfAbsent(d.getAtomType1(), k -> new ArrayList<>());
+            defs.add(d);
+        }
+    }
+
+    @Override
+    public Map<String, List<MetalBondDistance>> getContainer(){
+        return definitions;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConverter.java
new file mode 100644
index 0000000000..0f28fe6493
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConverter.java
@@ -0,0 +1,60 @@
+package org.biojava.nbio.structure.io.cif;
+
+import org.biojava.nbio.structure.chem.MetalBondDistance;
+import org.rcsb.cif.CifIO;
+import org.rcsb.cif.model.Block;
+import org.rcsb.cif.model.CifFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by andreas on 6/6/16.
+ */
+public class MetalBondConverter {
+    private static final Logger logger = LoggerFactory.getLogger(MetalBondConverter.class);
+    private static final String BONDS_FILE = "org/biojava/nbio/structure/bond_distance_limits.cif.gz";
+    private static Map<String, List<MetalBondDistance>> definitions;
+
+    static {
+        definitions = init();
+    }
+
+    public static Map<String,List<MetalBondDistance>> getMetalBondDefinitions() {
+        return definitions;
+    }
+
+    private static Map<String,List<MetalBondDistance>> init() {
+        InputStream inputStream = MetalBondConverter.class.getClassLoader().getResourceAsStream(BONDS_FILE);
+
+        if (inputStream == null) {
+            throw new RuntimeException("Could not find resource " + BONDS_FILE + ".  This probably means that your " +
+                    "biojava.jar file is corrupt or incorrectly built.");
+        }
+
+        try {
+            CifFile cifFile = CifIO.readFromInputStream(inputStream);
+            // initialize consumer
+            MetalBondConsumerImpl consumer = new MetalBondConsumerImpl();
+
+            // init structure
+            consumer.prepare();
+
+            // feed individual categories to consumer
+            for (Block cifBlock : cifFile.getBlocks()) {
+                cifBlock.categories().forEach(consumer::consume);
+            }
+
+            // prepare structure to be retrieved
+            consumer.finish();
+
+            return consumer.getContainer();
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        return null;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
index 6a952029ee..d858536847 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
@@ -24,6 +24,7 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureImpl;
 import org.biojava.nbio.structure.StructureTools;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.biojava.nbio.structure.io.BondMaker;
 import org.biojava.nbio.structure.io.ChargeAdder;
 import org.biojava.nbio.structure.io.EntityFinder;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConverter.java
similarity index 97%
rename from biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConverter.java
rename to biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConverter.java
index 2a53746297..45a5b97c76 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConverter.java
@@ -18,9 +18,9 @@
 /**
  * Convert BioJava structures to CifFiles and vice versa.
  * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
- * @since 5.3.0
+ * @since 6.0.0
  */
-public class CifFileConverter {
+public class StructureConverter {
     /**
      * Read data from a file and convert to Structure without any FileParsingParameters.
      * @param path the source of information - can be gzipped or binary or text data
@@ -66,7 +66,7 @@ private static Structure fromURL(URL url, FileParsingParameters parameters) thro
      * @param inputStream the InputStream of information - can be gzipped or binary or text data
      * @return the target
      * @throws IOException thrown when reading fails
-     * @see CifFileConverter#fromInputStream(InputStream, FileParsingParameters)
+     * @see StructureConverter#fromInputStream(InputStream, FileParsingParameters)
      */
     public static Structure fromInputStream(InputStream inputStream) throws IOException {
         return fromInputStream(inputStream, new FileParsingParameters());
@@ -87,7 +87,7 @@ public static Structure fromInputStream(InputStream inputStream, FileParsingPara
      * Convert CifFile to Structure without any FileParsingParameters.
      * @param cifFile the source
      * @return the target
-     * @see CifFileConverter#fromCifFile(CifFile, FileParsingParameters)
+     * @see StructureConverter#fromCifFile(CifFile, FileParsingParameters)
      */
     public static Structure fromCifFile(CifFile cifFile) {
         return fromCifFile(cifFile, new FileParsingParameters());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
index 0a6cd9739c..0f1394424a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
@@ -48,10 +48,10 @@
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.biojava.nbio.structure.chem.ChemCompTools;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyTransformation;
 import org.biojava.nbio.structure.secstruc.DSSPParser;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/ChemCompTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/ChemCompTest.java
index fd37644fd4..c937ad0978 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/ChemCompTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/ChemCompTest.java
@@ -20,13 +20,13 @@
  */
 package org.biojava.nbio.structure;
 
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.ChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.ReducedChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
-import org.biojava.nbio.structure.io.mmcif.chem.ResidueType;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
+import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.ChemCompProvider;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
+import org.biojava.nbio.structure.chem.PolymerType;
+import org.biojava.nbio.structure.chem.ReducedChemCompProvider;
+import org.biojava.nbio.structure.chem.ResidueType;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -69,9 +69,9 @@ public void testMEA(){
 
 		assertTrue(" is not mea" , cc.getId().equals(chemID));
 
-		assertEquals(" one letter code is not correct", "F", cc.getOne_letter_code());
+		assertEquals(" one letter code is not correct", "F", cc.getOneLetterCode());
 
-		assertEquals("MEA",cc.getThree_letter_code());
+		assertEquals("MEA",cc.getThreeLetterCode());
 
 		assertNotNull(cc.getPolymerType());
 
@@ -141,7 +141,7 @@ public void testChangingProviders(){
 
 	assertTrue(" is not mea" , cc.getId().equals(chemID));
 
-	assertEquals("MEA",cc.getThree_letter_code());
+	assertEquals("MEA",cc.getThreeLetterCode());
 
 
 
@@ -157,7 +157,7 @@ public void testChangingProviders(){
 
 	assertTrue(" is not mea" , cc.getId().equals(chemID));
 
-	assertEquals("MEA",cc.getThree_letter_code());
+	assertEquals("MEA",cc.getThreeLetterCode());
 
 	// now we change to reduced chem comp provider
 	ChemCompGroupFactory.setChemCompProvider(new ReducedChemCompProvider());
@@ -169,7 +169,7 @@ public void testChangingProviders(){
 	assertTrue(" is not mea" , cc.getId().equals(chemID));
 
 	//the cached description contains all information even with the ReducedProvider
-	assertNotNull(cc.getThree_letter_code());
+	assertNotNull(cc.getThreeLetterCode());
 
 
 	}
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/PdbFileFormat30Test.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/PdbFileFormat30Test.java
index 9daf7d7e18..f6968c7af5 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/PdbFileFormat30Test.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/PdbFileFormat30Test.java
@@ -23,10 +23,10 @@
 
 package org.biojava.nbio.structure;
 
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.ReducedChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.PDBFileParser;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.ReducedChemCompProvider;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/Test4hhb.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/Test4hhb.java
index afb5de1d59..bcf289cebc 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/Test4hhb.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/Test4hhb.java
@@ -26,9 +26,7 @@
 
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.PDBFileParser;
-import org.biojava.nbio.structure.io.mmcif.MMcifParser;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifConsumer;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
+import org.biojava.nbio.structure.io.cif.StructureConverter;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -75,15 +73,9 @@ public void test4hhbPDBFile() throws IOException
 		inStream = new GZIPInputStream(this.getClass().getResourceAsStream("/4hhb.cif.gz"));
 		assertNotNull(inStream);
 
-		MMcifParser mmcifpars = new SimpleMMcifParser();
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
 		params = new FileParsingParameters();
 		params.setAlignSeqRes(true);
-		consumer.setFileParsingParameters(params);
-		mmcifpars.addMMcifConsumer(consumer);
-
-		mmcifpars.parse(inStream) ;
-		structure2 = consumer.getStructure();
+		structure2 = StructureConverter.fromInputStream(inStream, params);
 
 		assertNotNull(structure2);
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java
index d1c6779e7c..3aa86bacd0 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java
@@ -21,19 +21,17 @@
 package org.biojava.nbio.structure;
 
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.ChemCompBond;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.PolymerType;
+import org.biojava.nbio.structure.chem.ResidueType;
 import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.MMCIFFileTools;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifConsumer;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
-import org.biojava.nbio.structure.io.mmcif.chem.ResidueType;
-import org.biojava.nbio.structure.io.mmcif.model.AtomSite;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
-import org.biojava.nbio.structure.io.mmcif.model.ChemCompBond;
+import org.biojava.nbio.structure.io.cif.StructureConverter;
 import org.junit.Test;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.ArrayList;
@@ -397,10 +395,10 @@ public void testAddBondsDoesntChangeGroups() throws IOException, StructureExcept
 					for (ChemCompBond chemCompBond : aminoChemComp.getBonds()) {
 
 						//
-						if(chemCompBond.getAtom_id_1().equals(atomA.getName())){
+						if(chemCompBond.getAtomId1().equals(atomA.getName())){
 							// Get the other atom in the group
 							for(Atom atomB : atomsList) {
-								if(chemCompBond.getAtom_id_2().equals(atomB.getName())){
+								if(chemCompBond.getAtomId2().equals(atomB.getName())){
 									int bondOrder = chemCompBond.getNumericalBondOrder();
 									new BondImpl(atomA, atomB, bondOrder);
 								}
@@ -641,15 +639,7 @@ public void testMmcifConversionPartialAltlocs() throws IOException {
 						"ATOM   117 N NH2 A ARG A 1 13 ? 7.812  17.972 17.172 0.50 24.80 ? 102  ARG A NH2 1\n" +
 						"ATOM   118 N NH2 B ARG A 1 13 ? 8.013  18.115 17.888 0.50 26.52 ? 102  ARG A NH2 1\n";
 
-		SimpleMMcifParser parser = new SimpleMMcifParser();
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-		parser.addMMcifConsumer(consumer);
-
-		BufferedReader buf = new BufferedReader(new StringReader(mmcifData));
-		parser.parse(buf);
-		buf.close();
-
-		Structure s = consumer.getStructure();
+		Structure s = StructureConverter.fromInputStream(new ByteArrayInputStream(mmcifData.getBytes()));
 		Chain c = s.getPolyChains().get(0);
 		assertEquals(1, c.getAtomGroups().size());
 		Group g = c.getAtomGroup(0);
@@ -681,8 +671,9 @@ public void testMmcifConversionPartialAltlocs() throws IOException {
 				assertEquals('B', a.getAltLoc().charValue());
 		}
 
-		List<AtomSite> atomSites = MMCIFFileTools.convertChainToAtomSites(c, 1, "A", "A");
-		assertEquals(17, atomSites.size());
+		// TODO reimpl
+//		List<AtomSite> atomSites = MMCIFFileTools.convertChainToAtomSites(c, 1, "A", "A");
+//		assertEquals(17, atomSites.size());
 
 	}
 
@@ -727,15 +718,7 @@ public void testMmcifConversionAllAltlocs() throws IOException {
 						"ATOM   216 C CD  A PRO A 1 23 ? 14.980 32.886 23.580 0.50 6.98  ? 112  PRO A CD  1 \n" +
 						"ATOM   217 C CD  B PRO A 1 23 ? 14.558 33.235 23.153 0.50 14.91 ? 112  PRO A CD  1 \n";
 
-		SimpleMMcifParser parser = new SimpleMMcifParser();
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-		parser.addMMcifConsumer(consumer);
-
-		BufferedReader buf = new BufferedReader(new StringReader(mmcifData));
-		parser.parse(buf);
-		buf.close();
-
-		Structure s = consumer.getStructure();
+		Structure s = StructureConverter.fromInputStream(new ByteArrayInputStream(mmcifData.getBytes()));
 		Chain c = s.getPolyChains().get(0);
 		assertEquals(1, c.getAtomGroups().size());
 
@@ -751,8 +734,9 @@ public void testMmcifConversionAllAltlocs() throws IOException {
 			assertEquals('B', a.getAltLoc().charValue());
 		}
 
-		List<AtomSite> atomSites = MMCIFFileTools.convertChainToAtomSites(c, 1, "A", "A");
-		assertEquals(14, atomSites.size());
+		// TODO reimpl
+//		List<AtomSite> atomSites = MMCIFFileTools.convertChainToAtomSites(c, 1, "A", "A");
+//		assertEquals(14, atomSites.size());
 
 	}
 
@@ -816,19 +800,10 @@ public void testIntraResidueBondsBetweenAltlocs() throws IOException {
 						"ATOM   1431 H  HE2  B MET A 1 86  ? 7.346   -16.554 -2.998  0.53 23.03 ? 104 MET A HE2  1 \n" +
 						"ATOM   1432 H  HE3  B MET A 1 86  ? 6.996   -15.566 -4.437  0.53 23.03 ? 104 MET A HE3  1 ";
 
-		SimpleMMcifParser parser = new SimpleMMcifParser();
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-		parser.addMMcifConsumer(consumer);
-
 		FileParsingParameters params = new FileParsingParameters();
 		params.setCreateAtomBonds(true);
-		consumer.setFileParsingParameters(params);
-
-		BufferedReader buf = new BufferedReader(new StringReader(mmcifData));
-		parser.parse(buf);
-		buf.close();
 
-		Structure s = consumer.getStructure();
+		Structure s = StructureConverter.fromInputStream(new ByteArrayInputStream(mmcifData.getBytes()), params);
 		Chain c = s.getPolyChains().get(0);
 		assertEquals(1, c.getAtomGroups().size());
 
@@ -971,19 +946,10 @@ public void testInterResidueBondsBetweenAltlocs() throws IOException {
 						"ATOM   1431 H  HE2  B MET A 1  2  ? 7.346   -16.554 -2.998  0.53 23.03 ? 104 MET A HE2  1 \n" +
 						"ATOM   1432 H  HE3  B MET A 1  2  ? 6.996   -15.566 -4.437  0.53 23.03 ? 104 MET A HE3  1 ";
 
-		SimpleMMcifParser parser = new SimpleMMcifParser();
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-		parser.addMMcifConsumer(consumer);
-
 		FileParsingParameters params = new FileParsingParameters();
 		params.setCreateAtomBonds(true);
-		consumer.setFileParsingParameters(params);
-
-		BufferedReader buf = new BufferedReader(new StringReader(mmcifData));
-		parser.parse(buf);
-		buf.close();
 
-		Structure s = consumer.getStructure();
+		Structure s = StructureConverter.fromInputStream(new ByteArrayInputStream(mmcifData.getBytes()), params);
 		Chain c = s.getPolyChains().get(0);
 		assertEquals(2, c.getAtomGroups().size());
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
index 87fc80a314..d3c61130ae 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
@@ -25,6 +25,7 @@
 package org.biojava.nbio.structure;
 
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.io.CifFileReader;
 import org.biojava.nbio.structure.io.LocalPDBDirectory;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.ObsoleteBehavior;
@@ -54,7 +55,7 @@ public void setUp() throws IOException {
 		};
 
 		List<LocalPDBDirectory> readers = new ArrayList<LocalPDBDirectory>();
-		readers.add(new MMCIFFileReader(cache.getPath()) );
+		readers.add(new CifFileReader(cache.getPath()) );
 		readers.add(new PDBFileReader(cache.getPath()) );
 		for(LocalPDBDirectory reader : readers) {
 			reader.setFetchBehavior(cache.getFetchBehavior());
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestBond.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestBond.java
index d1b7b24122..9a3022d0a1 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestBond.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestBond.java
@@ -25,9 +25,9 @@
 import java.util.List;
 
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java
index bc2a8dcd41..3c1b1626db 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java
@@ -21,9 +21,9 @@
 package org.biojava.nbio.structure;
 
 import org.biojava.nbio.core.util.FlatFileCache;
+import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.LocalPDBDirectory;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestNucleotides.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestNucleotides.java
index dc865eb366..1eb7f88cfa 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestNucleotides.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestNucleotides.java
@@ -25,12 +25,12 @@
 package org.biojava.nbio.structure;
 
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.ChemCompProvider;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
+import org.biojava.nbio.structure.chem.PolymerType;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.PDBFileReader;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.ChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
index 6ba61088b4..0882ae08a1 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
@@ -51,12 +51,13 @@
 import org.biojava.nbio.structure.StructureIdentifier;
 import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.SubstructureIdentifier;
+import org.biojava.nbio.structure.chem.ChemComp;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
+import org.biojava.nbio.structure.io.CifFileReader;
 import org.biojava.nbio.structure.io.LocalPDBDirectory;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.ObsoleteBehavior;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
 import org.biojava.nbio.structure.scop.ScopDatabase;
 import org.biojava.nbio.structure.scop.ScopFactory;
 import org.biojava.nbio.structure.test.util.GlobalsHelper;
@@ -203,7 +204,7 @@ public void testNewInstanceWithTilder() throws Exception {
 	public void testFetchBehavior() throws IOException, ParseException {
 		// really more of a LocalPDBDirectory test, but throw it in with AtomCache
 		String pdbId = "1hh0"; // A small structure, since we download it multiple times
-		LocalPDBDirectory reader = new MMCIFFileReader(cache.getPath());
+		LocalPDBDirectory reader = new CifFileReader(cache.getPath());
 
 		// delete
 		reader.deleteStructure(pdbId);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/asa/TestAsaCalc.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/asa/TestAsaCalc.java
index 79598bd410..72a8fb57a0 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/asa/TestAsaCalc.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/asa/TestAsaCalc.java
@@ -28,10 +28,10 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.StructureTools;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
 import static org.junit.Assert.*;
 
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -116,7 +116,7 @@ public void testNeighborIndicesFinding() throws StructureException, IOException
 					}
 				}
 			}
-			
+
 //		for (int i = 0; i<nbs.length; i++) {
 //			double dist = asaCalc.getAtomCoords()[i].distance(asaCalc.getAtomCoords()[indexToTest]);
 //			if (listOfMatchingIndices.contains(i)) {
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestDifficultMmCIFFiles.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestDifficultMmCIFFiles.java
index 5007db9b43..81695918a9 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestDifficultMmCIFFiles.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestDifficultMmCIFFiles.java
@@ -44,9 +44,7 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
-import org.biojava.nbio.structure.io.mmcif.MMcifParser;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifConsumer;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
+import org.biojava.nbio.structure.io.cif.StructureConverter;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.junit.Test;
 
@@ -193,7 +191,7 @@ public void test4letterChains() throws IOException, StructureException, URISynta
 		assumeNotNull(file);
 		assumeTrue(file.exists());
 
-		MMCIFFileReader reader = new MMCIFFileReader();
+		CifFileReader reader = new CifFileReader();
 		Structure s = reader.getStructure(file);
 
 		assertNotNull("Failed to load structure from jar",s);
@@ -220,20 +218,10 @@ public void test4letterChains() throws IOException, StructureException, URISynta
 	@Test
 	public void testQuotingCornerCase () throws IOException {
 		InputStream inStream = this.getClass().getResourceAsStream("/org/biojava/nbio/structure/io/difficult_mmcif_quoting.cif");
-		MMcifParser parser = new SimpleMMcifParser();
-
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
 
 		FileParsingParameters fileParsingParams = new FileParsingParameters();
 		fileParsingParams.setAlignSeqRes(true);
-
-		consumer.setFileParsingParameters(fileParsingParams);
-
-		parser.addMMcifConsumer(consumer);
-
-		parser.parse(new BufferedReader(new InputStreamReader(inStream)));
-
-		Structure s = consumer.getStructure();
+		Structure s = StructureConverter.fromInputStream(inStream, fileParsingParams);
 
 		assertNotNull(s);
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java
index 9d4c764690..f447953a32 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java
@@ -33,11 +33,9 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.chem.ChemComp;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
-import org.biojava.nbio.structure.io.mmcif.MMcifParser;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifConsumer;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
+import org.biojava.nbio.structure.io.cif.StructureConverter;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -122,7 +120,7 @@ public void testAlignSeqres() throws StructureException, IOException {
 	// @Test
 	public void testSpeed() {
 		// Force using a file reader.
-		MMCIFFileReader fr = new MMCIFFileReader();
+		CifFileReader fr = new CifFileReader();
 		FileParsingParameters par = new FileParsingParameters();
 		//par.setAlignSeqRes(true);
 		// par.setHeaderOnly(true);
@@ -169,15 +167,9 @@ public void testSpeed2() throws StructureException, IOException {
 		double diff = (stop - start) / 1000000000.0;
 		logger.info(String.format("[%s] Elapsed time: %.3f s", s1.getIdentifier(), diff));
 
-		MMcifParser mmcifpars = new SimpleMMcifParser();
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-		consumer.setFileParsingParameters(params);
-		mmcifpars.addMMcifConsumer(consumer);
-
 		logger.info("Testing mmCIF parsing speed");
 		start = System.nanoTime();
-		mmcifpars.parse(cifStream) ;
-		Structure s2 = consumer.getStructure();
+		Structure s2 = StructureConverter.fromInputStream(cifStream, params);
 		stop = System.nanoTime();
 		diff = (stop - start) / 1000000000.0;
 		logger.info(String.format("[%s] Elapsed time: %.3f s", s2.getIdentifier(), diff));
@@ -269,7 +261,7 @@ public String getSequenceString(List<Group> seqres) {
 
 		for (Group g : seqres) {
 			ChemComp c = g.getChemComp();
-			sb.append(c.getOne_letter_code());
+			sb.append(c.getOneLetterCode());
 		}
 
 		return sb.toString();
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java
index f64d5595a5..31d4b86dd8 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java
@@ -44,12 +44,7 @@
 import org.biojava.nbio.structure.StructureImpl;
 import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.align.util.AtomCache;
-import org.biojava.nbio.structure.io.mmcif.MMCIFFileTools;
-import org.biojava.nbio.structure.io.mmcif.MMcifParser;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifConsumer;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
-import org.biojava.nbio.structure.io.mmcif.model.CIFLabel;
-import org.biojava.nbio.structure.io.mmcif.model.IgnoreField;
+import org.biojava.nbio.structure.io.cif.StructureConverter;
 import org.junit.Test;
 
 public class TestMMCIFWriting {
@@ -77,46 +72,6 @@ public void test1A2C() throws IOException, StructureException {
 		testRoundTrip("1A2C");
 	}
 
-	private static class DemoBean {
-		@IgnoreField
-		String not_a_field;
-
-		@SuppressWarnings("unused")//used by reflection
-		String default_field;
-
-		@CIFLabel(label="custom_label")
-		String custom_field;
-
-		public void setNot_a_field(String not_a_field) {
-			this.not_a_field = not_a_field;
-		}
-		public void setDefault_field(String default_field) {
-			this.default_field = default_field;
-		}
-		public void setCustom_field(String custom_field) {
-			this.custom_field = custom_field;
-		}
-	}
-
-	@Test
-	public void testBeanAnnotations() {
-		DemoBean bean = new DemoBean();
-		bean.setCustom_field("custom_field");
-		bean.setDefault_field(null);
-		bean.setNot_a_field("not_a_field");
-
-
-		// Test (1) should have custom_label (@CIFLabel)
-		//      (2) shouldn't have not_a_field (@IgnoreField)
-		String newline = System.getProperty("line.separator");
-		String mmcif = MMCIFFileTools.toMMCIF("_demo", bean);
-		String expected =
-				  "_demo.default_field   ?" + newline
-				+ "_demo.custom_label    custom_field" + newline
-				+ "#" + newline;
-		assertEquals(expected, mmcif);
-	}
-
 	private static void testRoundTrip(String pdbId) throws IOException, StructureException {
 		AtomCache cache = new AtomCache();
 
@@ -138,21 +93,9 @@ private static void testRoundTrip(String pdbId) throws IOException, StructureExc
 		fw.write(originalStruct.toMMCIF());
 		fw.close();
 
-
-		MMcifParser parser = new SimpleMMcifParser();
-
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-
 		FileParsingParameters fileParsingParams = new FileParsingParameters();
 		fileParsingParams.setAlignSeqRes(true);
-
-		consumer.setFileParsingParameters(fileParsingParams);
-
-		parser.addMMcifConsumer(consumer);
-
-		parser.parse(new BufferedReader(new FileReader(outputFile)));
-
-		Structure readStruct = consumer.getStructure();
+		Structure readStruct = StructureConverter.fromPath(outputFile.toPath(), params);
 
 		assertNotNull(readStruct);
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMmCIFSpecialCases.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMmCIFSpecialCases.java
deleted file mode 100644
index 95bb0c29b9..0000000000
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMmCIFSpecialCases.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io;
-
-//import static org.junit.Assert.*;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.StringReader;
-
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
-import org.junit.Test;
-
-public class TestMmCIFSpecialCases {
-
-	/**
-	 * This tests for cases where dots appear in integer fields.
-	 * Unusual but it happens in some PDB entries like 1s32
-	 * See issue https://github.com/biojava/biojava/issues/368
-	 * @throws IOException
-	 */
-	@Test
-	public void testDotsInIntFields() throws IOException {
-
-		// taken from 1s32
-		String mmcifStr =
-				"data_\n" +
-				"loop_\n" +
-				"_struct_ref_seq_dif.align_id\n" +
-				"_struct_ref_seq_dif.pdbx_pdb_id_code\n"+
-				"_struct_ref_seq_dif.mon_id\n"+
-				"_struct_ref_seq_dif.pdbx_pdb_strand_id\n"+
-				"_struct_ref_seq_dif.seq_num\n"+ // integer field that contains '.'
-				"_struct_ref_seq_dif.pdbx_seq_db_name\n"+
-				"_struct_ref_seq_dif.pdbx_seq_db_accession_code\n"+
-				"_struct_ref_seq_dif.db_mon_id\n"+
-				"_struct_ref_seq_dif.pdbx_seq_db_seq_num\n"+
-				"_struct_ref_seq_dif.details\n"+
-				"_struct_ref_seq_dif.pdbx_auth_seq_num\n"+
-				"_struct_ref_seq_dif.pdbx_pdb_ins_code\n"+
-				"_struct_ref_seq_dif.pdbx_ordinal\n"+
-				"1 1S32 . A . GB  30268544 MET 1 'INTIATING METHIONINE' ? ? 1\n"+
-				"2 1S32 . E . GB  30268544 MET 1 'INTIATING METHIONINE' ? ? 2\n"+
-				"3 1S32 . B . UNP P02304   MET 0 'INTIATING METHIONINE' ? ? 3\n"+
-				"4 1S32 . F . UNP P02304   MET 0 'INTIATING METHIONINE' ? ? 4\n"+
-				"5 1S32 . C . GB  30268540 MET 1 'INTIATING METHIONINE' ? ? 5\n"+
-				"6 1S32 . G . GB  30268540 MET 1 'INTIATING METHIONINE' ? ? 6\n"+
-				"7 1S32 . D . GB  30268542 MET 1 'INTIATING METHIONINE' ? ? 7\n"+
-				"8 1S32 . H . GB  30268542 MET 1 'INTIATING METHIONINE' ? ? 8" ;
-
-		SimpleMMcifParser parser = new SimpleMMcifParser();
-
-		BufferedReader buf = new BufferedReader(new StringReader(mmcifStr));
-
-		parser.parse(buf);
-
-		buf.close();
-
-		// nothing to assert, the test just makes sure it doesn't throw an exception
-
-
-	}
-
-}
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
index 2e9ecc6140..b0c7c8fe55 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
@@ -38,9 +38,7 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
-import org.biojava.nbio.structure.io.mmcif.MMcifParser;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifConsumer;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
+import org.biojava.nbio.structure.io.cif.StructureConverter;
 import org.biojava.nbio.structure.xtal.CrystalCell;
 import org.junit.Test;
 
@@ -207,20 +205,10 @@ private void checkChains(Structure s) {
 	@Test
 	public void testPhenixCifFile() throws IOException {
 		InputStream inStream = new GZIPInputStream(this.getClass().getResourceAsStream("/org/biojava/nbio/structure/io/4lup_phenix_output.cif.gz"));
-		MMcifParser parser = new SimpleMMcifParser();
-
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
 
 		FileParsingParameters fileParsingParams = new FileParsingParameters();
 		fileParsingParams.setAlignSeqRes(true);
-
-		consumer.setFileParsingParameters(fileParsingParams);
-
-		parser.addMMcifConsumer(consumer);
-
-		parser.parse(new BufferedReader(new InputStreamReader(inStream)));
-
-		Structure s = consumer.getStructure();
+		Structure s = StructureConverter.fromInputStream(inStream, fileParsingParams);
 
 		assertNotNull(s);
 
@@ -344,12 +332,7 @@ public void testNewLigandChain() throws IOException {
 		int expectedNumLigands = 1;
 		assertEquals(expectedNumLigands, c1.getAtomGroups().size());
 
-		MMcifParser mmcifpars = new SimpleMMcifParser();
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-		consumer.setFileParsingParameters(params);
-		mmcifpars.addMMcifConsumer(consumer);
-		mmcifpars.parse(cifStream) ;
-		Structure s2 = consumer.getStructure();
+		Structure s2 = StructureConverter.fromInputStream(cifStream, params);
 
 		// The chain B should be present with 1 ligand HEM
 		Chain c2 = s2.getNonPolyChainsByPDB("B").get(0);
@@ -389,11 +372,7 @@ public void testWaterOnlyChainCif() throws IOException {
 		// following file is cut-down versions of 4a10
 		InputStream cifStream = new GZIPInputStream(this.getClass().getResourceAsStream("/org/biojava/nbio/structure/io/4a10_short.cif.gz"));
 
-		MMcifParser mmcifpars = new SimpleMMcifParser();
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-		mmcifpars.addMMcifConsumer(consumer);
-		mmcifpars.parse(cifStream) ;
-		Structure s2 = consumer.getStructure();
+		Structure s2 = StructureConverter.fromInputStream(cifStream);
 
 
 		assertEquals(2, s2.getChains().size());
@@ -451,13 +430,7 @@ public void testStructureWithBranchedEntities() throws IOException {
 		URL url = new URL("https://raw.githubusercontent.com/pdbxmmcifwg/carbohydrate-extension/master/examples/models/1B5F-carb.cif");
 		InputStream inStream = url.openStream();
 
-		MMcifParser parser = new SimpleMMcifParser();
-
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-		parser.addMMcifConsumer(consumer);
-		parser.parse(new BufferedReader(new InputStreamReader(inStream)));
-
-		Structure structure = consumer.getStructure();
+		Structure structure = StructureConverter.fromInputStream(inStream);
 
 		assertEquals(7, structure.getEntityInfos().size());
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFLigands.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFLigands.java
index c97aed8d88..2a997118f2 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFLigands.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFLigands.java
@@ -31,9 +31,9 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.chem.PolymerType;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
+import org.biojava.nbio.structure.chem.PolymerType;
 import org.junit.Test;
 
 /**
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestChemCompProvider.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestChemCompProvider.java
index 4791f21fe7..89af60dc65 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestChemCompProvider.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestChemCompProvider.java
@@ -33,6 +33,8 @@
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.align.util.UserConfiguration;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.ZipChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.PDBFileReader;
 import org.junit.Test;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
index 780aad41c4..94a9a18fa5 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
@@ -30,6 +30,8 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.junit.Test;
 /**
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestBondFinding.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestBondFinding.java
index ab5268578c..9e850585b6 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestBondFinding.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestBondFinding.java
@@ -20,6 +20,8 @@
  */
 package org.biojava.nbio.structure.io.mmtf;
 
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
@@ -36,8 +38,6 @@
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
 
 /**
  * Test bond finding in BioJava
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java
index f787b1e908..96f9dd8c43 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java
@@ -39,12 +39,10 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.MMcifParser;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifConsumer;
-import org.biojava.nbio.structure.io.mmcif.SimpleMMcifParser;
+import org.biojava.nbio.structure.io.cif.StructureConverter;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyTransformation;
 import org.junit.Test;
@@ -76,7 +74,7 @@ public void testRoundTrip() throws IOException, StructureException {
 		params.setParseBioAssembly(true);
 		cache.setFileParsingParams(params);
 		cache.setUseMmCif(true);
-		
+
 		StructureIO.setAtomCache(cache);
 
 		ChemCompGroupFactory.setChemCompProvider(new DownloadChemCompProvider());
@@ -146,11 +144,11 @@ private boolean checkIfAtomsSame(Structure structOne, Structure structTwo) {
 						System.out.println(groupTwo.getPDBName() + " and type: "+groupTwo.getType());;
 					}
 					// Check the single letter amino acid is correct
-					if(groupOne.getChemComp().getOne_letter_code().length()==1 && groupTwo.getChemComp().getOne_letter_code().length()==1){
-						if(!groupOne.getChemComp().getOne_letter_code().equals(groupTwo.getChemComp().getOne_letter_code())){
+					if(groupOne.getChemComp().getOneLetterCode().length()==1 && groupTwo.getChemComp().getOneLetterCode().length()==1){
+						if(!groupOne.getChemComp().getOneLetterCode().equals(groupTwo.getChemComp().getOneLetterCode())){
 							System.out.println(groupOne.getPDBName());
 						}
-						assertEquals(groupOne.getChemComp().getOne_letter_code(), groupTwo.getChemComp().getOne_letter_code());
+						assertEquals(groupOne.getChemComp().getOneLetterCode(), groupTwo.getChemComp().getOneLetterCode());
 					}
 					assertEquals(groupOne.getType(), groupTwo.getType());
 					assertEquals(groupOne.getPDBName(), groupTwo.getPDBName());
@@ -307,7 +305,7 @@ private void checkSeqresGroups(Chain chainOne, Chain chainTwo) {
 			Group gTwo = chainTwo.getSeqResGroup(i);
 			assertNotNull(gOne.getChemComp());
 			assertNotNull(gTwo.getChemComp());
-			assertEquals(gOne.getChemComp().getOne_letter_code(), gTwo.getChemComp().getOne_letter_code());
+			assertEquals(gOne.getChemComp().getOneLetterCode(), gTwo.getChemComp().getOneLetterCode());
 
 			assertEquals(gOne.getResidueNumber(), gTwo.getResidueNumber());
 			//assertEquals(gOne.getPDBName(), gTwo.getPDBName());
@@ -361,13 +359,7 @@ public void testStructWithBranchedEntitiesRoundTrip() throws IOException {
 		URL url = new URL("https://raw.githubusercontent.com/pdbxmmcifwg/carbohydrate-extension/master/examples/models/1B5F-carb.cif");
 		InputStream inStream = url.openStream();
 
-		MMcifParser parser = new SimpleMMcifParser();
-
-		SimpleMMcifConsumer consumer = new SimpleMMcifConsumer();
-		parser.addMMcifConsumer(consumer);
-		parser.parse(new BufferedReader(new InputStreamReader(inStream)));
-
-		Structure structure = consumer.getStructure();
+		Structure structure = StructureConverter.fromInputStream(inStream);
 
 		AdapterToStructureData writerToEncoder = new AdapterToStructureData();
 		new MmtfStructureWriter(structure, writerToEncoder);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java
index ac2d81e8d5..0bed40a6be 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java
@@ -11,16 +11,16 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
 import org.junit.Ignore;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 /**
  * Test the Biojava MMTF reader.
- * 
+ *
  * @author Anthony Bradley
  * @author Aleix Lafita
  *
@@ -32,50 +32,50 @@ public class TestMmtfStructureReader {
 	 */
 	@Test
 	public void testRead() throws IOException {
-		
+
 		// Get the MMTF file from the resources folder
 		ClassLoader classLoader = getClass().getClassLoader();
 		String resource = "org/biojava/nbio/structure/io/mmtf/4CUP.mmtf";
-		
+
 		// Load the structure into memory
 		Structure structure = MmtfActions.readFromFile((
 				Paths.get(classLoader.getResource(resource).getPath())));
-		
+
 		// Check header properties of the structure
 		assertEquals(structure.getPDBCode(), "4CUP");
-		assertEquals(MmtfUtils.dateToIsoString(structure.getPDBHeader().getDepDate()), 
+		assertEquals(MmtfUtils.dateToIsoString(structure.getPDBHeader().getDepDate()),
 				"2014-03-21");
-		
+
 		assertEquals(structure.getChains().size(), 6);
 	}
-	
+
 	/**
 	 * Compare structures loaded from MMCIF and MMTF files.
 	 */
 	@Test
 	public void compareMmcif() throws IOException, StructureException {
-		
+
 		// Get the MMTF and MMCIF files from the resources folder
 		ClassLoader classLoader = getClass().getClassLoader();
 		String resource = "org/biojava/nbio/structure/io/mmtf/4CUP";
-		
+
 		// Load the structures into memory
 		Structure mmtf = MmtfActions.readFromFile((
 				Paths.get(classLoader.getResource(resource + ".mmtf").getPath())));
 		Structure mmcif = StructureIO.getStructure(classLoader.getResource(resource + ".cif").getPath());
-		
+
 		// Compare the dates of the structure
-		assertEquals(mmcif.getPDBHeader().getDepDate(), 
+		assertEquals(mmcif.getPDBHeader().getDepDate(),
 				mmtf.getPDBHeader().getDepDate());
-		
+
 		// Compare the experimental method
-		assertEquals(mmcif.getPDBHeader().getExperimentalTechniques(), 
+		assertEquals(mmcif.getPDBHeader().getExperimentalTechniques(),
 				mmtf.getPDBHeader().getExperimentalTechniques());
-		
+
 		// Compare the SEQRES, see issue https://github.com/biojava/biojava/issues/671
-		assertEquals(mmcif.getChainByIndex(0).getSeqResSequence(), 
+		assertEquals(mmcif.getChainByIndex(0).getSeqResSequence(),
 				mmtf.getChainByIndex(0).getSeqResSequence());
-		
+
 	}
 
 	/**
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureWriter.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureWriter.java
index 6f98b250d3..efc9929916 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureWriter.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureWriter.java
@@ -37,7 +37,7 @@
 import org.biojava.nbio.structure.ResidueNumber;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureImpl;
-import org.biojava.nbio.structure.io.mmcif.model.ChemComp;
+import org.biojava.nbio.structure.chem.ChemComp;
 import org.junit.Rule;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -95,7 +95,7 @@ public void testWrite() throws IOException {
 		group.setPDBName("FKF");
 		ChemComp chemComp = new ChemComp();
 		chemComp.setType("TYPfdl");
-		chemComp.setOne_letter_code("A");
+		chemComp.setOneLetterCode("A");
 		group.setChemComp(chemComp);
 
 		// Create one Atom
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/redmine/Test1DARSeqAlign.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/redmine/Test1DARSeqAlign.java
index 4f351d3c74..0aefbc5713 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/redmine/Test1DARSeqAlign.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/redmine/Test1DARSeqAlign.java
@@ -23,10 +23,10 @@
 
 import org.biojava.nbio.structure.*;
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.ChemCompProvider;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.ChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
@@ -50,7 +50,7 @@ public void test1DAR() throws StructureException, IOException {
 
 		boolean usingReducedChemCompProvider = false;
 
-		ChemCompProvider ccp =ChemCompGroupFactory.getChemCompProvider();
+		ChemCompProvider ccp = ChemCompGroupFactory.getChemCompProvider();
 		if (ccp.getClass().getName().contains("ReducedChemCompProvider") ) {
 			usingReducedChemCompProvider = true;
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/test/util/GlobalsHelper.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/test/util/GlobalsHelper.java
index 9d7e5ae57d..0d5766d8f9 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/test/util/GlobalsHelper.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/test/util/GlobalsHelper.java
@@ -28,9 +28,9 @@
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.structure.io.mmcif.ChemCompGroupFactory;
-import org.biojava.nbio.structure.io.mmcif.ChemCompProvider;
-import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.ChemCompProvider;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.scop.ScopDatabase;
 import org.biojava.nbio.structure.scop.ScopFactory;
 

From b992e74865f878dd054e367e1a3bb05ae6897707 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Mon, 25 Jan 2021 11:14:35 -0800
Subject: [PATCH 018/599] metal parsing

---
 .../nbio/structure/io/cif/MetalBondConsumerImpl.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java
index 28833bc559..d9d03a9590 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java
@@ -31,10 +31,10 @@ public void finish() {
 
     @Override
     public void consume(Category category) {
-        StrColumn atomType1 = (StrColumn) category.getColumn("");
-        StrColumn atomType2 = (StrColumn) category.getColumn("");
-        FloatColumn lowerLimit = (FloatColumn) category.getColumn("");
-        FloatColumn upperLimit = (FloatColumn) category.getColumn("");
+        StrColumn atomType1 = (StrColumn) category.getColumn("atom_type_1");
+        StrColumn atomType2 = (StrColumn) category.getColumn("atom_type_2");
+        FloatColumn lowerLimit = (FloatColumn) category.getColumn("lower_limit");
+        FloatColumn upperLimit = (FloatColumn) category.getColumn("upper_limit");
         for (int i = 0; i < category.getRowCount(); i++) {
             MetalBondDistance d = new MetalBondDistance();
 

From 61bd8e8f51479951d4dd13b661f58b0f9c56c0b9 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Mon, 25 Jan 2021 12:50:40 -0800
Subject: [PATCH 019/599] new filetype param

---
 .../structure/test/StructureToolsTest.java    |   4 +-
 .../biojava/nbio/structure/test/Test1o2f.java |   3 +-
 .../test/io/TestAtomCachePerformance.java     |   5 +-
 .../structure/test/io/TestBioassemblies.java  |   9 +-
 .../test/io/TestCrystallographicMetadata.java |   7 +-
 .../test/io/TestLongPdbVsMmCifParsing.java    |   4 +-
 .../io/TestStructWithMultiparentChemComp.java |   3 +-
 .../TestQuatSymmetryDetectorExamples.java     |   9 +-
 .../test/xtal/TestCrystalBuilder.java         |  17 +-
 .../main/java/demo/DemoQuatSymmetryJmol.java  |   3 +-
 .../main/java/demo/DemoShowLargeAssembly.java |   3 +-
 .../src/main/java/demo/DemoAsa.java           |   3 +-
 .../src/main/java/demo/DemoContacts.java      |   2 +-
 .../main/java/demo/DemoCrystalInterfaces.java |   5 +-
 .../src/main/java/demo/DemoLoadSecStruc.java  |   3 +-
 .../src/main/java/demo/DemoMMCIFReader.java   |   5 +-
 .../nbio/structure/StructureFiletype.java     |  36 ++++
 .../biojava/nbio/structure/StructureIO.java   |  85 ++------
 .../biojava/nbio/structure/URLIdentifier.java |  74 +++----
 .../nbio/structure/align/util/AtomCache.java  | 198 +++++++-----------
 .../align/util/UserConfiguration.java         | 166 ++++++---------
 .../biojava/nbio/structure/chem/ChemComp.java |   3 +-
 .../nbio/structure/io/mmtf/MmtfUtils.java     |   5 +-
 .../org/biojava/nbio/structure/Test2JA5.java  |   4 +-
 .../biojava/nbio/structure/TestAltLocs.java   |  14 +-
 .../biojava/nbio/structure/TestAtomCache.java |  36 ++--
 .../org/biojava/nbio/structure/TestBond.java  |   2 +-
 .../biojava/nbio/structure/TestCloning.java   |   2 +-
 .../structure/TestEntityResIndexMapping.java  |   4 +-
 .../structure/TestExperimentalTechniques.java |  16 +-
 .../structure/TestLoadStructureFromURL.java   |   3 +-
 .../nbio/structure/TestParsingCalcium.java    |   2 +-
 .../TestStructureCrossReferences.java         |   8 +-
 .../structure/align/util/AtomCacheTest.java   |   5 +-
 .../structure/io/TestDifficultMmCIFFiles.java |  13 +-
 .../nbio/structure/io/TestHardBioUnits.java   |   4 +-
 .../nbio/structure/io/TestHeaderOnly.java     |   9 +-
 .../nbio/structure/io/TestMMCIFWriting.java   |   3 +-
 .../io/TestMMcifOrganismParsing.java          |   3 +-
 .../structure/io/TestNonDepositedFiles.java   |   3 +-
 .../structure/io/TestParseMmCIFFeatures.java  |   9 +-
 .../structure/io/TestParseMmCIFLigands.java   |   9 +-
 .../nbio/structure/io/TestParseOnAsymId.java  |   3 +-
 .../io/TestQuaternaryStructureProviders.java  |   8 +-
 .../nbio/structure/io/TestTitleParsing.java   |   5 +-
 .../io/TestWriteLargeCoordinatePDB.java       |   3 +-
 .../io/mmcif/TestChemCompProvider.java        |   6 +-
 .../io/mmcif/TestEntityNameAndType.java       |   3 +-
 .../io/mmcif/TestParseInternalChainId.java    |   3 +-
 .../io/mmcif/TestParseMmcifHeader.java        |   3 +-
 .../structure/io/mmtf/TestBondFinding.java    |   3 +-
 .../structure/io/mmtf/TestMmtfRoundTrip.java  |   3 +-
 .../io/mmtf/TestMmtfStructureReader.java      |   4 +-
 .../nbio/structure/xtal/TestCrystalInfo.java  |  16 +-
 .../xtal/TestInterfaceClustering.java         |   5 +-
 55 files changed, 392 insertions(+), 474 deletions(-)
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/StructureFiletype.java

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/StructureToolsTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/StructureToolsTest.java
index 170694a6e2..510b071200 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/StructureToolsTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/StructureToolsTest.java
@@ -186,12 +186,12 @@ public void testCAmmCIF() throws StructureException {
 
 		//mmCIF files left justify their atom names (eg "CA  "), so can have different behavior
 		AtomCache pdbCache = new AtomCache();
-		pdbCache.setUseMmCif(false);
+		pdbCache.setFiletype(StructureFiletype.PDB);
 		FileParsingParameters params = new FileParsingParameters();
 		pdbCache.setFileParsingParams(params);
 
 		AtomCache mmcifCache = new AtomCache();
-		mmcifCache.setUseMmCif(true);
+		mmcifCache.setFiletype(StructureFiletype.CIF);
 		FileParsingParameters params2 = new FileParsingParameters();
 		mmcifCache.setFileParsingParams(params2);
 
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1o2f.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1o2f.java
index 7acde4166e..af1ec695f7 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1o2f.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1o2f.java
@@ -22,6 +22,7 @@
 
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
@@ -38,7 +39,7 @@ public class Test1o2f {
 	@Before
 	public void setUp() throws Exception {
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		cache.setFetchBehavior(FetchBehavior.FETCH_FILES);
 		StructureIO.setAtomCache(cache);
 		String pdbId = "1O2F";
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestAtomCachePerformance.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestAtomCachePerformance.java
index 7df8c8bb10..03bf297484 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestAtomCachePerformance.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestAtomCachePerformance.java
@@ -22,6 +22,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
 import org.junit.BeforeClass;
@@ -94,14 +95,14 @@ public void testDownload() throws IOException, StructureException {
 	}
 
 	private Structure getCifStructure(String pdbId) throws IOException, StructureException {
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		return cache.getStructure(pdbId);
 
 	}
 
 	private Structure getPdbStructure(String pdbId) throws IOException, StructureException {
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 
 		return cache.getStructure(pdbId);
 
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBioassemblies.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBioassemblies.java
index 23a73a7ae8..001dd5434e 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBioassemblies.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBioassemblies.java
@@ -28,6 +28,7 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
@@ -47,7 +48,7 @@ public void test1E17() throws IOException, StructureException {
 		AtomCache prevAtomCache = StructureIO.getAtomCache();
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 
 		List<Structure> multiModelBioAssemblies = StructureIO.getBiologicalAssemblies("1E17", true);
@@ -79,7 +80,7 @@ public void test4TTX() throws IOException, StructureException {
 
 		AtomCache prevAtomCache = StructureIO.getAtomCache();
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 
 		List<Structure> multiModelBioAssemblies = StructureIO.getBiologicalAssemblies("4TTX", true);
@@ -124,7 +125,7 @@ public void test1M4X() throws IOException, StructureException {
 
 		AtomCache prevAtomCache = StructureIO.getAtomCache();
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 
 		Structure flattenedBioAssembly5 = StructureIO.getBiologicalAssembly("1M4X" , 5);
@@ -153,7 +154,7 @@ public void test4OPJ() throws IOException, StructureException {
 
 		AtomCache prevAtomCache = StructureIO.getAtomCache();
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 
 		List<Structure> multiModelBioAssemblies = StructureIO.getBiologicalAssemblies("4OPJ", true);
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java
index 26f83b7a28..c41ac34410 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java
@@ -20,6 +20,7 @@
  */
 package org.biojava.nbio.structure.test.io;
 
+import org.biojava.nbio.structure.StructureFiletype;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
@@ -46,7 +47,7 @@ public void test4hhb() throws Exception {
 
 		AtomCache cache = new AtomCache();
 		// at the moment implemented only in mmcif
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 
 		Structure s = StructureIO.getStructure("4hhb");
@@ -64,7 +65,7 @@ public void test1smt() throws Exception {
 
 		AtomCache cache = new AtomCache();
 		// at the moment implemented only in mmcif
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 
 		Structure s = StructureIO.getStructure("1smt");
@@ -82,7 +83,7 @@ public void test1smt() throws Exception {
 	public void test1zna() throws Exception {
 		AtomCache cache = new AtomCache();
 		// at the moment implemented only in mmcif
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 
 		Structure s = StructureIO.getStructure("1zna");
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestLongPdbVsMmCifParsing.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestLongPdbVsMmCifParsing.java
index daadcc7023..fc529b75e3 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestLongPdbVsMmCifParsing.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestLongPdbVsMmCifParsing.java
@@ -567,7 +567,7 @@ private void testSingleChain(Chain cPdb, Chain cCif) {
 
 
 	private Structure getPdbStructure(String pdbId) throws IOException, StructureException {
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		// set parsing params here:
 		params.setAlignSeqRes(true);
 		//params.setLoadChemCompInfo(true);
@@ -578,7 +578,7 @@ private Structure getPdbStructure(String pdbId) throws IOException, StructureExc
 	}
 
 	private Structure getCifStructure(String pdbId) throws IOException, StructureException {
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		// set parsing params here:
 		params.setAlignSeqRes(true);
 		//params.setLoadChemCompInfo(true);
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestStructWithMultiparentChemComp.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestStructWithMultiparentChemComp.java
index cbedb5b108..83059e7ea4 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestStructWithMultiparentChemComp.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestStructWithMultiparentChemComp.java
@@ -20,6 +20,7 @@
  */
 package org.biojava.nbio.structure.test.io;
 
+import org.biojava.nbio.structure.StructureFiletype;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
@@ -35,7 +36,7 @@ public class TestStructWithMultiparentChemComp {
 	public void test4Q7U() throws Exception {
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 
 		Structure s = StructureIO.getStructure("4q7u");
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java
index b5a8a5a2e1..3c153cde22 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java
@@ -27,6 +27,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.align.util.AtomCache;
@@ -146,7 +147,7 @@ public void testPseudosymmetry() throws IOException, StructureException {
 	public void testLocal() throws IOException, StructureException {
 
 		AtomCache atomCache = new AtomCache();
-		atomCache.setUseMmtf(true);
+		atomCache.setFiletype(StructureFiletype.MMTF);
 
 		List<String> testIds = new ArrayList<>();
 		List<String> testStoichiometries = new ArrayList<>();
@@ -376,8 +377,7 @@ public void testPseudoIdentity95() throws IOException, StructureException {
 	@Test
 	public void testSymDetectionWithClusteringByEntityId() throws IOException, StructureException {
 		AtomCache cache = new AtomCache();
-		cache.setUseMmtf(false);
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		FileParsingParameters params = new FileParsingParameters();
 		params.setAlignSeqRes(true);
 		cache.setFileParsingParams(params);
@@ -404,8 +404,7 @@ public void testSymDetectionWithClusteringByEntityId() throws IOException, Struc
 	@Test
 	public void testSymDetectionPerformanceLargeCapsid() throws IOException, StructureException {
 		AtomCache cache = new AtomCache();
-		cache.setUseMmtf(false);
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		FileParsingParameters params = new FileParsingParameters();
 		params.setAlignSeqRes(true);
 		params.setParseBioAssembly(true);
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/xtal/TestCrystalBuilder.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/xtal/TestCrystalBuilder.java
index 898e108a8e..4851c03ba9 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/xtal/TestCrystalBuilder.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/xtal/TestCrystalBuilder.java
@@ -22,6 +22,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.contact.StructureInterfaceList;
@@ -46,7 +47,7 @@ public void test1NMR() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s1 = StructureIO.getStructure("1NMR");
 
 		CrystalBuilder cb = new CrystalBuilder(s1);
@@ -64,7 +65,7 @@ public void test1B8G() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s1 = StructureIO.getStructure("1B8G");
 		CrystalBuilder cb = new CrystalBuilder(s1);
 		StructureInterfaceList interfaces = cb.getUniqueInterfaces(5.5);
@@ -82,7 +83,7 @@ public void test2MFZ() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s1 = StructureIO.getStructure("2MFZ");
 		CrystalBuilder cb = new CrystalBuilder(s1);
 		StructureInterfaceList interfaces = cb.getUniqueInterfaces(5.5);
@@ -99,7 +100,7 @@ public void test4MF8() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s1 = StructureIO.getStructure("4MF8");
 		CrystalBuilder cb = new CrystalBuilder(s1);
 		StructureInterfaceList interfaces = cb.getUniqueInterfaces(5.5);
@@ -112,7 +113,7 @@ public void test1AUY() throws IOException, StructureException {
 		// a virus with NCS operators
 		AtomCache cache = new AtomCache();
 		StructureIO.setAtomCache(cache);
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s1 = StructureIO.getStructure("1AUY");
 
 		Map<String,Matrix4d> chainNcsOps = new HashMap<>();
@@ -139,7 +140,7 @@ public void test1A37() throws IOException, StructureException {
 		// a smaller structure with NCS operators
 		AtomCache cache = new AtomCache();
 		StructureIO.setAtomCache(cache);
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s1 = StructureIO.getStructure("1A37");
 
 		Map<String,Matrix4d> chainNcsOps = new HashMap<>();
@@ -164,7 +165,7 @@ public void test2H2Z() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s1 = StructureIO.getStructure("2H2Z");
 		CrystalBuilder cb = new CrystalBuilder(s1);
 		StructureInterfaceList interfaces = cb.getUniqueInterfaces(5.5);
@@ -181,7 +182,7 @@ public void test4HHB() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s1 = StructureIO.getStructure("4HHB");
 		CrystalBuilder cb = new CrystalBuilder(s1);
 		StructureInterfaceList interfaces = cb.getUniqueInterfaces(5.5);
diff --git a/biojava-structure-gui/src/main/java/demo/DemoQuatSymmetryJmol.java b/biojava-structure-gui/src/main/java/demo/DemoQuatSymmetryJmol.java
index deadf35e43..674c846d4a 100644
--- a/biojava-structure-gui/src/main/java/demo/DemoQuatSymmetryJmol.java
+++ b/biojava-structure-gui/src/main/java/demo/DemoQuatSymmetryJmol.java
@@ -22,6 +22,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.cluster.SubunitClustererMethod;
 import org.biojava.nbio.structure.cluster.SubunitClustererParameters;
@@ -65,7 +66,7 @@ public static void main(String[] args) throws IOException,
 
 		// Download the biological assembly
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure structure = cache.getStructure("BIO:" + name + ":1");
 
 		QuatSymmetryParameters sp = new QuatSymmetryParameters();
diff --git a/biojava-structure-gui/src/main/java/demo/DemoShowLargeAssembly.java b/biojava-structure-gui/src/main/java/demo/DemoShowLargeAssembly.java
index c626e90f8a..4aa053e70a 100644
--- a/biojava-structure-gui/src/main/java/demo/DemoShowLargeAssembly.java
+++ b/biojava-structure-gui/src/main/java/demo/DemoShowLargeAssembly.java
@@ -1,6 +1,7 @@
 package demo;
 
 import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.FileParsingParameters;
@@ -77,7 +78,7 @@ public static Structure  readStructure(String pdbId, int bioAssemblyId) {
 		// we just need this to track where to store PDB files
 		// this checks the PDB_DIR property (and uses a tmp location if not set)
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		FileParsingParameters p = cache.getFileParsingParams();
 
 		// some bio assemblies are large, we want an all atom representation and avoid
diff --git a/biojava-structure/src/main/java/demo/DemoAsa.java b/biojava-structure/src/main/java/demo/DemoAsa.java
index caeacbd5d0..1df3d9feeb 100644
--- a/biojava-structure/src/main/java/demo/DemoAsa.java
+++ b/biojava-structure/src/main/java/demo/DemoAsa.java
@@ -24,6 +24,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.asa.AsaCalculator;
@@ -46,7 +47,7 @@ public static void main(String[] args) throws IOException, StructureException {
 	private static void demoAsa(String pdbCode, int numThreads) throws IOException, StructureException {
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		StructureIO.setAtomCache(cache);
 
diff --git a/biojava-structure/src/main/java/demo/DemoContacts.java b/biojava-structure/src/main/java/demo/DemoContacts.java
index 0d2d95ab82..0eed99e807 100644
--- a/biojava-structure/src/main/java/demo/DemoContacts.java
+++ b/biojava-structure/src/main/java/demo/DemoContacts.java
@@ -42,7 +42,7 @@ public static void main(String[] args) throws IOException, StructureException {
 	private static void demoContacts(String pdbCode) throws IOException, StructureException {
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		StructureIO.setAtomCache(cache);
 
diff --git a/biojava-structure/src/main/java/demo/DemoCrystalInterfaces.java b/biojava-structure/src/main/java/demo/DemoCrystalInterfaces.java
index caeef006ed..76fd4f6823 100644
--- a/biojava-structure/src/main/java/demo/DemoCrystalInterfaces.java
+++ b/biojava-structure/src/main/java/demo/DemoCrystalInterfaces.java
@@ -23,6 +23,7 @@
 
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.contact.*;
 import org.biojava.nbio.structure.io.FileParsingParameters;
@@ -60,12 +61,10 @@ public class DemoCrystalInterfaces {
 	 * @param args
 	 */
 	public static void main(String[] args) throws Exception {
-
-
 		String pdbCode = "1smt";
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		FileParsingParameters params = new FileParsingParameters();
 		params.setAlignSeqRes(true);
diff --git a/biojava-structure/src/main/java/demo/DemoLoadSecStruc.java b/biojava-structure/src/main/java/demo/DemoLoadSecStruc.java
index 8684ba1257..e0efc501c7 100644
--- a/biojava-structure/src/main/java/demo/DemoLoadSecStruc.java
+++ b/biojava-structure/src/main/java/demo/DemoLoadSecStruc.java
@@ -25,6 +25,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.secstruc.DSSPParser;
@@ -55,7 +56,7 @@ public static void main(String[] args) throws IOException,
 		cache.setFileParsingParams(params);
 
 		// Use PDB format, because SS cannot be parsed from mmCIF yet
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		// The loaded Structure contains the SS assigned by Author (simple)
 		Structure s = cache.getStructure(pdbID);
diff --git a/biojava-structure/src/main/java/demo/DemoMMCIFReader.java b/biojava-structure/src/main/java/demo/DemoMMCIFReader.java
index b94dbd2e19..e6b5eab186 100644
--- a/biojava-structure/src/main/java/demo/DemoMMCIFReader.java
+++ b/biojava-structure/src/main/java/demo/DemoMMCIFReader.java
@@ -57,15 +57,12 @@ public void loadSimple(){
 		String pdbId = "4hhb";
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		StructureIO.setAtomCache(cache);
-
 		try {
 			Structure s = StructureIO.getStructure(pdbId);
-
 			System.out.println(pdbId + " has nr atoms: " + StructureTools.getNrAtoms(s));
-
 		} catch (Exception e){
 			e.printStackTrace();
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureFiletype.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureFiletype.java
new file mode 100644
index 0000000000..6d56257f24
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureFiletype.java
@@ -0,0 +1,36 @@
+package org.biojava.nbio.structure;
+
+import org.biojava.nbio.structure.io.BcifFileReader;
+import org.biojava.nbio.structure.io.CifFileReader;
+import org.biojava.nbio.structure.io.MMTFFileReader;
+import org.biojava.nbio.structure.io.PDBFileReader;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * An enum of supported file formats.
+ */
+public enum StructureFiletype {
+    PDB(new PDBFileReader().getExtensions()),
+    CIF(new CifFileReader().getExtensions()),
+    BCIF(new BcifFileReader().getExtensions()),
+    MMTF(new MMTFFileReader().getExtensions()),
+    UNKNOWN(Collections.emptyList());
+
+    private final List<String> extensions;
+
+    /**
+     * @param extensions List of supported extensions, including leading period
+     */
+    StructureFiletype(List<String> extensions) {
+        this.extensions = extensions;
+    }
+
+    /**
+     * @return a list of file extensions associated with this type
+     */
+    public List<String> getExtensions() {
+        return extensions;
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
index e0592dfae3..fb2967b101 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
@@ -20,16 +20,11 @@
  */
 package org.biojava.nbio.structure;
 
+import org.biojava.nbio.structure.align.util.AtomCache;
+
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 
-import org.biojava.nbio.structure.align.util.AtomCache;
-import org.biojava.nbio.structure.io.BcifFileReader;
-import org.biojava.nbio.structure.io.CifFileReader;
-import org.biojava.nbio.structure.io.PDBFileReader;
-import org.rcsb.cif.binary.BinaryCifReader;
-
 /**
  * A class that provides static access methods for easy lookup of protein structure related components
  *
@@ -38,12 +33,8 @@
  * @since 3.0.5
  */
 public class StructureIO {
-
-	//private static final Logger logger = LoggerFactory.getLogger(StructureIO.class);
-
 	private static AtomCache cache ;
 
-
 	/**
 	 * Loads a structure based on a name. Supported naming conventions are:
 	 *
@@ -94,22 +85,16 @@ public class StructureIO {
 	 * @throws StructureException The name appeared valid but did not correspond to a structure.
 	 * 	Also thrown by some submethods upon errors, eg for poorly formatted subranges.
 	 */
-	public static Structure getStructure(String name) throws IOException, StructureException{
-
+	public static Structure getStructure(String name) throws IOException, StructureException {
 		checkInitAtomCache();
-
 		// delegate this functionality to AtomCache...
-
 		return cache.getStructure(name);
-
 	}
 
-
 	private static void checkInitAtomCache() {
-		if ( cache == null){
+		if (cache == null) {
 			cache = new AtomCache();
 		}
-
 	}
 
 	public static void setAtomCache(AtomCache c){
@@ -121,7 +106,6 @@ public static AtomCache getAtomCache() {
 		return cache;
 	}
 
-
 	/**
 	 * Returns the first biological assembly that is available for the given PDB id.
 	 * <p>
@@ -146,15 +130,10 @@ public static AtomCache getAtomCache() {
 	 * @throws StructureException
 	 * @throws IOException
 	 */
-	public static Structure getBiologicalAssembly(String pdbId, boolean multiModel) throws IOException, StructureException{
-
+	public static Structure getBiologicalAssembly(String pdbId, boolean multiModel) throws IOException, StructureException {
 		checkInitAtomCache();
-
 		pdbId = pdbId.toLowerCase();
-
-		Structure s = cache.getBiologicalAssembly(pdbId, multiModel);
-
-		return s;
+		return cache.getBiologicalAssembly(pdbId, multiModel);
 	}
 
 	/**
@@ -170,7 +149,7 @@ public static Structure getBiologicalAssembly(String pdbId, boolean multiModel)
 	 * @throws StructureException
 	 * @throws IOException
 	 */
-	public static Structure getBiologicalAssembly(String pdbId) throws IOException, StructureException{
+	public static Structure getBiologicalAssembly(String pdbId) throws IOException, StructureException {
 		return getBiologicalAssembly(pdbId, AtomCache.DEFAULT_BIOASSEMBLY_STYLE);
 	}
 
@@ -195,14 +174,9 @@ public static Structure getBiologicalAssembly(String pdbId) throws IOException,
 	 * @throws IOException
 	 */
 	public static Structure getBiologicalAssembly(String pdbId, int biolAssemblyNr, boolean multiModel) throws IOException, StructureException {
-
 		checkInitAtomCache();
-
 		pdbId = pdbId.toLowerCase();
-
-		Structure s = cache.getBiologicalAssembly(pdbId, biolAssemblyNr, multiModel);
-
-		return s;
+		return cache.getBiologicalAssembly(pdbId, biolAssemblyNr, multiModel);
 	}
 
 	/**
@@ -218,7 +192,6 @@ public static Structure getBiologicalAssembly(String pdbId, int biolAssemblyNr)
 		return getBiologicalAssembly(pdbId, biolAssemblyNr, AtomCache.DEFAULT_BIOASSEMBLY_STYLE);
 	}
 
-
 	/**
 	 * Returns all biological assemblies for the given PDB id.
 	 * <p>
@@ -241,15 +214,9 @@ public static Structure getBiologicalAssembly(String pdbId, int biolAssemblyNr)
 	 * @since 5.0
 	 */
 	public static List<Structure> getBiologicalAssemblies(String pdbId, boolean multiModel) throws IOException, StructureException {
-
 		checkInitAtomCache();
-
 		pdbId = pdbId.toLowerCase();
-
-		List<Structure> s = cache.getBiologicalAssemblies(pdbId, multiModel);
-
-		return s;
-
+		return cache.getBiologicalAssemblies(pdbId, multiModel);
 	}
 
 	/**
@@ -267,7 +234,6 @@ public static List<Structure> getBiologicalAssemblies(String pdbId) throws IOExc
 		return getBiologicalAssemblies(pdbId, AtomCache.DEFAULT_BIOASSEMBLY_STYLE);
 	}
 
-
 	private static final String FILE_SEPARATOR = System.getProperty("file.separator");
 
 	/**
@@ -275,34 +241,11 @@ public static List<Structure> getBiologicalAssemblies(String pdbId) throws IOExc
 	 *
 	 * @param pathToPDBFiles
 	 */
-	public static void setPdbPath(String pathToPDBFiles){
-
-		if ( ! pathToPDBFiles.endsWith(FILE_SEPARATOR))
+	public static void setPdbPath(String pathToPDBFiles) {
+		if (!pathToPDBFiles.endsWith(FILE_SEPARATOR))
 			pathToPDBFiles += FILE_SEPARATOR;
 	}
 
-
-	public static enum StructureFiletype {
-		PDB( (new PDBFileReader()).getExtensions()),
-		CIF(new CifFileReader().getExtensions()),
-		BCIF(new BcifFileReader().getExtensions()),
-		UNKNOWN(Collections.<String>emptyList());
-
-		private List<String> extensions;
-		/**
-		 * @param extensions List of supported extensions, including leading period
-		 */
-		private StructureFiletype(List<String> extensions) {
-			this.extensions = extensions;
-		}
-		/**
-		 * @return a list of file extensions associated with this type
-		 */
-		public List<String> getExtensions() {
-			return extensions;
-		}
-	}
-
 	/**
 	 * Attempts to guess the type of a structure file based on the extension
 	 * @param filename
@@ -310,9 +253,9 @@ public List<String> getExtensions() {
 	 */
 	public static StructureFiletype guessFiletype(String filename) {
 		String lower = filename.toLowerCase();
-		for(StructureFiletype type : StructureFiletype.values()) {
-			for(String ext : type.getExtensions()) {
-				if(lower.endsWith(ext.toLowerCase())) {
+		for (StructureFiletype type : StructureFiletype.values()) {
+			for (String ext : type.getExtensions()) {
+				if (lower.endsWith(ext.toLowerCase())) {
 					return type;
 				}
 			}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
index a36e93b508..00b624d95f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
@@ -20,10 +20,11 @@
  */
 package org.biojava.nbio.structure;
 
-import org.biojava.nbio.structure.StructureIO.StructureFiletype;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.PDBFileReader;
 import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.mmtf.MmtfActions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,13 +58,11 @@
  *
  */
 public class URLIdentifier implements StructureIdentifier {
-
 	private static final long serialVersionUID = -5161230822868926035L;
-
 	private static final Logger logger = LoggerFactory.getLogger(URLIdentifier.class);
 
 	// Used for guessing the PDB ID from the filename
-	private static final Pattern PDBID_REGEX = Pattern.compile("^([0-9][a-z0-9]{3})([._-]|\\s).*",Pattern.CASE_INSENSITIVE);
+	private static final Pattern PDBID_REGEX = Pattern.compile("^([0-9][a-z0-9]{3})([._-]|\\s).*", Pattern.CASE_INSENSITIVE);
 
 	/** URL parameter specifying the file format (PDB or CIF) */
 	public static final String FORMAT_PARAM = "format";
@@ -73,7 +72,8 @@ public class URLIdentifier implements StructureIdentifier {
 
 	//TODO: should this get renamed to chainname or asymid?
 	public static final String CHAINID_PARAM = "chainid";
-	/** URL parameter specifying residue ranges to include, e.g. <tt>residues=A:1-70</tt>
+	/**
+	 * URL parameter specifying residue ranges to include, e.g. <tt>residues=A:1-70</tt>
 	 * @see SubstructureIdentifier
 	 */
 	public static final String RESIDUES_PARAM = "residues";
@@ -90,6 +90,7 @@ public URLIdentifier(String url) throws MalformedURLException {
 	public URL getURL() {
 		return url;
 	}
+
 	@Override
 	public String getIdentifier() {
 		return url.toString();
@@ -104,20 +105,20 @@ public SubstructureIdentifier toCanonical() {
 		List<ResidueRange> ranges = Collections.emptyList();
 		try {
 			Map<String, String> params = parseQuery(url);
-			if(params.containsKey(PDBID_PARAM)) {
+			if (params.containsKey(PDBID_PARAM)) {
 				pdbId = params.get(PDBID_PARAM);
 			}
-			if(params.containsKey(RESIDUES_PARAM)) {
+			if (params.containsKey(RESIDUES_PARAM)) {
 				ranges = ResidueRange.parseMultiple(params.get(RESIDUES_PARAM));
-			} else if(params.containsKey(CHAINID_PARAM)) {
-				ranges = Arrays.asList(new ResidueRange(params.get(CHAINID_PARAM),(ResidueNumber)null,(ResidueNumber)null));
+			} else if (params.containsKey(CHAINID_PARAM)) {
+				ranges = Collections.singletonList(new ResidueRange(params.get(CHAINID_PARAM), (ResidueNumber) null, (ResidueNumber) null));
 			}
 		} catch (UnsupportedEncodingException e) {
-			logger.error("Unable to decode URL "+url,e);
+			logger.error("Unable to decode URL {}", url, e);
 		}
-		if(pdbId == null) {
+		if (pdbId == null) {
 			String path = url.getPath();
-			pdbId = guessPDBID(path.substring(path.lastIndexOf("/")+1));
+			pdbId = guessPDBID(path.substring(path.lastIndexOf("/") + 1));
 		}
 		return new SubstructureIdentifier(pdbId, ranges);
 	}
@@ -126,47 +127,46 @@ public SubstructureIdentifier toCanonical() {
 	public Structure reduce(Structure input) throws StructureException {
 		return toCanonical().reduce(input);
 	}
+
 	/**
 	 * Load the structure from the URL
 	 * @return null
 	 */
 	@Override
-	public Structure loadStructure(AtomCache cache) throws StructureException,
-			IOException {
+	public Structure loadStructure(AtomCache cache) throws StructureException, IOException {
 		StructureFiletype format = StructureFiletype.UNKNOWN;
 
 		// Use user-specified format
 		try {
 			Map<String, String> params = parseQuery(url);
-			if(params.containsKey(FORMAT_PARAM)) {
+			if (params.containsKey(FORMAT_PARAM)) {
 				String formatStr = params.get(FORMAT_PARAM);
-				format = StructureIO.guessFiletype("."+formatStr);
+				format = StructureIO.guessFiletype("." + formatStr);
 			}
 		} catch (UnsupportedEncodingException e) {
-			logger.error("Unable to decode URL "+url,e);
+			logger.error("Unable to decode URL {}", url, e);
 		}
 
 		// Guess format from extension
-		if(format == StructureFiletype.UNKNOWN) {
+		if (format == StructureFiletype.UNKNOWN) {
 			format = StructureIO.guessFiletype(url.getPath());
 		}
 
 		switch(format) {
-		case CIF:
-			return StructureConverter.fromURL(url);
-		default:
-		case PDB:
-			// pdb file based parsing
-
-			PDBFileReader reader = new PDBFileReader(cache.getPath());
-			reader.setFetchBehavior(cache.getFetchBehavior());
-			reader.setObsoleteBehavior(cache.getObsoleteBehavior());
-			reader.setFileParsingParameters(cache.getFileParsingParams());
-			return reader.getStructure(url);
+			case CIF: case BCIF:
+				return StructureConverter.fromURL(url);
+			case MMTF:
+				return MmtfActions.readFromInputStream(url.openStream());
+			default: case PDB:
+				// pdb file based parsing
+				PDBFileReader reader = new PDBFileReader(cache.getPath());
+				reader.setFetchBehavior(cache.getFetchBehavior());
+				reader.setObsoleteBehavior(cache.getObsoleteBehavior());
+				reader.setFileParsingParameters(cache.getFileParsingParams());
+				return reader.getStructure(url);
 		}
 	}
 
-
 	/**
 	 * Recognizes PDB IDs that occur at the beginning of name followed by some
 	 * delimiter.
@@ -175,7 +175,7 @@ public Structure loadStructure(AtomCache cache) throws StructureException,
 	 */
 	public static String guessPDBID(String name) {
 		Matcher match = PDBID_REGEX.matcher(name);
-		if(match.matches()) {
+		if (match.matches()) {
 			return match.group(1).toUpperCase();
 		} else {
 			// Give up if doesn't match
@@ -191,22 +191,22 @@ public static String guessPDBID(String name) {
 	 * @throws UnsupportedEncodingException
 	 */
 	private static Map<String,String> parseQuery(URL url) throws UnsupportedEncodingException {
-		Map<String,String> params = new LinkedHashMap<String, String>();
+		Map<String,String> params = new LinkedHashMap<>();
 		String query = url.getQuery();
-		if( query == null || query.isEmpty()) {
+		if (query == null || query.isEmpty()) {
 			// empty query
 			return params;
 		}
 		String[] pairs = url.getQuery().split("&");
-		for(String pair: pairs) {
+		for (String pair : pairs) {
 			int i = pair.indexOf("=");
 			String key = pair;
-			if(i > 0) {
+			if (i > 0) {
 				key = URLDecoder.decode(pair.substring(0, i), "UTF-8");
 			}
 			String value = null;
-			if(i > 0 && pair.length() > i+1) {
-				value = URLDecoder.decode(pair.substring(i+1), "UTF-8");
+			if(i > 0 && pair.length() > i + 1) {
+				value = URLDecoder.decode(pair.substring(i + 1), "UTF-8");
 			}
 			// note that this uses the last instance if a parameter is specified multiple times
 			params.put(key.toLowerCase(), value);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
index cc0220da07..4181792515 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
@@ -33,6 +33,7 @@
 import org.biojava.nbio.structure.cath.CathDatabase;
 import org.biojava.nbio.structure.cath.CathDomain;
 import org.biojava.nbio.structure.cath.CathFactory;
+import org.biojava.nbio.structure.io.BcifFileReader;
 import org.biojava.nbio.structure.io.CifFileReader;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
@@ -61,7 +62,6 @@
  * @since 3.0
  */
 public class AtomCache {
-
 	private static final Logger logger = LoggerFactory.getLogger(AtomCache.class);
 
 	/**
@@ -73,25 +73,20 @@ public class AtomCache {
 	public static final String BIOL_ASSEMBLY_IDENTIFIER = "BIO:";
 	public static final String CHAIN_NR_SYMBOL = ":";
 	public static final String CHAIN_SPLIT_SYMBOL = ".";
-
 	public static final String UNDERSCORE = "_";
 
 	private static final String FILE_SEPARATOR = System.getProperty("file.separator");
 
 	protected FileParsingParameters params;
-
 	private FetchBehavior fetchBehavior;
 	private ObsoleteBehavior obsoleteBehavior;
-
 	private String cachePath;
 
 	// make sure IDs are loaded uniquely
-	private Collection<String> currentlyLoading = Collections.synchronizedCollection(new TreeSet<String>());
+	private final Collection<String> currentlyLoading = Collections.synchronizedCollection(new TreeSet<>());
 
 	private String path;
-
-	private boolean useMmCif;
-	private boolean useMmtf;
+	private StructureFiletype filetype = StructureFiletype.BCIF;
 
 	/**
 	 * Default AtomCache constructor.
@@ -122,9 +117,7 @@ public AtomCache(String pdbFilePath) {
 	 * @param cachePath
 	 */
 	public AtomCache(String pdbFilePath, String cachePath) {
-
-		logger.debug("Initialising AtomCache with pdbFilePath={}, cachePath={}",pdbFilePath, cachePath);
-
+		logger.debug("Initialising AtomCache with pdbFilePath={}, cachePath={}", pdbFilePath, cachePath);
 		if (!pdbFilePath.endsWith(FILE_SEPARATOR)) {
 			pdbFilePath += FILE_SEPARATOR;
 		}
@@ -144,9 +137,7 @@ public AtomCache(String pdbFilePath, String cachePath) {
 		currentlyLoading.clear();
 		params = new FileParsingParameters();
 
-		setUseMmCif(false);
-		setUseMmtf(true);
-
+		setFiletype(StructureFiletype.BCIF);
 	}
 
 	/**
@@ -159,11 +150,7 @@ public AtomCache(UserConfiguration config) {
 		this(config.getPdbFilePath(), config.getCacheFilePath());
 		fetchBehavior = config.getFetchBehavior();
 		obsoleteBehavior = config.getObsoleteBehavior();
-		useMmCif = config.getFileFormat().equals( UserConfiguration.MMCIF_FORMAT );
-
-		if ( useMmCif)
-			useMmtf = false;
-
+		filetype = config.getStructureFiletype();
 	}
 
 	/**
@@ -180,21 +167,20 @@ public AtomCache(UserConfiguration config) {
 	public Atom[] getAtoms(String name) throws IOException, StructureException {
 		return getAtoms(new StructureName(name));
 	}
-	public Atom[] getAtoms(StructureIdentifier name) throws IOException, StructureException {
 
-		Atom[] atoms = null;
+	public Atom[] getAtoms(StructureIdentifier name) throws IOException, StructureException {
+		Atom[] atoms;
 
 		// System.out.println("loading " + name);
 		Structure s = getStructure(name);
-
 		atoms = StructureTools.getAtomCAArray(s);
 
 		/*
 		 * synchronized (cache){ cache.put(name, atoms); }
 		 */
-
 		return atoms;
 	}
+
 	/**
 	 * Returns the representative atoms for the provided name.
 	 * See {@link #getStructure(String)} for supported naming conventions.
@@ -210,17 +196,14 @@ public Atom[] getRepresentativeAtoms(String name) throws IOException, StructureE
 	}
 
 	public Atom[] getRepresentativeAtoms(StructureIdentifier name) throws IOException, StructureException {
-
-		Atom[] atoms = null;
+		Atom[] atoms;
 
 		Structure s = getStructure(name);
-
 		atoms = StructureTools.getRepresentativeAtomArray(s);
 
 		/*
 		 * synchronized (cache){ cache.put(name, atoms); }
 		 */
-
 		return atoms;
 	}
 
@@ -246,7 +229,6 @@ public Atom[] getRepresentativeAtoms(StructureIdentifier name) throws IOExceptio
 	 */
 	public Structure getBiologicalAssembly(String pdbId, int bioAssemblyId, boolean multiModel)
 			throws StructureException, IOException {
-
 		if (bioAssemblyId < 0) {
 			throw new StructureException("bioAssemblyID must be nonnegative: " + pdbId + " bioAssemblyId "
 					+ bioAssemblyId);
@@ -262,14 +244,14 @@ public Structure getBiologicalAssembly(String pdbId, int bioAssemblyId, boolean
 
 		getFileParsingParams().setParseBioAssembly(prevIsParseBioAssembly);
 
-		if (asymUnit.getPDBHeader() == null || asymUnit.getPDBHeader().getBioAssemblies()==null) {
+		if (asymUnit.getPDBHeader() == null || asymUnit.getPDBHeader().getBioAssemblies() == null) {
 			logger.info("No bioassembly information found for {}, returning asymmetric unit as biological assembly", pdbId);
 			return asymUnit;
 		}
 
 		// 0 ... asym unit
-		if ( bioAssemblyId == 0) {
-			logger.info("Requested biological assembly 0 for PDB id "+pdbId+", returning asymmetric unit");
+		if (bioAssemblyId == 0) {
+			logger.info("Requested biological assembly 0 for PDB id {}, returning asymmetric unit", pdbId);
 			return asymUnit;
 		}
 		// does it exist?
@@ -281,20 +263,18 @@ public Structure getBiologicalAssembly(String pdbId, int bioAssemblyId, boolean
 				asymUnit.getPDBHeader().getBioAssemblies().get(bioAssemblyId).getTransforms();
 
 
-		if ( transformations == null || transformations.size() == 0){
-
+		if (transformations == null || transformations.size() == 0) {
 			throw new StructureException("Could not load transformations to recreate biological assembly id " + bioAssemblyId + " of " + pdbId);
-
 		}
 
 		BiologicalAssemblyBuilder builder = new BiologicalAssemblyBuilder();
 
 		// if we use mmcif or mmtf, then we need to pass useAsymIds=true
 		boolean useAsymIds = false;
-		if (useMmCif) useAsymIds = true;
-		if (useMmtf) useAsymIds = true;
+		if (filetype == StructureFiletype.CIF || filetype == StructureFiletype.BCIF || filetype == StructureFiletype.MMTF) {
+			useAsymIds = true;
+		}
 		return builder.rebuildQuaternaryStructure(asymUnit, transformations, useAsymIds, multiModel);
-
 	}
 
 	/**
@@ -312,7 +292,6 @@ public Structure getBiologicalAssembly(String pdbId, int bioAssemblyId, boolean
 	 * @since 4.2
 	 */
 	public Structure getBiologicalAssembly(String pdbId, boolean multiModel) throws StructureException, IOException {
-
 		boolean prevIsParseBioAssembly = getFileParsingParams().isParseBioAssembly();
 
 		if (!getFileParsingParams().isParseBioAssembly()) {
@@ -320,11 +299,10 @@ public Structure getBiologicalAssembly(String pdbId, boolean multiModel) throws
 		}
 
 		Structure asymUnit = getStructureForPdbId(pdbId);
-
 		getFileParsingParams().setParseBioAssembly(prevIsParseBioAssembly);
 
 
-		if (asymUnit.getPDBHeader() == null || asymUnit.getPDBHeader().getBioAssemblies()==null) {
+		if (asymUnit.getPDBHeader() == null || asymUnit.getPDBHeader().getBioAssemblies() == null) {
 			logger.info("No bioassembly information found for {}, returning asymmetric unit as biological assembly", pdbId);
 			return asymUnit;
 		}
@@ -340,20 +318,18 @@ public Structure getBiologicalAssembly(String pdbId, boolean multiModel) throws
 				asymUnit.getPDBHeader().getBioAssemblies().get(bioAssemblyId).getTransforms();
 
 
-		if ( transformations == null || transformations.size() == 0){
-
+		if (transformations == null || transformations.size() == 0) {
 			throw new StructureException("Could not load transformations to recreate biological assembly id " + bioAssemblyId + " of " + pdbId);
-
 		}
 
 		BiologicalAssemblyBuilder builder = new BiologicalAssemblyBuilder();
 
 		// if we use mmcif or mmtf, then we need to pass useAsymIds=true
 		boolean useAsymIds = false;
-		if (useMmCif) useAsymIds = true;
-		if (useMmtf) useAsymIds = true;
+		if (filetype == StructureFiletype.CIF || filetype == StructureFiletype.BCIF || filetype == StructureFiletype.MMTF) {
+			useAsymIds = true;
+		}
 		return builder.rebuildQuaternaryStructure(asymUnit, transformations, useAsymIds, multiModel);
-
 	}
 
 	/**
@@ -367,7 +343,6 @@ public Structure getBiologicalAssembly(String pdbId, boolean multiModel) throws
 	 * @since 5.0
 	 */
 	public List<Structure> getBiologicalAssemblies(String pdbId, boolean multiModel) throws StructureException, IOException {
-
 		List<Structure> assemblies = new ArrayList<>();
 
 		boolean prevIsParseBioAssembly = getFileParsingParams().isParseBioAssembly();
@@ -377,25 +352,21 @@ public List<Structure> getBiologicalAssemblies(String pdbId, boolean multiModel)
 		}
 
 		Structure asymUnit = getStructureForPdbId(pdbId);
-
 		getFileParsingParams().setParseBioAssembly(prevIsParseBioAssembly);
 
-
-		if (asymUnit.getPDBHeader() == null || asymUnit.getPDBHeader().getBioAssemblies()==null) {
+		if (asymUnit.getPDBHeader() == null || asymUnit.getPDBHeader().getBioAssemblies() == null) {
 			logger.info("No bioassembly information found for {}, returning asymmetric unit as the only biological assembly", pdbId);
 			assemblies.add(asymUnit);
 			return assemblies;
 		}
 
-
 		for (int bioAssemblyId : asymUnit.getPDBHeader().getBioAssemblies().keySet()) {
 			List<BiologicalAssemblyTransformation> transformations =
 					asymUnit.getPDBHeader().getBioAssemblies().get(bioAssemblyId).getTransforms();
 
-
-			if ( transformations == null || transformations.size() == 0){
-
-				logger.info("Could not load transformations to recreate biological assembly id " + bioAssemblyId + " of " + pdbId+". Assembly id will be missing in biological assemblies.");
+			if (transformations == null || transformations.size() == 0) {
+				logger.info("Could not load transformations to recreate biological assembly id {} of {}. Assembly " +
+						"id will be missing in biological assemblies.", bioAssemblyId, pdbId);
 				continue;
 			}
 
@@ -403,8 +374,9 @@ public List<Structure> getBiologicalAssemblies(String pdbId, boolean multiModel)
 
 			// if we use mmcif or mmtf, then we need to pass useAsymIds=true
 			boolean useAsymIds = false;
-			if (useMmCif) useAsymIds = true;
-			if (useMmtf) useAsymIds = true;
+			if (filetype == StructureFiletype.CIF || filetype == StructureFiletype.BCIF || filetype == StructureFiletype.MMTF) {
+				useAsymIds = true;
+			}
 			Structure s = builder.rebuildQuaternaryStructure(asymUnit, transformations, useAsymIds, multiModel);
 			assemblies.add(s);
 		}
@@ -483,7 +455,6 @@ public String getPath() {
 	 */
 	public Structure getStructure(String name) throws IOException, StructureException {
 		StructureName structureName = new StructureName(name);
-
 		return getStructure(structureName);
 	}
 
@@ -552,7 +523,6 @@ public Structure getStructureForDomain(ScopDomain domain, ScopDatabase scopDatab
 	 */
 	public Structure getStructureForDomain(ScopDomain domain, ScopDatabase scopDatabase, boolean strictLigandHandling)
 			throws IOException, StructureException {
-
 		String pdbId = domain.getPdbId();
 		Structure fullStructure = getStructureForPdbId(pdbId);
 		Structure structure = domain.reduce(fullStructure);
@@ -569,13 +539,12 @@ public Structure getStructureForDomain(ScopDomain domain, ScopDatabase scopDatab
 			rrs = ResidueRangeAndLength.parseMultiple(domain.getRanges(), map);
 		}
 		for (Chain chain : fullStructure.getNonPolyChains()) {
-
 			if (!structure.hasPdbChain(chain.getName())) {
 				continue; // we can't do anything with a chain our domain
 			}
 
 			Chain newChain;
-			if (! structure.hasNonPolyChain(chain.getId())) {
+			if (!structure.hasNonPolyChain(chain.getId())) {
 				newChain = new ChainImpl();
 				newChain.setId(chain.getId());
 				newChain.setName(chain.getName());
@@ -584,6 +553,7 @@ public Structure getStructureForDomain(ScopDomain domain, ScopDatabase scopDatab
 			} else {
 				newChain = structure.getNonPolyChain(chain.getId());
 			}
+
 			List<Group> ligands = StructureTools.filterLigands(chain.getAtomGroups());
 			for (Group group : ligands) {
 				boolean shouldContain = true;
@@ -598,9 +568,7 @@ public Structure getStructureForDomain(ScopDomain domain, ScopDatabase scopDatab
 				boolean alreadyContains = newChain.getAtomGroups().contains(group); // we don't want to add duplicate
 																					// ligands
 				if (shouldContain && !alreadyContains) {
-
 					newChain.addGroup(group);
-
 				}
 			}
 		}
@@ -619,7 +587,6 @@ public Structure getStructureForDomain(ScopDomain domain, ScopDatabase scopDatab
 		structure.getPDBHeader().setDescription(header.toString());
 
 		return structure;
-
 	}
 
 	/**
@@ -665,7 +632,6 @@ public void setFileParsingParams(FileParsingParameters params) {
 		this.params = params;
 	}
 
-
 	/**
 	 * <b>[Optional]</b> This method changes the behavior when obsolete entries
 	 * are requested. Current behaviors are:
@@ -712,6 +678,7 @@ public ObsoleteBehavior getObsoleteBehavior() {
 	public FetchBehavior getFetchBehavior() {
 		return fetchBehavior;
 	}
+
 	/**
 	 * Set the behavior for fetching files from the server
 	 * @param fetchBehavior
@@ -731,45 +698,23 @@ public void setPath(String path) {
 	}
 
 	/**
-	 * @return the useMmCif
+	 * Returns the currently active file type that will be parsed.
+	 * @return a StructureFiletype
 	 */
-	public boolean isUseMmCif() {
-		return useMmCif;
+	public StructureFiletype getFiletype() {
+		return filetype;
 	}
 
 	/**
-	 * @param useMmCif
-	 *            the useMmCif to set
-	 */
-	public void setUseMmCif(boolean useMmCif) {
-		this.useMmCif = useMmCif;
-		// Either way the user wants to use PDB or MMCIF
-		this.useMmtf = false;
-	}
-
-	/**
-	 * Set whether to use mmtf.
-	 * @param useMmtf the input boolean to set
-	 */
-	public void setUseMmtf(boolean useMmtf) {
-		this.useMmtf = useMmtf;
-		if(useMmtf){
-			useMmCif=false;
-		}
-
-	}
-
-	/** Returns useMmtf flag
-	 *
-	 * @return true if will load data via mmtf file format
+	 * Set the file type that will be parsed.
+	 * @param filetype a StructureFiletype
 	 */
-	public boolean isUseMmtf(){
-		return this.useMmtf;
+	public void setFiletype(StructureFiletype filetype) {
+		this.filetype = filetype;
 	}
 
 	private boolean checkLoading(String name) {
 		return currentlyLoading.contains(name);
-
 	}
 
 	/**
@@ -784,17 +729,15 @@ public Structure getStructureForCathDomain(StructureName structureName) throws I
 	 * Returns a {@link Structure} corresponding to the CATH identifier supplied in {@code structureName}, using the specified {@link CathDatabase}.
 	 */
 	public Structure getStructureForCathDomain(StructureName structureName, CathDatabase cathInstall) throws IOException, StructureException {
-
 		CathDomain cathDomain = cathInstall.getDomainByCathId(structureName.getIdentifier());
 
 		Structure s = getStructureForPdbId(cathDomain.getIdentifier());
 		Structure n = cathDomain.reduce(s);
 
 		// add the ligands of the chain...
-
 		Chain newChain = n.getPolyChainByPDB(structureName.getChainId());
 		List<Chain> origChains = s.getNonPolyChainsByPDB(structureName.getChainId());
-		for ( Chain origChain : origChains) {
+		for (Chain origChain : origChains) {
 			List<Group> ligands = origChain.getAtomGroups();
 
 			for (Group g : ligands) {
@@ -815,7 +758,6 @@ protected void flagLoading(String name) {
 	}
 
 	protected void flagLoadingFinished(String name) {
-
 		currentlyLoading.remove(name);
 	}
 
@@ -827,10 +769,10 @@ protected void flagLoadingFinished(String name) {
 	 * @throws StructureException
 	 */
 	public Structure getStructureForPdbId(String pdbId) throws IOException, StructureException {
-		if(pdbId == null)
+		if (pdbId == null)
 			return null;
-		if(pdbId.length() != 4) {
-			throw new StructureException("Unrecognized PDB ID: "+pdbId);
+		if (pdbId.length() != 4) {
+			throw new StructureException("Unrecognized PDB ID: " + pdbId);
 		}
 		while (checkLoading(pdbId)) {
 			// waiting for loading to be finished...
@@ -840,22 +782,22 @@ public Structure getStructureForPdbId(String pdbId) throws IOException, Structur
 			} catch (InterruptedException e) {
 				logger.error(e.getMessage());
 			}
-
 		}
 
-		Structure s;
-		if (useMmtf) {
-			logger.debug("loading from mmtf");
-			s = loadStructureFromMmtfByPdbId(pdbId);
-		}
-		else if (useMmCif) {
-			logger.debug("loading from mmcif");
-			s = loadStructureFromCifByPdbId(pdbId);
-		} else {
-			logger.debug("loading from pdb");
-			s = loadStructureFromPdbByPdbId(pdbId);
+		switch (filetype) {
+			case CIF:
+				logger.debug("loading from mmcif");
+				return loadStructureFromCifByPdbId(pdbId);
+			case BCIF:
+				logger.debug("loading from bcif");
+				return loadStructureFromBcifByPdbId(pdbId);
+			case MMTF:
+				logger.debug("loading from mmtf");
+				return loadStructureFromMmtfByPdbId(pdbId);
+			case PDB: default:
+				logger.debug("loading from pdb");
+				return loadStructureFromPdbByPdbId(pdbId);
 		}
-		return s;
 	}
 
 	/**
@@ -869,12 +811,10 @@ private Structure loadStructureFromMmtfByPdbId(String pdbId) throws IOException
 		MMTFFileReader reader = new MMTFFileReader();
 		reader.setFetchBehavior(fetchBehavior);
 		reader.setObsoleteBehavior(obsoleteBehavior);
-		Structure structure = reader.getStructureById(pdbId.toLowerCase());
-		return structure;
+		return reader.getStructureById(pdbId.toLowerCase());
 	}
 
-	protected Structure loadStructureFromCifByPdbId(String pdbId) throws IOException, StructureException {
-
+	protected Structure loadStructureFromCifByPdbId(String pdbId) throws IOException {
 		logger.debug("Loading structure {} from mmCIF file {}.", pdbId, path);
 		Structure s;
 		flagLoading(pdbId);
@@ -891,8 +831,24 @@ protected Structure loadStructureFromCifByPdbId(String pdbId) throws IOException
 		return s;
 	}
 
-	protected Structure loadStructureFromPdbByPdbId(String pdbId) throws IOException, StructureException {
+	protected Structure loadStructureFromBcifByPdbId(String pdbId) throws IOException {
+		logger.debug("Loading structure {} from BinaryCIF file {}.", pdbId, path);
+		Structure s;
+		flagLoading(pdbId);
+		try {
+			BcifFileReader reader = new BcifFileReader(path);
+			reader.setFetchBehavior(fetchBehavior);
+			reader.setObsoleteBehavior(obsoleteBehavior);
+			reader.setFileParsingParameters(params);
+			s = reader.getStructureById(pdbId.toLowerCase());
+		} finally {
+			flagLoadingFinished(pdbId);
+		}
+
+		return s;
+	}
 
+	protected Structure loadStructureFromPdbByPdbId(String pdbId) throws IOException {
 		logger.debug("Loading structure {} from PDB file {}.", pdbId, path);
 		Structure s;
 		flagLoading(pdbId);
@@ -904,12 +860,10 @@ protected Structure loadStructureFromPdbByPdbId(String pdbId) throws IOException
 			reader.setFileParsingParameters(params);
 
 			s = reader.getStructureById(pdbId.toLowerCase());
-
 		} finally {
 			flagLoadingFinished(pdbId);
 		}
 
 		return s;
 	}
-
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/UserConfiguration.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/UserConfiguration.java
index e23f8e6db1..ebcf3aaba6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/UserConfiguration.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/UserConfiguration.java
@@ -19,6 +19,7 @@
 
 package org.biojava.nbio.structure.align.util;
 
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.align.ce.StartupParameters;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.ObsoleteBehavior;
@@ -33,19 +34,17 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-
-/** A container to persist config to the file system
+/**
+ *  A container to persist config to the file system
  *
  * @author Andreas Prlic
- *
  */
-public class UserConfiguration
-{
-
+public class UserConfiguration {
 	private static final Logger logger = LoggerFactory.getLogger(UserConfiguration.class);
 
 	public static final String PDB_FORMAT   = "PDB";
-	public static final String MMCIF_FORMAT = "mmCif";
+	public static final String MMCIF_FORMAT = "cif";
+	public static final String BINARY_CIF   = "bcif";
 	public static final String MMTF_FORMAT  = "mmtf";
 
 	public static final String TMP_DIR = "java.io.tmpdir";
@@ -63,8 +62,7 @@ public class UserConfiguration
 
 	private String fileFormat;
 
-	private static AtomicBoolean warningShown = new AtomicBoolean(false);
-
+	private static final AtomicBoolean warningShown = new AtomicBoolean(false);
 
 	/**
 	 * Default UserConfiguration:
@@ -98,66 +96,51 @@ public UserConfiguration(){
 		// note that in initCacheFilePath, we set to the provided one (if readable) or to the same as pdbFilePath
 		cacheFilePath = initCacheFilePath();
 
-		fileFormat = MMTF_FORMAT;
+		fileFormat = BINARY_CIF;
 	}
 
 	private String initPdbFilePath() {
-
 		String path = null;
-
 		String propertyName = PDB_DIR;
-
 		String userProvidedDir = System.getProperty(propertyName);
 
-		if ( userProvidedDir != null && !userProvidedDir.trim().isEmpty()) {
-
+		if (userProvidedDir != null && !userProvidedDir.trim().isEmpty()) {
 			path = userProvidedDir;
 			logger.debug("Read PDB dir from system property {}: {}", propertyName, path);
 			File f = new File(path);
 			if (!f.isDirectory()) {
-				logger.warn(
-						"Provided path {} (with system property {}) is not a directory. Using system's temp directory instead {}",
-						path, propertyName, System.getProperty(TMP_DIR));
+				logger.warn("Provided path {} (with system property {}) is not a directory. Using system's temp " +
+								"directory instead {}", path, propertyName, System.getProperty(TMP_DIR));
 				path = System.getProperty(TMP_DIR);
 			} else if (!f.canWrite()) {
-				logger.warn(
-						"Provided path {} (with system property {}) is not writable. Will not be able to write cached files.",
-						path, propertyName);
+				logger.warn("Provided path {} (with system property {}) is not writable. Will not be able to write " +
+								"cached files.", path, propertyName);
 				// we don't require the PDB_DIR to be writable, so that it can be used with a pre-rsynced dir
 				// thus if not writable, we only warn and go ahead using it
 			}
-
-
 		} else {
 			Map<String,String> env = System.getenv();
-
-			if( env.containsKey(propertyName) && !env.get(propertyName).trim().isEmpty()) {
+			if (env.containsKey(propertyName) && !env.get(propertyName).trim().isEmpty()) {
 				path = env.get(propertyName);
 				logger.debug("Read dir from environment variable {}: {}", propertyName, path);
 
 				File f = new File(path);
 				if (!f.isDirectory()) {
-					logger.warn(
-							"Provided path {} (with environment variable {}) is not a directory. Using system's temp directory instead {}",
-							path, propertyName, System.getProperty(TMP_DIR));
+					logger.warn("Provided path {} (with environment variable {}) is not a directory. Using system's " +
+									"temp directory instead {}", path, propertyName, System.getProperty(TMP_DIR));
 					path = System.getProperty(TMP_DIR);
 				} else if (!f.canWrite()) {
-					logger.warn(
-							"Provided path {} (with environment variable {}) is not writable. Will not be able to write cached files",
-							path, propertyName);
+					logger.warn("Provided path {} (with environment variable {}) is not writable. Will not be able " +
+									"to write cached files", path, propertyName);
 					// we don't require the PDB_DIR to be writable, so that it can be used with a pre-rsynced dir
 					// thus if not writable, we only warn and go ahead using it
 				}
-
 			} else {
 				path = System.getProperty(TMP_DIR);
 
-				if ( ! warningShown.get()) {
-
-					logger.warn("Could not read dir from system property {} or environment variable {}, "
-									+ "using system's temp directory {}",
-							propertyName, propertyName, path);
-
+				if (! warningShown.get()) {
+					logger.warn("Could not read dir from system property {} or environment variable {}, " +
+									"using system's temp directory {}", propertyName, propertyName, path);
 					warningShown.set(true);
 				}
 
@@ -165,95 +148,79 @@ private String initPdbFilePath() {
 			}
 		}
 
-		if ( ! path.endsWith(lineSplit) )
+		if (!path.endsWith(lineSplit)) {
 			path = path + lineSplit;
+		}
 
 		return path;
-
 	}
 
 	private String initCacheFilePath() {
-
 		String path = null;
-
 		String propertyName = PDB_CACHE_DIR;
-
 		String userProvidedDir = System.getProperty(propertyName);
 
-		if ( userProvidedDir != null ) {
-
+		if (userProvidedDir != null) {
 			path = userProvidedDir;
 			logger.debug("Read cache dir from system property {}: {}", propertyName, path);
 			File f = new File(path);
 			if (!f.isDirectory()) {
-				logger.warn(
-						"Provided path {} (with system property {}) is not a directory. Using system's temp directory instead {}",
-						path, propertyName, System.getProperty(TMP_DIR));
+				logger.warn("Provided path {} (with system property {}) is not a directory. Using system's temp " +
+								"directory instead {}", path, propertyName, System.getProperty(TMP_DIR));
 				path = System.getProperty(TMP_DIR);
 			} else if (!f.canWrite()) {
-				logger.warn(
-						"Provided path {} (with system property {}) is not writable. Using system's temp directory instead {}",
-						path, propertyName, System.getProperty(TMP_DIR));
+				logger.warn("Provided path {} (with system property {}) is not writable. Using system's temp " +
+								"directory instead {}", path, propertyName, System.getProperty(TMP_DIR));
 				path = System.getProperty(TMP_DIR);
 				System.setProperty(propertyName,path);
 			}
-
-
 		} else {
 			Map<String,String> env = System.getenv();
 
-			if( env.containsKey(propertyName)) {
+			if (env.containsKey(propertyName)) {
 				path = env.get(propertyName);
 				logger.debug("Read dir from environment variable {}: {}", propertyName, path);
 
 				File f = new File(path);
 				if (!f.isDirectory()) {
-					logger.warn(
-							"Provided path {} (with environment variable {}) is not a directory. Using system's temp directory instead {}",
-							path, propertyName, System.getProperty(TMP_DIR));
+					logger.warn("Provided path {} (with environment variable {}) is not a directory. Using system's " +
+									"temp directory instead {}", path, propertyName, System.getProperty(TMP_DIR));
 					path = System.getProperty(TMP_DIR);
 				} else if (!f.canWrite()) {
-					logger.warn(
-							"Provided path {} (with environment variable {}) is not writable. Using system's temp directory instead {}",
-							path, propertyName, System.getProperty(TMP_DIR));
+					logger.warn("Provided path {} (with environment variable {}) is not writable. Using system's " +
+									"temp directory instead {}", path, propertyName, System.getProperty(TMP_DIR));
 					path = System.getProperty(TMP_DIR);
 				}
-
 			} else {
 				// NOTE in case of not provided, then it is set to same as pdbFilePath
 				// as PDB_DIR is not checked for being writable, we have to do that check here in case
 				if (new File(pdbFilePath).canWrite()){
 					path = pdbFilePath;
-					logger.info("Could not read cache dir from system property {} or environment variable {}, "
-							+ "using PDB directory instead {}",
-							propertyName, propertyName, path);
+					logger.info("Could not read cache dir from system property {} or environment variable {}, " +
+									"using PDB directory instead {}", propertyName, propertyName, path);
 					System.setProperty(propertyName,path);
-
 				} else {
 					path = System.getProperty(TMP_DIR);
 					logger.warn("Could not read cache dir from system property {} or environment variable {}, "
 							+ "and PDB directory {} is not writable. Using system's temp directory instead {}",
 							propertyName, propertyName, pdbFilePath, path);
 					System.setProperty(propertyName,path);
-
 				}
 			}
 		}
 
-		if ( ! path.endsWith(lineSplit) )
+		if (!path.endsWith(lineSplit)) {
 			path = path + lineSplit;
+		}
 
 		return path;
-
 	}
 
-	public String getPdbFilePath()
-	{
+	public String getPdbFilePath() {
 		return pdbFilePath;
 	}
 
-	public void setPdbFilePath(String pdbFilePath)
-	{
+	public void setPdbFilePath(String pdbFilePath) {
 		this.pdbFilePath = pdbFilePath;
 	}
 
@@ -281,24 +248,22 @@ public void setObsoleteBehavior(ObsoleteBehavior obsoleteBehavior) {
 		this.obsoleteBehavior = obsoleteBehavior;
 	}
 
-	/** convert Configuration to an XML file so it can be serialized
+	/**
+	 * convert Configuration to an XML file so it can be serialized
 	 *
 	 * @param pw
 	 * @return XMLWriter
 	 * @throws IOException
 	 */
-	public XMLWriter toXML(PrintWriter pw)
-			throws IOException
-			{
-
-		XMLWriter     xw = new PrettyXMLWriter( pw);
-
+	public XMLWriter toXML(PrintWriter pw) throws IOException {
+		XMLWriter xw = new PrettyXMLWriter(pw);
 		toXML(xw);
-		return xw ;
-			}
+		return xw;
+	}
 
 
-	/** convert Configuration to an XML file so it can be serialized
+	/**
+	 * convert Configuration to an XML file so it can be serialized
 	 * add to an already existing xml file.
 	 *
 	 * @param xw the XML writer to use
@@ -306,10 +271,7 @@ public XMLWriter toXML(PrintWriter pw)
 	 * @throws IOException
 	 * @see org.biojava.nbio.structure.align.webstart.ConfigXMLHandler
 	 */
-
-	public XMLWriter toXML(XMLWriter xw)
-			throws IOException
-			{
+	public XMLWriter toXML(XMLWriter xw) throws IOException {
 		xw.printRaw("<?xml version='1.0' standalone='no' ?>");
 		//xw.printRaw("<!DOCTYPE " + XML_CONTENT_TYPE + " SYSTEM '" + XML_DTD + "' >");
 		xw.openTag("JFatCatConfig");
@@ -317,18 +279,18 @@ public XMLWriter toXML(XMLWriter xw)
 		xw.openTag("PDBFILEPATH");
 		// we don;t serialize the tempdir...
 		String tempdir = System.getProperty(TMP_DIR);
-		if (! pdbFilePath.equals(tempdir))
+		if (!pdbFilePath.equals(tempdir)) {
 			xw.attribute("path", pdbFilePath);
+		}
 
-		xw.attribute("fetchBehavior", fetchBehavior+"");
-		xw.attribute("obsoleteBehavior", obsoleteBehavior+"");
+		xw.attribute("fetchBehavior", fetchBehavior + "");
+		xw.attribute("obsoleteBehavior", obsoleteBehavior + "");
 		xw.attribute("fileFormat", fileFormat);
 		xw.closeTag("PDBFILEPATH");
 
 		xw.closeTag("JFatCatConfig");
 		return xw ;
-
-			}
+	}
 
 	public static UserConfiguration fromStartupParams(StartupParameters params) {
 		UserConfiguration config = new UserConfiguration();
@@ -349,14 +311,22 @@ public void setFileFormat (String fileFormat){
 		this.fileFormat = fileFormat;
 	}
 
-	public String getFileFormat()
-	{
+	public String getFileFormat() {
 		return fileFormat;
 	}
 
-
-
-
-
-
+	public StructureFiletype getStructureFiletype() {
+		switch (fileFormat) {
+			case MMCIF_FORMAT:
+				return StructureFiletype.CIF;
+			case BINARY_CIF:
+				return StructureFiletype.BCIF;
+			case MMTF_FORMAT:
+				return StructureFiletype.MMTF;
+			case PDB_FORMAT:
+				return StructureFiletype.PDB;
+			default:
+				return StructureFiletype.BCIF;
+		}
+	}
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
index 7109d60204..f550d82a96 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
@@ -228,7 +228,8 @@ public String getOneLetterCode() {
     }
 
     public void setOneLetterCode(String oneLetterCode) {
-        this.oneLetterCode = oneLetterCode;
+        // backwards compatibility that treats missing olc as ?
+        this.oneLetterCode = "".equals(oneLetterCode) ? "?" : oneLetterCode;
         setStandardFlag();
     }
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
index 0f1394424a..53d4c6e42f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
@@ -45,6 +45,7 @@
 import org.biojava.nbio.structure.PDBCrystallographicInfo;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemComp;
@@ -80,7 +81,7 @@ public class MmtfUtils {
 	public static AtomCache setUpBioJava() {
 		// Set up the atom cache etc
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.MMTF);
 		FileParsingParameters params = cache.getFileParsingParams();
 		params.setCreateAtomBonds(true);
 		params.setAlignSeqRes(true);
@@ -101,7 +102,7 @@ public static AtomCache setUpBioJava() {
 	public static AtomCache setUpBioJava(String extraUrl) {
 		// Set up the atom cache etc
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.MMTF);
 		FileParsingParameters params = cache.getFileParsingParams();
 		params.setCreateAtomBonds(true);
 		params.setAlignSeqRes(true);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/Test2JA5.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/Test2JA5.java
index 8d42461300..eb7008d0cb 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/Test2JA5.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/Test2JA5.java
@@ -41,7 +41,7 @@ public void test2JA5() throws IOException, StructureException {
 		fileParsingParameters.setHeaderOnly(false); // Need header only off to have chains to match.
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		cache.setFileParsingParams(fileParsingParameters);
 
 		StructureIO.setAtomCache(cache);
@@ -70,7 +70,7 @@ public void test2JA5noHeader() throws IOException, StructureException {
 		fileParsingParameters.setHeaderOnly(true);
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		cache.setFileParsingParams(fileParsingParameters);
 
 		StructureIO.setAtomCache(cache);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java
index 3aa86bacd0..ef9f830ae1 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java
@@ -47,7 +47,7 @@ public class TestAltLocs {
 	public void testAltLocParsing() throws StructureException, IOException{
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s = cache.getStructure("2CI1");
 
 		Chain a = s.getPolyChainByPDB("A");
@@ -210,7 +210,7 @@ private void ensureAllAtomsSameAltCode(Group groupInputAltLocGroup, Group inputM
 	public void test1AAC() throws IOException, StructureException{
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		StructureIO.setAtomCache(cache);
 
 		Structure s = StructureIO.getStructure("1AAC");
@@ -221,7 +221,7 @@ public void test1AAC() throws IOException, StructureException{
 		testCBAtomInMainGroup(g);
 
 		cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 
 		Structure s1 = cache.getStructure("1AAC");
@@ -262,7 +262,7 @@ public void test3PIUpdb() throws IOException, StructureException{
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 
 		Structure structure = StructureIO.getStructure("3PIU");
 
@@ -428,7 +428,7 @@ public void test4CUPBonds() throws IOException, StructureException{
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 
 		Structure structure = StructureIO.getStructure("4CUP");
 
@@ -489,7 +489,7 @@ public void test3PIUmmcif() throws IOException, StructureException{
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		Structure structure = StructureIO.getStructure("3PIU");
 
@@ -549,7 +549,7 @@ public void test3U7Tmmcif() throws IOException, StructureException{
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		FileParsingParameters params = new FileParsingParameters();
 		params.setAlignSeqRes(true);
 		cache.setFileParsingParams(params);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
index d3c61130ae..17c6836a4f 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
@@ -156,7 +156,7 @@ public void testObsoleteId() throws StructureException, IOException {
 		cache.setObsoleteBehavior(ObsoleteBehavior.THROW_EXCEPTION);
 
 		// OBSOLETE PDB; should throw an exception
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		cache.getStructure("1HHB");
 	}
 
@@ -168,13 +168,13 @@ public void testFetchCurrent1CMW() throws IOException, StructureException {
 		cache.setObsoleteBehavior(ObsoleteBehavior.FETCH_CURRENT);
 
 		// OBSOLETE PDB; should throw an exception
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		try {
 			cache.getStructure("1CMW");
 			fail("Obsolete structure should throw exception");
 		} catch(IOException e) {}
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		try {
 			cache.getStructure("1CMW");
 			fail("Obsolete structure should throw exception");
@@ -188,11 +188,11 @@ public void testFetchCurrent1HHB() throws IOException, StructureException {
 		cache.setFetchBehavior(FetchBehavior.FETCH_FILES);
 		cache.setObsoleteBehavior(ObsoleteBehavior.FETCH_CURRENT);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		Structure s = cache.getStructure("1HHB");
 		assertEquals("Failed to get the current ID for 1HHB.","4HHB",s.getPDBCode());
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		s = cache.getStructure("1HHB");
 		assertEquals("Failed to get the current ID for 1HHB.","4HHB",s.getPDBCode());
 	}
@@ -204,15 +204,14 @@ public void testFetchObsolete() throws IOException, StructureException {
 		cache.setObsoleteBehavior(ObsoleteBehavior.FETCH_OBSOLETE);
 
 		Structure s;
-		cache.setUseMmtf(false);
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		s = cache.getStructure("1CMW");
 		assertEquals("Failed to get OBSOLETE file 1CMW.","1CMW", s.getPDBCode());
 
 		s = cache.getStructure("1HHB");
 		assertEquals("Failed to get OBSOLETE file 1HHB.","1HHB", s.getPDBCode());
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		s = cache.getStructure("1CMW");
 		assertEquals("Failed to get OBSOLETE file 1CMW.","1CMW", s.getPDBCode());
 
@@ -229,35 +228,32 @@ public void testSettingFileParsingType(){
 
 		//test defaults
 
-		// by default we either use mmtf or mmcif, but not both.
-		assertNotEquals(cache.isUseMmtf(), cache.isUseMmCif());
-
 		// first is mmtf, second is mmcif
 		testFlags(cache,true,false);
 
 		// now change the values
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		testFlags(cache,false,true);
 
-		cache.setUseMmtf(true);
+		cache.setFiletype(StructureFiletype.MMTF);
 
 		testFlags(cache,true,false);
 
 		// this sets to use PDB!
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 
 		testFlags(cache,false,false);
 
 		// back to defaults
-		cache.setUseMmtf(true);
+		cache.setFiletype(StructureFiletype.MMTF);
 
 		testFlags(cache,true,false);
 
 
 		// back to parsing PDB
-		cache.setUseMmtf(false);
+		cache.setFiletype(StructureFiletype.PDB);
 
 		testFlags(cache,false,false);
 
@@ -274,10 +270,10 @@ public void testSettingFileParsingType(){
 	 */
 	private void testFlags(AtomCache cache ,boolean useMmTf, boolean useMmCif) {
 
-		assertEquals("flag for parsing mmtf is set to " + cache.isUseMmtf() + " but should be " + useMmTf,
-				cache.isUseMmtf(), useMmTf);
-		assertEquals("flag for parsing mmcif is set to " + cache.isUseMmCif() + " but should be set to " + useMmCif,
-				cache.isUseMmCif(), useMmCif);
+		assertEquals("flag for parsing mmtf is set to " + cache.getFiletype() + " but should be " + useMmTf,
+				cache.getFiletype() == StructureFiletype.MMTF, useMmTf);
+		assertEquals("flag for parsing mmcif is set to " + cache.getFiletype() + " but should be set to " + useMmCif,
+				cache.getFiletype() == StructureFiletype.CIF, useMmCif);
 
 
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestBond.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestBond.java
index 9a3022d0a1..cd64006861 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestBond.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestBond.java
@@ -52,7 +52,7 @@ public static void setUp() {
 
 		cache = new AtomCache();
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		FileParsingParameters params = cache.getFileParsingParams();
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestCloning.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestCloning.java
index ac8b728d93..4ce757bc91 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestCloning.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestCloning.java
@@ -191,7 +191,7 @@ private void compareCloned(final Structure s, final Structure c) throws Structur
 	public void testBondCloning() throws IOException, StructureException {
 
 		final AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		final FileParsingParameters params = cache.getFileParsingParams();
 		params.setCreateAtomBonds(true);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestEntityResIndexMapping.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestEntityResIndexMapping.java
index f0926364b9..401a42f2cb 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestEntityResIndexMapping.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestEntityResIndexMapping.java
@@ -54,7 +54,7 @@ public void test1B8G() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		Structure s = StructureIO.getStructure("1B8G");
 
 		Chain chainA = s.getPolyChainByPDB("A");
@@ -76,7 +76,7 @@ public void test1SMT() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		Structure s = StructureIO.getStructure("1SMT");
 
 		Chain chainA = s.getPolyChainByPDB("A");
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestExperimentalTechniques.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestExperimentalTechniques.java
index 25436297a6..6ef6224f8d 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestExperimentalTechniques.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestExperimentalTechniques.java
@@ -39,9 +39,9 @@ public void test6F2Q() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		Structure sPdb = StructureIO.getStructure("6F2Q");
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure sCif = StructureIO.getStructure("6F2Q");
 
 		comparePdbToCif(sPdb, sCif);
@@ -69,9 +69,9 @@ public void test3ZPK() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		Structure sPdb = StructureIO.getStructure("3ZPK");
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure sCif = StructureIO.getStructure("3ZPK");
 
 		comparePdbToCif(sPdb, sCif);
@@ -99,9 +99,9 @@ public void test2B6O() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		Structure sPdb = StructureIO.getStructure("2B6O");
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure sCif = StructureIO.getStructure("2B6O");
 
 		comparePdbToCif(sPdb, sCif);
@@ -129,9 +129,9 @@ public void test4CSO() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		Structure sPdb = StructureIO.getStructure("4CSO");
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure sCif = StructureIO.getStructure("4CSO");
 
 		comparePdbToCif(sPdb, sCif);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestLoadStructureFromURL.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestLoadStructureFromURL.java
index c7cf3ede33..fb182535f1 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestLoadStructureFromURL.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestLoadStructureFromURL.java
@@ -50,8 +50,7 @@ public void testLoadStructureFromURL() throws IOException, StructureException{
 			f.mkdir();
 		}
 		AtomCache c = new AtomCache(f.toString(), f.toString());
-		c.setUseMmCif(false);
-		c.setUseMmtf(false);
+		c.setFiletype(StructureFiletype.PDB);
 		// fetch a random small structure
 
 		c.getStructure("1znf");
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestParsingCalcium.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestParsingCalcium.java
index 783ca74dba..c3212fac8c 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestParsingCalcium.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestParsingCalcium.java
@@ -46,7 +46,7 @@ public void testCalciumParsing() throws StructureException, IOException {
 
 		AtomCache cache = new AtomCache();
 		Structure s = cache.getStructure(pdbID);
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		Structure m = cache.getStructure(pdbID);
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestStructureCrossReferences.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestStructureCrossReferences.java
index d2c5b2d0b8..ebcea45acf 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestStructureCrossReferences.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestStructureCrossReferences.java
@@ -50,7 +50,7 @@ public void testCrossReferencesMmCif() throws IOException, StructureException {
 		boolean emptySeqRes = true;
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		FileParsingParameters params = new FileParsingParameters();
 		params.setAlignSeqRes(false); // Store empty seqres groups.
@@ -73,7 +73,7 @@ public void testCrossReferencesMmCifAlignSeqRes() throws IOException, StructureE
 		boolean emptySeqRes = false;
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		FileParsingParameters params = new FileParsingParameters();
 		params.setAlignSeqRes(true);
@@ -97,7 +97,7 @@ public void testCrossReferencesMmCifAlignSeqRes() throws IOException, StructureE
 	public void testCrossReferencesPdb() throws IOException, StructureException {
 		boolean emptySeqRes = true;
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 
 		FileParsingParameters params = new FileParsingParameters();
 		params.setAlignSeqRes(false);  // Store empty seqres groups
@@ -119,7 +119,7 @@ public void testCrossReferencesPdb() throws IOException, StructureException {
 	public void testCrossReferencesPdbAlignSeqRes() throws IOException, StructureException {
 		boolean emptySeqRes = false;
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 
 		FileParsingParameters params = new FileParsingParameters();
 		params.setAlignSeqRes(true);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
index 0882ae08a1..1b30f95ad6 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
@@ -47,6 +47,7 @@
 import org.biojava.nbio.structure.ResidueRangeAndLength;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.StructureIdentifier;
 import org.biojava.nbio.structure.StructureTools;
@@ -372,7 +373,7 @@ public void testEmptyChemComp() throws IOException, StructureException {
 		try {
 			cache.setPath(tmpCache.toString());
 			cache.setCachePath(tmpCache.toString());
-			cache.setUseMmCif(true);
+			cache.setFiletype(StructureFiletype.CIF);
 			ChemCompGroupFactory.setChemCompProvider(new DownloadChemCompProvider(tmpCache.toString()));
 
 			// Create an empty chemcomp
@@ -431,7 +432,7 @@ public void testEmptyGZChemComp() throws IOException, StructureException {
 		try {
 			cache.setPath(tmpCache.toString());
 			cache.setCachePath(tmpCache.toString());
-			cache.setUseMmCif(true);
+			cache.setFiletype(StructureFiletype.CIF);
 			ChemCompGroupFactory.setChemCompProvider(new DownloadChemCompProvider(tmpCache.toString()));
 
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestDifficultMmCIFFiles.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestDifficultMmCIFFiles.java
index 81695918a9..690f877f08 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestDifficultMmCIFFiles.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestDifficultMmCIFFiles.java
@@ -42,6 +42,7 @@
 import org.biojava.nbio.structure.ResidueNumber;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.cif.StructureConverter;
@@ -77,7 +78,7 @@ public void test2KSA() throws IOException, StructureException {
 		StructureIO.setAtomCache(cache);
 
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure sCif = StructureIO.getStructure("2KSA");
 
 		assertNotNull(sCif);
@@ -105,7 +106,7 @@ public void test2BI6() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure sCif = StructureIO.getStructure("2BI6");
 
 		assertNotNull(sCif);
@@ -134,10 +135,10 @@ public void test1GQO() throws IOException, StructureException {
 		params.setParseBioAssembly(true);
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		Structure sPdb = StructureIO.getStructure("1GQO");
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure sCif = StructureIO.getStructure("1GQO");
 
 		assertNotNull(sCif);
@@ -168,7 +169,7 @@ public void test1GQO() throws IOException, StructureException {
 	@Test
 	public void testResidueNumbers() throws IOException, StructureException {
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		Structure s = cache.getStructure("2PTC");
 		Chain c = s.getChainByIndex(0);
@@ -248,7 +249,7 @@ public void test2KLI() throws IOException, StructureException {
 		StructureIO.setAtomCache(cache);
 
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure sCif = StructureIO.getStructure("2KLI");
 
 		assertNotNull(sCif);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
index 6362dc2a84..b205bd2140 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
@@ -24,6 +24,7 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.align.util.AtomCache;
@@ -56,8 +57,7 @@ public void test4A1Immcif() throws IOException, StructureException {
 		int biolAssemblyNr = 2;
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
-		cache.setUseMmtf(false);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 
 		Structure bioAssembly = StructureIO.getBiologicalAssembly(pdbId,biolAssemblyNr);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java
index f447953a32..7d246fc25e 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java
@@ -31,6 +31,7 @@
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemComp;
@@ -60,7 +61,7 @@ public void testHeaderOnly() throws StructureException, IOException {
 
 		// Test 1: with PDB
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 
 		FileParsingParameters params = new FileParsingParameters();
 		params.setHeaderOnly(true);
@@ -74,7 +75,7 @@ public void testHeaderOnly() throws StructureException, IOException {
 		Assert.assertEquals(false, doSeqResHaveAtoms(sPDB));
 
 		// Test 2: with mmCIF
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		Structure sCIF = StructureIO.getStructure(pdbID);
 		Assert.assertEquals(false, doSeqResHaveAtoms(sCIF));
@@ -95,7 +96,7 @@ public void testAlignSeqres() throws StructureException, IOException {
 
 		// Test 1: with PDB
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 
 		FileParsingParameters params = new FileParsingParameters();
 		params.setHeaderOnly(false);
@@ -109,7 +110,7 @@ public void testAlignSeqres() throws StructureException, IOException {
 		check1REPChainC(sPDB); // Check particular residues to be aligned.
 
 		// Test 2: with mmCIF
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		Structure sCIF = StructureIO.getStructure(pdbID);
 		Assert.assertEquals(true, doSeqResHaveAtoms(sCIF));
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java
index 31d4b86dd8..6187f2127b 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java
@@ -40,6 +40,7 @@
 import org.biojava.nbio.structure.ResidueNumber;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.StructureImpl;
 import org.biojava.nbio.structure.StructureTools;
@@ -77,7 +78,7 @@ private static void testRoundTrip(String pdbId) throws IOException, StructureExc
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		FileParsingParameters params = new FileParsingParameters();
 		params.setAlignSeqRes(true);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMcifOrganismParsing.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMcifOrganismParsing.java
index 71733aabaa..31c309f68e 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMcifOrganismParsing.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMcifOrganismParsing.java
@@ -28,6 +28,7 @@
 import org.biojava.nbio.structure.EntityType;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.BeforeClass;
@@ -48,7 +49,7 @@ public class TestMMcifOrganismParsing {
 	public static void setUp() throws Exception {
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 	}
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
index b0c7c8fe55..a604fffcaa 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
@@ -36,6 +36,7 @@
 import org.biojava.nbio.structure.EntityType;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.cif.StructureConverter;
@@ -117,7 +118,7 @@ public void test1B8G() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s = StructureIO.getStructure("1B8G");
 
 		System.out.println("Chains from full deposited file: ");
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFFeatures.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFFeatures.java
index f0c10f5e17..f4d5a6d9d2 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFFeatures.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFFeatures.java
@@ -31,6 +31,7 @@
 import org.biojava.nbio.structure.Site;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
@@ -45,7 +46,7 @@ public void testSSBond()throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		FileParsingParameters params = new FileParsingParameters();
 		params.setCreateAtomBonds(true);
 		cache.setFileParsingParams(params);
@@ -77,7 +78,7 @@ public void testSSBondAltLocs() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		FileParsingParameters params = new FileParsingParameters();
 		params.setCreateAtomBonds(true);
 		cache.setFileParsingParams(params);
@@ -147,7 +148,7 @@ public void testSites()throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure sCif = StructureIO.getStructure("4HHB");
 
 		assertNotNull(sCif);
@@ -181,7 +182,7 @@ public void testSites1a4w()throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure sCif = StructureIO.getStructure("1A4W");
 
 		assertNotNull(sCif);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFLigands.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFLigands.java
index 2a997118f2..76d7d74a3d 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFLigands.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFLigands.java
@@ -29,6 +29,7 @@
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
@@ -50,10 +51,10 @@ public class TestParseMmCIFLigands {
 	public void testLigandConnections()throws IOException, StructureException {
 		AtomCache cache = new AtomCache();
 		// This needs MMCIF
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		ChemCompGroupFactory.setChemCompProvider(new DownloadChemCompProvider());
 
 		FileParsingParameters params = cache.getFileParsingParams();
@@ -93,10 +94,10 @@ private int countBondedAtomsInLigandGroups(Structure s){
 	public void testMultipleConformations()throws IOException, StructureException {
 		AtomCache cache = new AtomCache();
 		// This needs MMCIF
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		ChemCompGroupFactory.setChemCompProvider(new DownloadChemCompProvider());
 
 		FileParsingParameters params = cache.getFileParsingParams();
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseOnAsymId.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseOnAsymId.java
index 448aed4750..fda734d668 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseOnAsymId.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseOnAsymId.java
@@ -27,6 +27,7 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
@@ -39,7 +40,7 @@ public class TestParseOnAsymId {
 	public void test4cup() throws IOException, StructureException {
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		FileParsingParameters params = cache.getFileParsingParams();
 
 		cache.setFileParsingParams(params);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestQuaternaryStructureProviders.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestQuaternaryStructureProviders.java
index c2d4ec71ad..0b67e66aaa 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestQuaternaryStructureProviders.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestQuaternaryStructureProviders.java
@@ -59,7 +59,7 @@ public void test5LDH() throws IOException, StructureException{
 		boolean gotException = false;
 		try {
 			AtomCache cache = new AtomCache();
-			cache.setUseMmCif(true);
+			cache.setFiletype(StructureFiletype.CIF);
 			StructureIO.setAtomCache(cache);
 			StructureIO.getBiologicalAssembly("5LDH",3);
 		} catch (StructureException e) {
@@ -72,7 +72,7 @@ public void test5LDH() throws IOException, StructureException{
 		gotException = false;
 		try {
 			AtomCache cache = new AtomCache();
-			cache.setUseMmCif(true);
+			cache.setFiletype(StructureFiletype.CIF);
 			StructureIO.setAtomCache(cache);
 			StructureIO.getBiologicalAssembly("5LDH",2);
 		} catch (StructureException e) {
@@ -198,7 +198,7 @@ private void comparePdbVsMmcif(String pdbId, int bioMolecule, int mmSize) throws
 	private Structure getPdbBioAssembly(String pdbId, int bioMolecule, boolean multiModel) throws IOException, StructureException {
 		// get bio assembly from PDB file
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		StructureIO.setAtomCache(cache);
 		Structure pdbS = StructureIO.getBiologicalAssembly(pdbId, bioMolecule, multiModel);
 		return pdbS;
@@ -207,7 +207,7 @@ private Structure getPdbBioAssembly(String pdbId, int bioMolecule, boolean multi
 	private Structure getMmcifBioAssembly(String pdbId, int bioMolecule, boolean multiModel) throws IOException, StructureException {
 		// get bio assembly from mmcif file
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		StructureIO.setAtomCache(cache);
 		Structure mmcifS = StructureIO.getBiologicalAssembly(pdbId, bioMolecule, multiModel);
 		return mmcifS;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestTitleParsing.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestTitleParsing.java
index 6b0be0663e..40b1368027 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestTitleParsing.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestTitleParsing.java
@@ -22,6 +22,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
@@ -48,9 +49,9 @@ public void test2W6E() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		Structure sPdb = StructureIO.getStructure("2W6E");
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure sCif = StructureIO.getStructure("2W6E");
 
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestWriteLargeCoordinatePDB.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestWriteLargeCoordinatePDB.java
index 78137f73e2..0588d54d01 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestWriteLargeCoordinatePDB.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestWriteLargeCoordinatePDB.java
@@ -28,6 +28,7 @@
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
@@ -41,7 +42,7 @@ public class TestWriteLargeCoordinatePDB {
 	public void TestWrite5D9Q() throws IOException, StructureException {
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 
 		FileParsingParameters params = new FileParsingParameters();
 		params.setHeaderOnly(false);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestChemCompProvider.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestChemCompProvider.java
index 89af60dc65..cf818c5c18 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestChemCompProvider.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestChemCompProvider.java
@@ -46,7 +46,6 @@ public class TestChemCompProvider {
 
 	// Short test with bad ligand name (QNA is bogus)
 	final	String DNAexample =
-
 	"ATOM      1  H   MET A   1      11.756 -15.759  11.647  1.00  7.95\n" +
 	"ATOM      2  N   MET A   1      12.461 -16.373  11.329  1.00  7.95\n" +
 	"ATOM      3  CA  MET A   1      12.297 -17.782  11.674  1.00  7.95\n" +
@@ -181,7 +180,7 @@ public void testNormalStructure() throws StructureException, IOException {
 		long startTime = System.currentTimeMillis();
 		StructureIO.getStructure("4HHM");
 		long finishTime = System.currentTimeMillis();
-		s_logger.info("ZipChemComp time: "+(finishTime-startTime)+ " ms");
+		s_logger.info("ZipChemComp time: {} ms", finishTime - startTime);
 
 		// Not wanted here for testing, but useful for cleaning up downloaded .cif.gz files.
 		// ZipChemCompProvider.purgeTempFiles(pdbdir.toString());
@@ -189,7 +188,6 @@ public void testNormalStructure() throws StructureException, IOException {
 
 	@Test
 	public void testGetOneLetterCode() throws Exception {
-
 		String oneLetter;
 
 		oneLetter = ChemCompGroupFactory.getOneLetterCode(ChemCompGroupFactory.getChemComp("ALA"));
@@ -202,7 +200,5 @@ public void testGetOneLetterCode() throws Exception {
 		// multiparent case, we should return ?
 		oneLetter = ChemCompGroupFactory.getOneLetterCode(ChemCompGroupFactory.getChemComp("OIM"));
 		assertEquals("?", oneLetter);
-
 	}
-
 }
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
index 94a9a18fa5..9f1fea5eb4 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
@@ -28,6 +28,7 @@
 import org.biojava.nbio.structure.EntityInfo;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
@@ -46,7 +47,7 @@ public void testEntityId() throws IOException, StructureException {
 
 		// Set up the atom cache to parse on Internal chain id
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		FileParsingParameters params = cache.getFileParsingParams();
 
 		DownloadChemCompProvider cc = new DownloadChemCompProvider();
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseInternalChainId.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseInternalChainId.java
index 0132d29de4..8c4084745d 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseInternalChainId.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseInternalChainId.java
@@ -26,6 +26,7 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -40,7 +41,7 @@ public void test2I13() throws IOException, StructureException {
 
 
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 
 		Structure s = cache.getStructure("2I13");
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseMmcifHeader.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseMmcifHeader.java
index 52c76422ec..c0d2423d35 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseMmcifHeader.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseMmcifHeader.java
@@ -31,6 +31,7 @@
 import org.biojava.nbio.structure.PDBHeader;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
@@ -51,7 +52,7 @@ public class TestParseMmcifHeader {
 	public void testRfactors() throws IOException, StructureException {
 
 		AtomCache atomCache = new AtomCache();
-		atomCache.setUseMmCif(true);
+		atomCache.setFiletype(StructureFiletype.CIF);
 
 		Structure structure = atomCache.getStructure("4cup");
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestBondFinding.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestBondFinding.java
index 9e850585b6..e400465ecb 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestBondFinding.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestBondFinding.java
@@ -20,6 +20,7 @@
  */
 package org.biojava.nbio.structure.io.mmtf;
 
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.junit.Test;
@@ -81,7 +82,7 @@ public int getInterBonds(String pdbId) throws IOException, StructureException {
 
 		// Download parameters
 		AtomCache cache = new AtomCache();
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		cache.setFetchBehavior(FetchBehavior.FETCH_FILES);
 		FileParsingParameters params = cache.getFileParsingParams();
 		params.setCreateAtomBonds(true);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java
index 96f9dd8c43..04e4cc93df 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java
@@ -37,6 +37,7 @@
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
@@ -73,7 +74,7 @@ public void testRoundTrip() throws IOException, StructureException {
 		FileParsingParameters params = new FileParsingParameters();
 		params.setParseBioAssembly(true);
 		cache.setFileParsingParams(params);
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		StructureIO.setAtomCache(cache);
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java
index 0bed40a6be..acf23d4f88 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java
@@ -9,6 +9,7 @@
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
@@ -89,8 +90,7 @@ public void checkNonStandardAminoSeqresGroupsPopulated() throws StructureExcepti
         AtomCache cache = new AtomCache();
         FileParsingParameters params = new FileParsingParameters();
         cache.setFileParsingParams(params);
-        cache.setUseMmCif(false);
-        cache.setUseMmtf(true);
+        cache.setFiletype(StructureFiletype.MMTF);
 
         StructureIO.setAtomCache(cache);
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestCrystalInfo.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestCrystalInfo.java
index 501d6eb2af..775588a2ae 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestCrystalInfo.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestCrystalInfo.java
@@ -45,13 +45,13 @@ public void test1NMR() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		Structure s1 = StructureIO.getStructure("1NMR");
 		assertFalse(s1.isCrystallographic());
 		assertTrue(s1.isNmr());
 		assertEquals(s1.getPDBHeader().getExperimentalTechniques().iterator().next(),ExperimentalTechnique.SOLUTION_NMR);
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s2 = StructureIO.getStructure("1NMR");
 		assertFalse(s2.isCrystallographic());
 		assertTrue(s2.isNmr());
@@ -69,14 +69,14 @@ public void test1B8G() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		Structure s1 = StructureIO.getStructure("1B8G");
 		assertTrue(s1.isCrystallographic());
 		assertFalse(s1.isNmr());
 		assertEquals(s1.getPDBHeader().getExperimentalTechniques().iterator().next(),ExperimentalTechnique.XRAY_DIFFRACTION);
 
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s2 = StructureIO.getStructure("1B8G");
 		assertTrue(s2.isCrystallographic());
 		assertFalse(s2.isNmr());
@@ -95,7 +95,7 @@ public void test4M7P() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		Structure s1 = StructureIO.getStructure("4M7P");
 		assertTrue(s1.isCrystallographic());
 		assertFalse(s1.isNmr());
@@ -103,7 +103,7 @@ public void test4M7P() throws IOException, StructureException {
 		assertEquals(s1.getPDBHeader().getExperimentalTechniques().iterator().next(),ExperimentalTechnique.XRAY_DIFFRACTION);
 
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s2 = StructureIO.getStructure("4M7P");
 		assertTrue(s2.isCrystallographic());
 		assertFalse(s2.isNmr());
@@ -123,7 +123,7 @@ public void test2MBQ() throws IOException, StructureException {
 
 		StructureIO.setAtomCache(cache);
 
-		cache.setUseMmCif(false);
+		cache.setFiletype(StructureFiletype.PDB);
 		Structure s1 = StructureIO.getStructure("2MBQ");
 		assertFalse(s1.isCrystallographic());
 		assertTrue(s1.isNmr());
@@ -131,7 +131,7 @@ public void test2MBQ() throws IOException, StructureException {
 		assertEquals(s1.getPDBHeader().getExperimentalTechniques().iterator().next(),ExperimentalTechnique.SOLUTION_NMR);
 
 
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 		Structure s2 = StructureIO.getStructure("2MBQ");
 		assertFalse(s2.isCrystallographic());
 		assertTrue(s2.isNmr());
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestInterfaceClustering.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestInterfaceClustering.java
index af80c99ae1..bb5fe0b74c 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestInterfaceClustering.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestInterfaceClustering.java
@@ -32,6 +32,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.asa.GroupAsa;
@@ -55,7 +56,7 @@ public void test3DDO() throws IOException, StructureException {
 		FileParsingParameters params = new FileParsingParameters();
 		params.setAlignSeqRes(true);
 		cache.setFileParsingParams(params);
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		StructureIO.setAtomCache(cache);
 
@@ -103,7 +104,7 @@ public void test1AUY() throws IOException, StructureException {
 		FileParsingParameters params = new FileParsingParameters();
 		params.setAlignSeqRes(true);
 		cache.setFileParsingParams(params);
-		cache.setUseMmCif(true);
+		cache.setFiletype(StructureFiletype.CIF);
 
 		StructureIO.setAtomCache(cache);
 

From e7f563d78c31227d4f09736f5e6c6050da2d6a7d Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Mon, 25 Jan 2021 13:13:45 -0800
Subject: [PATCH 020/599] fix bcif download

---
 .../org/biojava/nbio/structure/io/LocalPDBDirectory.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index 61735ecfa6..72ff6dee38 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -517,8 +517,11 @@ private File downloadStructure(String pdbId, String pathOnServer, boolean obsole
 
 		String ftp;
 
-		if (getFilename(pdbId).endsWith(".mmtf.gz")){
+		String filename = getFilename(pdbId);
+		if (filename.endsWith(".mmtf.gz")){
 			ftp = CodecUtils.getMmtfEntryUrl(pdbId, true, false);
+		} else if (filename.endsWith(".bcif") || filename.endsWith(".bcif.gz")) {
+			ftp = "https://models.rcsb.org/" + filename;
 		} else {
 			ftp = String.format("%s%s/%s/%s",
 			serverName, pathOnServer, pdbId.substring(1,3).toLowerCase(), getFilename(pdbId));

From 0c00caca270976872b4423d0d344e00bd1e8fe28 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Mon, 25 Jan 2021 15:59:53 -0800
Subject: [PATCH 021/599] fix chemcomp type

---
 .../java/org/biojava/nbio/structure/chem/ResidueType.java     | 4 ++++
 .../nbio/structure/io/mmcif/TestEntityNameAndType.java        | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ResidueType.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ResidueType.java
index ddcaac453c..33390df136 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ResidueType.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ResidueType.java
@@ -88,6 +88,10 @@ public PolymerType getPolymerType() {
      * @return
      */
     public static ResidueType getResidueTypeFromString(String chem_comp_type) {
+        if (chem_comp_type == null) {
+            return null;
+        }
+
         // Almost all calls to this method are for L-peptide linking. Use this knowledge for a shortcut.
         if (chem_comp_type.equalsIgnoreCase(lPeptideLinking.chem_comp_type)) {
             return lPeptideLinking;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
index 9f1fea5eb4..88b5c3cc40 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertArrayEquals;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.EntityInfo;
@@ -97,6 +98,8 @@ public void testEntityId() throws IOException, StructureException {
 		assertArrayEquals(descriptionInformation, testDescInfo);
 		assertArrayEquals(typeInformation, testTypeInfo);
 		// Now check these work too
+		System.out.println(Arrays.toString(geneSourceSciName));
+		System.out.println(Arrays.toString(testGeneSourceSciName));
 		assertArrayEquals(geneSourceSciName, testGeneSourceSciName);
 		assertArrayEquals(geneSourceTaxId, testGeneSourceTaxId);
 		assertArrayEquals(hostOrganismSciName, testHostOrganismSciName);

From 85b6c6b3e7794f38a2cf916c865e8981163f9028 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Tue, 26 Jan 2021 10:39:34 -0800
Subject: [PATCH 022/599] chem comp parsing errors & missing crystal
 translation

---
 .../chem/DownloadChemCompProvider.java        | 11 ++++--
 .../structure/io/cif/ChemCompConverter.java   |  1 -
 .../io/cif/StructureConsumerImpl.java         |  3 ++
 .../biojava/nbio/structure/TestAtomCache.java | 36 ++++++-------------
 4 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
index 71a17b7292..e250a1ebd8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -5,6 +5,7 @@
 import org.biojava.nbio.structure.align.util.UserConfiguration;
 import org.biojava.nbio.structure.io.LocalPDBDirectory;
 import org.biojava.nbio.structure.io.cif.ChemCompConverter;
+import org.rcsb.cif.ParsingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -217,8 +218,14 @@ public ChemComp getChemComp(String recordName) {
         if (haveFile) {
             String filename = getLocalFileName(recordName);
             try {
-                ChemicalComponentDictionary dict = ChemCompConverter.fromPath(Paths.get(filename));
-                ChemComp chemComp = dict.getChemComp(recordName);
+                ChemComp chemComp;
+                try {
+                    ChemicalComponentDictionary dict = ChemCompConverter.fromPath(Paths.get(filename));
+                    chemComp = dict.getChemComp(recordName);
+                } catch (ParsingException e) {
+                    // happens for corrupt files
+                    chemComp = null;
+                }
 
                 // May be null if the file was corrupt. Fall back on ReducedChemCompProvider in that case
                 if (chemComp != null) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConverter.java
index d234d27dc4..aec300e717 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConverter.java
@@ -1,6 +1,5 @@
 package org.biojava.nbio.structure.io.cif;
 
-import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.chem.ChemicalComponentDictionary;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.rcsb.cif.CifIO;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
index d858536847..346ac12d41 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
@@ -1377,14 +1377,17 @@ private void setStructNcsOps() {
                 operator.setElement(0, 0, structNcsOper.getMatrix11().get(rowIndex));
                 operator.setElement(0, 1, structNcsOper.getMatrix12().get(rowIndex));
                 operator.setElement(0, 2, structNcsOper.getMatrix13().get(rowIndex));
+                operator.setElement(0, 3, structNcsOper.getVector1().get(rowIndex));
 
                 operator.setElement(1, 0, structNcsOper.getMatrix21().get(rowIndex));
                 operator.setElement(1, 1, structNcsOper.getMatrix22().get(rowIndex));
                 operator.setElement(1, 2, structNcsOper.getMatrix23().get(rowIndex));
+                operator.setElement(1, 3, structNcsOper.getVector2().get(rowIndex));
 
                 operator.setElement(2, 0, structNcsOper.getMatrix31().get(rowIndex));
                 operator.setElement(2, 1, structNcsOper.getMatrix32().get(rowIndex));
                 operator.setElement(2, 2, structNcsOper.getMatrix33().get(rowIndex));
+                operator.setElement(2, 3, structNcsOper.getVector3().get(rowIndex));
 
                 operator.setElement(3, 0, 0);
                 operator.setElement(3, 1, 0);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
index 17c6836a4f..5de3eca23a 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
@@ -220,45 +220,32 @@ public void testFetchObsolete() throws IOException, StructureException {
 
 	}
 
-
 	@Test
 	public void testSettingFileParsingType(){
-
 		AtomCache cache = new AtomCache();
 
 		//test defaults
-
 		// first is mmtf, second is mmcif
-		testFlags(cache,true,false);
+		testFlags(cache, false, false, true);
 
 		// now change the values
-
 		cache.setFiletype(StructureFiletype.CIF);
-
-		testFlags(cache,false,true);
+		testFlags(cache, false, true, false);
 
 		cache.setFiletype(StructureFiletype.MMTF);
-
-		testFlags(cache,true,false);
+		testFlags(cache, true, false, false);
 
 		// this sets to use PDB!
 		cache.setFiletype(StructureFiletype.PDB);
+		testFlags(cache, false, false, false);
 
-		testFlags(cache,false,false);
-
-		// back to defaults
+		// back to MMTF
 		cache.setFiletype(StructureFiletype.MMTF);
-
-		testFlags(cache,true,false);
-
+		testFlags(cache, true, false, false);
 
 		// back to parsing PDB
 		cache.setFiletype(StructureFiletype.PDB);
-
-		testFlags(cache,false,false);
-
-
-
+		testFlags(cache, false, false, false);
 	}
 
 
@@ -268,15 +255,12 @@ public void testSettingFileParsingType(){
 	 * @param useMmTf
 	 * @param useMmCif
 	 */
-	private void testFlags(AtomCache cache ,boolean useMmTf, boolean useMmCif) {
-
+	private void testFlags(AtomCache cache ,boolean useMmTf, boolean useMmCif, boolean useBcif) {
 		assertEquals("flag for parsing mmtf is set to " + cache.getFiletype() + " but should be " + useMmTf,
 				cache.getFiletype() == StructureFiletype.MMTF, useMmTf);
 		assertEquals("flag for parsing mmcif is set to " + cache.getFiletype() + " but should be set to " + useMmCif,
 				cache.getFiletype() == StructureFiletype.CIF, useMmCif);
-
-
-
+		assertEquals("flag for parsing bcif is set to " + cache.getFiletype() + " but should be set to " + useBcif,
+				cache.getFiletype() == StructureFiletype.BCIF, useBcif);
 	}
-
 }

From e9c59f677f33a4d89bb539be80df36dd91af2e9b Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Tue, 26 Jan 2021 11:10:00 -0800
Subject: [PATCH 023/599] fix entity parsing

---
 .../nbio/structure/io/cif/StructureConsumerImpl.java        | 6 +++---
 .../nbio/structure/io/mmcif/TestEntityNameAndType.java      | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
index 346ac12d41..e49d9aaefe 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
@@ -1315,7 +1315,7 @@ private void addAncilliaryEntityData(int asymRowIndex, EntityInfo entityInfo) {
         // This is a potentially huge assumption...
 
         for (int rowIndex = 0; rowIndex < entitySrcGen.getRowCount(); rowIndex++) {
-            if (entitySrcGen.getEntityId().get(rowIndex).equals(structAsym.getEntityId().get(asymRowIndex))) {
+            if (!entitySrcGen.getEntityId().get(rowIndex).equals(structAsym.getEntityId().get(asymRowIndex))) {
                 continue;
             }
 
@@ -1323,7 +1323,7 @@ private void addAncilliaryEntityData(int asymRowIndex, EntityInfo entityInfo) {
         }
 
         for (int rowIndex = 0; rowIndex < entitySrcNat.getRowCount(); rowIndex++) {
-            if (entitySrcNat.getEntityId().get(rowIndex).equals(structAsym.getEntityId().get(asymRowIndex))) {
+            if (!entitySrcNat.getEntityId().get(rowIndex).equals(structAsym.getEntityId().get(asymRowIndex))) {
                 continue;
             }
 
@@ -1331,7 +1331,7 @@ private void addAncilliaryEntityData(int asymRowIndex, EntityInfo entityInfo) {
         }
 
         for (int rowIndex = 0; rowIndex < entitySrcSyn.getRowCount(); rowIndex++) {
-            if (entitySrcSyn.getEntityId().get(rowIndex).equals(structAsym.getEntityId().get(asymRowIndex))) {
+            if (!entitySrcSyn.getEntityId().get(rowIndex).equals(structAsym.getEntityId().get(asymRowIndex))) {
                 continue;
             }
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
index 88b5c3cc40..444a7b800e 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
@@ -98,8 +98,6 @@ public void testEntityId() throws IOException, StructureException {
 		assertArrayEquals(descriptionInformation, testDescInfo);
 		assertArrayEquals(typeInformation, testTypeInfo);
 		// Now check these work too
-		System.out.println(Arrays.toString(geneSourceSciName));
-		System.out.println(Arrays.toString(testGeneSourceSciName));
 		assertArrayEquals(geneSourceSciName, testGeneSourceSciName);
 		assertArrayEquals(geneSourceTaxId, testGeneSourceTaxId);
 		assertArrayEquals(hostOrganismSciName, testHostOrganismSciName);

From c30ab8f4a329279b04c0c2d7e351678cb6533f28 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 26 Jan 2021 11:19:17 -0800
Subject: [PATCH 024/599] Solving jaxb warning

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 411aa6d1be..66521c8b2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -519,17 +519,17 @@
 			<dependency>
 			    <groupId>javax.xml.bind</groupId>
 			    <artifactId>jaxb-api</artifactId>
-			    <version>2.3.0</version>
+			    <version>2.3.1</version>
 			</dependency>
 			<dependency>
 				<groupId>com.sun.xml.bind</groupId>
 				<artifactId>jaxb-core</artifactId>
-				<version>2.3.0</version>
+				<version>2.3.0.1</version>
 			</dependency>
 			<dependency>
 				<groupId>com.sun.xml.bind</groupId>
 				<artifactId>jaxb-impl</artifactId>
-				<version>2.3.0</version>
+				<version>2.3.3</version>
 			</dependency>
 			<dependency>
 				<groupId>javax.activation</groupId>

From 28815dbd5c5d08cdad8a7b2e486cefb3b7a02106 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Tue, 26 Jan 2021 11:41:12 -0800
Subject: [PATCH 025/599] handle missing rfree/rwork

---
 .../biojava/nbio/structure/io/cif/StructureConsumerImpl.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
index e49d9aaefe..35f46dc066 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
@@ -39,6 +39,7 @@
 import org.rcsb.cif.model.FloatColumn;
 import org.rcsb.cif.model.IntColumn;
 import org.rcsb.cif.model.StrColumn;
+import org.rcsb.cif.model.ValueKind;
 import org.rcsb.cif.schema.mm.AtomSite;
 import org.rcsb.cif.schema.mm.AtomSites;
 import org.rcsb.cif.schema.mm.AuditAuthor;
@@ -829,7 +830,7 @@ public void consumeRefine(Refine refine) {
                 logger.warn("More than 1 Rfree value present, will use last one {} and discard previous {}",
                         lsRFactorRFree, String.format("%4.2f",pdbHeader.getRfree()));
             }
-            if (lsRFactorRFree.isDefined()) {
+            if (lsRFactorRFree.isDefined() && lsRFactorRFree.getValueKind(rowIndex) == ValueKind.PRESENT) {
                 pdbHeader.setRfree((float) lsRFactorRFree.get(rowIndex));
             } else {
                 // some entries like 2ifo haven't got this field at all
@@ -842,7 +843,7 @@ public void consumeRefine(Refine refine) {
                 logger.warn("More than 1 R work value present, will use last one {} and discard previous {} ",
                         lsRFactorRWork, String.format("%4.2f",pdbHeader.getRwork()));
             }
-            if (lsRFactorRWork.isDefined()) {
+            if (lsRFactorRWork.isDefined() && lsRFactorRWork.getValueKind(rowIndex) == ValueKind.PRESENT) {
                 pdbHeader.setRwork((float) lsRFactorRWork.get(rowIndex));
             } else {
                 logger.info("_refine.ls_R_factor_R_work not present, not parsing R-work value");

From f36f82cb601895aa2f78f1dd440a072762cb0516 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Tue, 26 Jan 2021 11:59:45 -0800
Subject: [PATCH 026/599] SCOP hack to force loading of MMTF

---
 .../nbio/structure/align/util/AtomCache.java  | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
index 4181792515..3067e5955d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
@@ -524,7 +524,8 @@ public Structure getStructureForDomain(ScopDomain domain, ScopDatabase scopDatab
 	public Structure getStructureForDomain(ScopDomain domain, ScopDatabase scopDatabase, boolean strictLigandHandling)
 			throws IOException, StructureException {
 		String pdbId = domain.getPdbId();
-		Structure fullStructure = getStructureForPdbId(pdbId);
+		// SMB 1/26/21 - forcing loading MMTF here - TODO why doesn't mmCIF/CIF/BCIF parsing work here?
+		Structure fullStructure = getStructureForPdbIdByMmtf(pdbId);
 		Structure structure = domain.reduce(fullStructure);
 
 		// TODO It would be better to move all of this into the reduce method,
@@ -800,6 +801,33 @@ public Structure getStructureForPdbId(String pdbId) throws IOException, Structur
 		}
 	}
 
+	/**
+	 * SCOP parsing depends on MMTF, this a dedicated method to allow for that.
+	 * @param pdbId what to load
+	 * @return a Structure object
+	 * @throws IOException
+	 * @throws StructureException
+	 */
+	private Structure getStructureForPdbIdByMmtf(String pdbId) throws IOException, StructureException {
+		if (pdbId == null)
+			return null;
+		if (pdbId.length() != 4) {
+			throw new StructureException("Unrecognized PDB ID: " + pdbId);
+		}
+		while (checkLoading(pdbId)) {
+			// waiting for loading to be finished...
+
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+				logger.error(e.getMessage());
+			}
+		}
+
+		logger.debug("loading from mmtf");
+		return loadStructureFromMmtfByPdbId(pdbId);
+	}
+
 	/**
 	 * Load a {@link Structure} from MMTF either from the local file system.
 	 * @param pdbId the input PDB id

From 63d2ee7d2e25f929b9630cc5eebe4b102fa4bb58 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Tue, 26 Jan 2021 12:23:10 -0800
Subject: [PATCH 027/599] bcif/models URL is a constant

---
 .../org/biojava/nbio/structure/io/LocalPDBDirectory.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index d207c5c886..2db30b046f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -63,6 +63,11 @@ public abstract class LocalPDBDirectory implements StructureIOFile {
 	public static final String DEFAULT_PDB_FILE_SERVER = "http://ftp.wwpdb.org";
 	public static final String PDB_FILE_SERVER_PROPERTY = "PDB.FILE.SERVER";
 
+	/**
+	 * The default server to retrieve BinaryCIF files.
+	 */
+	public static final String DEFAULT_BCIF_FILE_SERVER = "https://models.rcsb.org/";
+
 	/**
 	 * Behaviors for when an obsolete structure is requested.
 	 * @author Spencer Bliven
@@ -521,7 +526,8 @@ private File downloadStructure(String pdbId, String pathOnServer, boolean obsole
 		if (filename.endsWith(".mmtf.gz")){
 			ftp = CodecUtils.getMmtfEntryUrl(pdbId, true, false);
 		} else if (filename.endsWith(".bcif") || filename.endsWith(".bcif.gz")) {
-			ftp = "https://models.rcsb.org/" + filename;
+			// TODO this should be configurable
+			ftp = DEFAULT_BCIF_FILE_SERVER + filename;
 		} else {
 			ftp = String.format("%s%s/%s/%s",
 			serverName, pathOnServer, pdbId.substring(1,3).toLowerCase(), getFilename(pdbId));

From 2d4cc74edd6f3a88689a6de40b579a701230a351 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Tue, 26 Jan 2021 14:41:25 -0800
Subject: [PATCH 028/599] StructureInterface#toMMCIF

---
 .../structure/contact/StructureInterface.java | 95 ++++++++++---------
 .../io/cif/AbstractCifFileSupplier.java       | 20 ++--
 .../structure/io/cif/CifFileSupplier.java     |  2 -
 3 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
index de50722b34..72a4cc2178 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
@@ -20,12 +20,6 @@
  */
 package org.biojava.nbio.structure.contact;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
 import org.biojava.nbio.structure.Atom;
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Element;
@@ -40,10 +34,24 @@
 import org.biojava.nbio.structure.chem.PolymerType;
 import org.biojava.nbio.structure.io.FileConvert;
 import org.biojava.nbio.structure.io.FileParsingParameters;
+import org.biojava.nbio.structure.io.cif.AbstractCifFileSupplier;
 import org.biojava.nbio.structure.xtal.CrystalTransform;
+import org.rcsb.cif.CifBuilder;
+import org.rcsb.cif.CifIO;
+import org.rcsb.cif.model.Category;
+import org.rcsb.cif.schema.StandardSchemata;
+import org.rcsb.cif.schema.mm.MmCifBlockBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.UncheckedIOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
 
 /**
  * An interface between 2 molecules (2 sets of atoms).
@@ -748,45 +756,46 @@ public String toPDB() {
 	 * @return the mmCIF-formatted string
 	 */
 	public String toMMCIF() {
-		StringBuilder sb = new StringBuilder();
+		String molecId1 = getMoleculeIds().getFirst();
+		String molecId2 = getMoleculeIds().getSecond();
 
-		// TODO impl
-//		String molecId1 = getMoleculeIds().getFirst();
-//		String molecId2 = getMoleculeIds().getSecond();
-//
-//		if (isSymRelated()) {
-//			// if both chains are named equally we want to still named them differently in the output mmcif file
-//			// so that molecular viewers can handle properly the 2 chains as separate entities
-//			molecId2 = molecId2 + "_" +getTransforms().getSecond().getTransformId();
-//		}
-//
-//		sb.append(SimpleMMcifParser.MMCIF_TOP_HEADER).append("BioJava_interface_").append(getId()).append(System.getProperty("line.separator"));
-//
-//		sb.append(FileConvert.getAtomSiteHeader());
-//
-//		// we reassign atom ids if sym related (otherwise atom ids would be duplicated and some molecular viewers can't cope with that)
-//		int atomId = 1;
-//		List<AtomSite> atomSites = new ArrayList<>();
-//		for (Atom atom:this.molecules.getFirst()) {
-//			if (isSymRelated()) {
-//				atomSites.add(MMCIFFileTools.convertAtomToAtomSite(atom, 1, molecId1, molecId1, atomId));
-//			} else {
-//				atomSites.add(MMCIFFileTools.convertAtomToAtomSite(atom, 1, molecId1, molecId1));
-//			}
-//			atomId++;
-//		}
-//		for (Atom atom:this.molecules.getSecond()) {
-//			if (isSymRelated()) {
-//				atomSites.add(MMCIFFileTools.convertAtomToAtomSite(atom, 1, molecId2, molecId2, atomId));
-//			} else {
-//				atomSites.add(MMCIFFileTools.convertAtomToAtomSite(atom, 1, molecId2, molecId2));
-//			}
-//			atomId++;
-//		}
-//
-//		sb.append(MMCIFFileTools.toMMCIF(atomSites,AtomSite.class));
+		if (isSymRelated()) {
+			// if both chains are named equally we want to still named them differently in the output mmcif file
+			// so that molecular viewers can handle properly the 2 chains as separate entities
+			molecId2 = molecId2 + "_" + getTransforms().getSecond().getTransformId();
+		}
 
-		return sb.toString();
+		MmCifBlockBuilder mmCifBlockBuilder = CifBuilder.enterFile(StandardSchemata.MMCIF)
+				.enterBlock("BioJava_interface_" + getId());
+
+		// we reassign atom ids if sym related (otherwise atom ids would be duplicated and some molecular viewers can't cope with that)
+		int atomId = 1;
+		List<AbstractCifFileSupplier.WrappedAtom> wrappedAtoms = new ArrayList<>();
+		for (Atom atom : this.molecules.getFirst()) {
+			if (isSymRelated()) {
+				wrappedAtoms.add(new AbstractCifFileSupplier.WrappedAtom(1, molecId1, molecId1, atom, atomId));
+			} else {
+				wrappedAtoms.add(new AbstractCifFileSupplier.WrappedAtom(1, molecId1, molecId1, atom, atom.getPDBserial()));
+			}
+			atomId++;
+		}
+		for (Atom atom : this.molecules.getSecond()) {
+			if (isSymRelated()) {
+				wrappedAtoms.add(new AbstractCifFileSupplier.WrappedAtom(1, molecId2, molecId2, atom, atomId));
+			} else {
+				wrappedAtoms.add(new AbstractCifFileSupplier.WrappedAtom(1, molecId2, molecId2, atom, atom.getPDBserial()));
+			}
+			atomId++;
+		}
+
+		Category atomSite = wrappedAtoms.stream().collect(AbstractCifFileSupplier.toAtomSite());
+		mmCifBlockBuilder.addCategory(atomSite);
+
+		try {
+			return new String(CifIO.writeText(mmCifBlockBuilder.leaveBlock().leaveFile()));
+		} catch (IOException e) {
+			throw new UncheckedIOException(e);
+		}
 	}
 
 	@Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
index 0c039467c1..2cb5e11acf 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
@@ -107,7 +107,7 @@ protected void handleChain(Chain chain, int model, List<WrappedAtom> wrappedAtom
                     continue;
                 }
 
-                uniqueAtoms.put(atom.getPDBserial(), new WrappedAtom(chain, model, chainName, chainId, atom, atom.getPDBserial()));
+                uniqueAtoms.put(atom.getPDBserial(), new WrappedAtom(model, chainName, chainId, atom, atom.getPDBserial()));
             }
 
             if (group.hasAltLoc()) {
@@ -118,7 +118,7 @@ protected void handleChain(Chain chain, int model, List<WrappedAtom> wrappedAtom
                             continue;
                         }
 
-                        uniqueAtoms.put(atom.getPDBserial(), new WrappedAtom(chain, model, chainName, chainId, atom, atom.getPDBserial()));
+                        uniqueAtoms.put(atom.getPDBserial(), new WrappedAtom(model, chainName, chainId, atom, atom.getPDBserial()));
                     }
                 }
             }
@@ -127,16 +127,14 @@ protected void handleChain(Chain chain, int model, List<WrappedAtom> wrappedAtom
         }
     }
 
-    static class WrappedAtom {
-        private final Chain chain;
+    public static class WrappedAtom {
         private final int model;
         private final String chainName;
         private final String chainId;
         private final Atom atom;
         private final int atomId;
 
-        WrappedAtom(Chain chain, int model, String chainName, String chainId, Atom atom, int atomId) {
-            this.chain = chain;
+        public WrappedAtom(int model, String chainName, String chainId, Atom atom, int atomId) {
             this.model = model;
             this.chainName = chainName;
             this.chainId = chainId;
@@ -144,10 +142,6 @@ static class WrappedAtom {
             this.atomId = atomId;
         }
 
-        Chain getChain() {
-            return chain;
-        }
-
         int getModel() {
             return model;
         }
@@ -169,7 +163,7 @@ int getAtomId() {
         }
     }
 
-    private static Collector<WrappedAtom, ?, Category> toAtomSite() {
+    public static Collector<WrappedAtom, ?, Category> toAtomSite() {
         return Collector.of(AtomSiteCollector::new,
                 AtomSiteCollector::accept,
                 AtomSiteCollector::combine,
@@ -255,7 +249,7 @@ public void accept(WrappedAtom wrappedAtom) {
             labelEntityId.add(entityId);
             labelSeqId.add(seqId);
             String insCode = "";
-            if (group.getResidueNumber().getInsCode() != null ) {
+            if (group.getResidueNumber().getInsCode() != null) {
                 insCode = Character.toString(group.getResidueNumber().getInsCode());
             }
             if (insCode.isEmpty()) {
@@ -276,7 +270,7 @@ public void accept(WrappedAtom wrappedAtom) {
         }
 
         AtomSiteCollector combine(AtomSiteCollector other) {
-            throw new UnsupportedOperationException("impl by calling addAll for all collection");
+            throw new UnsupportedOperationException("impl by calling addAll for all collections");
         }
 
         Category get() {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplier.java
index 08f35fce54..e46a0bf058 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplier.java
@@ -2,8 +2,6 @@
 
 import org.rcsb.cif.model.CifFile;
 
-import java.util.function.Supplier;
-
 /**
  * Create a CifFile instance for a given container of structure data.
  * @param <S> the container type used as source

From b7a40c545ff7aad55ee12433a51ea87fc8e09957 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Tue, 26 Jan 2021 18:04:43 -0800
Subject: [PATCH 029/599] TODO TestHardBioUnits

---
 .../java/org/biojava/nbio/structure/io/TestHardBioUnits.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
index b205bd2140..2c73fe0e0d 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
@@ -108,6 +108,10 @@ public void test4A1I() throws IOException, StructureException {
 		String pdbId = "4A1I";
 		int biolAssemblyNr = 2;
 
+		AtomCache atomCache = new AtomCache();
+		// TODO there seem to be numerical instabilities when parsing BCIF
+		atomCache.setFiletype(StructureFiletype.CIF);
+		StructureIO.setAtomCache(atomCache);
 		Structure bioAssembly = StructureIO.getBiologicalAssembly(pdbId,biolAssemblyNr);
 
 		if ( bioAssembly == null){

From 2f91dbf2d3085076f2b38f0e90c5c304c2c86727 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Tue, 26 Jan 2021 18:23:12 -0800
Subject: [PATCH 030/599] those aren't the FloatColumns you're looking for

---
 .../nbio/structure/io/cif/MetalBondConsumerImpl.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java
index d9d03a9590..4d484e5465 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java
@@ -33,15 +33,15 @@ public void finish() {
     public void consume(Category category) {
         StrColumn atomType1 = (StrColumn) category.getColumn("atom_type_1");
         StrColumn atomType2 = (StrColumn) category.getColumn("atom_type_2");
-        FloatColumn lowerLimit = (FloatColumn) category.getColumn("lower_limit");
-        FloatColumn upperLimit = (FloatColumn) category.getColumn("upper_limit");
+        StrColumn lowerLimit = (StrColumn) category.getColumn("lower_limit");
+        StrColumn upperLimit = (StrColumn) category.getColumn("upper_limit");
         for (int i = 0; i < category.getRowCount(); i++) {
             MetalBondDistance d = new MetalBondDistance();
 
             d.setAtomType1(atomType1.get(i));
             d.setAtomType2(atomType2.get(i));
-            d.setLowerLimit((float) lowerLimit.get(i));
-            d.setUpperLimit((float) upperLimit.get(i));
+            d.setLowerLimit(Float.parseFloat(lowerLimit.get(i)));
+            d.setUpperLimit(Float.parseFloat(upperLimit.get(i)));
 
             List<MetalBondDistance> defs = definitions.computeIfAbsent(d.getAtomType1(), k -> new ArrayList<>());
             defs.add(d);

From 9f42c9c142207737970489115a9880096cacc111 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Tue, 26 Jan 2021 18:51:31 -0800
Subject: [PATCH 031/599] trigger build

---
 .../org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java
index 4d484e5465..7a5d600c79 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumerImpl.java
@@ -2,7 +2,6 @@
 
 import org.biojava.nbio.structure.chem.MetalBondDistance;
 import org.rcsb.cif.model.Category;
-import org.rcsb.cif.model.FloatColumn;
 import org.rcsb.cif.model.StrColumn;
 
 import java.util.ArrayList;

From 454830a223fb4a2b90c7d7650033b99ffad4783c Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Wed, 27 Jan 2021 09:20:52 -0800
Subject: [PATCH 032/599] docs

---
 .../structure/test/StructureToolsTest.java    |   1 +
 .../biojava/nbio/structure/test/Test1o2f.java |   2 +-
 .../test/io/TestAtomCachePerformance.java     |   2 +-
 .../structure/test/io/TestBioassemblies.java  |   2 +-
 .../test/io/TestCrystallographicMetadata.java |   2 +-
 .../test/io/TestLongPdbVsMmCifParsing.java    |   1 +
 .../io/TestStructWithMultiparentChemComp.java |   2 +-
 .../cif/CifFileSupplierIntegrationTest.java   |  10 +-
 .../TestQuatSymmetryDetectorExamples.java     |   2 +-
 .../test/xtal/TestCrystalBuilder.java         |   2 +-
 .../main/java/demo/DemoQuatSymmetryJmol.java  |   2 +-
 .../main/java/demo/DemoShowLargeAssembly.java |   2 +-
 .../src/main/java/demo/DemoAsa.java           |   2 +-
 .../src/main/java/demo/DemoContacts.java      |   1 +
 .../main/java/demo/DemoCrystalInterfaces.java |   2 +-
 .../src/main/java/demo/DemoLoadSecStruc.java  |   2 +-
 .../src/main/java/demo/DemoMMCIFReader.java   |   1 +
 .../java/demo/DemoMmcifToPdbConverter.java    |   4 +-
 .../org/biojava/nbio/structure/Chain.java     |   1 +
 .../nbio/structure/DatabasePDBRevRecord.java  |   7 +-
 .../org/biojava/nbio/structure/Group.java     | 103 ++++++------
 .../biojava/nbio/structure/StructureIO.java   |   1 +
 .../biojava/nbio/structure/URLIdentifier.java |   7 +-
 .../nbio/structure/align/util/AtomCache.java  |   1 +
 .../align/util/UserConfiguration.java         | 156 +++++++++++-------
 .../biojava/nbio/structure/chem/ChemComp.java |   4 +-
 .../nbio/structure/chem/ChemCompAtom.java     |   7 +-
 .../nbio/structure/chem/ChemCompBond.java     |   7 +-
 .../structure/chem/ChemCompDescriptor.java    |   7 +-
 .../nbio/structure/io/BcifFileReader.java     |   6 +-
 .../nbio/structure/io/CifFileReader.java      |   6 +-
 .../nbio/structure/io/FileConvert.java        |  15 +-
 .../structure/{ => io}/StructureFiletype.java |   9 +-
 .../io/cif/AbstractCifFileSupplier.java       |  28 +++-
 .../structure/io/cif/ChemCompConsumer.java    |  18 +-
 .../io/cif/ChemCompConsumerImpl.java          |   4 +
 .../structure/io/cif/ChemCompConverter.java   |   4 +-
 .../nbio/structure/io/cif/CifBean.java        |   9 +-
 ...ierImpl.java => CifChainSupplierImpl.java} |   6 +-
 .../structure/io/cif/CifFileConsumer.java     |   3 +-
 .../structure/io/cif/CifFileSupplier.java     |   2 +-
 ...onsumer.java => CifStructureConsumer.java} |   7 +-
 ...mpl.java => CifStructureConsumerImpl.java} |   8 +-
 ...verter.java => CifStructureConverter.java} |  14 +-
 ...mpl.java => CifStructureSupplierImpl.java} |   6 +-
 .../structure/io/cif/MetalBondConsumer.java   |   7 +-
 .../structure/io/cif/MetalBondConverter.java  |   2 +-
 .../nbio/structure/io/mmtf/MmtfUtils.java     |   3 +-
 .../org/biojava/nbio/structure/Test2JA5.java  |   1 +
 .../org/biojava/nbio/structure/Test4hhb.java  |   4 +-
 .../biojava/nbio/structure/TestAltLocs.java   |  13 +-
 .../biojava/nbio/structure/TestAtomCache.java |   1 +
 .../org/biojava/nbio/structure/TestBond.java  |   1 +
 .../biojava/nbio/structure/TestCloning.java   |   1 +
 .../structure/TestEntityResIndexMapping.java  |   1 +
 .../structure/TestExperimentalTechniques.java |   1 +
 .../structure/TestLoadStructureFromURL.java   |   1 +
 .../nbio/structure/TestParsingCalcium.java    |   1 +
 .../TestStructureCrossReferences.java         |   1 +
 .../structure/align/util/AtomCacheTest.java   |   2 +-
 .../structure/io/TestDifficultMmCIFFiles.java |   7 +-
 .../nbio/structure/io/TestHardBioUnits.java   |   1 -
 .../nbio/structure/io/TestHeaderOnly.java     |   5 +-
 .../nbio/structure/io/TestMMCIFWriting.java   |   7 +-
 .../io/TestMMcifOrganismParsing.java          |   1 -
 .../structure/io/TestNonDepositedFiles.java   |  13 +-
 .../structure/io/TestParseMmCIFFeatures.java  |   1 -
 .../structure/io/TestParseMmCIFLigands.java   |   1 -
 .../nbio/structure/io/TestParseOnAsymId.java  |   1 -
 .../nbio/structure/io/TestTitleParsing.java   |   1 -
 .../io/TestWriteLargeCoordinatePDB.java       |   1 -
 .../io/mmcif/TestEntityNameAndType.java       |   3 +-
 .../io/mmcif/TestParseInternalChainId.java    |   2 +-
 .../io/mmcif/TestParseMmcifHeader.java        |   2 +-
 .../structure/io/mmtf/TestBondFinding.java    |   2 +-
 .../structure/io/mmtf/TestMmtfRoundTrip.java  |   8 +-
 .../io/mmtf/TestMmtfStructureReader.java      |   2 +-
 .../nbio/structure/xtal/TestCrystalInfo.java  |   1 +
 .../xtal/TestInterfaceClustering.java         |   2 +-
 79 files changed, 357 insertions(+), 232 deletions(-)
 rename biojava-structure/src/main/java/org/biojava/nbio/structure/{ => io}/StructureFiletype.java (75%)
 rename biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/{ChainSupplierImpl.java => CifChainSupplierImpl.java} (77%)
 rename biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/{StructureConsumer.java => CifStructureConsumer.java} (98%)
 rename biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/{StructureConsumerImpl.java => CifStructureConsumerImpl.java} (99%)
 rename biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/{StructureConverter.java => CifStructureConverter.java} (95%)
 rename biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/{StructureSupplierImpl.java => CifStructureSupplierImpl.java} (83%)

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/StructureToolsTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/StructureToolsTest.java
index 510b071200..53bf6fe9ad 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/StructureToolsTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/StructureToolsTest.java
@@ -29,6 +29,7 @@
 import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.PDBFileParser;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1o2f.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1o2f.java
index af1ec695f7..d2795e28c4 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1o2f.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1o2f.java
@@ -22,7 +22,7 @@
 
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestAtomCachePerformance.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestAtomCachePerformance.java
index 03bf297484..5a89995450 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestAtomCachePerformance.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestAtomCachePerformance.java
@@ -22,7 +22,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
 import org.junit.BeforeClass;
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBioassemblies.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBioassemblies.java
index 001dd5434e..f85c2a275b 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBioassemblies.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBioassemblies.java
@@ -28,7 +28,7 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java
index c41ac34410..1c4db79571 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java
@@ -20,7 +20,7 @@
  */
 package org.biojava.nbio.structure.test.io;
 
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestLongPdbVsMmCifParsing.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestLongPdbVsMmCifParsing.java
index fc529b75e3..3d788e830c 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestLongPdbVsMmCifParsing.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestLongPdbVsMmCifParsing.java
@@ -24,6 +24,7 @@
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.ObsoleteBehavior;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.biojava.nbio.structure.xtal.CrystalCell;
 import org.junit.After;
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestStructWithMultiparentChemComp.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestStructWithMultiparentChemComp.java
index 83059e7ea4..8aa6643fa4 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestStructWithMultiparentChemComp.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestStructWithMultiparentChemComp.java
@@ -20,7 +20,7 @@
  */
 package org.biojava.nbio.structure.test.io;
 
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
index 8e59c8a931..5cda83225d 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
@@ -12,7 +12,7 @@
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureImpl;
 import org.biojava.nbio.structure.StructureTools;
-import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
@@ -49,10 +49,10 @@ public void test1A2C() throws IOException {
 
     private static void testRoundTrip(String pdbId) throws IOException {
         URL url = new URL("https://files.rcsb.org/download/" + pdbId + ".cif");
-        Structure originalStruct = StructureConverter.fromURL(url);
+        Structure originalStruct = CifStructureConverter.fromURL(url);
 
-        InputStream inputStream = new ByteArrayInputStream(StructureConverter.toText(originalStruct).getBytes());
-        Structure readStruct = StructureConverter.fromInputStream(inputStream);
+        InputStream inputStream = new ByteArrayInputStream(CifStructureConverter.toText(originalStruct).getBytes());
+        Structure readStruct = CifStructureConverter.fromInputStream(inputStream);
 
         assertNotNull(readStruct);
         assertEquals(originalStruct.getChains().size(), readStruct.getChains().size());
@@ -113,7 +113,7 @@ private static void testRoundTrip(String pdbId) throws IOException {
     @Test
     public void testBiounitWriting() throws IOException {
         Structure s = createDummyStructure();
-        String mmcif = StructureConverter.toText(s);
+        String mmcif = CifStructureConverter.toText(s);
         String[] lines = mmcif.split("\n");
         long atomLines = Arrays.stream(lines).filter(l -> l.startsWith("ATOM")).count();
         assertNotNull(mmcif);
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java
index c46087eb58..08946e3e0a 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java
@@ -27,7 +27,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.align.util.AtomCache;
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/xtal/TestCrystalBuilder.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/xtal/TestCrystalBuilder.java
index 4851c03ba9..d90241dbe0 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/xtal/TestCrystalBuilder.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/xtal/TestCrystalBuilder.java
@@ -22,7 +22,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.contact.StructureInterfaceList;
diff --git a/biojava-structure-gui/src/main/java/demo/DemoQuatSymmetryJmol.java b/biojava-structure-gui/src/main/java/demo/DemoQuatSymmetryJmol.java
index 674c846d4a..999e4305fc 100644
--- a/biojava-structure-gui/src/main/java/demo/DemoQuatSymmetryJmol.java
+++ b/biojava-structure-gui/src/main/java/demo/DemoQuatSymmetryJmol.java
@@ -22,7 +22,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.cluster.SubunitClustererMethod;
 import org.biojava.nbio.structure.cluster.SubunitClustererParameters;
diff --git a/biojava-structure-gui/src/main/java/demo/DemoShowLargeAssembly.java b/biojava-structure-gui/src/main/java/demo/DemoShowLargeAssembly.java
index 4aa053e70a..343e50d226 100644
--- a/biojava-structure-gui/src/main/java/demo/DemoShowLargeAssembly.java
+++ b/biojava-structure-gui/src/main/java/demo/DemoShowLargeAssembly.java
@@ -1,7 +1,7 @@
 package demo;
 
 import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.FileParsingParameters;
diff --git a/biojava-structure/src/main/java/demo/DemoAsa.java b/biojava-structure/src/main/java/demo/DemoAsa.java
index 1df3d9feeb..72d2b096d5 100644
--- a/biojava-structure/src/main/java/demo/DemoAsa.java
+++ b/biojava-structure/src/main/java/demo/DemoAsa.java
@@ -24,7 +24,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.asa.AsaCalculator;
diff --git a/biojava-structure/src/main/java/demo/DemoContacts.java b/biojava-structure/src/main/java/demo/DemoContacts.java
index 0eed99e807..f5ee18934c 100644
--- a/biojava-structure/src/main/java/demo/DemoContacts.java
+++ b/biojava-structure/src/main/java/demo/DemoContacts.java
@@ -25,6 +25,7 @@
 import org.biojava.nbio.structure.contact.AtomContact;
 import org.biojava.nbio.structure.contact.AtomContactSet;
 import org.biojava.nbio.structure.contact.GroupContactSet;
+import org.biojava.nbio.structure.io.StructureFiletype;
 
 import java.io.IOException;
 
diff --git a/biojava-structure/src/main/java/demo/DemoCrystalInterfaces.java b/biojava-structure/src/main/java/demo/DemoCrystalInterfaces.java
index 76fd4f6823..f5b76d86bf 100644
--- a/biojava-structure/src/main/java/demo/DemoCrystalInterfaces.java
+++ b/biojava-structure/src/main/java/demo/DemoCrystalInterfaces.java
@@ -23,7 +23,7 @@
 
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.contact.*;
 import org.biojava.nbio.structure.io.FileParsingParameters;
diff --git a/biojava-structure/src/main/java/demo/DemoLoadSecStruc.java b/biojava-structure/src/main/java/demo/DemoLoadSecStruc.java
index 3254ff64ae..a9eaf67e41 100644
--- a/biojava-structure/src/main/java/demo/DemoLoadSecStruc.java
+++ b/biojava-structure/src/main/java/demo/DemoLoadSecStruc.java
@@ -25,7 +25,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.secstruc.SecStrucCalc;
diff --git a/biojava-structure/src/main/java/demo/DemoMMCIFReader.java b/biojava-structure/src/main/java/demo/DemoMMCIFReader.java
index e6b5eab186..1954ad99a4 100644
--- a/biojava-structure/src/main/java/demo/DemoMMCIFReader.java
+++ b/biojava-structure/src/main/java/demo/DemoMMCIFReader.java
@@ -28,6 +28,7 @@
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.CifFileReader;
 import org.biojava.nbio.structure.io.StructureProvider;
+import org.biojava.nbio.structure.io.StructureFiletype;
 
 import java.util.List;
 
diff --git a/biojava-structure/src/main/java/demo/DemoMmcifToPdbConverter.java b/biojava-structure/src/main/java/demo/DemoMmcifToPdbConverter.java
index 67de1031c0..e5c9f5cda6 100644
--- a/biojava-structure/src/main/java/demo/DemoMmcifToPdbConverter.java
+++ b/biojava-structure/src/main/java/demo/DemoMmcifToPdbConverter.java
@@ -23,7 +23,7 @@
 
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,7 +43,7 @@ public static void main(String[] args) throws Exception {
 
 	public static void convert(File inFile, File outFile) throws IOException {
 		// now get the protein structure.
-		Structure cifStructure = StructureConverter.fromPath(inFile.toPath());
+		Structure cifStructure = CifStructureConverter.fromPath(inFile.toPath());
 
 		// and write it out as PDB format
 		PrintWriter pr = new PrintWriter(outFile);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java
index c8413228ee..73827d2434 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java
@@ -24,6 +24,7 @@
 package org.biojava.nbio.structure;
 
 import org.biojava.nbio.core.sequence.template.Sequence;
+import org.biojava.nbio.structure.chem.ChemComp;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 
 import java.io.Serializable;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePDBRevRecord.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePDBRevRecord.java
index 039c2f0cc4..ad6945ac70 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePDBRevRecord.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/DatabasePDBRevRecord.java
@@ -2,7 +2,12 @@
 
 import org.biojava.nbio.structure.io.cif.CifBean;
 
-public class DatabasePDBRevRecord implements CifBean<org.rcsb.cif.schema.mm.DatabasePDBRevRecord> {
+/**
+ * Represents revision records for use by {@link PDBHeader}.
+ * @author Sebastian Bittrich
+ * @since 6.0.0
+ */
+public class DatabasePDBRevRecord implements CifBean {
     private static final long serialVersionUID = 1L;
     private String revNum;
     private String type;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java
index 36b8d3b1cd..d1e5f34963 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java
@@ -53,28 +53,29 @@
  *
  */
 public interface Group extends Serializable {
+
 	/** Group property key for secondary structure annotation */
-	String SEC_STRUC = "secstruc";
+	public static final String SEC_STRUC = "secstruc";
 
 	/**
 	 * Get number of atoms.
 	 * @return number of atoms of this Group
 	 */
-	int size();
+	public int size();
 
 	/**
 	 * Return true or false, depending if this group has 3D coordinates or not.
 	 *
 	 * @return true if Group has 3D coordinates
 	 */
-	boolean has3D();
+	public boolean has3D ();
 
 	/**
 	 * Flag if group has 3D data .
 	 *
 	 * @param flag  true to set flag that this Group has 3D coordinates
 	 */
-	void setPDBFlag(boolean flag);
+	public void setPDBFlag(boolean flag);
 
 	/**
 	 * Get Type of group, one of {@link GroupType#AMINOACID}, {@link GroupType#HETATM}
@@ -82,14 +83,14 @@ public interface Group extends Serializable {
 	 *
 	 * @return a String representing the type value
 	 */
-	GroupType getType();
+	public GroupType getType();
 
 	/**
 	 * Add an atom to this group.
 	 *
 	 * @param atom  an Atom object
 	 */
-	void addAtom(Atom atom);
+	public void addAtom(Atom atom);
 
 	/**
 	 * Get list of atoms.
@@ -97,33 +98,32 @@ public interface Group extends Serializable {
 	 * @return a List object representing the atoms
 	 * @see #setAtoms(List)
 	 */
-	List<Atom> getAtoms();
+	public List<Atom> getAtoms() ;
+
 
 	/**
 	 * Set the atoms of this group.
-	 * @see Atom
+	 * @see {@link Atom}
 	 * @param atoms a list of atoms
 	 */
-	void setAtoms(List<Atom> atoms);
+	public void setAtoms(List<Atom> atoms);
 
-	/**
-	 * Remove all atoms from this group.
+	/** Remove all atoms from this group.
 	 *
 	 */
-	void clearAtoms();
+	public void clearAtoms();
 
 	/**
 	 * Get an atom given its PDB name.
 	 * Beware that some PDB atom names are ambiguous (e.g. CA, which means C-alpha or Calcium),
 	 * ambiguities should not occur within the same group though. To solve these ambiguities
 	 * one would need to check the atom returned for the required element with {@link Atom#getElement()}
-	 * <p>
-	 * Note this method will return only the atom in the default alternative location (be it '.' or a letter).
 	 *
 	 * @param name  a trimmed String representing the atom's PDB name, e.g. "CA"
 	 * @return an Atom object or null if no such atom exists within this group
 	 */
-	Atom getAtom(String name);
+	public Atom getAtom(String name) ;
+
 
 	/**
 	 * Get at atom by position.
@@ -131,7 +131,7 @@ public interface Group extends Serializable {
 	 * @param position  an int
 	 * @return an Atom object or null if no Atom exists for given position
 	 */
-	Atom getAtom(int position);
+	public Atom getAtom(int position) ;
 
 	/**
 	 * Tell whether a particular atom exists within this group.
@@ -141,7 +141,7 @@ public interface Group extends Serializable {
 	 * @param name  a trimmed String representing the atom's PDB name, e.g. "CA"
 	 * @return true if Atom with name exists within this group
 	 */
-	boolean hasAtom(String name);
+	public boolean hasAtom(String name);
 
 	/**
 	 * Get the PDB 3-letter name for this group. (e.g. ALA)
@@ -149,7 +149,7 @@ public interface Group extends Serializable {
 	 * @return a String representing the PDBName value
 	 * @see #setPDBName
 	 */
-	String getPDBName();
+	public String getPDBName();
 
 	/**
 	 * Set the PDB 3-letter name for this group. (e.g. ALA)
@@ -157,7 +157,8 @@ public interface Group extends Serializable {
 	 * @param s  a String specifying the PDBName value
 	 * @see #getPDBName
 	 */
-	void setPDBName(String s);
+	public void setPDBName(String s) ;
+
 
 	/**
 	 * Calculate if this group has all atoms required for an amino acid backbone.
@@ -180,28 +181,33 @@ public interface Group extends Serializable {
 	 * @return true if all Atoms required for an AminoAcid are available (N, CA, C, O)
 	 * @see #getType
 	 */
-	boolean hasAminoAtoms();
+	public boolean hasAminoAtoms() ;
+
 
 	/**
 	 * Check if this group is a polymeric group, from the definition in Chemical Component Dictionary
 	 *
 	 * @return true if a polymeric group
 	 */
-	boolean isPolymeric();
+	public boolean isPolymeric();
+
 
 	/**
 	 * Check if this group is an aminoacid group, from the definition in Chemical Component Dictionary
 	 *
 	 * @return true if an amino acid
 	 */
-	boolean isAminoAcid();
+	public boolean isAminoAcid();
+
 
 	/**
 	 * Check if this group is a nucleotide group, from the definition in Chemical Component Dictionary
 	 *
 	 * @return true if a nucleotide
 	 */
-	boolean isNucleotide();
+	public boolean isNucleotide();
+
+
 
 	/**
 	 * Properties of this amino acid. Currently available properties are:
@@ -212,7 +218,7 @@ public interface Group extends Serializable {
 	 * @param properties  a Map object specifying the properties value
 	 * @see #getProperties
 	 */
-	void setProperties(Map<String, Object> properties);
+	public void setProperties(Map<String,Object> properties) ;
 
 	/**
 	 * Return properties.
@@ -220,7 +226,7 @@ public interface Group extends Serializable {
 	 *
 	 * @return a HashMap object representing the properties value
 	 */
-	Map<String,Object> getProperties();
+	public Map<String,Object> getProperties() ;
 
 	/**
 	 * Set a single property .
@@ -229,7 +235,7 @@ public interface Group extends Serializable {
 	 * @param value  an Object
 	 * @see #getProperty
 	 */
-	void setProperty(String key, Object value);
+	public void setProperty(String key, Object value) ;
 
 	/**
 	 * Get a single property .
@@ -238,20 +244,21 @@ public interface Group extends Serializable {
 	 * @return an Object
 	 * @see #setProperty
 	 */
-	Object getProperty(String key);
+	public Object getProperty(String key) ;
 
 	/**
 	 * Get an Atom Iterator.
 	 *
 	 * @return an Iterator object
 	 */
-	Iterator<Atom> iterator();
+	public Iterator<Atom> iterator() ;
+
 
 	/**
 	 * Returns and identical copy of this Group object .
 	 * @return  and identical copy of this Group object
 	 */
-	Object clone();
+	public Object clone();
 
 	/**
 	 * Sets the back-reference to its parent Chain.
@@ -259,7 +266,7 @@ public interface Group extends Serializable {
 	 * @see #getChain()
 	 * @since 3.0
 	 */
-	void setChain(Chain chain);
+	public void setChain(Chain chain);
 
 	/**
 	 * Returns the parent Chain of the Group.
@@ -268,7 +275,7 @@ public interface Group extends Serializable {
 	 * @see #setChain(Chain)
 	 * @since 3.0
 	 */
-	Chain getChain();
+	public Chain getChain() ;
 
 	/**
 	 * Returns a dynamically created ResidueNumber for the group - this
@@ -277,14 +284,15 @@ public interface Group extends Serializable {
 	 * @return ResidueNumber for the group.
 	 * @since 3.0
 	 */
-	ResidueNumber getResidueNumber();
+	public ResidueNumber getResidueNumber();
+
 
 	/**
 	 * Sets the ResidueNumber for this Group
 	 *
 	 * @param residueNumber the PDB residueNumber
 	 */
-	void setResidueNumber(ResidueNumber residueNumber);
+	public void setResidueNumber(ResidueNumber residueNumber);
 
 	/**
 	 * Utility method to temporarily set a chainID for a group, if a parent chain object does not exist yet.
@@ -294,7 +302,7 @@ public interface Group extends Serializable {
 	 * @param residueNumber
 	 * @param iCode
 	 */
-	void setResidueNumber(String chainId, Integer residueNumber, Character iCode);
+	public void setResidueNumber(String chainId, Integer residueNumber, Character iCode);
 
 	/**
 	 * Utility method for returning the chainId of the Group or null if no
@@ -304,21 +312,22 @@ public interface Group extends Serializable {
 	 * @since 3.0
 	 * @return  the ID of the chain
 	 */
-	String getChainId();
+	public String getChainId();
 
 	/**
 	 * Set the Chemical Component that closer describes this group.
 	 *
 	 * @param cc the chemical component
 	 */
-	void setChemComp(ChemComp cc);
+	public void setChemComp(ChemComp cc);
 
 	/**
 	 * Get the chemical component that closer describes this group. If the information does not exist yet, fetches the information from PDB web site.
 	 *
 	 * @return the Chemical Component definition for this Group.
 	 */
-	ChemComp getChemComp();
+	public ChemComp getChemComp();
+
 
 	/**
 	 * Check if this group has alternate location groups.
@@ -326,7 +335,8 @@ public interface Group extends Serializable {
 	 * @return boolean flag if there are alternate locations.
 	 * @see #getAltLocs()
 	 */
-	boolean hasAltLoc();
+	public boolean hasAltLoc();
+
 
 	/**
 	 * Get the list of other alternate location groups.
@@ -351,14 +361,14 @@ public interface Group extends Serializable {
 	 *
 	 * @return List of other groups that are on alternate locations
 	 */
-	List<Group> getAltLocs();
+	public List<Group> getAltLocs();
 
 	/**
 	 * Add a group that is an alternate location for this group.
 	 *
 	 * @param g the altloc group to add
 	 */
-	void addAltLoc(Group g);
+	public void addAltLoc(Group g);
 
 	/**
 	 * Determines if this group is water.
@@ -366,7 +376,7 @@ public interface Group extends Serializable {
 	 * @see GroupType#WATERNAMES
 	 * @return true if it's water, false otherwise.
 	 */
-	boolean isWater();
+	public boolean isWater();
 
 	/**
 	 * Gets the alternate location group to this group that has the alt-loc character code passed.
@@ -374,20 +384,21 @@ public interface Group extends Serializable {
 	 * @param altLoc the alternate location code of the group desired
 	 * @return the alternate location group if found, or null otherwise
 	 */
-	Group getAltLocGroup(Character altLoc);
+	public Group getAltLocGroup(Character altLoc);
+
 
 	/**
 	 * Attempts to reduce the memory imprint of this group by trimming
 	 * all internal Collection objects to the required size.
 	 *
 	 */
-	void trimToSize();
+	public void trimToSize();
 
 	/**
 	 * Function to get the Group as an MDL molblock
 	 * @return the string of the MDL molblock
 	 */
-	String toSDF();
+	public String toSDF();
 
 	/**
 	 * Tells whether the group is annotated as HETATM in the file.
@@ -395,7 +406,7 @@ public interface Group extends Serializable {
 	 * polymeric group is in a ligand chain or not.
 	 * @return
 	 */
-	boolean isHetAtomInFile();
+	public boolean isHetAtomInFile();
 
 	/**
 	 * Sets the field isHetAtomInFile which is intented only for
@@ -403,5 +414,5 @@ public interface Group extends Serializable {
 	 * or in a polymeric chain.
 	 * @param isHetAtomInFile
 	 */
-	void setHetAtomInFile(boolean isHetAtomInFile);
+	public void setHetAtomInFile(boolean isHetAtomInFile);
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
index fb2967b101..c556d4444c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
@@ -21,6 +21,7 @@
 package org.biojava.nbio.structure;
 
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.io.StructureFiletype;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
index 00b624d95f..69b5833766 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
@@ -20,10 +20,10 @@
  */
 package org.biojava.nbio.structure;
 
-import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.PDBFileReader;
-import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.io.mmtf.MmtfActions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,7 +33,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -154,7 +153,7 @@ public Structure loadStructure(AtomCache cache) throws StructureException, IOExc
 
 		switch(format) {
 			case CIF: case BCIF:
-				return StructureConverter.fromURL(url);
+				return CifStructureConverter.fromURL(url);
 			case MMTF:
 				return MmtfActions.readFromInputStream(url.openStream());
 			default: case PDB:
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
index 3067e5955d..552f0427ef 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
@@ -41,6 +41,7 @@
 import org.biojava.nbio.structure.io.MMTFFileReader;
 import org.biojava.nbio.structure.io.PDBFileReader;
 import org.biojava.nbio.core.util.FileDownloadUtils;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyBuilder;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyTransformation;
 import org.biojava.nbio.structure.scop.ScopDatabase;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/UserConfiguration.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/UserConfiguration.java
index ebcf3aaba6..70e85acec3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/UserConfiguration.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/UserConfiguration.java
@@ -19,12 +19,12 @@
 
 package org.biojava.nbio.structure.align.util;
 
-import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.align.ce.StartupParameters;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.ObsoleteBehavior;
 import org.biojava.nbio.core.util.PrettyXMLWriter;
 import org.biojava.nbio.core.util.XMLWriter;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,18 +34,21 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-/**
- *  A container to persist config to the file system
+
+/** A container to persist config to the file system
  *
  * @author Andreas Prlic
+ *
  */
-public class UserConfiguration {
+public class UserConfiguration
+{
+
 	private static final Logger logger = LoggerFactory.getLogger(UserConfiguration.class);
 
 	public static final String PDB_FORMAT   = "PDB";
-	public static final String MMCIF_FORMAT = "cif";
-	public static final String BINARY_CIF   = "bcif";
+	public static final String MMCIF_FORMAT = "mmCif";
 	public static final String MMTF_FORMAT  = "mmtf";
+	public static final String BCIF_FORMAT  = "bcif";
 
 	public static final String TMP_DIR = "java.io.tmpdir";
 
@@ -62,7 +65,8 @@ public class UserConfiguration {
 
 	private String fileFormat;
 
-	private static final AtomicBoolean warningShown = new AtomicBoolean(false);
+	private static AtomicBoolean warningShown = new AtomicBoolean(false);
+
 
 	/**
 	 * Default UserConfiguration:
@@ -96,51 +100,66 @@ public UserConfiguration(){
 		// note that in initCacheFilePath, we set to the provided one (if readable) or to the same as pdbFilePath
 		cacheFilePath = initCacheFilePath();
 
-		fileFormat = BINARY_CIF;
+		fileFormat = BCIF_FORMAT;
 	}
 
 	private String initPdbFilePath() {
+
 		String path = null;
+
 		String propertyName = PDB_DIR;
+
 		String userProvidedDir = System.getProperty(propertyName);
 
-		if (userProvidedDir != null && !userProvidedDir.trim().isEmpty()) {
+		if ( userProvidedDir != null && !userProvidedDir.trim().isEmpty()) {
+
 			path = userProvidedDir;
 			logger.debug("Read PDB dir from system property {}: {}", propertyName, path);
 			File f = new File(path);
 			if (!f.isDirectory()) {
-				logger.warn("Provided path {} (with system property {}) is not a directory. Using system's temp " +
-								"directory instead {}", path, propertyName, System.getProperty(TMP_DIR));
+				logger.warn(
+						"Provided path {} (with system property {}) is not a directory. Using system's temp directory instead {}",
+						path, propertyName, System.getProperty(TMP_DIR));
 				path = System.getProperty(TMP_DIR);
 			} else if (!f.canWrite()) {
-				logger.warn("Provided path {} (with system property {}) is not writable. Will not be able to write " +
-								"cached files.", path, propertyName);
+				logger.warn(
+						"Provided path {} (with system property {}) is not writable. Will not be able to write cached files.",
+						path, propertyName);
 				// we don't require the PDB_DIR to be writable, so that it can be used with a pre-rsynced dir
 				// thus if not writable, we only warn and go ahead using it
 			}
+
+
 		} else {
 			Map<String,String> env = System.getenv();
-			if (env.containsKey(propertyName) && !env.get(propertyName).trim().isEmpty()) {
+
+			if( env.containsKey(propertyName) && !env.get(propertyName).trim().isEmpty()) {
 				path = env.get(propertyName);
 				logger.debug("Read dir from environment variable {}: {}", propertyName, path);
 
 				File f = new File(path);
 				if (!f.isDirectory()) {
-					logger.warn("Provided path {} (with environment variable {}) is not a directory. Using system's " +
-									"temp directory instead {}", path, propertyName, System.getProperty(TMP_DIR));
+					logger.warn(
+							"Provided path {} (with environment variable {}) is not a directory. Using system's temp directory instead {}",
+							path, propertyName, System.getProperty(TMP_DIR));
 					path = System.getProperty(TMP_DIR);
 				} else if (!f.canWrite()) {
-					logger.warn("Provided path {} (with environment variable {}) is not writable. Will not be able " +
-									"to write cached files", path, propertyName);
+					logger.warn(
+							"Provided path {} (with environment variable {}) is not writable. Will not be able to write cached files",
+							path, propertyName);
 					// we don't require the PDB_DIR to be writable, so that it can be used with a pre-rsynced dir
 					// thus if not writable, we only warn and go ahead using it
 				}
+
 			} else {
 				path = System.getProperty(TMP_DIR);
 
-				if (! warningShown.get()) {
-					logger.warn("Could not read dir from system property {} or environment variable {}, " +
-									"using system's temp directory {}", propertyName, propertyName, path);
+				if ( ! warningShown.get()) {
+
+					logger.warn("Could not read dir from system property {} or environment variable {}, "
+									+ "using system's temp directory {}",
+							propertyName, propertyName, path);
+
 					warningShown.set(true);
 				}
 
@@ -148,79 +167,95 @@ private String initPdbFilePath() {
 			}
 		}
 
-		if (!path.endsWith(lineSplit)) {
+		if ( ! path.endsWith(lineSplit) )
 			path = path + lineSplit;
-		}
 
 		return path;
+
 	}
 
 	private String initCacheFilePath() {
+
 		String path = null;
+
 		String propertyName = PDB_CACHE_DIR;
+
 		String userProvidedDir = System.getProperty(propertyName);
 
-		if (userProvidedDir != null) {
+		if ( userProvidedDir != null ) {
+
 			path = userProvidedDir;
 			logger.debug("Read cache dir from system property {}: {}", propertyName, path);
 			File f = new File(path);
 			if (!f.isDirectory()) {
-				logger.warn("Provided path {} (with system property {}) is not a directory. Using system's temp " +
-								"directory instead {}", path, propertyName, System.getProperty(TMP_DIR));
+				logger.warn(
+						"Provided path {} (with system property {}) is not a directory. Using system's temp directory instead {}",
+						path, propertyName, System.getProperty(TMP_DIR));
 				path = System.getProperty(TMP_DIR);
 			} else if (!f.canWrite()) {
-				logger.warn("Provided path {} (with system property {}) is not writable. Using system's temp " +
-								"directory instead {}", path, propertyName, System.getProperty(TMP_DIR));
+				logger.warn(
+						"Provided path {} (with system property {}) is not writable. Using system's temp directory instead {}",
+						path, propertyName, System.getProperty(TMP_DIR));
 				path = System.getProperty(TMP_DIR);
 				System.setProperty(propertyName,path);
 			}
+
+
 		} else {
 			Map<String,String> env = System.getenv();
 
-			if (env.containsKey(propertyName)) {
+			if( env.containsKey(propertyName)) {
 				path = env.get(propertyName);
 				logger.debug("Read dir from environment variable {}: {}", propertyName, path);
 
 				File f = new File(path);
 				if (!f.isDirectory()) {
-					logger.warn("Provided path {} (with environment variable {}) is not a directory. Using system's " +
-									"temp directory instead {}", path, propertyName, System.getProperty(TMP_DIR));
+					logger.warn(
+							"Provided path {} (with environment variable {}) is not a directory. Using system's temp directory instead {}",
+							path, propertyName, System.getProperty(TMP_DIR));
 					path = System.getProperty(TMP_DIR);
 				} else if (!f.canWrite()) {
-					logger.warn("Provided path {} (with environment variable {}) is not writable. Using system's " +
-									"temp directory instead {}", path, propertyName, System.getProperty(TMP_DIR));
+					logger.warn(
+							"Provided path {} (with environment variable {}) is not writable. Using system's temp directory instead {}",
+							path, propertyName, System.getProperty(TMP_DIR));
 					path = System.getProperty(TMP_DIR);
 				}
+
 			} else {
 				// NOTE in case of not provided, then it is set to same as pdbFilePath
 				// as PDB_DIR is not checked for being writable, we have to do that check here in case
 				if (new File(pdbFilePath).canWrite()){
 					path = pdbFilePath;
-					logger.info("Could not read cache dir from system property {} or environment variable {}, " +
-									"using PDB directory instead {}", propertyName, propertyName, path);
+					logger.info("Could not read cache dir from system property {} or environment variable {}, "
+							+ "using PDB directory instead {}",
+							propertyName, propertyName, path);
 					System.setProperty(propertyName,path);
+
 				} else {
 					path = System.getProperty(TMP_DIR);
 					logger.warn("Could not read cache dir from system property {} or environment variable {}, "
 							+ "and PDB directory {} is not writable. Using system's temp directory instead {}",
 							propertyName, propertyName, pdbFilePath, path);
 					System.setProperty(propertyName,path);
+
 				}
 			}
 		}
 
-		if (!path.endsWith(lineSplit)) {
+		if ( ! path.endsWith(lineSplit) )
 			path = path + lineSplit;
-		}
 
 		return path;
+
 	}
 
-	public String getPdbFilePath() {
+	public String getPdbFilePath()
+	{
 		return pdbFilePath;
 	}
 
-	public void setPdbFilePath(String pdbFilePath) {
+	public void setPdbFilePath(String pdbFilePath)
+	{
 		this.pdbFilePath = pdbFilePath;
 	}
 
@@ -248,22 +283,24 @@ public void setObsoleteBehavior(ObsoleteBehavior obsoleteBehavior) {
 		this.obsoleteBehavior = obsoleteBehavior;
 	}
 
-	/**
-	 * convert Configuration to an XML file so it can be serialized
+	/** convert Configuration to an XML file so it can be serialized
 	 *
 	 * @param pw
 	 * @return XMLWriter
 	 * @throws IOException
 	 */
-	public XMLWriter toXML(PrintWriter pw) throws IOException {
-		XMLWriter xw = new PrettyXMLWriter(pw);
+	public XMLWriter toXML(PrintWriter pw)
+			throws IOException
+			{
+
+		XMLWriter     xw = new PrettyXMLWriter( pw);
+
 		toXML(xw);
-		return xw;
-	}
+		return xw ;
+			}
 
 
-	/**
-	 * convert Configuration to an XML file so it can be serialized
+	/** convert Configuration to an XML file so it can be serialized
 	 * add to an already existing xml file.
 	 *
 	 * @param xw the XML writer to use
@@ -271,7 +308,10 @@ public XMLWriter toXML(PrintWriter pw) throws IOException {
 	 * @throws IOException
 	 * @see org.biojava.nbio.structure.align.webstart.ConfigXMLHandler
 	 */
-	public XMLWriter toXML(XMLWriter xw) throws IOException {
+
+	public XMLWriter toXML(XMLWriter xw)
+			throws IOException
+			{
 		xw.printRaw("<?xml version='1.0' standalone='no' ?>");
 		//xw.printRaw("<!DOCTYPE " + XML_CONTENT_TYPE + " SYSTEM '" + XML_DTD + "' >");
 		xw.openTag("JFatCatConfig");
@@ -279,18 +319,18 @@ public XMLWriter toXML(XMLWriter xw) throws IOException {
 		xw.openTag("PDBFILEPATH");
 		// we don;t serialize the tempdir...
 		String tempdir = System.getProperty(TMP_DIR);
-		if (!pdbFilePath.equals(tempdir)) {
+		if (! pdbFilePath.equals(tempdir))
 			xw.attribute("path", pdbFilePath);
-		}
 
-		xw.attribute("fetchBehavior", fetchBehavior + "");
-		xw.attribute("obsoleteBehavior", obsoleteBehavior + "");
+		xw.attribute("fetchBehavior", fetchBehavior+"");
+		xw.attribute("obsoleteBehavior", obsoleteBehavior+"");
 		xw.attribute("fileFormat", fileFormat);
 		xw.closeTag("PDBFILEPATH");
 
 		xw.closeTag("JFatCatConfig");
 		return xw ;
-	}
+
+			}
 
 	public static UserConfiguration fromStartupParams(StartupParameters params) {
 		UserConfiguration config = new UserConfiguration();
@@ -311,7 +351,8 @@ public void setFileFormat (String fileFormat){
 		this.fileFormat = fileFormat;
 	}
 
-	public String getFileFormat() {
+	public String getFileFormat()
+	{
 		return fileFormat;
 	}
 
@@ -319,12 +360,11 @@ public StructureFiletype getStructureFiletype() {
 		switch (fileFormat) {
 			case MMCIF_FORMAT:
 				return StructureFiletype.CIF;
-			case BINARY_CIF:
-				return StructureFiletype.BCIF;
-			case MMTF_FORMAT:
-				return StructureFiletype.MMTF;
 			case PDB_FORMAT:
 				return StructureFiletype.PDB;
+			case MMTF_FORMAT:
+				return StructureFiletype.MMTF;
+			case BCIF_FORMAT:
 			default:
 				return StructureFiletype.BCIF;
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
index f550d82a96..76043374fc 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
@@ -8,8 +8,10 @@
 
 /**
  * Properties of a chemical component.
+ * @author Sebastian Bittrich
+ * @since 6.0.0
  */
-public class ChemComp implements CifBean<org.rcsb.cif.schema.mm.ChemComp>, Comparable<ChemComp> {
+public class ChemComp implements CifBean, Comparable<ChemComp> {
     private static final long serialVersionUID = -4736341142030215915L;
 
     private String id;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompAtom.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompAtom.java
index d87a51e720..f99b3d6f74 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompAtom.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompAtom.java
@@ -2,7 +2,12 @@
 
 import org.biojava.nbio.structure.io.cif.CifBean;
 
-public class ChemCompAtom implements CifBean<org.rcsb.cif.schema.mm.ChemCompAtom> {
+/**
+ * Properties of an atom of a chemical component.
+ * @author Sebastian Bittrich
+ * @since 6.0.0
+ */
+public class ChemCompAtom implements CifBean {
     private static final long serialVersionUID = 4070599340294758941L;
     private String compId;
     private String atomId;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompBond.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompBond.java
index 6ac2ea25fd..8bc3b1ebdb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompBond.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompBond.java
@@ -4,7 +4,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ChemCompBond implements CifBean<org.rcsb.cif.schema.mm.ChemCompBond> {
+/**
+ * Properties of a bond in a chemical component.
+ * @author Sebastian Bittrich
+ * @since 6.0.0
+ */
+public class ChemCompBond implements CifBean {
     private static final long serialVersionUID = 5905371029161975421L;
     private static final Logger logger = LoggerFactory.getLogger(ChemCompBond.class);
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompDescriptor.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompDescriptor.java
index 7628caef53..eb0cb13b5f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompDescriptor.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompDescriptor.java
@@ -4,7 +4,12 @@
 
 import java.util.Objects;
 
-public class ChemCompDescriptor implements CifBean<org.rcsb.cif.schema.mm.PdbxChemCompDescriptor> {
+/**
+ * Properties of the chemical component descriptor.
+ * @author Sebastian Bittrich
+ * @since 6.0.0
+ */
+public class ChemCompDescriptor implements CifBean {
     private static final long serialVersionUID = 1078685833800736278L;
     private String compId;
     private String type;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BcifFileReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BcifFileReader.java
index a122158aee..70e4b5fcf5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BcifFileReader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BcifFileReader.java
@@ -2,14 +2,14 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 /**
  * Parse binary Cif files and provide capabilities to store them locally.
- * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
+ * @author Sebastian Bittrich
  * @since 5.3.0
  */
 public class BcifFileReader extends LocalPDBDirectory {
@@ -38,7 +38,7 @@ public BcifFileReader(String path) {
 
     @Override
     public Structure getStructure(InputStream inStream) throws IOException {
-        return StructureConverter.fromInputStream(inStream, getFileParsingParameters());
+        return CifStructureConverter.fromInputStream(inStream, getFileParsingParameters());
     }
 
     @Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CifFileReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CifFileReader.java
index edfe601b8d..6afaf14717 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CifFileReader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CifFileReader.java
@@ -2,14 +2,14 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 /**
  * Parse text Cif files and provide capabilities to store them locally.
- * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
+ * @author Sebastian Bittrich
  * @since 5.3.0
  */
 public class CifFileReader extends LocalPDBDirectory {
@@ -40,7 +40,7 @@ public CifFileReader(String path) {
 
     @Override
     public Structure getStructure(InputStream inStream) throws IOException{
-        return StructureConverter.fromInputStream(inStream, getFileParsingParameters());
+        return CifStructureConverter.fromInputStream(inStream, getFileParsingParameters());
     }
 
     @Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
index 8264fb2b3f..35654bcb17 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
@@ -40,7 +40,7 @@
 import org.biojava.nbio.structure.PDBHeader;
 import org.biojava.nbio.structure.Site;
 import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -592,11 +592,20 @@ else if (name.length()==1)
 	}
 
 
+	/**
+	 * Convert this structure to its CIF representation.
+	 * @return a String representing this structure as CIF
+	 */
 	public String toMMCIF() {
-		return StructureConverter.toText(this.structure);
+		return CifStructureConverter.toText(this.structure);
 	}
 
+	/**
+	 * Convert a chain to its CIF representation.
+	 * @param chain data
+	 * @return a String representing this chain as CIF
+	 */
 	public static String toMMCIF(Chain chain) {
-		return StructureConverter.toText(chain);
+		return CifStructureConverter.toText(chain);
 	}
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureFiletype.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureFiletype.java
similarity index 75%
rename from biojava-structure/src/main/java/org/biojava/nbio/structure/StructureFiletype.java
rename to biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureFiletype.java
index 6d56257f24..04a74a6220 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureFiletype.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureFiletype.java
@@ -1,15 +1,12 @@
-package org.biojava.nbio.structure;
-
-import org.biojava.nbio.structure.io.BcifFileReader;
-import org.biojava.nbio.structure.io.CifFileReader;
-import org.biojava.nbio.structure.io.MMTFFileReader;
-import org.biojava.nbio.structure.io.PDBFileReader;
+package org.biojava.nbio.structure.io;
 
 import java.util.Collections;
 import java.util.List;
 
 /**
  * An enum of supported file formats.
+ * @author Sebastian Bittrich
+ * @since 6.0.0
  */
 public enum StructureFiletype {
     PDB(new PDBFileReader().getExtensions()),
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
index 2cb5e11acf..4b9c3045b6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
@@ -28,7 +28,7 @@
 
 /**
  * Convert a BioJava object to a CifFile.
- * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
+ * @author Sebastian Bittrich
  * @since 5.3.0
  */
 public abstract class AbstractCifFileSupplier<S> implements CifFileSupplier<S> {
@@ -127,6 +127,10 @@ protected void handleChain(Chain chain, int model, List<WrappedAtom> wrappedAtom
         }
     }
 
+    /**
+     * Wrapped atoms represent individual atoms enriched with model- and chain-level information. Also, gives control
+     * over the atomId field. Useful to convert structures (and subsets thereof) to their mmCIF representation.
+     */
     public static class WrappedAtom {
         private final int model;
         private final String chainName;
@@ -134,6 +138,14 @@ public static class WrappedAtom {
         private final Atom atom;
         private final int atomId;
 
+        /**
+         * Construct a new atoms.
+         * @param model the model number
+         * @param chainName the label_asym_id
+         * @param chainId the auth_asym_id
+         * @param atom the atom instance itself
+         * @param atomId the label_atom_id
+         */
         public WrappedAtom(int model, String chainName, String chainId, Atom atom, int atomId) {
             this.model = model;
             this.chainName = chainName;
@@ -142,27 +154,31 @@ public WrappedAtom(int model, String chainName, String chainId, Atom atom, int a
             this.atomId = atomId;
         }
 
-        int getModel() {
+        public int getModel() {
             return model;
         }
 
-        String getChainName() {
+        public String getChainName() {
             return chainName;
         }
 
-        String getChainId() {
+        public String getChainId() {
             return chainId;
         }
 
-        Atom getAtom() {
+        public Atom getAtom() {
             return atom;
         }
 
-        int getAtomId() {
+        public int getAtomId() {
             return atomId;
         }
     }
 
+    /**
+     * Collects {@link WrappedAtom} instances into one {@link org.rcsb.cif.schema.mm.AtomSite}.
+     * @return an atom site record containing all atoms
+     */
     public static Collector<WrappedAtom, ?, Category> toAtomSite() {
         return Collector.of(AtomSiteCollector::new,
                 AtomSiteCollector::accept,
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java
index 5bbb3f7a6a..26bd53884d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumer.java
@@ -1,16 +1,32 @@
 package org.biojava.nbio.structure.io.cif;
 
-import org.biojava.nbio.structure.chem.ChemCompDescriptor;
 import org.biojava.nbio.structure.chem.ChemicalComponentDictionary;
 import org.rcsb.cif.schema.mm.ChemComp;
 import org.rcsb.cif.schema.mm.ChemCompAtom;
 import org.rcsb.cif.schema.mm.ChemCompBond;
 
+/**
+ * Create the {@link ChemicalComponentDictionary} from CIF data.
+ * @author Sebastian Bittrich
+ * @since 6.0.0
+ */
 public interface ChemCompConsumer extends CifFileConsumer<ChemicalComponentDictionary> {
+    /**
+     * Consume a particular Cif category.
+     * @param c data
+     */
     void consumeChemComp(ChemComp c);
 
+    /**
+     * Consume a particular Cif category.
+     * @param atom data
+     */
     void consumeChemCompAtom(ChemCompAtom atom);
 
+    /**
+     * Consume a particular Cif category.
+     * @param bond data
+     */
     void consumeChemCompBond(ChemCompBond bond);
 }
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java
index ffe61f2d0b..584d8c6dfa 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConsumerImpl.java
@@ -7,6 +7,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * Consumes a CCD file to create the {@link ChemicalComponentDictionary}.
+ * @author Sebastian Bittrich
+ */
 public class ChemCompConsumerImpl implements ChemCompConsumer {
     private static final Logger logger = LoggerFactory.getLogger(ChemCompConsumerImpl.class);
     private final ChemicalComponentDictionary dictionary;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConverter.java
index aec300e717..497af0f0da 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChemCompConverter.java
@@ -16,7 +16,7 @@
 
 /**
  * Convert CifFiles to chem comps.
- * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
+ * @author Sebastian Bittrich
  * @since 6.0.0
  */
 public class ChemCompConverter {
@@ -44,7 +44,7 @@ public static ChemicalComponentDictionary fromURL(URL url) throws IOException {
      * @param inputStream the InputStream of information - can be gzipped or binary or text data
      * @return the target
      * @throws IOException thrown when reading fails
-     * @see StructureConverter#fromInputStream(InputStream, FileParsingParameters)
+     * @see CifStructureConverter#fromInputStream(InputStream, FileParsingParameters)
      */
     public static ChemicalComponentDictionary fromInputStream(InputStream inputStream) throws IOException {
         return fromCifFile(CifIO.readFromInputStream(inputStream));
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifBean.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifBean.java
index 1196aafada..9adf3b3e43 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifBean.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifBean.java
@@ -1,12 +1,11 @@
 package org.biojava.nbio.structure.io.cif;
 
-import org.rcsb.cif.model.Category;
-
 import java.io.Serializable;
 
 /**
- * Flag for BioJava beans that actually resemble categories defined by the mmCIF schema.
- * @param <C> the modeled ciftools-java category
+ * Flag for BioJava beans that resemble categories defined by the mmCIF schema.
+ * @author Sebastian Bittrich
+ * @since 6.0.0
  */
-public interface CifBean<C extends Category> extends Serializable {
+public interface CifBean extends Serializable {
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChainSupplierImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifChainSupplierImpl.java
similarity index 77%
rename from biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChainSupplierImpl.java
rename to biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifChainSupplierImpl.java
index 08516d47b3..98e9da2f4e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/ChainSupplierImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifChainSupplierImpl.java
@@ -6,7 +6,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class ChainSupplierImpl extends AbstractCifFileSupplier<Chain> {
+/**
+ * Convert a chain to a {@link CifFile}.
+ * @author Sebastian Bittrich
+ */
+public class CifChainSupplierImpl extends AbstractCifFileSupplier<Chain> {
     @Override
     public CifFile get(Chain container) {
         return getInternal(container.getStructure(), collectWrappedAtoms(container));
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumer.java
index d95f7b9422..565868e516 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileConsumer.java
@@ -2,9 +2,8 @@
 
 /**
  * Defines a rather generic interface which allows to populate some data structure with data parsed from a CIF file.
- *
  * @param <S> the type of container an implementing class will return
- * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
+ * @author Sebastian Bittrich
  * @since 5.3.0
  */
 public interface CifFileConsumer<S> {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplier.java
index e46a0bf058..0ea1e06bd7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifFileSupplier.java
@@ -5,7 +5,7 @@
 /**
  * Create a CifFile instance for a given container of structure data.
  * @param <S> the container type used as source
- * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
+ * @author Sebastian Bittrich
  * @since 5.3.0
  */
 public interface CifFileSupplier<S> {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumer.java
similarity index 98%
rename from biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumer.java
rename to biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumer.java
index 9594a2c71d..c6c5318217 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumer.java
@@ -47,7 +47,12 @@
 import org.rcsb.cif.schema.mm.StructSiteGen;
 import org.rcsb.cif.schema.mm.Symmetry;
 
-public interface StructureConsumer extends CifFileConsumer<Structure> {
+/**
+ * Defines the categories to consume during CIF parsing.
+ * @author Sebastian Bittrich
+ * @since 6.0.0
+ */
+public interface CifStructureConsumer extends CifFileConsumer<Structure> {
     /**
      * Consume a particular Cif category.
      * @param atomSite data
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
similarity index 99%
rename from biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
rename to biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 35f46dc066..c64f1ac412 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -100,11 +100,11 @@
 /**
  * An implementation of a CifFileConsumer for BioJava. Will process the information provided by a CifFile instance and
  * use it to build up a {@link Structure} object.
- * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
+ * @author Sebastian Bittrich
  * @since 6.0.0
  */
-public class StructureConsumerImpl implements StructureConsumer {
-    private static final Logger logger = LoggerFactory.getLogger(StructureConsumerImpl.class);
+public class CifStructureConsumerImpl implements CifStructureConsumer {
+    private static final Logger logger = LoggerFactory.getLogger(CifStructureConsumerImpl.class);
     private static final DateTimeFormatter DATE_FORMAT = new DateTimeFormatterBuilder()
             .parseCaseInsensitive()
             .appendPattern("yyyy-MM-dd")
@@ -141,7 +141,7 @@ public class StructureConsumerImpl implements StructureConsumer {
 
     private final FileParsingParameters params;
 
-    public StructureConsumerImpl(FileParsingParameters params) {
+    public CifStructureConsumerImpl(FileParsingParameters params) {
         this.params = params;
     }
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConverter.java
similarity index 95%
rename from biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConverter.java
rename to biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConverter.java
index 45a5b97c76..98ef24561b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConverter.java
@@ -17,10 +17,10 @@
 
 /**
  * Convert BioJava structures to CifFiles and vice versa.
- * @author Sebastian Bittrich <sebastian.bittrich@rcsb.org>
+ * @author Sebastian Bittrich
  * @since 6.0.0
  */
-public class StructureConverter {
+public class CifStructureConverter {
     /**
      * Read data from a file and convert to Structure without any FileParsingParameters.
      * @param path the source of information - can be gzipped or binary or text data
@@ -66,7 +66,7 @@ private static Structure fromURL(URL url, FileParsingParameters parameters) thro
      * @param inputStream the InputStream of information - can be gzipped or binary or text data
      * @return the target
      * @throws IOException thrown when reading fails
-     * @see StructureConverter#fromInputStream(InputStream, FileParsingParameters)
+     * @see CifStructureConverter#fromInputStream(InputStream, FileParsingParameters)
      */
     public static Structure fromInputStream(InputStream inputStream) throws IOException {
         return fromInputStream(inputStream, new FileParsingParameters());
@@ -87,7 +87,7 @@ public static Structure fromInputStream(InputStream inputStream, FileParsingPara
      * Convert CifFile to Structure without any FileParsingParameters.
      * @param cifFile the source
      * @return the target
-     * @see StructureConverter#fromCifFile(CifFile, FileParsingParameters)
+     * @see CifStructureConverter#fromCifFile(CifFile, FileParsingParameters)
      */
     public static Structure fromCifFile(CifFile cifFile) {
         return fromCifFile(cifFile, new FileParsingParameters());
@@ -101,7 +101,7 @@ public static Structure fromCifFile(CifFile cifFile) {
      */
     public static Structure fromCifFile(CifFile cifFile, FileParsingParameters parameters) {
         // initialize consumer
-        StructureConsumer consumer = new StructureConsumerImpl(parameters);
+        CifStructureConsumer consumer = new CifStructureConsumerImpl(parameters);
 
         // init structure
         consumer.prepare();
@@ -226,7 +226,7 @@ public static String toText(Chain chain) {
      * @return the target
      */
     public static CifFile toCifFile(Structure structure) {
-        return new StructureSupplierImpl().get(structure);
+        return new CifStructureSupplierImpl().get(structure);
     }
 
     /**
@@ -235,6 +235,6 @@ public static CifFile toCifFile(Structure structure) {
      * @return the target
      */
     public static CifFile toCifFile(Chain chain) {
-        return new ChainSupplierImpl().get(chain);
+        return new CifChainSupplierImpl().get(chain);
     }
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureSupplierImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureSupplierImpl.java
similarity index 83%
rename from biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureSupplierImpl.java
rename to biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureSupplierImpl.java
index ef377ad52a..4b0eb79eb3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/StructureSupplierImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureSupplierImpl.java
@@ -7,7 +7,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class StructureSupplierImpl extends AbstractCifFileSupplier<Structure> {
+/**
+ * Convert a structure to a CifFile.
+ * @author Sebastian Bittrich
+ */
+public class CifStructureSupplierImpl extends AbstractCifFileSupplier<Structure> {
     @Override
     public CifFile get(Structure container) {
         return getInternal(container, collectWrappedAtoms(container));
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumer.java
index d76d91d1e7..df86c2c216 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConsumer.java
@@ -6,6 +6,11 @@
 import java.util.List;
 import java.util.Map;
 
-public interface MetalBondConsumer extends CifFileConsumer<Map<String,List<MetalBondDistance>>> {
+/**
+ * Consume metal bond data.
+ * @author Sebastian Bittrich
+ * @since 6.0.0
+ */
+public interface MetalBondConsumer extends CifFileConsumer<Map<String, List<MetalBondDistance>>> {
     void consume(Category category);
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConverter.java
index 0f28fe6493..c1ac0f3d2c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/MetalBondConverter.java
@@ -17,7 +17,7 @@
 public class MetalBondConverter {
     private static final Logger logger = LoggerFactory.getLogger(MetalBondConverter.class);
     private static final String BONDS_FILE = "org/biojava/nbio/structure/bond_distance_limits.cif.gz";
-    private static Map<String, List<MetalBondDistance>> definitions;
+    private static final Map<String, List<MetalBondDistance>> definitions;
 
     static {
         definitions = init();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
index a6c52c95bd..c41eb33033 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
@@ -45,7 +45,7 @@
 import org.biojava.nbio.structure.PDBCrystallographicInfo;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemComp;
@@ -55,7 +55,6 @@
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyTransformation;
-import org.biojava.nbio.structure.secstruc.DSSPParser;
 import org.biojava.nbio.structure.secstruc.SecStrucCalc;
 import org.biojava.nbio.structure.secstruc.SecStrucState;
 import org.biojava.nbio.structure.secstruc.SecStrucType;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/Test2JA5.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/Test2JA5.java
index eb7008d0cb..0d2a6d5742 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/Test2JA5.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/Test2JA5.java
@@ -26,6 +26,7 @@
 
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.FileParsingParameters;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.Test;
 
 /**
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/Test4hhb.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/Test4hhb.java
index bcf289cebc..52e088261e 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/Test4hhb.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/Test4hhb.java
@@ -26,7 +26,7 @@
 
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.PDBFileParser;
-import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -75,7 +75,7 @@ public void test4hhbPDBFile() throws IOException
 
 		params = new FileParsingParameters();
 		params.setAlignSeqRes(true);
-		structure2 = StructureConverter.fromInputStream(inStream, params);
+		structure2 = CifStructureConverter.fromInputStream(inStream, params);
 
 		assertNotNull(structure2);
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java
index ef9f830ae1..9c5bdcf0be 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java
@@ -27,13 +27,12 @@
 import org.biojava.nbio.structure.chem.PolymerType;
 import org.biojava.nbio.structure.chem.ResidueType;
 import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.Test;
 
-import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -639,7 +638,7 @@ public void testMmcifConversionPartialAltlocs() throws IOException {
 						"ATOM   117 N NH2 A ARG A 1 13 ? 7.812  17.972 17.172 0.50 24.80 ? 102  ARG A NH2 1\n" +
 						"ATOM   118 N NH2 B ARG A 1 13 ? 8.013  18.115 17.888 0.50 26.52 ? 102  ARG A NH2 1\n";
 
-		Structure s = StructureConverter.fromInputStream(new ByteArrayInputStream(mmcifData.getBytes()));
+		Structure s = CifStructureConverter.fromInputStream(new ByteArrayInputStream(mmcifData.getBytes()));
 		Chain c = s.getPolyChains().get(0);
 		assertEquals(1, c.getAtomGroups().size());
 		Group g = c.getAtomGroup(0);
@@ -718,7 +717,7 @@ public void testMmcifConversionAllAltlocs() throws IOException {
 						"ATOM   216 C CD  A PRO A 1 23 ? 14.980 32.886 23.580 0.50 6.98  ? 112  PRO A CD  1 \n" +
 						"ATOM   217 C CD  B PRO A 1 23 ? 14.558 33.235 23.153 0.50 14.91 ? 112  PRO A CD  1 \n";
 
-		Structure s = StructureConverter.fromInputStream(new ByteArrayInputStream(mmcifData.getBytes()));
+		Structure s = CifStructureConverter.fromInputStream(new ByteArrayInputStream(mmcifData.getBytes()));
 		Chain c = s.getPolyChains().get(0);
 		assertEquals(1, c.getAtomGroups().size());
 
@@ -803,7 +802,7 @@ public void testIntraResidueBondsBetweenAltlocs() throws IOException {
 		FileParsingParameters params = new FileParsingParameters();
 		params.setCreateAtomBonds(true);
 
-		Structure s = StructureConverter.fromInputStream(new ByteArrayInputStream(mmcifData.getBytes()), params);
+		Structure s = CifStructureConverter.fromInputStream(new ByteArrayInputStream(mmcifData.getBytes()), params);
 		Chain c = s.getPolyChains().get(0);
 		assertEquals(1, c.getAtomGroups().size());
 
@@ -949,7 +948,7 @@ public void testInterResidueBondsBetweenAltlocs() throws IOException {
 		FileParsingParameters params = new FileParsingParameters();
 		params.setCreateAtomBonds(true);
 
-		Structure s = StructureConverter.fromInputStream(new ByteArrayInputStream(mmcifData.getBytes()), params);
+		Structure s = CifStructureConverter.fromInputStream(new ByteArrayInputStream(mmcifData.getBytes()), params);
 		Chain c = s.getPolyChains().get(0);
 		assertEquals(2, c.getAtomGroups().size());
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
index 5de3eca23a..bb9ec5ba2a 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
@@ -30,6 +30,7 @@
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.ObsoleteBehavior;
 import org.biojava.nbio.structure.io.PDBFileReader;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestBond.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestBond.java
index cd64006861..6cc9b2d05e 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestBond.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestBond.java
@@ -28,6 +28,7 @@
 import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestCloning.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestCloning.java
index 4ce757bc91..516e96fce5 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestCloning.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestCloning.java
@@ -30,6 +30,7 @@
 
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.FileParsingParameters;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestEntityResIndexMapping.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestEntityResIndexMapping.java
index 401a42f2cb..61b3812a46 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestEntityResIndexMapping.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestEntityResIndexMapping.java
@@ -31,6 +31,7 @@
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.PDBFileParser;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestExperimentalTechniques.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestExperimentalTechniques.java
index 6ef6224f8d..1edea84097 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestExperimentalTechniques.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestExperimentalTechniques.java
@@ -21,6 +21,7 @@
 package org.biojava.nbio.structure;
 
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestLoadStructureFromURL.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestLoadStructureFromURL.java
index fb182535f1..5ba56deb19 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestLoadStructureFromURL.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestLoadStructureFromURL.java
@@ -23,6 +23,7 @@
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.align.util.UserConfiguration;
 import org.biojava.nbio.structure.io.PDBFileReader;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.Test;
 
 import java.io.File;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestParsingCalcium.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestParsingCalcium.java
index c3212fac8c..096dff1e1a 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestParsingCalcium.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestParsingCalcium.java
@@ -25,6 +25,7 @@
 package org.biojava.nbio.structure;
 
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestStructureCrossReferences.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestStructureCrossReferences.java
index ebcea45acf..816d817231 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestStructureCrossReferences.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestStructureCrossReferences.java
@@ -33,6 +33,7 @@
 import org.biojava.nbio.structure.contact.StructureInterface;
 import org.biojava.nbio.structure.contact.StructureInterfaceList;
 import org.biojava.nbio.structure.io.FileParsingParameters;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.xtal.CrystalBuilder;
 import org.junit.Test;
 import org.slf4j.Logger;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
index 1b30f95ad6..25a711e0b1 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
@@ -47,7 +47,7 @@
 import org.biojava.nbio.structure.ResidueRangeAndLength;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.StructureIdentifier;
 import org.biojava.nbio.structure.StructureTools;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestDifficultMmCIFFiles.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestDifficultMmCIFFiles.java
index 690f877f08..0edf607c86 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestDifficultMmCIFFiles.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestDifficultMmCIFFiles.java
@@ -27,11 +27,9 @@
 import static org.junit.Assume.assumeNotNull;
 import static org.junit.Assume.assumeTrue;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.List;
@@ -42,10 +40,9 @@
 import org.biojava.nbio.structure.ResidueNumber;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
-import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.junit.Test;
 
@@ -222,7 +219,7 @@ public void testQuotingCornerCase () throws IOException {
 
 		FileParsingParameters fileParsingParams = new FileParsingParameters();
 		fileParsingParams.setAlignSeqRes(true);
-		Structure s = StructureConverter.fromInputStream(inStream, fileParsingParams);
+		Structure s = CifStructureConverter.fromInputStream(inStream, fileParsingParams);
 
 		assertNotNull(s);
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
index 2c73fe0e0d..b50b4524fc 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
@@ -24,7 +24,6 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.align.util.AtomCache;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java
index 7d246fc25e..5ac9537412 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java
@@ -31,12 +31,11 @@
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemComp;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
-import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -170,7 +169,7 @@ public void testSpeed2() throws StructureException, IOException {
 
 		logger.info("Testing mmCIF parsing speed");
 		start = System.nanoTime();
-		Structure s2 = StructureConverter.fromInputStream(cifStream, params);
+		Structure s2 = CifStructureConverter.fromInputStream(cifStream, params);
 		stop = System.nanoTime();
 		diff = (stop - start) / 1000000000.0;
 		logger.info(String.format("[%s] Elapsed time: %.3f s", s2.getIdentifier(), diff));
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java
index 6187f2127b..12b3d1a3b7 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java
@@ -22,9 +22,7 @@
 
 import static org.junit.Assert.*;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Arrays;
@@ -40,12 +38,11 @@
 import org.biojava.nbio.structure.ResidueNumber;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.StructureImpl;
 import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.align.util.AtomCache;
-import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
 import org.junit.Test;
 
 public class TestMMCIFWriting {
@@ -96,7 +93,7 @@ private static void testRoundTrip(String pdbId) throws IOException, StructureExc
 
 		FileParsingParameters fileParsingParams = new FileParsingParameters();
 		fileParsingParams.setAlignSeqRes(true);
-		Structure readStruct = StructureConverter.fromPath(outputFile.toPath(), params);
+		Structure readStruct = CifStructureConverter.fromPath(outputFile.toPath(), params);
 
 		assertNotNull(readStruct);
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMcifOrganismParsing.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMcifOrganismParsing.java
index 31c309f68e..8d018f6c0a 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMcifOrganismParsing.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMcifOrganismParsing.java
@@ -28,7 +28,6 @@
 import org.biojava.nbio.structure.EntityType;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.BeforeClass;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
index a604fffcaa..a04deda47d 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
@@ -22,11 +22,9 @@
 
 import static org.junit.Assert.*;
 
-import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.List;
 import java.util.zip.GZIPInputStream;
@@ -36,10 +34,9 @@
 import org.biojava.nbio.structure.EntityType;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
-import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
 import org.biojava.nbio.structure.xtal.CrystalCell;
 import org.junit.Test;
 
@@ -209,7 +206,7 @@ public void testPhenixCifFile() throws IOException {
 
 		FileParsingParameters fileParsingParams = new FileParsingParameters();
 		fileParsingParams.setAlignSeqRes(true);
-		Structure s = StructureConverter.fromInputStream(inStream, fileParsingParams);
+		Structure s = CifStructureConverter.fromInputStream(inStream, fileParsingParams);
 
 		assertNotNull(s);
 
@@ -333,7 +330,7 @@ public void testNewLigandChain() throws IOException {
 		int expectedNumLigands = 1;
 		assertEquals(expectedNumLigands, c1.getAtomGroups().size());
 
-		Structure s2 = StructureConverter.fromInputStream(cifStream, params);
+		Structure s2 = CifStructureConverter.fromInputStream(cifStream, params);
 
 		// The chain B should be present with 1 ligand HEM
 		Chain c2 = s2.getNonPolyChainsByPDB("B").get(0);
@@ -373,7 +370,7 @@ public void testWaterOnlyChainCif() throws IOException {
 		// following file is cut-down versions of 4a10
 		InputStream cifStream = new GZIPInputStream(this.getClass().getResourceAsStream("/org/biojava/nbio/structure/io/4a10_short.cif.gz"));
 
-		Structure s2 = StructureConverter.fromInputStream(cifStream);
+		Structure s2 = CifStructureConverter.fromInputStream(cifStream);
 
 
 		assertEquals(2, s2.getChains().size());
@@ -431,7 +428,7 @@ public void testStructureWithBranchedEntities() throws IOException {
 		URL url = new URL("https://raw.githubusercontent.com/pdbxmmcifwg/carbohydrate-extension/master/examples/models/1B5F-carb.cif");
 		InputStream inStream = url.openStream();
 
-		Structure structure = StructureConverter.fromInputStream(inStream);
+		Structure structure = CifStructureConverter.fromInputStream(inStream);
 
 		assertEquals(7, structure.getEntityInfos().size());
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFFeatures.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFFeatures.java
index f4d5a6d9d2..3042cc6269 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFFeatures.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFFeatures.java
@@ -31,7 +31,6 @@
 import org.biojava.nbio.structure.Site;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFLigands.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFLigands.java
index 76d7d74a3d..43017bf5d9 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFLigands.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseMmCIFLigands.java
@@ -29,7 +29,6 @@
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseOnAsymId.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseOnAsymId.java
index fda734d668..45ca5f2211 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseOnAsymId.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestParseOnAsymId.java
@@ -27,7 +27,6 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestTitleParsing.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestTitleParsing.java
index 40b1368027..06e9f48484 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestTitleParsing.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestTitleParsing.java
@@ -22,7 +22,6 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestWriteLargeCoordinatePDB.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestWriteLargeCoordinatePDB.java
index 0588d54d01..eeb488a5d4 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestWriteLargeCoordinatePDB.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestWriteLargeCoordinatePDB.java
@@ -28,7 +28,6 @@
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
index 444a7b800e..5c6b132cbb 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestEntityNameAndType.java
@@ -23,13 +23,12 @@
 import static org.junit.Assert.assertArrayEquals;
 
 import java.io.IOException;
-import java.util.Arrays;
 
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.EntityInfo;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseInternalChainId.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseInternalChainId.java
index 8c4084745d..01fcc953c3 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseInternalChainId.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseInternalChainId.java
@@ -26,7 +26,7 @@
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
 import static org.junit.Assert.*;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseMmcifHeader.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseMmcifHeader.java
index c0d2423d35..8c789ea2d6 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseMmcifHeader.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmcif/TestParseMmcifHeader.java
@@ -31,7 +31,7 @@
 import org.biojava.nbio.structure.PDBHeader;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.junit.Test;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestBondFinding.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestBondFinding.java
index e400465ecb..fd94dff8f5 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestBondFinding.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestBondFinding.java
@@ -20,7 +20,7 @@
  */
 package org.biojava.nbio.structure.io.mmtf;
 
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.junit.Test;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java
index 04e4cc93df..e362c2a35f 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java
@@ -20,10 +20,8 @@
  */
 package org.biojava.nbio.structure.io.mmtf;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -37,13 +35,13 @@
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
 import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.cif.StructureConverter;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyTransformation;
 import org.junit.Test;
@@ -360,7 +358,7 @@ public void testStructWithBranchedEntitiesRoundTrip() throws IOException {
 		URL url = new URL("https://raw.githubusercontent.com/pdbxmmcifwg/carbohydrate-extension/master/examples/models/1B5F-carb.cif");
 		InputStream inStream = url.openStream();
 
-		Structure structure = StructureConverter.fromInputStream(inStream);
+		Structure structure = CifStructureConverter.fromInputStream(inStream);
 
 		AdapterToStructureData writerToEncoder = new AdapterToStructureData();
 		new MmtfStructureWriter(structure, writerToEncoder);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java
index acf23d4f88..095deecb64 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java
@@ -9,7 +9,7 @@
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestCrystalInfo.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestCrystalInfo.java
index 775588a2ae..4e48bab634 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestCrystalInfo.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestCrystalInfo.java
@@ -22,6 +22,7 @@
 
 import org.biojava.nbio.structure.*;
 import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestInterfaceClustering.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestInterfaceClustering.java
index bb5fe0b74c..d69ce237d3 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestInterfaceClustering.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/xtal/TestInterfaceClustering.java
@@ -32,7 +32,7 @@
 
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureFiletype;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.asa.GroupAsa;

From 9e501a9e3bfee814f00bd5d23746ea2a01debcb5 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 27 Jan 2021 12:27:26 -0800
Subject: [PATCH 033/599] Further optimization: sort by distance. Achieves ~1/3
 of runtime

---
 .../nbio/structure/asa/AsaCalculator.java     | 83 +++++++++++--------
 1 file changed, 47 insertions(+), 36 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
index 19ece0ab72..59ba0dc138 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
@@ -30,8 +30,7 @@
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
-
+import java.util.stream.Collectors;
 
 
 /**
@@ -86,8 +85,8 @@ public class AsaCalculator {
 
 	private class AsaCalcWorker implements Runnable {
 
-		private int i;
-		private double[] asas;
+		private final int i;
+		private final double[] asas;
 
 		public AsaCalcWorker(int i, double[] asas) {
 			this.i = i;
@@ -100,12 +99,21 @@ public void run() {
 		}
 	}
 
+	private static class IndexAndDistance {
+		private final int index;
+		private final double dist;
+		public IndexAndDistance(int index, double dist) {
+			this.index = index;
+			this.dist = dist;
+		}
+	}
+
 
-	private Point3d[] atomCoords;
-	private Atom[] atoms;
-	private double[] radii;
-	private double probe;
-	private int nThreads;
+	private final Point3d[] atomCoords;
+	private final Atom[] atoms;
+	private final double[] radii;
+	private final double probe;
+	private final int nThreads;
 	private Point3d[] spherePoints;
 	private double cons;
 	private int[][] neighborIndices;
@@ -123,7 +131,6 @@ public void run() {
 	 * @param nThreads the number of parallel threads to use for the calculation
 	 * @param hetAtoms if true HET residues are considered, if false they aren't, equivalent to
 	 * NACCESS' -h option
-	 * @see StructureTools#getAllNonHAtomArray
 	 */
 	public AsaCalculator(Structure structure, double probe, int nSpherePoints, int nThreads, boolean hetAtoms) {
 		this.atoms = StructureTools.getAllNonHAtomArray(structure, hetAtoms);
@@ -312,10 +319,8 @@ public double[] calculateAsas() {
 			//12 threads, time:  0.9s -- x11.4
 
 
-
 			ExecutorService threadPool = Executors.newFixedThreadPool(nThreads);
 
-
 			for (int i=0;i<atomCoords.length;i++) {
 				threadPool.submit(new AsaCalcWorker(i,asas));
 			}
@@ -404,14 +409,14 @@ int[][] findNeighborIndicesSpatialHashing() {
 		int initialCapacity = 60;
 
 		List<Contact> contactList = calcContacts();
-		Map<Integer, List<Integer>> indices = new HashMap<>(atomCoords.length);
+		Map<Integer, List<IndexAndDistance>> indices = new HashMap<>(atomCoords.length);
 		for (Contact contact : contactList) {
 			// note contacts are stored 1-way only, with j>i
 			int i = contact.getI();
 			int j = contact.getJ();
 
-			List<Integer> iIndices;
-			List<Integer> jIndices;
+			List<IndexAndDistance> iIndices;
+			List<IndexAndDistance> jIndices;
 			if (!indices.containsKey(i)) {
 				iIndices = new ArrayList<>(initialCapacity);
 				indices.put(i, iIndices);
@@ -428,17 +433,21 @@ int[][] findNeighborIndicesSpatialHashing() {
 			double radius = radii[i] + probe + probe;
 			double dist = contact.getDistance();
 			if (dist < radius + radii[j]) {
-				iIndices.add(j);
-				jIndices.add(i);
+				iIndices.add(new IndexAndDistance(j, dist));
+				jIndices.add(new IndexAndDistance(i, dist));
 			}
 		}
 
 		// convert map to array for fast access
 		int[][] nbsIndices = new int[atomCoords.length][];
-		for (Map.Entry<Integer, List<Integer>> entry : indices.entrySet()) {
-			List<Integer> list = entry.getValue();
+		for (Map.Entry<Integer, List<IndexAndDistance>> entry : indices.entrySet()) {
+			List<IndexAndDistance> list = entry.getValue();
+			// Sorting by closest to farthest away neighbors achieves faster runtimes when checking for occluded sphere sample points in calcSingleAsa.
+			// This follows the ideas exposed in Eisenhaber et al, J Comp Chemistry 1994 (https://onlinelibrary.wiley.com/doi/epdf/10.1002/jcc.540160303)
+			list = list.stream().sorted(Comparator.comparingDouble(o -> o.dist)).collect(Collectors.toList());
 			int[] indicesArray = new int[list.size()];
-			for (int i=0;i<entry.getValue().size();i++) indicesArray[i] = list.get(i);
+			for (int i=0; i<list.size(); i++) indicesArray[i] = list.get(i).index;
+
 			nbsIndices[entry.getKey()] = indicesArray;
 		}
 
@@ -475,34 +484,29 @@ private double calcSingleAsa(int i) {
 
 		int n_neighbor = neighborIndices[i].length;
 		int[] neighbor_indices = neighborIndices[i];
-		int j_closest_neighbor = 0;
 		double radius = probe + radii[i];
 
 		int n_accessible_point = 0;
 
+		int[] numDistsCalced = null;
+		if (logger.isDebugEnabled()) numDistsCalced = new int[n_neighbor];
+
 		for (Point3d point: spherePoints){
 			boolean is_accessible = true;
 			Point3d test_point = new Point3d(point.x*radius + atom_i.x,
 					point.y*radius + atom_i.y,
 					point.z*radius + atom_i.z);
 
-			int[] cycled_indices = new int[n_neighbor];
-			int arind = 0;
-			for (int ind=j_closest_neighbor;ind<n_neighbor;ind++) {
-				cycled_indices[arind] = ind;
-				arind++;
-			}
-			for (int ind=0;ind<j_closest_neighbor;ind++){
-				cycled_indices[arind] = ind;
-				arind++;
-			}
-
-			for (int j: cycled_indices) {
-				Point3d atom_j = atomCoords[neighbor_indices[j]];
-				double r = radii[neighbor_indices[j]] + probe;
+			int iter = -1;
+			for (int j : neighbor_indices) {
+				iter++;
+				Point3d atom_j = atomCoords[j];
+				double r = radii[j] + probe;
 				double diff_sq = test_point.distanceSquared(atom_j);
+
+				if (numDistsCalced!=null) numDistsCalced[iter]++;
+
 				if (diff_sq < r*r) {
-					j_closest_neighbor = j;
 					is_accessible = false;
 					break;
 				}
@@ -511,6 +515,13 @@ private double calcSingleAsa(int i) {
 				n_accessible_point++;
 			}
 		}
+
+		if (numDistsCalced!=null) {
+			int sum = 0;
+			for (int j = 0; j < n_neighbor; j++) sum += numDistsCalced[j];
+			logger.debug("Number of sample points distances calculated for neighbors of i={} : average {}, all {}", i, (double) sum / (double) n_neighbor, numDistsCalced);
+		}
+
 		return cons*n_accessible_point*radius*radius;
 	}
 

From 8e84d62e9885c4814bb08245250df50e7196c212 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 27 Jan 2021 14:51:55 -0800
Subject: [PATCH 034/599] Small optimisation: avoid recalculating radii

---
 .../nbio/structure/asa/AsaCalculator.java     | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
index 59ba0dc138..9a5f6edd75 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
@@ -491,22 +491,31 @@ private double calcSingleAsa(int i) {
 		int[] numDistsCalced = null;
 		if (logger.isDebugEnabled()) numDistsCalced = new int[n_neighbor];
 
+		// now we precalculate the squared j radii to compare to in inner loop (which does not depend on each sphere point, but only on i, j
+		double[] sqRadii = new double[n_neighbor];
+		for (int nbArrayInd =0; nbArrayInd<n_neighbor; nbArrayInd++) {
+			int j = neighbor_indices[nbArrayInd];
+			double r = radii[j] + probe;
+			sqRadii[nbArrayInd] = r * r;
+		}
+
 		for (Point3d point: spherePoints){
 			boolean is_accessible = true;
 			Point3d test_point = new Point3d(point.x*radius + atom_i.x,
 					point.y*radius + atom_i.y,
 					point.z*radius + atom_i.z);
 
-			int iter = -1;
-			for (int j : neighbor_indices) {
-				iter++;
+			// note that the neighbors are sorted by distance, achieving optimal performance in this inner loop
+			// See Eisenhaber et al, J Comp Chemistry 1994 (https://onlinelibrary.wiley.com/doi/epdf/10.1002/jcc.540160303)
+
+			for (int nbArrayInd =0; nbArrayInd<n_neighbor; nbArrayInd++) {
+				int j = neighbor_indices[nbArrayInd];
 				Point3d atom_j = atomCoords[j];
-				double r = radii[j] + probe;
 				double diff_sq = test_point.distanceSquared(atom_j);
 
-				if (numDistsCalced!=null) numDistsCalced[iter]++;
+				if (numDistsCalced!=null) numDistsCalced[nbArrayInd]++;
 
-				if (diff_sq < r*r) {
+				if (diff_sq < sqRadii[nbArrayInd]) {
 					is_accessible = false;
 					break;
 				}

From ae8b992b4ec90a6f6bbf01a2cf626a37095ef9e1 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 27 Jan 2021 17:11:11 -0800
Subject: [PATCH 035/599] Another optimisation from Eisenhaber 1994

---
 .../nbio/structure/asa/AsaCalculator.java     | 64 ++++++++++---------
 .../nbio/structure/asa/TestAsaCalc.java       | 20 +++---
 2 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
index 9a5f6edd75..2deed82865 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
@@ -27,6 +27,7 @@
 import org.slf4j.LoggerFactory;
 
 import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -99,9 +100,9 @@ public void run() {
 		}
 	}
 
-	private static class IndexAndDistance {
-		private final int index;
-		private final double dist;
+	public static class IndexAndDistance {
+		public final int index;
+		public final double dist;
 		public IndexAndDistance(int index, double dist) {
 			this.index = index;
 			this.dist = dist;
@@ -116,7 +117,7 @@ public IndexAndDistance(int index, double dist) {
 	private final int nThreads;
 	private Point3d[] spherePoints;
 	private double cons;
-	private int[][] neighborIndices;
+	private IndexAndDistance[][] neighborIndices;
 
 	private boolean useSpatialHashingForNeighbors;
 
@@ -369,17 +370,17 @@ private Point3d[] generateSpherePoints(int nSpherePoints) {
 	 * Returns the 2-dimensional array with neighbor indices for every atom.
 	 * @return 2-dimensional array of size: n_atoms x n_neighbors_per_atom
 	 */
-	int[][] findNeighborIndices() {
+	IndexAndDistance[][] findNeighborIndices() {
 
 		// looking at a typical protein case, number of neighbours are from ~10 to ~50, with an average of ~30
 		int initialCapacity = 60;
 
-		int[][] nbsIndices = new int[atomCoords.length][];
+		IndexAndDistance[][] nbsIndices = new IndexAndDistance[atomCoords.length][];
 
 		for (int k=0; k<atomCoords.length; k++) {
 			double radius = radii[k] + probe + probe;
 
-			List<Integer> thisNbIndices = new ArrayList<>(initialCapacity);
+			List<IndexAndDistance> thisNbIndices = new ArrayList<>(initialCapacity);
 
 			for (int i = 0; i < atomCoords.length; i++) {
 				if (i == k) continue;
@@ -387,12 +388,11 @@ int[][] findNeighborIndices() {
 				double dist = atomCoords[i].distance(atomCoords[k]);
 
 				if (dist < radius + radii[i]) {
-					thisNbIndices.add(i);
+					thisNbIndices.add(new IndexAndDistance(i, dist));
 				}
 			}
 
-			int[] indicesArray = new int[thisNbIndices.size()];
-			for (int i=0;i<thisNbIndices.size();i++) indicesArray[i] = thisNbIndices.get(i);
+			IndexAndDistance[] indicesArray = thisNbIndices.toArray(new IndexAndDistance[0]);
 			nbsIndices[k] = indicesArray;
 		}
 		return nbsIndices;
@@ -403,7 +403,7 @@ int[][] findNeighborIndices() {
 	 * using spatial hashing to avoid all to all distance calculation.
 	 * @return 2-dimensional array of size: n_atoms x n_neighbors_per_atom
 	 */
-	int[][] findNeighborIndicesSpatialHashing() {
+	IndexAndDistance[][] findNeighborIndicesSpatialHashing() {
 
 		// looking at a typical protein case, number of neighbours are from ~10 to ~50, with an average of ~30
 		int initialCapacity = 60;
@@ -439,22 +439,21 @@ int[][] findNeighborIndicesSpatialHashing() {
 		}
 
 		// convert map to array for fast access
-		int[][] nbsIndices = new int[atomCoords.length][];
+		IndexAndDistance[][] nbsIndices = new IndexAndDistance[atomCoords.length][];
 		for (Map.Entry<Integer, List<IndexAndDistance>> entry : indices.entrySet()) {
 			List<IndexAndDistance> list = entry.getValue();
 			// Sorting by closest to farthest away neighbors achieves faster runtimes when checking for occluded sphere sample points in calcSingleAsa.
 			// This follows the ideas exposed in Eisenhaber et al, J Comp Chemistry 1994 (https://onlinelibrary.wiley.com/doi/epdf/10.1002/jcc.540160303)
 			list = list.stream().sorted(Comparator.comparingDouble(o -> o.dist)).collect(Collectors.toList());
-			int[] indicesArray = new int[list.size()];
-			for (int i=0; i<list.size(); i++) indicesArray[i] = list.get(i).index;
+			IndexAndDistance[] indexAndDistances = list.toArray(new IndexAndDistance[0]);
 
-			nbsIndices[entry.getKey()] = indicesArray;
+			nbsIndices[entry.getKey()] = indexAndDistances;
 		}
 
 		// important: some atoms might have no neighbors at all: we need to initialise to empty arrays
 		for (int i=0; i<nbsIndices.length; i++) {
 			if (nbsIndices[i] == null) {
-				nbsIndices[i] = new int[0];
+				nbsIndices[i] = new IndexAndDistance[0];
 			}
 		}
 
@@ -483,39 +482,42 @@ private double calcSingleAsa(int i) {
 		Point3d atom_i = atomCoords[i];
 
 		int n_neighbor = neighborIndices[i].length;
-		int[] neighbor_indices = neighborIndices[i];
-		double radius = probe + radii[i];
+		IndexAndDistance[] neighbor_indices = neighborIndices[i];
+		double radius_i = probe + radii[i];
 
 		int n_accessible_point = 0;
 
 		int[] numDistsCalced = null;
 		if (logger.isDebugEnabled()) numDistsCalced = new int[n_neighbor];
 
-		// now we precalculate the squared j radii to compare to in inner loop (which does not depend on each sphere point, but only on i, j
+		// now we precalculate anything depending only on i,j in equation 3 in Eisenhaber 1994
 		double[] sqRadii = new double[n_neighbor];
+		Vector3d[] aj_minus_ais = new Vector3d[n_neighbor];
 		for (int nbArrayInd =0; nbArrayInd<n_neighbor; nbArrayInd++) {
-			int j = neighbor_indices[nbArrayInd];
-			double r = radii[j] + probe;
-			sqRadii[nbArrayInd] = r * r;
+			int j = neighbor_indices[nbArrayInd].index;
+			double dist = neighbor_indices[nbArrayInd].dist;
+			double radius_j = radii[j] + probe;
+			// see equation 3 in Eisenhaber 1994
+			sqRadii[nbArrayInd] = (dist*dist + radius_i*radius_i - radius_j*radius_j)/(2*radius_i);
+			Vector3d aj_minus_ai = new Vector3d(atomCoords[j]);
+			aj_minus_ai.sub(atom_i);
+			aj_minus_ais[nbArrayInd] = aj_minus_ai;
 		}
 
 		for (Point3d point: spherePoints){
 			boolean is_accessible = true;
-			Point3d test_point = new Point3d(point.x*radius + atom_i.x,
-					point.y*radius + atom_i.y,
-					point.z*radius + atom_i.z);
 
 			// note that the neighbors are sorted by distance, achieving optimal performance in this inner loop
 			// See Eisenhaber et al, J Comp Chemistry 1994 (https://onlinelibrary.wiley.com/doi/epdf/10.1002/jcc.540160303)
 
 			for (int nbArrayInd =0; nbArrayInd<n_neighbor; nbArrayInd++) {
-				int j = neighbor_indices[nbArrayInd];
-				Point3d atom_j = atomCoords[j];
-				double diff_sq = test_point.distanceSquared(atom_j);
+
+				// see equation 3 in Eisenhaber 1994
+				double dotProd = aj_minus_ais[nbArrayInd].dot(new Vector3d(point));
 
 				if (numDistsCalced!=null) numDistsCalced[nbArrayInd]++;
 
-				if (diff_sq < sqRadii[nbArrayInd]) {
+				if (dotProd > sqRadii[nbArrayInd]) {
 					is_accessible = false;
 					break;
 				}
@@ -527,11 +529,11 @@ private double calcSingleAsa(int i) {
 
 		if (numDistsCalced!=null) {
 			int sum = 0;
-			for (int j = 0; j < n_neighbor; j++) sum += numDistsCalced[j];
+			for (int nbArrayInd = 0; nbArrayInd < n_neighbor; nbArrayInd++) sum += numDistsCalced[nbArrayInd];
 			logger.debug("Number of sample points distances calculated for neighbors of i={} : average {}, all {}", i, (double) sum / (double) n_neighbor, numDistsCalced);
 		}
 
-		return cons*n_accessible_point*radius*radius;
+		return cons*n_accessible_point*radius_i*radius_i;
 	}
 
 	/**
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/asa/TestAsaCalc.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/asa/TestAsaCalc.java
index 79598bd410..941d85c06d 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/asa/TestAsaCalc.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/asa/TestAsaCalc.java
@@ -98,19 +98,19 @@ public void testNeighborIndicesFinding() throws StructureException, IOException
 				AsaCalculator.DEFAULT_PROBE_SIZE,
 				1000, 1, false);
 
-		int[][] allNbsSh = asaCalc.findNeighborIndicesSpatialHashing();
+		AsaCalculator.IndexAndDistance[][] allNbsSh = asaCalc.findNeighborIndicesSpatialHashing();
 
-		int[][] allNbs = asaCalc.findNeighborIndices();
+		AsaCalculator.IndexAndDistance[][] allNbs = asaCalc.findNeighborIndices();
 
 		for (int indexToTest =0; indexToTest < asaCalc.getAtomCoords().length; indexToTest++) {
 			//int indexToTest = 198;
-			int[] nbsSh = allNbsSh[indexToTest];
-			int[] nbs = allNbs[indexToTest];
+			AsaCalculator.IndexAndDistance[] nbsSh = allNbsSh[indexToTest];
+			AsaCalculator.IndexAndDistance[] nbs = allNbs[indexToTest];
 
 			List<Integer> listOfMatchingIndices = new ArrayList<>();
 			for (int i = 0; i < nbsSh.length; i++) {
 				for (int j = 0; j < nbs.length; j++) {
-					if (nbs[j] == nbsSh[i]) {
+					if (nbs[j].index == nbsSh[i].index) {
 						listOfMatchingIndices.add(j);
 						break;
 					}
@@ -201,21 +201,21 @@ public void testNoNeighborsIssue() {
 				AsaCalculator.DEFAULT_PROBE_SIZE,
 				1000, 1);
 
-		int[][] allNbsSh = asaCalc.findNeighborIndicesSpatialHashing();
+		AsaCalculator.IndexAndDistance[][] allNbsSh = asaCalc.findNeighborIndicesSpatialHashing();
 
-		int[][] allNbs = asaCalc.findNeighborIndices();
+		AsaCalculator.IndexAndDistance[][] allNbs = asaCalc.findNeighborIndices();
 
 		assertEquals(3, allNbs.length);
 		assertEquals(3, allNbsSh.length);
 
 		for (int indexToTest =0; indexToTest < asaCalc.getAtomCoords().length; indexToTest++) {
-			int[] nbsSh = allNbsSh[indexToTest];
-			int[] nbs = allNbs[indexToTest];
+			AsaCalculator.IndexAndDistance[] nbsSh = allNbsSh[indexToTest];
+			AsaCalculator.IndexAndDistance[] nbs = allNbs[indexToTest];
 
 			List<Integer> listOfMatchingIndices = new ArrayList<>();
 			for (int i = 0; i < nbsSh.length; i++) {
 				for (int j = 0; j < nbs.length; j++) {
-					if (nbs[j] == nbsSh[i]) {
+					if (nbs[j].index == nbsSh[i].index) {
 						listOfMatchingIndices.add(j);
 						break;
 					}

From f3e7e00977bcfe21c2b831411f17f402e5f556a8 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 27 Jan 2021 22:30:06 -0800
Subject: [PATCH 036/599] Some reorg and docs

---
 .../nbio/structure/asa/AsaCalculator.java     | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
index 2deed82865..6693490029 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
@@ -31,7 +31,6 @@
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
 
 
 /**
@@ -42,6 +41,9 @@
  * (now source is available at https://github.com/boscoh/asa).
  * Thanks to Bosco K. Ho for a great piece of code and for his fantastic blog.
  * <p>
+ * A few optimizations come from Eisenhaber et al, J Comp Chemistry 1994
+ * (https://onlinelibrary.wiley.com/doi/epdf/10.1002/jcc.540160303)
+ * <p>
  * See
  * Shrake, A., and J. A. Rupley. "Environment and Exposure to Solvent of Protein Atoms.
  * Lysozyme and Insulin." JMB (1973) 79:351-371.
@@ -49,7 +51,6 @@
  * Static Accessibility" JMB (1971) 55:379-400
  *
  * @author Jose Duarte
- *
  */
 public class AsaCalculator {
 
@@ -251,7 +252,7 @@ public GroupAsa[] getGroupAsas() {
 			}
 		}
 
-		return asas.values().toArray(new GroupAsa[asas.size()]);
+		return asas.values().toArray(new GroupAsa[0]);
 	}
 
 	/**
@@ -442,11 +443,7 @@ IndexAndDistance[][] findNeighborIndicesSpatialHashing() {
 		IndexAndDistance[][] nbsIndices = new IndexAndDistance[atomCoords.length][];
 		for (Map.Entry<Integer, List<IndexAndDistance>> entry : indices.entrySet()) {
 			List<IndexAndDistance> list = entry.getValue();
-			// Sorting by closest to farthest away neighbors achieves faster runtimes when checking for occluded sphere sample points in calcSingleAsa.
-			// This follows the ideas exposed in Eisenhaber et al, J Comp Chemistry 1994 (https://onlinelibrary.wiley.com/doi/epdf/10.1002/jcc.540160303)
-			list = list.stream().sorted(Comparator.comparingDouble(o -> o.dist)).collect(Collectors.toList());
 			IndexAndDistance[] indexAndDistances = list.toArray(new IndexAndDistance[0]);
-
 			nbsIndices[entry.getKey()] = indexAndDistances;
 		}
 
@@ -483,6 +480,11 @@ private double calcSingleAsa(int i) {
 
 		int n_neighbor = neighborIndices[i].length;
 		IndexAndDistance[] neighbor_indices = neighborIndices[i];
+		// Sorting by closest to farthest away neighbors achieves faster runtimes when checking for occluded
+		// sphere sample points below. This follows the ideas exposed in
+		// Eisenhaber et al, J Comp Chemistry 1994 (https://onlinelibrary.wiley.com/doi/epdf/10.1002/jcc.540160303)
+		Arrays.sort(neighbor_indices, Comparator.comparingDouble(o -> o.dist));
+
 		double radius_i = probe + radii[i];
 
 		int n_accessible_point = 0;
@@ -508,11 +510,13 @@ private double calcSingleAsa(int i) {
 			boolean is_accessible = true;
 
 			// note that the neighbors are sorted by distance, achieving optimal performance in this inner loop
-			// See Eisenhaber et al, J Comp Chemistry 1994 (https://onlinelibrary.wiley.com/doi/epdf/10.1002/jcc.540160303)
+			// See Eisenhaber et al, J Comp Chemistry 1994
 
 			for (int nbArrayInd =0; nbArrayInd<n_neighbor; nbArrayInd++) {
 
-				// see equation 3 in Eisenhaber 1994
+				// see equation 3 in Eisenhaber 1994. This is slightly more efficient than
+				// calculating distances to the actual sphere points on atom_i (which would be obtained with:
+				// Point3d test_point = new Point3d(point.x*radius + atom_i.x,point.y*radius + atom_i.y,point.z*radius + atom_i.z))
 				double dotProd = aj_minus_ais[nbArrayInd].dot(new Vector3d(point));
 
 				if (numDistsCalced!=null) numDistsCalced[nbArrayInd]++;
@@ -529,7 +533,7 @@ private double calcSingleAsa(int i) {
 
 		if (numDistsCalced!=null) {
 			int sum = 0;
-			for (int nbArrayInd = 0; nbArrayInd < n_neighbor; nbArrayInd++) sum += numDistsCalced[nbArrayInd];
+			for (int numDistCalcedForJ : numDistsCalced) sum += numDistCalcedForJ;
 			logger.debug("Number of sample points distances calculated for neighbors of i={} : average {}, all {}", i, (double) sum / (double) n_neighbor, numDistsCalced);
 		}
 

From 8cfd1c25decac38ab0e31a15e006b76e2461690d Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 27 Jan 2021 22:47:26 -0800
Subject: [PATCH 037/599] A scaling test (ignored)

---
 .../nbio/structure/asa/AsaCalculator.java     | 35 -------------------
 .../nbio/structure/asa/TestAsaCalc.java       | 30 +++++++++++++++-
 2 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
index 6693490029..ad6b464805 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
@@ -285,41 +285,6 @@ public double[] calculateAsas() {
 
 		} else {
 			logger.debug("Will use {} threads for ASA calculation", nThreads);
-			// NOTE the multithreaded calculation does not scale up well in some systems,
-			// why? I guess some memory/garbage collect problem? I tried increasing Xmx in pc8201 but didn't help
-
-			// Following scaling tests are for 3hbx, calculating ASA of full asym unit (6 chains):
-
-			// SCALING test done in merlinl01 (12 cores, Xeon X5670  @ 2.93GHz, 24GB RAM)
-			//1 threads, time:  8.8s -- x1.0
-			//2 threads, time:  4.4s -- x2.0
-			//3 threads, time:  2.9s -- x3.0
-			//4 threads, time:  2.2s -- x3.9
-			//5 threads, time:  1.8s -- x4.9
-			//6 threads, time:  1.6s -- x5.5
-			//7 threads, time:  1.4s -- x6.5
-			//8 threads, time:  1.3s -- x6.9
-
-			// SCALING test done in pc8201 (4 cores, Core2 Quad Q9550  @ 2.83GHz, 8GB RAM)
-			//1 threads, time: 17.2s -- x1.0
-			//2 threads, time:  9.7s -- x1.8
-			//3 threads, time:  7.7s -- x2.2
-			//4 threads, time:  7.9s -- x2.2
-
-			// SCALING test done in eppic01 (16 cores, Xeon E5-2650 0  @ 2.00GHz, 128GB RAM)
-			//1 threads, time: 10.7s -- x1.0
-			//2 threads, time:  5.6s -- x1.9
-			//3 threads, time:  3.6s -- x3.0
-			//4 threads, time:  2.8s -- x3.9
-			//5 threads, time:  2.3s -- x4.8
-			//6 threads, time:  1.8s -- x6.0
-			//7 threads, time:  1.6s -- x6.8
-			//8 threads, time:  1.3s -- x8.0
-			//9 threads, time:  1.3s -- x8.5
-			//10 threads, time:  1.1s -- x10.0
-			//11 threads, time:  1.0s -- x10.9
-			//12 threads, time:  0.9s -- x11.4
-
 
 			ExecutorService threadPool = Executors.newFixedThreadPool(nThreads);
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/asa/TestAsaCalc.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/asa/TestAsaCalc.java
index 941d85c06d..7add4cf1e7 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/asa/TestAsaCalc.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/asa/TestAsaCalc.java
@@ -32,6 +32,7 @@
 import org.biojava.nbio.structure.io.mmcif.DownloadChemCompProvider;
 import static org.junit.Assert.*;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -57,7 +58,6 @@ public void testAsa3PIU() throws StructureException, IOException {
 
 		Structure structure = StructureIO.getStructure("3PIU");
 
-
 		AsaCalculator asaCalc = new AsaCalculator(structure,
 				AsaCalculator.DEFAULT_PROBE_SIZE,
 				1000, 1, false);
@@ -86,6 +86,34 @@ public void testAsa3PIU() throws StructureException, IOException {
 
 	}
 
+	@Ignore("This is a performance test to be run manually")
+	@Test
+	public void testMultithreadScaling() throws StructureException, IOException {
+
+		// important: without this the tests can fail when running in maven (but not in IDE)
+		// that's because it depends on the order on how tests were run - JD 2018-03-10
+		ChemCompGroupFactory.setChemCompProvider(new DownloadChemCompProvider());
+
+		Structure structure = StructureIO.getStructure("3hbx");
+		int[] numThreads = {1, 2, 3, 4};
+		long timeSingleThread = 0;
+		for (int numThread : numThreads) {
+			AsaCalculator asaCalc = new AsaCalculator(structure,
+					AsaCalculator.DEFAULT_PROBE_SIZE,
+					100, numThread, false);
+
+			long start = System.currentTimeMillis();
+			asaCalc.calculateAsas();
+			long end = System.currentTimeMillis();
+			long time = end - start;
+			if (numThread == 1) {
+				timeSingleThread = time;
+			}
+			System.out.printf("%6d threads : %6d ms (x%3.1f)\n", numThread, time, (double)timeSingleThread/time);
+		}
+		// nothing to assert
+	}
+
 	@Test
 	public void testNeighborIndicesFinding() throws StructureException, IOException {
 		// important: without this the tests can fail when running in maven (but not in IDE)

From 8e9535c070fdafea32609bd9f5065b00b641dd27 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 27 Jan 2021 22:52:22 -0800
Subject: [PATCH 038/599] Logging

---
 .../java/org/biojava/nbio/structure/asa/AsaCalculator.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
index ad6b464805..4edb428df0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
@@ -568,7 +568,7 @@ else if (atomCode.equals("CA") || atomCode.equals("CB") ||
 					else if (atomCode.equals("CG")) return TETRAHEDRAL_CARBON_VDW;
 
 				default:
-					logger.info("Unexpected carbon atom "+atomCode+" for aminoacid "+aa+", assigning its standard vdw radius");
+					logger.info("Unexpected carbon atom {} for aminoacid {}, assigning its standard vdw radius", atomCode, aa);
 					return Element.C.getVDWRadius();
 				}
 			}
@@ -576,8 +576,7 @@ else if (atomCode.equals("CA") || atomCode.equals("CB") ||
 			// not any of the expected atoms
 		} else {
 			// non standard aas, (e.g. MSE, LLP) will always have this problem,
-			logger.info("Unexpected atom "+atomCode+" for aminoacid "+aa+ " ("+amino.getPDBName()+"), assigning its standard vdw radius");
-
+			logger.debug("Unexpected atom {} for aminoacid {} ({}), assigning its standard vdw radius", atomCode, aa, amino.getPDBName());
 
 			return atom.getElement().getVDWRadius();
 		}

From f27295efe12f15a8b7ff196682da9ae7726375ca Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 28 Jan 2021 09:57:29 -0800
Subject: [PATCH 039/599] Visibility

---
 .../org/biojava/nbio/structure/asa/AsaCalculator.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
index 4edb428df0..387e60ed68 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
@@ -90,7 +90,7 @@ private class AsaCalcWorker implements Runnable {
 		private final int i;
 		private final double[] asas;
 
-		public AsaCalcWorker(int i, double[] asas) {
+		private AsaCalcWorker(int i, double[] asas) {
 			this.i = i;
 			this.asas = asas;
 		}
@@ -101,10 +101,10 @@ public void run() {
 		}
 	}
 
-	public static class IndexAndDistance {
-		public final int index;
-		public final double dist;
-		public IndexAndDistance(int index, double dist) {
+	static class IndexAndDistance {
+		final int index;
+		final double dist;
+		IndexAndDistance(int index, double dist) {
 			this.index = index;
 			this.dist = dist;
 		}

From 6a447d61226aeb1ab287750f99b5be8dc72ab84a Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 28 Jan 2021 11:52:05 -0800
Subject: [PATCH 040/599] Use Vector3d for points, more docs

---
 .../nbio/structure/asa/AsaCalculator.java     | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
index 387e60ed68..144bcd1209 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
@@ -116,7 +116,7 @@ static class IndexAndDistance {
 	private final double[] radii;
 	private final double probe;
 	private final int nThreads;
-	private Point3d[] spherePoints;
+	private Vector3d[] spherePoints;
 	private double cons;
 	private IndexAndDistance[][] neighborIndices;
 
@@ -314,20 +314,20 @@ void setUseSpatialHashingForNeighbors(boolean useSpatialHashingForNeighbors) {
 	}
 
 	/**
-	 * Returns list of 3d coordinates of points on a sphere using the
+	 * Returns list of 3d coordinates of points on a unit sphere using the
 	 * Golden Section Spiral algorithm.
 	 * @param nSpherePoints the number of points to be used in generating the spherical dot-density
-	 * @return
+	 * @return the array of points as Vector3d objects
 	 */
-	private Point3d[] generateSpherePoints(int nSpherePoints) {
-		Point3d[] points = new Point3d[nSpherePoints];
+	private Vector3d[] generateSpherePoints(int nSpherePoints) {
+		Vector3d[] points = new Vector3d[nSpherePoints];
 		double inc = Math.PI * (3.0 - Math.sqrt(5.0));
 		double offset = 2.0 / nSpherePoints;
 		for (int k=0;k<nSpherePoints;k++) {
 			double y = k * offset - 1.0 + (offset / 2.0);
 			double r = Math.sqrt(1.0 - y*y);
 			double phi = k * inc;
-			points[k] = new Point3d(Math.cos(phi)*r, y, Math.sin(phi)*r);
+			points[k] = new Vector3d(Math.cos(phi)*r, y, Math.sin(phi)*r);
 		}
 		return points;
 	}
@@ -448,12 +448,14 @@ private double calcSingleAsa(int i) {
 		// Sorting by closest to farthest away neighbors achieves faster runtimes when checking for occluded
 		// sphere sample points below. This follows the ideas exposed in
 		// Eisenhaber et al, J Comp Chemistry 1994 (https://onlinelibrary.wiley.com/doi/epdf/10.1002/jcc.540160303)
+		// This is essential for performance. In my tests this brings down the number of occlusion checks in loop below to
+		// an average of n_sphere_points/10 per atom i, producing ~ x4 performance gain overall
 		Arrays.sort(neighbor_indices, Comparator.comparingDouble(o -> o.dist));
 
 		double radius_i = probe + radii[i];
 
 		int n_accessible_point = 0;
-
+		// purely for debugging
 		int[] numDistsCalced = null;
 		if (logger.isDebugEnabled()) numDistsCalced = new int[n_neighbor];
 
@@ -471,7 +473,7 @@ private double calcSingleAsa(int i) {
 			aj_minus_ais[nbArrayInd] = aj_minus_ai;
 		}
 
-		for (Point3d point: spherePoints){
+		for (Vector3d point: spherePoints){
 			boolean is_accessible = true;
 
 			// note that the neighbors are sorted by distance, achieving optimal performance in this inner loop
@@ -482,7 +484,7 @@ private double calcSingleAsa(int i) {
 				// see equation 3 in Eisenhaber 1994. This is slightly more efficient than
 				// calculating distances to the actual sphere points on atom_i (which would be obtained with:
 				// Point3d test_point = new Point3d(point.x*radius + atom_i.x,point.y*radius + atom_i.y,point.z*radius + atom_i.z))
-				double dotProd = aj_minus_ais[nbArrayInd].dot(new Vector3d(point));
+				double dotProd = aj_minus_ais[nbArrayInd].dot(point);
 
 				if (numDistsCalced!=null) numDistsCalced[nbArrayInd]++;
 
@@ -496,6 +498,7 @@ private double calcSingleAsa(int i) {
 			}
 		}
 
+		// purely for debugging
 		if (numDistsCalced!=null) {
 			int sum = 0;
 			for (int numDistCalcedForJ : numDistsCalced) sum += numDistCalcedForJ;

From 4f44fce6e278582f612286b23eed866e5bb67ebc Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Mon, 1 Feb 2021 15:33:36 -0800
Subject: [PATCH 041/599] Group.java from upstream

---
 .../src/main/java/org/biojava/nbio/structure/Group.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java
index d1e5f34963..8b7b5cb809 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java
@@ -103,12 +103,13 @@ public interface Group extends Serializable {
 
 	/**
 	 * Set the atoms of this group.
-	 * @see {@link Atom}
+	 * @see Atom
 	 * @param atoms a list of atoms
 	 */
 	public void setAtoms(List<Atom> atoms);
 
-	/** Remove all atoms from this group.
+	/**
+	 * Remove all atoms from this group.
 	 *
 	 */
 	public void clearAtoms();
@@ -118,13 +119,14 @@ public interface Group extends Serializable {
 	 * Beware that some PDB atom names are ambiguous (e.g. CA, which means C-alpha or Calcium),
 	 * ambiguities should not occur within the same group though. To solve these ambiguities
 	 * one would need to check the atom returned for the required element with {@link Atom#getElement()}
+	 * <p>
+	 * Note this method will return only the atom in the default alternative location (be it '.' or a letter).
 	 *
 	 * @param name  a trimmed String representing the atom's PDB name, e.g. "CA"
 	 * @return an Atom object or null if no such atom exists within this group
 	 */
 	public Atom getAtom(String name) ;
 
-
 	/**
 	 * Get at atom by position.
 	 *

From 53982b0ba820e020c37596d25d6af27639f4a053 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Tue, 2 Feb 2021 09:37:02 -0800
Subject: [PATCH 042/599] update CHANGELOG.md

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22f265c548..2403e0f6ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,16 @@ BioJava 6.0.0 (future release)
 * Support for automatically fetching dssp files from RCSB (`org.biojava.nbio.structure.secstruc.DSSPParser.fetch()`)
 * `org.biojava.nbio.structure.PDBStatus`: simplified `Status` enum to 3 states, with OBSOLETE now called REMOVED
 * `org.biojava.nbio.structure.PDBStatus`: removed `getReplacement` and `getReplaces` 
+* Removed `org.biojava.nbio.structure.io.mmcif` package
+* Removed functionality to write isolated CIF headers from `FileConvert`
+
+### Breaking API changes
+* Extracted `StructureIO.StructureFiletype` enum to `org.biojava.nbio.structure.io.StructureFiletype` (supports `PDB`, `MMTF`, `CIF`, and `BCIF`)
+* `org.biojava.nbio.structure.align.util.AtomCache`: removed `setUseMmCif`, `setUseMmtf`, `isUseMmCif`, and `isUseMmtf` - replaced by `setFiletype` and `getFiletype` that controls parsed content via the `StructureFiletype`
+* `org.biojava.nbio.structure.io.MMCIFFileReader` is now effectively `org.biojava.nbio.structure.io.CifFileReader`
+* Moved `org.biojava.nbio.structure.io.mmcif.model.DatabasePdbrevRecord` to `org.biojava.nbio.structure.DatabasePDBRevRecord.java`
+* Moved all chem-comp model classes from `org.biojava.nbio.structure.io.mmcif.chem` to `org.biojava.nbio.structure.chem`
+* Moved all chem-comp parsing classes from `org.biojava.nbio.structure.io.mmcif.chem` to `org.biojava.nbio.structure.io.cif`
 
 BioJava 5.4.0
 =============

From 19766ca1414f3cc701a03e99e918c466a070d516 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Tue, 2 Feb 2021 17:29:15 -0800
Subject: [PATCH 043/599] update AtomCacheTest

---
 .../nbio/structure/align/util/AtomCache.java  | 30 +------------------
 .../structure/align/util/AtomCacheTest.java   | 11 ++++---
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
index 552f0427ef..d4d1638c12 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
@@ -525,8 +525,7 @@ public Structure getStructureForDomain(ScopDomain domain, ScopDatabase scopDatab
 	public Structure getStructureForDomain(ScopDomain domain, ScopDatabase scopDatabase, boolean strictLigandHandling)
 			throws IOException, StructureException {
 		String pdbId = domain.getPdbId();
-		// SMB 1/26/21 - forcing loading MMTF here - TODO why doesn't mmCIF/CIF/BCIF parsing work here?
-		Structure fullStructure = getStructureForPdbIdByMmtf(pdbId);
+		Structure fullStructure = getStructureForPdbId(pdbId);
 		Structure structure = domain.reduce(fullStructure);
 
 		// TODO It would be better to move all of this into the reduce method,
@@ -802,33 +801,6 @@ public Structure getStructureForPdbId(String pdbId) throws IOException, Structur
 		}
 	}
 
-	/**
-	 * SCOP parsing depends on MMTF, this a dedicated method to allow for that.
-	 * @param pdbId what to load
-	 * @return a Structure object
-	 * @throws IOException
-	 * @throws StructureException
-	 */
-	private Structure getStructureForPdbIdByMmtf(String pdbId) throws IOException, StructureException {
-		if (pdbId == null)
-			return null;
-		if (pdbId.length() != 4) {
-			throw new StructureException("Unrecognized PDB ID: " + pdbId);
-		}
-		while (checkLoading(pdbId)) {
-			// waiting for loading to be finished...
-
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException e) {
-				logger.error(e.getMessage());
-			}
-		}
-
-		logger.debug("loading from mmtf");
-		return loadStructureFromMmtfByPdbId(pdbId);
-	}
-
 	/**
 	 * Load a {@link Structure} from MMTF either from the local file system.
 	 * @param pdbId the input PDB id
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
index 25a711e0b1..ce332f4f70 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
@@ -178,13 +178,12 @@ public void testGetStructureForChainlessDomains() throws IOException, StructureE
 		int expectedLengthA = 135;
 		assertEquals(expectedLengthA, a.getAtomGroups().size());
 
+		assertEquals(2, structure.getNonPolyChains().size());
 
-		assertTrue(structure.hasNonPolyChain("G"));
-		assertTrue(structure.hasNonPolyChain("H"));
-
-		Chain copper  = structure.getNonPolyChain("I");
-		assertEquals(1,copper.getAtomGroups().size());
-
+		Chain copperM  = structure.getNonPolyChain("M");
+		assertEquals(1, copperM.getAtomGroups().size());
+		Chain copperN  = structure.getNonPolyChain("N");
+		assertEquals(1, copperN.getAtomGroups().size());
 	}
 
 	@Test

From e94f047cad95ccc1bf1acd4f6341f5569cf8a75c Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Wed, 10 Feb 2021 11:04:07 -0800
Subject: [PATCH 044/599] increase QCP precision threshold (try to fix #914)

---
 .../org/biojava/nbio/structure/geometry/SuperPositionQCP.java | 2 +-
 .../java/org/biojava/nbio/structure/io/TestHardBioUnits.java  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
index a3d5728f19..a45a854bbf 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
@@ -111,7 +111,7 @@ public final class SuperPositionQCP extends SuperPositionAbstract {
 
 	private static final Logger logger = LoggerFactory.getLogger(SuperPositionQCP.class);
 
-	private double evec_prec = 1E-6;
+	private double evec_prec = 1E-3;
 	private double eval_prec = 1E-11;
 
 	private Point3d[] x;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
index b50b4524fc..797307d0c0 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
@@ -107,10 +107,6 @@ public void test4A1I() throws IOException, StructureException {
 		String pdbId = "4A1I";
 		int biolAssemblyNr = 2;
 
-		AtomCache atomCache = new AtomCache();
-		// TODO there seem to be numerical instabilities when parsing BCIF
-		atomCache.setFiletype(StructureFiletype.CIF);
-		StructureIO.setAtomCache(atomCache);
 		Structure bioAssembly = StructureIO.getBiologicalAssembly(pdbId,biolAssemblyNr);
 
 		if ( bioAssembly == null){

From 83cf763e0f4b91da5b45fb2deaa8bb63ecbe9857 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Thu, 11 Feb 2021 16:57:33 -0800
Subject: [PATCH 045/599] Revert "increase QCP precision threshold (try to fix
 #914)"

This reverts commit e94f047c
---
 .../org/biojava/nbio/structure/geometry/SuperPositionQCP.java | 2 +-
 .../java/org/biojava/nbio/structure/io/TestHardBioUnits.java  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
index a45a854bbf..a3d5728f19 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
@@ -111,7 +111,7 @@ public final class SuperPositionQCP extends SuperPositionAbstract {
 
 	private static final Logger logger = LoggerFactory.getLogger(SuperPositionQCP.class);
 
-	private double evec_prec = 1E-3;
+	private double evec_prec = 1E-6;
 	private double eval_prec = 1E-11;
 
 	private Point3d[] x;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
index 797307d0c0..b50b4524fc 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
@@ -107,6 +107,10 @@ public void test4A1I() throws IOException, StructureException {
 		String pdbId = "4A1I";
 		int biolAssemblyNr = 2;
 
+		AtomCache atomCache = new AtomCache();
+		// TODO there seem to be numerical instabilities when parsing BCIF
+		atomCache.setFiletype(StructureFiletype.CIF);
+		StructureIO.setAtomCache(atomCache);
 		Structure bioAssembly = StructureIO.getBiologicalAssembly(pdbId,biolAssemblyNr);
 
 		if ( bioAssembly == null){

From 069126ced7e1a85ea188ada0df77181de4d90c2b Mon Sep 17 00:00:00 2001
From: Michael L Heuer <heuermh@acm.org>
Date: Mon, 22 Feb 2021 09:26:59 -0600
Subject: [PATCH 046/599] Update guava dependency version to 29.0-jre.

---
 biojava-genome/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index e219872582..c4d667cf50 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -75,7 +75,7 @@
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<scope>compile</scope>
-			<version>28.1-jre</version>
+			<version>29.0-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

From 1e59bb59883c3d2afe88671d60f48924fc3ece73 Mon Sep 17 00:00:00 2001
From: Michael L Heuer <heuermh@acm.org>
Date: Mon, 22 Feb 2021 09:27:35 -0600
Subject: [PATCH 047/599] Collect to ArrayList rather than LinkedList.

---
 .../org/biojava/nbio/genome/io/fastq/AbstractFastqReader.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/AbstractFastqReader.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/AbstractFastqReader.java
index 17ca61205c..b10a005fc7 100755
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/AbstractFastqReader.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/AbstractFastqReader.java
@@ -152,7 +152,7 @@ public final Iterable<Fastq> read(final InputStream inputStream) throws IOExcept
 	private static final class Collect implements StreamListener
 	{
 		/** List of FASTQ formatted sequences. */
-		private final List<Fastq> result = Lists.newLinkedList();
+		private final List<Fastq> result = Lists.newArrayList();
 
 		@Override
 		public void fastq(final Fastq fastq)

From 02b0ece17db3dc6ace817c231ea0ae7998cfcc1b Mon Sep 17 00:00:00 2001
From: Michael L Heuer <heuermh@acm.org>
Date: Mon, 22 Feb 2021 09:48:37 -0600
Subject: [PATCH 048/599] Add copy constructor to FastqBuilder.

---
 .../biojava/nbio/genome/io/fastq/Fastq.java   | 15 ++++++++
 .../nbio/genome/io/fastq/FastqBuilder.java    | 19 ++++++++++
 .../genome/io/fastq/FastqBuilderTest.java     | 35 +++++++++++++++++++
 .../nbio/genome/io/fastq/FastqTest.java       | 14 ++++++++
 4 files changed, 83 insertions(+)

diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/Fastq.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/Fastq.java
index 2de9e05713..11e1d959f8 100755
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/Fastq.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/Fastq.java
@@ -145,4 +145,19 @@ public static final FastqBuilder builder()
 	{
 		return new FastqBuilder();
 	}
+
+	/**
+	 * Create and return a new FastqBuilder configured from the
+	 * specified FASTQ formatted sequence.
+	 * The FastqBuilder will not be null.
+	 *
+	 * @since 6.0.0
+	 * @param fastq FASTQ formatted sequence, must not be null
+	 * @return a new FastqBuilder configured from the specified FASTQ
+	 *    formatted sequence
+	 */
+	public static final FastqBuilder builder(final Fastq fastq)
+	{
+		return new FastqBuilder(fastq);
+	}
 }
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/FastqBuilder.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/FastqBuilder.java
index 4067e90b9c..8b2ced15f2 100755
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/FastqBuilder.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/FastqBuilder.java
@@ -51,6 +51,25 @@ public FastqBuilder()
 		// empty
 	}
 
+	/**
+	 * Create a new FASTQ formatted sequence builder configured
+	 * from the specified FASTQ formatted sequence.
+	 *
+	 * @since 6.0.0
+	 * @param fastq FASTQ formatted sequence, must not be null
+	 */
+	public FastqBuilder(final Fastq fastq)
+	{
+		if (fastq == null)
+		{
+			throw new IllegalArgumentException("fastq must not be null");
+		}
+		withDescription(fastq.getDescription());
+		withSequence(fastq.getSequence());
+		withQuality(fastq.getQuality());
+		withVariant(fastq.getVariant());
+	}
+
 
 	/**
 	 * Return the description for this FASTQ formatted sequence builder.
diff --git a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqBuilderTest.java b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqBuilderTest.java
index b013e996d2..8d68673989 100755
--- a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqBuilderTest.java
+++ b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqBuilderTest.java
@@ -36,6 +36,41 @@ public void testConstructor()
 		Assert.assertNotNull(fastqBuilder);
 	}
 
+	@Test
+	public void testConstructorFastq()
+	{
+		FastqBuilder fastqBuilder = new FastqBuilder()
+			.withDescription("description")
+			.withSequence("sequence")
+			.withQuality("quality_")
+			.withVariant(FastqVariant.FASTQ_SOLEXA);
+
+		Fastq fastq = fastqBuilder.build();
+
+		FastqBuilder fastqBuilder2 = new FastqBuilder(fastq);
+		Assert.assertNotNull(fastqBuilder2);
+
+		Fastq fastq2 = fastqBuilder2.build();
+		Assert.assertEquals("description", fastq2.getDescription());
+		Assert.assertEquals("sequence", fastq2.getSequence());
+		Assert.assertEquals("quality_", fastq2.getQuality());
+		Assert.assertEquals(FastqVariant.FASTQ_SOLEXA, fastq2.getVariant());
+	}
+
+	@Test
+	public void testConstructorNullFastq()
+	{
+		try
+		{
+			new FastqBuilder(null);
+			Assert.fail("builder(null) expected IllegalArgumentException");
+		}
+		catch (IllegalArgumentException e)
+		{
+			// expected
+		}
+	}
+
 	@Test
 	public void testBuildDefault()
 	{
diff --git a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqTest.java b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqTest.java
index b6fc3c98b0..564f8eed1c 100755
--- a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqTest.java
+++ b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqTest.java
@@ -111,6 +111,20 @@ public void testBuilder()
 		Assert.assertNotNull(Fastq.builder());
 	}
 
+	@Test
+	public void testBuilderNullFastq()
+	{
+		try
+		{
+			Fastq.builder(null);
+			Assert.fail("builder(null) expected IllegalArgumentException");
+		}
+		catch (IllegalArgumentException e)
+		{
+			// expected
+		}
+	}
+
 	@Test
 	public void testEquals()
 	{

From 54f4c2b1797d55ff034ac27e897cfc0cb5e55e2f Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Wed, 24 Feb 2021 10:27:35 -0800
Subject: [PATCH 049/599] dedicated test for SuperPositionQCP issues (#914)

---
 .../geometry/TestSuperPositionQCP.java        | 34 ++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/geometry/TestSuperPositionQCP.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/geometry/TestSuperPositionQCP.java
index 8928c26cbd..f5080786fb 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/geometry/TestSuperPositionQCP.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/geometry/TestSuperPositionQCP.java
@@ -20,20 +20,19 @@
  */
 package org.biojava.nbio.structure.geometry;
 
-import static org.junit.Assert.*;
-
-import java.util.Random;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.vecmath.AxisAngle4d;
 import javax.vecmath.Matrix4d;
 import javax.vecmath.Point3d;
 import javax.vecmath.Vector3d;
+import java.util.Random;
 
-import org.biojava.nbio.structure.geometry.SuperPositionQuat;
-import org.biojava.nbio.structure.geometry.SuperPositionQCP;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test the Quaternion-Based Characteristic Polynomial {@link SuperPositionQCP}
@@ -166,4 +165,23 @@ public void testAlternativeUsageQCP() {
 
 	}
 
+	@Ignore("test for https://github.com/biojava/biojava/issues/914")
+	@Test
+	public void shouldHandleTwoFoldSymmetry() {
+		Matrix4d operator = new Matrix4d(-1, 0, 0, 0,
+				0, 1, 0, 0,
+				0, 0, -1, 0,
+				0, 0, 0, 1);
+
+		// add some jitter - otherwise rotation matrix will contain NaN
+		Point3d[] original = new Point3d[] { new Point3d(0, 0, 0), new Point3d(1.001, 0, 0) };
+		Point3d[] transformed = new Point3d[] { new Point3d(0, 0, 0), new Point3d(-1, 0, 0) };
+
+		SuperPosition sqcp = new SuperPositionQCP(false);
+
+		// operator 2 is a 2-fold, trace should be == -1
+		Matrix4d m = sqcp.superposeAndTransform(original, transformed);
+		assertEquals(-1.0, m.m00 + m.m11 + m.m22, 0.001);
+		assertEquals(0.0, CalcPoint.rmsd(original, transformed), 0.001);
+	}
 }

From 288b18c88181b422ff9fafbc50ee5748350554f4 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Wed, 24 Feb 2021 10:29:57 -0800
Subject: [PATCH 050/599] switch from QCP to SVD

---
 .../biojava/nbio/structure/io/TestHardBioUnits.java  | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
index b50b4524fc..41e2394cb5 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHardBioUnits.java
@@ -29,7 +29,7 @@
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.geometry.CalcPoint;
 import org.biojava.nbio.structure.geometry.SuperPosition;
-import org.biojava.nbio.structure.geometry.SuperPositionQCP;
+import org.biojava.nbio.structure.geometry.SuperPositionSVD;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -107,10 +107,6 @@ public void test4A1I() throws IOException, StructureException {
 		String pdbId = "4A1I";
 		int biolAssemblyNr = 2;
 
-		AtomCache atomCache = new AtomCache();
-		// TODO there seem to be numerical instabilities when parsing BCIF
-		atomCache.setFiletype(StructureFiletype.CIF);
-		StructureIO.setAtomCache(atomCache);
 		Structure bioAssembly = StructureIO.getBiologicalAssembly(pdbId,biolAssemblyNr);
 
 		if ( bioAssembly == null){
@@ -177,16 +173,16 @@ public void test4A1I() throws IOException, StructureException {
 		Point3d[] atomsTransfChainG = Calc.atomsToPoints(StructureTools.getAtomCAArray(transfChainG));
 		Point3d[] atomsTransfChainB = Calc.atomsToPoints(StructureTools.getAtomCAArray(transfChainB));
 
-		SuperPosition sqcp = new SuperPositionQCP(false);
+		SuperPosition superPosition = new SuperPositionSVD(false);
 
 		// operator 1 is the identity, trace should be == 3
-		Matrix4d m1 = sqcp.superposeAndTransform(atomsOrigChainG, atomsTransfChainG);
+		Matrix4d m1 = superPosition.superposeAndTransform(atomsOrigChainG, atomsTransfChainG);
 		assertEquals(3.0, m1.m00 + m1.m11 + m1.m22, 0.00001);
 		assertEquals(0.0, CalcPoint.rmsd(atomsOrigChainG, atomsTransfChainG), 0.00001);
 
 
 		// operator 2 is a 2-fold, trace should be == -1
-		Matrix4d m2 = sqcp.superposeAndTransform(atomsOrigChainB, atomsTransfChainB);
+		Matrix4d m2 = superPosition.superposeAndTransform(atomsOrigChainB, atomsTransfChainB);
 		assertEquals(-1.0, m2.m00 + m2.m11 + m2.m22, 0.00001);
 		assertEquals(0.0, CalcPoint.rmsd(atomsOrigChainB, atomsTransfChainB), 0.00001);
 

From 71368bebfc9e3cd9113df9031978d5f7c8e2ebb5 Mon Sep 17 00:00:00 2001
From: Michael L Heuer <heuermh@acm.org>
Date: Fri, 26 Feb 2021 11:33:21 -0600
Subject: [PATCH 051/599] Address review comments.

---
 .../nbio/genome/io/fastq/FastqBuilderTest.java | 18 ++++++++----------
 .../nbio/genome/io/fastq/FastqTest.java        | 16 +++++++---------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqBuilderTest.java b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqBuilderTest.java
index 8d68673989..5803068276 100755
--- a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqBuilderTest.java
+++ b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqBuilderTest.java
@@ -20,10 +20,11 @@
  */
 package org.biojava.nbio.genome.io.fastq;
 
-
 import org.junit.Assert;
 import org.junit.Test;
 
+import org.junit.function.ThrowingRunnable;
+
 /**
  * Unit test for FastqBuilder.
  */
@@ -60,15 +61,12 @@ public void testConstructorFastq()
 	@Test
 	public void testConstructorNullFastq()
 	{
-		try
-		{
-			new FastqBuilder(null);
-			Assert.fail("builder(null) expected IllegalArgumentException");
-		}
-		catch (IllegalArgumentException e)
-		{
-			// expected
-		}
+		Assert.assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+			@Override
+			public void run() {
+				new FastqBuilder(null);
+			}
+		});
 	}
 
 	@Test
diff --git a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqTest.java b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqTest.java
index 564f8eed1c..62d7ee9368 100755
--- a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqTest.java
+++ b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/FastqTest.java
@@ -23,6 +23,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import org.junit.function.ThrowingRunnable;
 
 /**
  * Unit test for Fastq.
@@ -114,15 +115,12 @@ public void testBuilder()
 	@Test
 	public void testBuilderNullFastq()
 	{
-		try
-		{
-			Fastq.builder(null);
-			Assert.fail("builder(null) expected IllegalArgumentException");
-		}
-		catch (IllegalArgumentException e)
-		{
-			// expected
-		}
+		Assert.assertThrows(IllegalArgumentException.class, new ThrowingRunnable() {
+			@Override
+			public void run() {
+				Fastq.builder(null);
+			}
+		});
 	}
 
 	@Test

From 1f80b1976518a108e143db9e34104abe8aa68098 Mon Sep 17 00:00:00 2001
From: Michael L Heuer <heuermh@acm.org>
Date: Fri, 26 Feb 2021 16:25:38 -0600
Subject: [PATCH 052/599] Update junit dependency version to 4.13.2, log4j to
 2.14.0.

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 66521c8b2f..368b6ab568 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 		<maxmem>512M</maxmem>
 		<mmtf.version>1.0.9</mmtf.version>
 		<slf4j.version>1.7.30</slf4j.version>
-		<log4j.version>2.13.3</log4j.version>
+		<log4j.version>2.14.0</log4j.version>
 		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>
 		<ciftools.version>2.0.2</ciftools.version>
 	</properties>
@@ -480,7 +480,7 @@
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.13.1</version>
+				<version>4.13.2</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>

From 20c72bfe109719a03f2dde3c497be3ec687aadd2 Mon Sep 17 00:00:00 2001
From: Michael L Heuer <heuermh@acm.org>
Date: Fri, 26 Feb 2021 17:03:13 -0600
Subject: [PATCH 053/599] Update maven plugin dependency versions.

---
 pom.xml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 368b6ab568..afee698d7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,7 +170,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.8.0</version>
+					<version>3.8.1</version>
 					<configuration>
 						<source>${jdk.version}</source>
 						<target>${jdk.version}</target>
@@ -178,23 +178,23 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.1.1</version>
+					<version>3.1.2</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.1.2</version>
+					<version>3.2.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-scm-plugin</artifactId>
-					<version>1.10.0</version>
+					<version>1.11.2</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>3.0.1</version>
+					<version>3.2.1</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>3.0.0-M3</version>
+					<version>3.0.0-M5</version>
 				</plugin>
 				<plugin>
 					<groupId>net.sf</groupId>
@@ -209,7 +209,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>2.5.3</version>
+					<version>3.0.0-M1</version>
 					<configuration>
 						<remoteTagging>true</remoteTagging>
 						<preparationGoals>clean install</preparationGoals>
@@ -227,7 +227,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.2.0</version>
 					<configuration>
 					    <additionalJOptions>-Xdoclint:none</additionalJOptions>
 					    <!-- we need to allow script in comments or otherwise we can't use google analytics js in footer below - JD 2017-03-30 -->
@@ -245,11 +245,11 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
-					<version>3.2.0</version>
+					<version>3.2.4</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.3.0</version>
 					<configuration>
 						<descriptors>
 							<descriptor>src/main/assembly/assembly.xml</descriptor>
@@ -283,18 +283,18 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-checkstyle-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>3.1.1</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.2.0</version>
 				</plugin>
 
 				<plugin>
 					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.0.0-M2</version>
+					<version>3.0.0-M3</version>
 					<executions>
 						<execution>
 							<id>enforce-java</id>
@@ -319,12 +319,12 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.0.0-M3</version>
+					<version>3.0.0-M5</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.7.1</version>
+					<version>3.9.1</version>
 				</plugin>
 
 				<plugin>
@@ -343,7 +343,7 @@
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
+				<version>1.6.8</version>
 				<extensions>true</extensions>
 				<configuration>
 					<serverId>ossrh</serverId>

From e40d0efdd0d1337741264d3e6389605bf822f440 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Mon, 1 Mar 2021 17:35:50 +0100
Subject: [PATCH 054/599] Fix #917: Symmetry doesn't display with non-US
 locales

- Always use the US locale when printing jmol scripts
- Update Jmol to 14.31.10 while we're at it.
---
 biojava-structure-gui/pom.xml                                | 2 +-
 .../symmetry/jmolScript/JmolSymmetryScriptGenerator.java     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index a57bf73cdb..154f7c229d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>net.sourceforge.jmol</groupId>
             <artifactId>jmol</artifactId>
-            <version>14.29.17</version>
+            <version>14.31.10</version>
         </dependency>
         <!-- logging dependencies (managed by parent pom, don't set versions or
             scopes here) -->
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java
index dd2401b2c8..8d3e89b4bf 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java
@@ -29,6 +29,7 @@
 import javax.vecmath.Tuple3d;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -226,11 +227,11 @@ protected static String getJmolPoint(Tuple3d point) {
 	}
 
 	protected static String f1Dot2(float number) {
-		return String.format("%1.2f", number);
+		return String.format(Locale.US, "%1.2f", number);
 	}
 
 	protected static String fDot2(double number) {
-		return String.format("%.2f", number);
+		return String.format(Locale.US, "%.2f", number);
 	}
 
 	/**

From 802abb832c3295ff32b589f5190956dfb57515b6 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Mon, 1 Mar 2021 17:38:24 +0100
Subject: [PATCH 055/599] Test that Jmol polygons scripts generate correctly.

This runs QuatSymmetryDetector. It would be better to mock the results,
but this is nontrivial with the current implementation.
---
 .../TestJmolSymmetryScriptGenerator.java      | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 biojava-structure-gui/src/test/java/org/biojava/nbio/structure/symmetry/TestJmolSymmetryScriptGenerator.java

diff --git a/biojava-structure-gui/src/test/java/org/biojava/nbio/structure/symmetry/TestJmolSymmetryScriptGenerator.java b/biojava-structure-gui/src/test/java/org/biojava/nbio/structure/symmetry/TestJmolSymmetryScriptGenerator.java
new file mode 100644
index 0000000000..164319e977
--- /dev/null
+++ b/biojava-structure-gui/src/test/java/org/biojava/nbio/structure/symmetry/TestJmolSymmetryScriptGenerator.java
@@ -0,0 +1,67 @@
+/*
+ *                    BioJava development code
+ *
+ * This code may be freely distributed and modified under the
+ * terms of the GNU Lesser General Public Licence.  This should
+ * be distributed with the code.  If you do not have a copy,
+ * see:
+ *
+ *      http://www.gnu.org/copyleft/lesser.html
+ *
+ * Copyright for this code is held jointly by the individual
+ * authors.  These should be listed in @author doc comments.
+ *
+ * For more information on the BioJava project and its aims,
+ * or to join the biojava-l mailing list, visit the home page
+ * at:
+ *
+ *      http://www.biojava.org/
+ *
+ */
+package org.biojava.nbio.structure.symmetry;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureIO;
+import org.biojava.nbio.structure.cluster.SubunitCluster;
+import org.biojava.nbio.structure.cluster.SubunitClustererParameters;
+import org.biojava.nbio.structure.symmetry.axis.RotationAxisAligner;
+import org.biojava.nbio.structure.symmetry.core.QuatSymmetryDetector;
+import org.biojava.nbio.structure.symmetry.core.QuatSymmetryParameters;
+import org.biojava.nbio.structure.symmetry.core.QuatSymmetryResults;
+import org.biojava.nbio.structure.symmetry.core.RotationGroup;
+import org.biojava.nbio.structure.symmetry.core.Stoichiometry;
+import org.biojava.nbio.structure.symmetry.core.SymmetryPerceptionMethod;
+import org.biojava.nbio.structure.symmetry.jmolScript.JmolSymmetryScriptGeneratorDn;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ *
+ * @author Spencer Bliven
+ */
+public class TestJmolSymmetryScriptGenerator {
+    @Before
+    public void setUp() {
+    }
+
+    @Test
+    public void testPolygon() throws IOException, StructureException {
+        Structure struc = StructureIO.getStructure("4hhb");
+        QuatSymmetryParameters sp = new QuatSymmetryParameters();
+		SubunitClustererParameters cp = new SubunitClustererParameters();
+
+        QuatSymmetryResults results = QuatSymmetryDetector.calcGlobalSymmetry(struc, sp, cp);
+        RotationAxisAligner axis = new RotationAxisAligner(results);
+        JmolSymmetryScriptGeneratorDn gen = new JmolSymmetryScriptGeneratorDn(axis, "D3");
+
+        String poly = gen.drawPolyhedron();
+        String expected = "draw polyhedronD30 line{30.02,-39.95,0.59}{29.24,-0.53,40.00}{30.02,38.89,0.59}{30.80,-0.53,-38.82}{30.02,-39.95,0.59}{-30.00,-39.95,-0.60}{-30.79,-0.53,38.81}{-30.00,38.89,-0.60}{-29.22,-0.53,-40.01}{-30.00,-39.95,-0.60}width 0.45 color [x42ffd9] off;draw polyhedronD31 line{29.24,-0.53,40.00}{-30.79,-0.53,38.81}width 0.45 color [x42ffd9] off;draw polyhedronD32 line{30.02,38.89,0.59}{-30.00,38.89,-0.60}width 0.45 color [x42ffd9] off;draw polyhedronD33 line{30.80,-0.53,-38.82}{-29.22,-0.53,-40.01}width 0.45 color [x42ffd9] off;";
+        assertEquals(expected, poly);
+    }
+}
\ No newline at end of file

From 6a10ba505aadf845d0c7a9eec8fed85f81f783e3 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Mon, 1 Mar 2021 17:39:02 +0100
Subject: [PATCH 056/599] Test that fetching structures by SCOP domain works.

---
 .../java/org/biojava/nbio/structure/TestAtomCache.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
index bb9ec5ba2a..ab7988ae3f 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
@@ -221,6 +221,15 @@ public void testFetchObsolete() throws IOException, StructureException {
 
 	}
 
+	@Test
+	public void testGetScopDomain() throws IOException, StructureException {
+		String name = "d2gs2a_";
+
+		Structure s = cache.getStructure(name);
+		assertNotNull("Failed to fetch structure from SCOP ID", s);
+		assertEquals("2gs2.A", s.getName());
+	}
+
 	@Test
 	public void testSettingFileParsingType(){
 		AtomCache cache = new AtomCache();

From 55b61461d3ddbc449c3ca5ecbbccc9ef97f2c393 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Mon, 1 Mar 2021 17:53:50 +0100
Subject: [PATCH 057/599] Fix compilation issues.

These seem to be regularly deleted by IDEs running on different JDKs.
If you see a warning, please find the correct syntax to silence it
rather than deleting the cast.
---
 .../biojava/nbio/structure/chem/ZipChemCompProvider.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java
index 34d7eea4db..5888213c5b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java
@@ -206,7 +206,8 @@ private synchronized ChemComp getFromZip(String recordName) {
         final String filename = "chemcomp/" + recordName + ".cif.gz";
 
         // try with resources block to read from the filesystem.
-        try (FileSystem fs = FileSystems.newFileSystem(m_zipFile, null)) {
+        // Don't remove the (ClassLoader) cast! It is required for openjdk 11.
+        try (FileSystem fs = FileSystems.newFileSystem(m_zipFile, (ClassLoader)null)) {
             Path cif = fs.getPath(filename);
 
             if (Files.exists(cif)) {
@@ -255,7 +256,8 @@ private synchronized boolean addToZipFileSystem(Path zipFile, File[] files, Path
 		*/
 
         // Copy in each file.
-        try (FileSystem zipfs = FileSystems.newFileSystem(zipFile, null)) {
+        // Don't remove the (ClassLoader) cast! It is required for openjdk 11.
+        try (FileSystem zipfs = FileSystems.newFileSystem(zipFile, (ClassLoader)null)) {
             Files.createDirectories(pathWithinArchive);
             for (File f : files) {
                 if (!f.isDirectory() && f.exists()) {

From b8d7edd62a3b8ed5b366844da66f3f2d5865441b Mon Sep 17 00:00:00 2001
From: Jose Manuel Duarte <jose.m.duarte@gmail.com>
Date: Tue, 2 Mar 2021 10:37:09 -0800
Subject: [PATCH 058/599] [maven-release-plugin] prepare release
 biojava-6.0.0-alpha1

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 78344622b1..7ad442f3b9 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha1</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a22b560d19..5c45f050df 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha1</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 6cc9c6c9af..ee5b63903a 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index c4d667cf50..84017f41f8 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 0bd381f989..ad8bccc314 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha1</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -28,7 +28,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha1</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 4df1148dee..130a9a8e8b 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha1</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha1</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 03787e7d7a..92a8733da7 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha1</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 9153de3e05..103e19986c 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha1</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha1</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 154f7c229d..56087dedb3 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha1</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 87b34d4dcb..8e7cfa717a 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha1</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha1</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8774d85478..f579e85eb5 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0-alpha1</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 65b13c6730..628f4782e4 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha1</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index afee698d7b..48009bd348 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-SNAPSHOT</version>
+	<version>6.0.0-alpha1</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.0-alpha1</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 53c2dc0c3807161707bfecd4302b906c6ad5d84e Mon Sep 17 00:00:00 2001
From: Jose Manuel Duarte <jose.m.duarte@gmail.com>
Date: Tue, 2 Mar 2021 10:37:17 -0800
Subject: [PATCH 059/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 7ad442f3b9..78344622b1 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha1</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha1</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha1</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 5c45f050df..a22b560d19 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha1</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha1</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index ee5b63903a..6cc9c6c9af 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha1</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 84017f41f8..c4d667cf50 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha1</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha1</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha1</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index ad8bccc314..0bd381f989 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha1</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -28,7 +28,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha1</version>
+    	<version>6.0.0-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 130a9a8e8b..4df1148dee 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha1</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha1</version>
+    	<version>6.0.0-SNAPSHOT</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 92a8733da7..03787e7d7a 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-alpha1</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 103e19986c..9153de3e05 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha1</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha1</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 56087dedb3..154f7c229d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-alpha1</version>
+		<version>6.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha1</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha1</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 8e7cfa717a..87b34d4dcb 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha1</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha1</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha1</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index f579e85eb5..8774d85478 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-alpha1</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 628f4782e4..65b13c6730 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha1</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha1</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 48009bd348..afee698d7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-alpha1</version>
+	<version>6.0.0-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.0-alpha1</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From ae0679597d9659941f9a25e08c2b32835d33b445 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 3 Mar 2021 21:59:13 -0800
Subject: [PATCH 060/599] Better release process, clean up

---
 pom.xml | 195 +++++++++++++++++++++++++-------------------------------
 1 file changed, 87 insertions(+), 108 deletions(-)

diff --git a/pom.xml b/pom.xml
index afee698d7b..039670095e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,9 +218,9 @@
 						<!-- work around for GPG hanging issue http://jira.codehaus.org/browse/MGPG-9 -->
 						<mavenExecutorId>forked-path</mavenExecutorId>
 
-						<!-- needed for jenkins release plugin -->
-						<useReleaseProfile>true</useReleaseProfile>
-						<arguments>-Pgpg-release</arguments>
+						<!-- TODO remove when testing finished -->
+						<pushChanges>false</pushChanges>
+
 					</configuration>
 
 				</plugin>
@@ -339,35 +339,6 @@
 
 		<plugins>
 
-			<!-- for deployment on OSS Sonatype -->
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.8</version>
-				<extensions>true</extensions>
-				<configuration>
-					<serverId>ossrh</serverId>
-					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-					<autoReleaseAfterClose>true</autoReleaseAfterClose>
-				</configuration>
-			</plugin>
-
-			<!-- for digital signing of code -->
-			<!--<plugin> -->
-			<!--<groupId>org.apache.maven.plugins</groupId> -->
-			<!--<artifactId>maven-gpg-plugin</artifactId> -->
-			<!--<version>1.5</version> -->
-			<!--<executions> -->
-			<!--<execution> -->
-			<!--<id>sign-artifacts</id> -->
-			<!--<phase>verify</phase> -->
-			<!--<goals> -->
-			<!--<goal>sign</goal> -->
-			<!--</goals> -->
-			<!--</execution> -->
-			<!--</executions> -->
-			<!--</plugin> -->
-
 			<!-- give more memory for junit tests -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -379,7 +350,6 @@
 				</configuration>
 			</plugin>
 
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
@@ -403,7 +373,6 @@
 
 			</plugin>
 
-
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>findbugs-maven-plugin</artifactId>
@@ -418,49 +387,6 @@
 				</configuration>
 			</plugin>
 
-			<!-- code coverage plugin -->
-			<!-- coveralls/cobertura seems outdated and has many problems, I think we need to use a different plugin. Commenting out - JD 2018-03-16 -->
-			<!--<plugin>-->
-				<!--<groupId>org.eluder.coveralls</groupId>-->
-				<!--<artifactId>coveralls-maven-plugin</artifactId>-->
-				<!--<version>4.2.0</version>-->
-				<!--&lt;!&ndash;<configuration>&ndash;&gt;-->
-					<!--&lt;!&ndash;<repoToken>YOURTOKENGOESHERE</repoToken>&ndash;&gt;-->
-				<!--&lt;!&ndash;</configuration>&ndash;&gt;-->
-			<!--</plugin>-->
-			<!--<plugin>-->
-				<!--<groupId>org.codehaus.mojo</groupId>-->
-				<!--<artifactId>cobertura-maven-plugin</artifactId>-->
-				<!--<version>2.7</version>-->
-				<!--<configuration>-->
-					<!--<check>true</check>-->
-					<!--<format>xml</format>-->
-					<!--<maxmem>256m</maxmem>-->
-					<!--&lt;!&ndash; aggregated reports for multi-module projects &ndash;&gt;-->
-					<!--<aggregate>true</aggregate>-->
-
-					<!--<instrumentation>-->
-						<!--<excludes>-->
-							<!--<exclude>org/biojava/nbio/structure/io/mmcif/MMCIFFileTools.class</exclude>-->
-							<!--<exclude>org/biojava/nbio/structure/symmetry/utils/SymmetryTools.class</exclude>-->
-							<!--<exclude>demo/DemoFATCAT.class</exclude>-->
-							<!--<exclude>org/biojava/nbio/structure/align/ce/CECalculator.class</exclude>-->
-						<!--</excludes>-->
-						<!--<ignores>-->
-							<!--<ignore>org.biojava.nbio.structure.io.mmcif.MMCIFFileTools*</ignore>-->
-							<!--<ignore>demo.*</ignore>-->
-						<!--</ignores>-->
-					<!--</instrumentation>-->
-				<!--</configuration>-->
-				<!--<executions>-->
-					<!--<execution>-->
-						<!--<goals>-->
-							<!--<goal>clean</goal>-->
-						<!--</goals>-->
-					<!--</execution>-->
-				<!--</executions>-->
-			<!--</plugin>-->
-
 		</plugins>
 
 		<extensions>
@@ -471,8 +397,6 @@
 			</extension>
 		</extensions>
 
-
-
 	</build>
 
 	<dependencyManagement>
@@ -589,12 +513,96 @@
 		</plugins>
 	</reporting>
 
+	<!-- https://central.sonatype.org/pages/apache-maven.html -->
+	<!-- https://github.com/chhh/sonatype-ossrh-parent/blob/master/pom.xml -->
+	<distributionManagement>
+		<snapshotRepository>
+			<id>ossrh</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+		<repository>
+			<id>ossrh</id>
+			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+		</repository>
+	</distributionManagement>
 
 	<profiles>
+		<profile>
+			<!-- This is the profile needed for release, e.g.:
+			 mvn -Prelease release:clean release:prepare
+			 mvn -Prelease release:perform
+			  -->
+			<id>release</id>
+			<build>
+				<plugins>
+					<!-- for deployment on OSS Sonatype -->
+					<!-- handles propagating the build to the staging repository -->
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.6.8</version>
+						<extensions>true</extensions>
+						<configuration>
+							<serverId>ossrh</serverId>
+							<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+							<autoReleaseAfterClose>true</autoReleaseAfterClose>
+						</configuration>
+					</plugin>
+
+					<!-- for code signing -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.6</version>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+					<!-- create source -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+						<version>3.2.0</version>
+						<executions>
+							<execution>
+								<id>attach-sources</id>
+								<goals>
+									<goal>jar-no-fork</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+					<!-- create javadoc -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.2.0</version>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+				</plugins>
+			</build>
+		</profile>
 
 		<!-- Note: before you can use this build profile you need to set up an
 			environment that contains correctly signed keys. Configure the keystore properties
 			and the profile in ~/.m2/settings.xml -->
+		<!-- Note: as of March 2021 I'm not sure what this profile is needed for. I don't think it is needed for releases, perhaps for automated snapshot builds? - JD 2021 -->
 		<profile>
 			<id>codesigning</id>
 			<activation>
@@ -636,35 +644,6 @@
 						</configuration>
 					</plugin>
 
-
-				</plugins>
-			</build>
-		</profile>
-
-		<profile>
-			<id>release-sign-artifacts</id>
-			<activation>
-				<property>
-					<name>performRelease</name>
-					<value>true</value>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.6</version>
-						<executions>
-							<execution>
-								<id>sign-artifacts</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>

From 71b02ebc68a40c605fdd5b8d15ce1e65cce45e7e Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 3 Mar 2021 22:14:53 -0800
Subject: [PATCH 061/599] Adding some gpg config that works in other projects

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 039670095e..d1940f9add 100644
--- a/pom.xml
+++ b/pom.xml
@@ -561,6 +561,13 @@
 								<goals>
 									<goal>sign</goal>
 								</goals>
+								<configuration>
+									<!-- This is necessary for gpg to not try to use the pinentry programs -->
+									<gpgArguments>
+										<arg>--pinentry-mode</arg>
+										<arg>loopback</arg>
+									</gpgArguments>
+								</configuration>
 							</execution>
 						</executions>
 					</plugin>

From fce9a51f295673968ae23cd2e9d21eb94f64d706 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 3 Mar 2021 22:54:30 -0800
Subject: [PATCH 062/599] Can't test relase:perform without pushing

---
 pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index d1940f9add..6d307acc49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,9 +218,6 @@
 						<!-- work around for GPG hanging issue http://jira.codehaus.org/browse/MGPG-9 -->
 						<mavenExecutorId>forked-path</mavenExecutorId>
 
-						<!-- TODO remove when testing finished -->
-						<pushChanges>false</pushChanges>
-
 					</configuration>
 
 				</plugin>

From 58eb57015d303d980d07b4c66a8a79d80aea3b57 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Thu, 4 Mar 2021 17:06:51 -0800
Subject: [PATCH 063/599] ChemComp#monNstdParentCompId now returns null instead
 of empty String (#921)

---
 .../src/main/java/org/biojava/nbio/structure/chem/ChemComp.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
index 76043374fc..0323e82489 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
@@ -149,7 +149,7 @@ public String getMonNstdParentCompId() {
     }
 
     public void setMonNstdParentCompId(String monNstdParentCompId) {
-        this.monNstdParentCompId = monNstdParentCompId;
+        this.monNstdParentCompId = monNstdParentCompId.isEmpty() ? null : monNstdParentCompId;
         setStandardFlag();
     }
 

From 4dcc024c9de0d6c85701186bf8557a47e408735a Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Thu, 4 Mar 2021 17:25:26 -0800
Subject: [PATCH 064/599] null check

---
 .../src/main/java/org/biojava/nbio/structure/chem/ChemComp.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
index 0323e82489..cb33e369b3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
@@ -149,7 +149,7 @@ public String getMonNstdParentCompId() {
     }
 
     public void setMonNstdParentCompId(String monNstdParentCompId) {
-        this.monNstdParentCompId = monNstdParentCompId.isEmpty() ? null : monNstdParentCompId;
+        this.monNstdParentCompId = (monNstdParentCompId == null || monNstdParentCompId.isEmpty()) ? null : monNstdParentCompId;
         setStandardFlag();
     }
 

From c9f58cec9d661672c10b0c08aa2c618bc90caf44 Mon Sep 17 00:00:00 2001
From: Jose Manuel Duarte <jose.m.duarte@gmail.com>
Date: Thu, 4 Mar 2021 22:01:44 -0800
Subject: [PATCH 065/599] [maven-release-plugin] prepare release
 biojava-6.0.0-alpha2

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 78344622b1..698b5ad850 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha2</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a22b560d19..f6e899ebd5 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha2</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 6cc9c6c9af..f0c4a02483 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index c4d667cf50..fbf64183da 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 0bd381f989..9630da7a40 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha2</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -28,7 +28,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha2</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 4df1148dee..a80d79fa8c 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha2</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha2</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 03787e7d7a..ff59bfea06 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha2</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 9153de3e05..ac7c1cb0a4 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha2</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha2</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 154f7c229d..5f78ed2113 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha2</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 87b34d4dcb..1642df61e4 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha2</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha2</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8774d85478..082f35dc01 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0-alpha2</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 65b13c6730..05ea584fc4 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha2</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 6d307acc49..c8c3d67ebe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-SNAPSHOT</version>
+	<version>6.0.0-alpha2</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.0-alpha2</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 1d03fb4faaa435aff8903483930b60eac8eff56d Mon Sep 17 00:00:00 2001
From: Jose Manuel Duarte <jose.m.duarte@gmail.com>
Date: Thu, 4 Mar 2021 22:01:49 -0800
Subject: [PATCH 066/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 698b5ad850..78344622b1 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha2</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha2</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha2</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index f6e899ebd5..a22b560d19 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha2</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha2</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index f0c4a02483..6cc9c6c9af 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha2</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index fbf64183da..c4d667cf50 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha2</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha2</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha2</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 9630da7a40..0bd381f989 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha2</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -28,7 +28,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha2</version>
+    	<version>6.0.0-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index a80d79fa8c..4df1148dee 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha2</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha2</version>
+    	<version>6.0.0-SNAPSHOT</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index ff59bfea06..03787e7d7a 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-alpha2</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index ac7c1cb0a4..9153de3e05 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha2</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha2</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 5f78ed2113..154f7c229d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-alpha2</version>
+		<version>6.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha2</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha2</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 1642df61e4..87b34d4dcb 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha2</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha2</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha2</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 082f35dc01..8774d85478 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-alpha2</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 05ea584fc4..65b13c6730 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha2</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha2</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index c8c3d67ebe..6d307acc49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-alpha2</version>
+	<version>6.0.0-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.0-alpha2</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 15808673c2e58c816e7a6795cf914edebab36dec Mon Sep 17 00:00:00 2001
From: Jose Manuel Duarte <jose.m.duarte@gmail.com>
Date: Wed, 10 Mar 2021 17:10:20 -0800
Subject: [PATCH 067/599] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2403e0f6ca..ae187a040b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ BioJava 6.0.0 (future release)
 * Moved `org.biojava.nbio.structure.io.mmcif.model.DatabasePdbrevRecord` to `org.biojava.nbio.structure.DatabasePDBRevRecord.java`
 * Moved all chem-comp model classes from `org.biojava.nbio.structure.io.mmcif.chem` to `org.biojava.nbio.structure.chem`
 * Moved all chem-comp parsing classes from `org.biojava.nbio.structure.io.mmcif.chem` to `org.biojava.nbio.structure.io.cif`
+* Moved classes in `org.biojava.nbio.structure.io.mmcif` to `org.biojava.nbio.structure.chem`
 
 BioJava 5.4.0
 =============

From 6e3627f13fcc9f85f1af82850937bcb133c53122 Mon Sep 17 00:00:00 2001
From: Maximilian Greil <maximilian_greil@web.de>
Date: Fri, 12 Mar 2021 20:14:10 +0100
Subject: [PATCH 068/599] Fix issue 864

---
 .../align/pairwise/AltAligComparator.java     | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AltAligComparator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AltAligComparator.java
index 1ac6c90e78..85bc21f913 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AltAligComparator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AltAligComparator.java
@@ -48,20 +48,15 @@ public int compare(AlternativeAlignment a, AlternativeAlignment b) {
 
 		if ( s1 > s2)
 			return 1;
-		if ( s1 < s2)
+		else if ( s1 < s2)
 			return -1;
+		else {
+			// seem to have the same length
+			double rms1 = a.getRmsd();
+			double rms2 = b.getRmsd();
+			return Double.compare(rms1, rms2);
+		}
 
-		// seem to have the same length
-
-		double rms1 = a.getRmsd();
-		double rms2 = b.getRmsd();
-
-		if ( rms1 < rms2)
-			return 1;
-		if ( rms1 < rms2)
-			return -1;
-
-		return 0;
 	}
 
 

From 527aca325915b932bb5a8d5d41cf33448a9b6f9b Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 12 Mar 2021 16:29:28 -0800
Subject: [PATCH 069/599] Cleanups and logging fixes

---
 .../nbio/structure/align/AFPTwister.java      |  8 ++---
 .../align/AbstractStructureAlignment.java     |  2 --
 .../align/BioJavaStructureAlignment.java      | 15 +++-------
 .../align/CallableStructureAlignment.java     | 20 ++++++-------
 .../nbio/structure/align/ClusterAltAligs.java | 30 +++++++++----------
 .../structure/align/StrucAligParameters.java  |  6 ++--
 .../align/StructureAlignmentFactory.java      |  2 +-
 .../structure/align/StructurePairAligner.java | 30 +++++++++----------
 .../align/pairwise/AltAligComparator.java     | 11 ++-----
 9 files changed, 54 insertions(+), 70 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/AFPTwister.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/AFPTwister.java
index 57ff697730..3718259c56 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/AFPTwister.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/AFPTwister.java
@@ -40,8 +40,6 @@
 
 import javax.vecmath.Matrix4d;
 
-//import org.biojava.nbio.structure.align.gui.jmol.StructureAlignmentJmol;
-
 public class AFPTwister {
 	private final static Logger logger = LoggerFactory
 			.getLogger(AFPTwister.class);
@@ -90,7 +88,7 @@ public static Group[] twistPDB(AFPChain afpChain, Atom[] ca1, Atom[] ca2)
 		e2 = 0;
 		b2 = 0;
 
-		logger.debug("blockNUm at twister: ", blockNum);
+		logger.debug("blockNUm at twister: {}", blockNum);
 
 		for (int bk = 0; bk < blockNum; bk++) {
 
@@ -309,7 +307,7 @@ private static Atom[] getAtoms(Atom[] ca, int[] positions, int length,
 			}
 			atoms.add(a);
 		}
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 	}
 
 	/**
@@ -329,7 +327,7 @@ private static void cloneAtomRange(Atom[] p1, Atom[] p2, int r1, int r2)
 		// special clone method, can;t use StructureTools.cloneCAArray, since we
 		// access the data
 		// slightly differently here.
-		List<Chain> model = new ArrayList<Chain>();
+		List<Chain> model = new ArrayList<>();
 		for (int i = r1; i < r2; i++) {
 
 			Group g = p2[i].getGroup();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/AbstractStructureAlignment.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/AbstractStructureAlignment.java
index 295ea6903a..86944165a3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/AbstractStructureAlignment.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/AbstractStructureAlignment.java
@@ -28,8 +28,6 @@
 
 public abstract class AbstractStructureAlignment implements StructureAlignment{
 
-	public static String newline = System.getProperty("line.separator");
-
 	@Override
 	abstract public  AFPChain align(Atom[] ca1, Atom[] ca2)
 			throws StructureException;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/BioJavaStructureAlignment.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/BioJavaStructureAlignment.java
index 6b5b279f20..d0be76dfd8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/BioJavaStructureAlignment.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/BioJavaStructureAlignment.java
@@ -36,18 +36,16 @@
 import org.biojava.nbio.structure.jama.Matrix;
 
 
-/** Wrapper for the BioJava Structure Alignment Implementation
+/**
+ * Wrapper for the BioJava Structure Alignment Implementation
  *
  * @author Andreas Prlic
- *
  */
-public class BioJavaStructureAlignment
-
-implements StructureAlignment  {
+public class BioJavaStructureAlignment implements StructureAlignment  {
 
 	public static final String algorithmName = "BioJava_structure";
 	private static final float versionNr = 0.1f;
-	StrucAligParameters params;
+	private StrucAligParameters params;
 
 	public BioJavaStructureAlignment(){
 		params = new StrucAligParameters();
@@ -81,8 +79,6 @@ public String printHelp() {
 		return "not implemented yet. Algorithm still under development.";
 	}
 
-
-
 	@Override
 	public AFPChain align(Atom[] ca1, Atom[] ca2) throws StructureException {
 		StrucAligParameters params = StrucAligParameters.getDefaultParameters();
@@ -90,7 +86,6 @@ public AFPChain align(Atom[] ca1, Atom[] ca2) throws StructureException {
 
 	}
 
-
 	@Override
 	public AFPChain align(Atom[] ca1, Atom[] ca2, Object params)
 			throws StructureException {
@@ -118,8 +113,6 @@ public AFPChain align(Atom[] ca1, Atom[] ca2, Object params)
 
 	}
 
-
-
 	private void copyResults(AFPChain afpChain, AlternativeAlignment altAlig, Atom[] ca1, Atom[] ca2) {
 		afpChain.setAlgorithmName(getAlgorithmName());
 		afpChain.setVersion(getVersion());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/CallableStructureAlignment.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/CallableStructureAlignment.java
index 80087f8e3c..f22e2a31f5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/CallableStructureAlignment.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/CallableStructureAlignment.java
@@ -20,16 +20,7 @@
  */
 package org.biojava.nbio.structure.align;
 
-/**
- * Simple Callable Class that calculates a pairwise alignment in a different
- * thread, so that multiple pairwise alignments can be run in parallel
- * (examples: all-to-all alignments, DB search alignments).
- * Adapted to a more general implementation since 4.1.0, because before it
- * was thought for DB search only.
- *
- * @author Aleix Lafita
- *
- */
+
 import org.biojava.nbio.structure.Atom;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureTools;
@@ -48,6 +39,15 @@
 import java.util.concurrent.Callable;
 import java.util.zip.GZIPOutputStream;
 
+/**
+ * Simple Callable Class that calculates a pairwise alignment in a different
+ * thread, so that multiple pairwise alignments can be run in parallel
+ * (examples: all-to-all alignments, DB search alignments).
+ * Adapted to a more general implementation since 4.1.0, because before it
+ * was thought for DB search only.
+ *
+ * @author Aleix Lafita
+ */
 public class CallableStructureAlignment implements  Callable<AFPChain> {
 
 	private final static Logger logger = LoggerFactory.getLogger(
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ClusterAltAligs.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ClusterAltAligs.java
index 3a6150da3b..373bcf1611 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ClusterAltAligs.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ClusterAltAligs.java
@@ -27,7 +27,8 @@
 import java.util.Iterator;
 import java.util.List;
 
-/** A class that clusters alternative alignments according to their
+/**
+ * A class that clusters alternative alignments according to their
  * similarity.
  *
  * @author Andreas Prlic
@@ -43,15 +44,14 @@ public static void cluster(AlternativeAlignment[] aligs ){
 		cluster(aligs, DEFAULT_CLUSTER_CUTOFF);
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public static void cluster(AlternativeAlignment[] aligs, int cutoff){
 
 
-		List alist = Arrays.asList(aligs);
-		List testAligs = new ArrayList(alist);
+		List<AlternativeAlignment> alist = Arrays.asList(aligs);
+		List<AlternativeAlignment> testAligs = new ArrayList<>(alist);
 
-		List clusters = new ArrayList();
-		List excludeList = new ArrayList();
+		List<List<Integer>> clusters = new ArrayList<>();
+		List<AlternativeAlignment> excludeList = new ArrayList<>();
 
 		// check how similar the eqrs are...
 		for ( int i=0 ; i< aligs.length;i++){
@@ -61,11 +61,11 @@ public static void cluster(AlternativeAlignment[] aligs, int cutoff){
 			}
 			int[] idxA = a.getIdx1();
 
-			Iterator iter = testAligs.iterator();
-			List remainList = new ArrayList();
-			List currentCluster = new ArrayList();
+			Iterator<AlternativeAlignment> iter = testAligs.iterator();
+			List<AlternativeAlignment> remainList = new ArrayList<>();
+			List<Integer> currentCluster = new ArrayList<>();
 
-			currentCluster.add( new Integer(i));
+			currentCluster.add(i);
 			excludeList.add(a);
 
 			int j=-1;
@@ -94,7 +94,7 @@ public static void cluster(AlternativeAlignment[] aligs, int cutoff){
 				//		" l1:"+ idxA.length + " l2:" + idxB.length + " perpos:" + perpos);
 
 				if ( perpos > cutoff){
-					currentCluster.add(new Integer(j));
+					currentCluster.add(j);
 					excludeList.add(b);
 				} else {
 					remainList.add(b);
@@ -109,17 +109,17 @@ public static void cluster(AlternativeAlignment[] aligs, int cutoff){
 
 		// now print the clusters...
 
-		Iterator iter = clusters.iterator();
+		Iterator<List<Integer>> iter = clusters.iterator();
 		int cpos = 0;
 		while (iter.hasNext()){
 			cpos++;
 			//System.out.println("cluster "+cpos+":");
-			List cluster = (List) iter.next();
-			Iterator iter2 = cluster.iterator();
+			List<Integer> cluster = iter.next();
+			Iterator<Integer> iter2 = cluster.iterator();
 			while (iter2.hasNext()){
 				Integer i = (Integer) iter2.next();
 
-				AlternativeAlignment alig = aligs[i.intValue()];
+				AlternativeAlignment alig = aligs[i];
 				alig.setCluster(cpos);
 				//System.out.println( " ("+ aligs[i.intValue()]+")");
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StrucAligParameters.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StrucAligParameters.java
index 8851d863e1..c871e46a0f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StrucAligParameters.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StrucAligParameters.java
@@ -24,7 +24,8 @@
 
 import org.biojava.nbio.structure.StructureTools;
 
-/** A class that contains all the parameters of the structure alignment algorithm.
+/**
+ * A class that contains all the parameters of the structure alignment algorithm.
  *
  * @author Andreas Prlic
  * @since 1.5
@@ -304,7 +305,8 @@ public void setCreate_co(float create_co) {
 		this.create_co = create_co;
 	}
 
-	/** if this is set to false, the time spent to joint the initial fragments (step 2)
+	/**
+	 * if this is set to false, the time spent to joint the initial fragments (step 2)
 	 * is increased. - particular for large structures this increases calc. time a lot.
 	 * advantage: more combinations of fragments are used.
 	 *
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructureAlignmentFactory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructureAlignmentFactory.java
index a31012cf25..8b1c2629ef 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructureAlignmentFactory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructureAlignmentFactory.java
@@ -38,7 +38,7 @@ public class StructureAlignmentFactory {
 
 	private final static Logger logger = LoggerFactory.getLogger(StructureAlignmentFactory.class);
 
-	private static List<StructureAlignment> algorithms = new ArrayList<StructureAlignment>();
+	private static List<StructureAlignment> algorithms = new ArrayList<>();
 
 	static {
 		algorithms.add( new CeMain() );
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructurePairAligner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructurePairAligner.java
index fabe4c9bc6..d47dc52502 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructurePairAligner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructurePairAligner.java
@@ -138,12 +138,12 @@ public class StructurePairAligner {
 	private final static Logger logger = LoggerFactory
 			.getLogger(StructurePairAligner.class);
 
-	AlternativeAlignment[] alts;
-	Matrix distanceMatrix;
-	StrucAligParameters params;
-	FragmentPair[] fragPairs;
+	private AlternativeAlignment[] alts;
+	private Matrix distanceMatrix;
+	private StrucAligParameters params;
+	private FragmentPair[] fragPairs;
 
-	List<AlignmentProgressListener> listeners = new ArrayList<AlignmentProgressListener>();
+	private final List<AlignmentProgressListener> listeners = new ArrayList<>();
 
 	public StructurePairAligner() {
 		super();
@@ -202,7 +202,7 @@ public static void main(String[] args) throws Exception {
 		// the AlternativeAlignment object gives also access to rotation
 		// matrices / shift vectors.
 		for (AlternativeAlignment aa : aligs) {
-			logger.info("Alternative Alignment: ", aa);
+			logger.info("Alternative Alignment: {}", aa);
 		}
 
 		// convert AlternativeAlignemnt 1 to PDB file, so it can be opened with
@@ -386,11 +386,9 @@ public Atom[] getAlignmentAtoms(Structure s) {
 	}
 
 	/**
-	 * calculate the protein structure superimposition, between two sets of
+	 * Calculate the protein structure superimposition, between two sets of
 	 * atoms.
 	 *
-	 *
-	 *
 	 * @param ca1
 	 *            set of Atoms of structure 1
 	 * @param ca2
@@ -444,7 +442,7 @@ public void align(Atom[] ca1, Atom[] ca2, StrucAligParameters params)
 		Atom unitvector = new AtomImpl();
 		unitvector.setCoords(utmp[0]);
 
-		List<FragmentPair> fragments = new ArrayList<FragmentPair>();
+		List<FragmentPair> fragments = new ArrayList<>();
 
 		for (int i = 0; i < rows; i++) {
 
@@ -499,8 +497,7 @@ public void align(Atom[] ca1, Atom[] ca2, StrucAligParameters params)
 
 		notifyFragmentListeners(fragments);
 
-		FragmentPair[] fp = fragments
-				.toArray(new FragmentPair[fragments.size()]);
+		FragmentPair[] fp = fragments.toArray(new FragmentPair[0]);
 		setFragmentPairs(fp);
 
 		logger.debug(" got # fragment pairs: {}", fp.length);
@@ -532,11 +529,11 @@ public void align(Atom[] ca1, Atom[] ca2, StrucAligParameters params)
 
 		notifyJointFragments(frags);
 
-		logger.debug(" number joint fragments: ", frags.length);
+		logger.debug(" number joint fragments: {}", frags.length);
 
 		logger.debug("step 3 - refine alignments");
 
-		List<AlternativeAlignment> aas = new ArrayList<AlternativeAlignment>();
+		List<AlternativeAlignment> aas = new ArrayList<>();
 		for (int i = 0; i < frags.length; i++) {
 			JointFragments f = frags[i];
 			AlternativeAlignment a = new AlternativeAlignment();
@@ -556,16 +553,17 @@ public void align(Atom[] ca1, Atom[] ca2, StrucAligParameters params)
 			} catch (StructureException e) {
 				logger.error("Refinement of fragment {} failed", i, e);
 			}
+
 			a.calcScores(ca1, ca2);
 			aas.add(a);
 		}
 
 		// sort the alternative alignments
 		Comparator<AlternativeAlignment> comp = new AltAligComparator();
-		Collections.sort(aas, comp);
+		aas.sort(comp);
 		Collections.reverse(aas);
 
-		alts = aas.toArray(new AlternativeAlignment[aas.size()]);
+		alts = aas.toArray(new AlternativeAlignment[0]);
 		// do final numbering of alternative solutions
 		int aanbr = 0;
 		for (AlternativeAlignment a : alts) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AltAligComparator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AltAligComparator.java
index 1ac6c90e78..4034675f6f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AltAligComparator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AltAligComparator.java
@@ -26,19 +26,14 @@
 import java.util.Comparator;
 
 
-/** a comparator to sort AlternativeAlignments based on their number of equivalent residues
+/**
+ * A comparator to sort AlternativeAlignments based on their number of equivalent residues
  * and RMSD.
  *
  * @author Andreas Prlic
  *
  */
-public class AltAligComparator implements Comparator<AlternativeAlignment>, Serializable {
-	private static final long serialVersionUID = 1;
-
-	public AltAligComparator() {
-		super();
-
-	}
+public class AltAligComparator implements Comparator<AlternativeAlignment> {
 
 	@Override
 	public int compare(AlternativeAlignment a, AlternativeAlignment b) {

From dfd154267cb73ed2278fd99fba2aa573af9f2806 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Sat, 13 Mar 2021 00:15:38 -0800
Subject: [PATCH 070/599] Trying sonarcloud in CI

---
 .travis.yml              | 6 ++++++
 sonar-project.properties | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 sonar-project.properties

diff --git a/.travis.yml b/.travis.yml
index 5c668648ce..e188292892 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,3 +14,9 @@ env:
   global:
   - secure: MkIoyU3GmlgDRhO0n1lDKvZ/k0myVY3IsFTRNUFjaBBpohLyOBrs5L8gYmfnHYHB/LvJsP6EWA6i0wCchy8hU/2pn66T12K1+WZHyqCe7RRz2kgcvVgMXTsHgvVyZ3dERcBfEDeZENzEYCYADaysT+A73ofWdJemOqfa7IFEb80=
   - secure: it5av1icAvJn/6UI0aWS23m+En0ij1hCiPKw1QIbDLCE3oJOE4nHR8qINcnontH4XUQYTkmekStDkXj0WVVgp08zArj9o018XBtadYY+15h2QZBBAIpYb3UdlJoQfkcAx8yCv59BMd/u6DhMtcKSTHptVWvsLAS7YGW5hR6ZNYA=
+addons:
+ sonarcloud:
+  organization: "biojava_biojava"
+script:
+ # the following command line builds the project, runs the tests with coverage and then execute the SonarCloud analysis
+ - mvn clean verify sonar:sonar -Dsonar.projectKey=biojava_biojava
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000000..0e7a0b311b
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1 @@
+sonar.projectKey=biojava_biojava

From 15ce47d9a8618e9af8e7de7b15f0f31b7cc394f2 Mon Sep 17 00:00:00 2001
From: Jose Manuel Duarte <jose.m.duarte@gmail.com>
Date: Sat, 13 Mar 2021 21:11:18 -0800
Subject: [PATCH 071/599] Fixing organization name

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e188292892..913f287017 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ env:
   - secure: it5av1icAvJn/6UI0aWS23m+En0ij1hCiPKw1QIbDLCE3oJOE4nHR8qINcnontH4XUQYTkmekStDkXj0WVVgp08zArj9o018XBtadYY+15h2QZBBAIpYb3UdlJoQfkcAx8yCv59BMd/u6DhMtcKSTHptVWvsLAS7YGW5hR6ZNYA=
 addons:
  sonarcloud:
-  organization: "biojava_biojava"
+  organization: "biojava"
 script:
  # the following command line builds the project, runs the tests with coverage and then execute the SonarCloud analysis
  - mvn clean verify sonar:sonar -Dsonar.projectKey=biojava_biojava

From 4d1cf58837ca3d661582c3b6343ee47563d6ed04 Mon Sep 17 00:00:00 2001
From: Maximilian Greil <maximilian_greil@web.de>
Date: Fri, 26 Mar 2021 23:58:30 +0100
Subject: [PATCH 072/599] Github issue 843 - Genebank parser (#919)

* Github issue 843

* Changes

* Add transl_except to parser

* Test

* Test changes
---
 .../sequence/io/GenbankSequenceParser.java    |  3 +-
 .../core/sequence/io/GenbankReaderTest.java   | 34 ++++++++++++++++---
 biojava-core/src/test/resources/NC_018080.gb  | 28 +++++++++++++++
 3 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 biojava-core/src/test/resources/NC_018080.gb

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
index 70462a9c0b..7d7eab9d43 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
@@ -222,7 +222,8 @@ private void parseFeatureTag(List<String[]> section) {
 					Qualifier q = new Qualifier(key, val.replace('\n', ' '));
 					gbFeature.addQualifier(key, q);
 				} else {
-					if (key.equalsIgnoreCase("translation")) {
+					if (key.equalsIgnoreCase("translation") || key.equals("anticodon")
+							|| key.equals("transl_except")) {
 						// strip spaces from sequence
 						val = val.replaceAll("\\s+", "");
 						Qualifier q = new Qualifier(key, val);
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankReaderTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankReaderTest.java
index f38070c710..325e07a5ef 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankReaderTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankReaderTest.java
@@ -36,10 +36,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
@@ -333,6 +330,35 @@ public void readSequenceWithZeroSpanFeature() throws IOException, CompoundNotFou
 		assertEquals(Strand.NEGATIVE, fLocation.getStrand());
 	}
 
+	/**
+	 * Biojava fails to parse anticodon and transl_except feature qualifiers when they line wrap.
+	 * https://github.com/biojava/biojava/issues/843
+	 */
+	@Test
+	public void testGithub843() throws Exception {
+		CheckableInputStream inStream = new CheckableInputStream(this.getClass().getResourceAsStream("/NC_018080.gb"));
+		assertNotNull(inStream);
+
+		GenbankReader<DNASequence, NucleotideCompound> genbankDNA
+				= new GenbankReader<>(
+				inStream,
+				new GenericGenbankHeaderParser<>(),
+				new DNASequenceCreator(DNACompoundSet.getDNACompoundSet())
+		);
+
+		LinkedHashMap<String, DNASequence> dnaSequences = genbankDNA.process();
+		assertNotNull(dnaSequences);
+
+		DNASequence dna = new ArrayList<>(dnaSequences.values()).get(0);
+		assertNotNull(dna);
+
+		FeatureInterface<AbstractSequence<NucleotideCompound>, NucleotideCompound> tRNAFeature = dna.getFeaturesByType("tRNA").get(0);
+		String anticodon = tRNAFeature.getQualifiers().get("anticodon").get(0).getValue();
+		assertEquals("(pos:complement(1123552..1123554),aa:Leu,seq:caa)", anticodon);
+		String transl_except = tRNAFeature.getQualifiers().get("transl_except").get(0).getValue();
+		assertEquals("(pos:complement(1123552..1123554),aa:Leu)",transl_except);
+	}
+
 	/**
 	 * Helper class to be able to verify the closed state of the input stream.
 	 */
diff --git a/biojava-core/src/test/resources/NC_018080.gb b/biojava-core/src/test/resources/NC_018080.gb
new file mode 100644
index 0000000000..11d2d295ff
--- /dev/null
+++ b/biojava-core/src/test/resources/NC_018080.gb
@@ -0,0 +1,28 @@
+LOCUS       NC_018080            6402658 bp    DNA     circular CON 27-OCT-2020
+DEFINITION  Pseudomonas aeruginosa DK2
+ACCESSION
+VERSION     .0
+KEYWORDS    .
+FEATURES             Location/Qualifiers
+     source          1..6402658
+                     /organism="Pseudomonas aeruginosa DK2"
+                     /mol_type="genomic DNA"
+                     /strain="DK2"
+                     /db_xref="taxon:1093787"
+     gene            complement(1123502..1123588)
+                     /locus_tag="PADK2_RS05265"
+                     /old_locus_tag="PADK2_t29613"
+     tRNA            complement(1123502..1123588)
+                     /locus_tag="PADK2_RS05265"
+                     /old_locus_tag="PADK2_t29613"
+                     /product="tRNA-Leu"
+                     /inference="COORDINATES: profile:tRNAscan-SE:2.0.6"
+                     /note="Derived by automated computational analysis using
+                     gene prediction method: tRNAscan-SE."
+                     /anticodon=(pos:complement(1123552..1123554),aa:Leu,
+                     seq:caa)
+                     /transl_except=(pos:complement(1123552..1123554),
+                     aa:Leu)
+ORIGIN
+        1 tttaaagaga ccggcgattc tagtgaaatc gaacgggcag gtcaatttcc aaccagcgat
+//
\ No newline at end of file

From f1bcdb21ca868b712aac4cc26e2d05ea42327149 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 8 Apr 2021 09:57:36 -0700
Subject: [PATCH 073/599] Removing utility method that shouldn't be here

---
 CHANGELOG.md                                  |  1 +
 .../src/main/java/demo/DemoMmtfWriter.java    |  2 -
 .../nbio/structure/io/mmtf/MmtfUtils.java     | 48 -------------------
 .../nbio/structure/io/mmtf/TestMmtfUtils.java | 27 ++++++++++-
 4 files changed, 26 insertions(+), 52 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae187a040b..555c8502b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ BioJava 6.0.0 (future release)
 * `org.biojava.nbio.structure.PDBStatus`: removed `getReplacement` and `getReplaces` 
 * Removed `org.biojava.nbio.structure.io.mmcif` package
 * Removed functionality to write isolated CIF headers from `FileConvert`
+* Removed `org.biojava.nbio.structure.io.mmtf.MmtfUtils.setUpBioJava()`
 
 ### Breaking API changes
 * Extracted `StructureIO.StructureFiletype` enum to `org.biojava.nbio.structure.io.StructureFiletype` (supports `PDB`, `MMTF`, `CIF`, and `BCIF`)
diff --git a/biojava-structure/src/main/java/demo/DemoMmtfWriter.java b/biojava-structure/src/main/java/demo/DemoMmtfWriter.java
index c9fcd8166c..b5f8e1f020 100644
--- a/biojava-structure/src/main/java/demo/DemoMmtfWriter.java
+++ b/biojava-structure/src/main/java/demo/DemoMmtfWriter.java
@@ -27,12 +27,10 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.io.mmtf.MmtfActions;
-import org.biojava.nbio.structure.io.mmtf.MmtfUtils;
 
 public class DemoMmtfWriter {
 
 	public static void main(String[] args) throws IOException, StructureException {
-		MmtfUtils.setUpBioJava();
 		Structure structure = StructureIO.getStructure("4cup");
 		MmtfActions.writeToFile(structure, Paths.get("/tmp/4cup.mmtf"));
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
index c41eb33033..622f16122f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
@@ -45,14 +45,9 @@
 import org.biojava.nbio.structure.PDBCrystallographicInfo;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.io.StructureFiletype;
-import org.biojava.nbio.structure.StructureIO;
-import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemComp;
 import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
 import org.biojava.nbio.structure.chem.ChemCompTools;
-import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
-import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyTransformation;
 import org.biojava.nbio.structure.secstruc.SecStrucCalc;
@@ -74,49 +69,6 @@ public class MmtfUtils {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(MmtfUtils.class);
 
-	/**
-	 * Set up the configuration parameters for BioJava.
-	 */
-	public static AtomCache setUpBioJava() {
-		// Set up the atom cache etc
-		AtomCache cache = new AtomCache();
-		cache.setFiletype(StructureFiletype.MMTF);
-		FileParsingParameters params = cache.getFileParsingParams();
-		params.setCreateAtomBonds(true);
-		params.setAlignSeqRes(true);
-		params.setParseBioAssembly(true);
-		DownloadChemCompProvider cc = new DownloadChemCompProvider();
-		ChemCompGroupFactory.setChemCompProvider(cc);
-		cc.checkDoFirstInstall();
-		cache.setFileParsingParams(params);
-		StructureIO.setAtomCache(cache);
-		return cache;
-	}
-
-	/**
-	 * Set up the configuration parameters for BioJava.
-	 * @param extraUrl the string describing the URL (or file path) from which
-	 * to get missing CCD entries.
-	 */
-	public static AtomCache setUpBioJava(String extraUrl) {
-		// Set up the atom cache etc
-		AtomCache cache = new AtomCache();
-		cache.setFiletype(StructureFiletype.MMTF);
-		FileParsingParameters params = cache.getFileParsingParams();
-		params.setCreateAtomBonds(true);
-		params.setAlignSeqRes(true);
-		params.setParseBioAssembly(true);
-		DownloadChemCompProvider.serverBaseUrl = extraUrl;
-		DownloadChemCompProvider.useDefaultUrlLayout = false;
-		DownloadChemCompProvider cc = new DownloadChemCompProvider();
-		ChemCompGroupFactory.setChemCompProvider(cc);
-		cc.checkDoFirstInstall();
-		cache.setFileParsingParams(params);
-		StructureIO.setAtomCache(cache);
-		return cache;
-	}
-
-
 	/**
 	 * This sets all microheterogeneous groups
 	 * (previously alternate location groups) as separate groups.
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfUtils.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfUtils.java
index ed86712893..cecc05a234 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfUtils.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfUtils.java
@@ -20,6 +20,11 @@
  */
 package org.biojava.nbio.structure.io.mmtf;
 
+import org.biojava.nbio.structure.align.util.AtomCache;
+import org.biojava.nbio.structure.chem.ChemCompGroupFactory;
+import org.biojava.nbio.structure.chem.DownloadChemCompProvider;
+import org.biojava.nbio.structure.io.FileParsingParameters;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -51,7 +56,6 @@
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.StructureImpl;
-import org.biojava.nbio.structure.io.mmtf.MmtfUtils;
 import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
 import org.biojava.nbio.structure.quaternary.BiologicalAssemblyTransformation;
 import org.biojava.nbio.structure.xtal.BravaisLattice;
@@ -66,6 +70,25 @@
  */
 public class TestMmtfUtils {
 
+	/**
+	 * Set up the configuration parameters for BioJava.
+	 */
+	public static AtomCache setUpBioJava() {
+		// Set up the atom cache etc
+		AtomCache cache = new AtomCache();
+		cache.setFiletype(StructureFiletype.CIF);
+		FileParsingParameters params = cache.getFileParsingParams();
+		params.setCreateAtomBonds(true);
+		params.setAlignSeqRes(true);
+		params.setParseBioAssembly(true);
+		DownloadChemCompProvider cc = new DownloadChemCompProvider();
+		ChemCompGroupFactory.setChemCompProvider(cc);
+		cc.checkDoFirstInstall();
+		cache.setFileParsingParams(params);
+		StructureIO.setAtomCache(cache);
+		return cache;
+	}
+
 	/**
 	 * Integration test to see that the microheterogenity is being dealt with correctly.
 	 * 
@@ -74,7 +97,7 @@ public class TestMmtfUtils {
 	 */
 	@Test
 	public void microHeterogenity() throws IOException, StructureException {
-		MmtfUtils.setUpBioJava();
+		setUpBioJava();
 		Structure inputStructure = StructureIO.getStructure("4ck4");
 		// Count the number of groups
 		Group before = inputStructure.getChains().get(0).getAtomGroup(17);

From 687e0290af99ff6fe8cf5a0eaab728486bf20191 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Tue, 13 Apr 2021 12:17:30 -0700
Subject: [PATCH 074/599] fix logging in CifStructureConsumerImpl if type
 symbol is unknown

---
 .../biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index c64f1ac412..146281d0dd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -332,7 +332,7 @@ public void consumeAtomSite(AtomSite atomSite) {
                 atom.setElement(element);
             }  catch (IllegalArgumentException e) {
                 logger.info("Element {} was not recognised as a BioJava-known element, the element will be " +
-                        "represented as the generic element {}", typeSymbol, Element.R.name());
+                        "represented as the generic element {}", ts, Element.R.name());
                 atom.setElement(Element.R);
             }
 

From 93b053933c14c75e21d3488f37e3a5eae253a561 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 13 Apr 2021 18:20:04 -0700
Subject: [PATCH 075/599] Fixing issue with file parsing params, they weren't
 passed in Cif reading case

---
 .../src/main/java/org/biojava/nbio/structure/URLIdentifier.java | 2 +-
 .../biojava/nbio/structure/io/cif/CifStructureConverter.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
index 69b5833766..0581ba3a60 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
@@ -153,7 +153,7 @@ public Structure loadStructure(AtomCache cache) throws StructureException, IOExc
 
 		switch(format) {
 			case CIF: case BCIF:
-				return CifStructureConverter.fromURL(url);
+				return CifStructureConverter.fromURL(url, cache.getFileParsingParams());
 			case MMTF:
 				return MmtfActions.readFromInputStream(url.openStream());
 			default: case PDB:
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConverter.java
index 98ef24561b..1351223982 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConverter.java
@@ -57,7 +57,7 @@ public static Structure fromURL(URL url) throws IOException {
      * @return the target
      * @throws IOException thrown when reading fails
      */
-    private static Structure fromURL(URL url, FileParsingParameters parameters) throws IOException {
+    public static Structure fromURL(URL url, FileParsingParameters parameters) throws IOException {
         return fromInputStream(url.openStream(), parameters);
     }
 

From 936bfc034925195de7c52c72169474fdc9d8ca59 Mon Sep 17 00:00:00 2001
From: Jose Manuel Duarte <jose.m.duarte@gmail.com>
Date: Tue, 13 Apr 2021 18:54:27 -0700
Subject: [PATCH 076/599] [maven-release-plugin] prepare release
 biojava-6.0.0-alpha3

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 78344622b1..59a6f762bc 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha3</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a22b560d19..108cdee778 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha3</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 6cc9c6c9af..7b38b5bddd 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index c4d667cf50..f23c858b42 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 0bd381f989..404c462ad6 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha3</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -28,7 +28,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha3</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 4df1148dee..67f3440a0a 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha3</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha3</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 03787e7d7a..414e38f0b0 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha3</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 9153de3e05..06d6ff0013 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha3</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha3</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 154f7c229d..f09fb9ae90 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha3</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 87b34d4dcb..2307cd5f17 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha3</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha3</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8774d85478..d13042e8dc 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0-alpha3</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 65b13c6730..e848c5e84f 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha3</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 6d307acc49..c6b236e951 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-SNAPSHOT</version>
+	<version>6.0.0-alpha3</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.0-alpha3</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From ba138051474124d01f1de39c6193a52f6ecf4240 Mon Sep 17 00:00:00 2001
From: Jose Manuel Duarte <jose.m.duarte@gmail.com>
Date: Tue, 13 Apr 2021 18:54:31 -0700
Subject: [PATCH 077/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 59a6f762bc..78344622b1 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha3</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha3</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha3</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 108cdee778..a22b560d19 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha3</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha3</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 7b38b5bddd..6cc9c6c9af 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha3</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index f23c858b42..c4d667cf50 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha3</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha3</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha3</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 404c462ad6..0bd381f989 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha3</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -28,7 +28,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha3</version>
+    	<version>6.0.0-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 67f3440a0a..4df1148dee 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha3</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha3</version>
+    	<version>6.0.0-SNAPSHOT</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 414e38f0b0..03787e7d7a 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-alpha3</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 06d6ff0013..9153de3e05 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha3</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha3</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index f09fb9ae90..154f7c229d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-alpha3</version>
+		<version>6.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha3</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha3</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 2307cd5f17..87b34d4dcb 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha3</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha3</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha3</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index d13042e8dc..8774d85478 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-alpha3</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index e848c5e84f..65b13c6730 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha3</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha3</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index c6b236e951..6d307acc49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-alpha3</version>
+	<version>6.0.0-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.0-alpha3</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 34c6916676355a70cdfa14d47f109802ddd6125f Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 14 Apr 2021 09:38:59 -0700
Subject: [PATCH 078/599] Deprecation cleanup

---
 CHANGELOG.md                                  |   3 +
 .../nbio/structure/gui/SequenceDisplay.java   |   2 +-
 .../events/JmolAlignedPositionListener.java   |   8 +-
 .../nbio/structure/gui/util/PDBDirPanel.java  |   2 +-
 .../structure/gui/util/PDBServerPanel.java    |   2 +-
 .../biojava/nbio/structure/AminoAcidImpl.java |   3 +-
 .../java/org/biojava/nbio/structure/Atom.java |   3 +-
 .../org/biojava/nbio/structure/Chain.java     | 121 +------
 .../org/biojava/nbio/structure/ChainImpl.java | 200 +-----------
 .../biojava/nbio/structure/EntityInfo.java    |   2 +-
 .../org/biojava/nbio/structure/PDBRecord.java |   6 +-
 .../org/biojava/nbio/structure/Structure.java |  98 ------
 .../biojava/nbio/structure/StructureImpl.java | 103 +-----
 .../nbio/structure/StructureTools.java        | 298 +++++++-----------
 .../nbio/structure/io/CAConverter.java        |   1 -
 .../nbio/structure/io/FileConvert.java        |   1 -
 .../structure/io/FileParsingParameters.java   |   1 -
 .../io/StructureSequenceMatcher.java          |   1 -
 18 files changed, 168 insertions(+), 687 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 555c8502b4..748154949c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,9 @@ BioJava 6.0.0 (future release)
 * Removed `org.biojava.nbio.structure.io.mmcif` package
 * Removed functionality to write isolated CIF headers from `FileConvert`
 * Removed `org.biojava.nbio.structure.io.mmtf.MmtfUtils.setUpBioJava()`
+* Removed from `org.biojava.nbio.structure.Chain` interface: `getParent()`, `setParent()`, `getAtomLigands()`, `getSwissprotId()`, `setSwissprotId()`, `getInternalChainID()`, `setInternalChainID()`, `getChainID()`, `setChainID()`
+* Removed from `org.biojava.nbio.structure.Structure` interface: `findChain()`, `getId()`, `setId()`, `getChainByPDB()`, `getCompoundById()`, `getResidueRanges()`, `getRanges()`
+* Removed from `org.biojava.nbio.structure.StructureTools` : `isNucleicAcid()`, `isProtein()`, `getPredominantGroupType()`, `isChainWaterOnly()`, `isChainPureNonPolymer()`
 
 ### Breaking API changes
 * Extracted `StructureIO.StructureFiletype` enum to `org.biojava.nbio.structure.io.StructureFiletype` (supports `PDB`, `MMTF`, `CIF`, and `BCIF`)
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/SequenceDisplay.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/SequenceDisplay.java
index dd4dc97cc4..0aada492fb 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/SequenceDisplay.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/SequenceDisplay.java
@@ -350,7 +350,7 @@ private void setAtoms(Structure s, SequenceScalePanel panel){
 		}
 		Atom[] ca1 = structurePairAligner.getAlignmentAtoms(s);
 		Chain c = new ChainImpl();
-		c.setChainID("1");
+		c.setId("1");
 		for (Atom atom : ca1) {
 
 			Group g = atom.getGroup();
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/events/JmolAlignedPositionListener.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/events/JmolAlignedPositionListener.java
index 14937adea2..7fe43819de 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/events/JmolAlignedPositionListener.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/events/JmolAlignedPositionListener.java
@@ -80,8 +80,8 @@ public void mouseOverPosition(AlignedPosition p) {
 			Chain c = parent.getChain();
 			pdbpos1 = parent.getResidueNumber().toString();
 			//System.out.printlng"chainid 1 is >"+c.getName()+"<");
-			if (! c.getChainID().equals( " ")) {
-				pdbpos1 += ":" + c.getChainID();
+			if (! c.getId().equals( " ")) {
+				pdbpos1 += ":" + c.getId();
 			}
 
 
@@ -96,8 +96,8 @@ public void mouseOverPosition(AlignedPosition p) {
 			pdbpos2 = parent.getResidueNumber().toString();
 			//System.out.println("2:" + parent);
 			//System.out.println("chainid 2 is >"+c.getName()+"<");
-			if (! c.getChainID().equals( " ")) {
-				pdbpos2 += ":" + c.getChainID();
+			if (! c.getId().equals( " ")) {
+				pdbpos2 += ":" + c.getId();
 			}
 			if ( p1 > -1)
 				s +=",";
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBDirPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBDirPanel.java
index 7db9f67424..31f6dea395 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBDirPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBDirPanel.java
@@ -132,7 +132,7 @@ private Structure fromPDB(JTextField f, JTextField c) throws StructureException{
 			}
 			if ( debug)
 				System.out.println("using chain " + chain +  " for structure " + structure1.getPDBCode());
-			Chain c1 = structure1.findChain(chain);
+			Chain c1 = structure1.getPolyChainByPDB(chain);
 			tmp1.setPDBCode(structure1.getPDBCode());
 			tmp1.setPDBHeader(structure1.getPDBHeader());
 			tmp1.setPDBCode(structure1.getPDBCode());
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBServerPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBServerPanel.java
index 22d0157021..161a23a923 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBServerPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBServerPanel.java
@@ -117,7 +117,7 @@ private Structure fromPDB(JTextField f, JTextField c) throws StructureException{
 			}
 			if ( debug)
 				System.out.println("using chain " + chain +  " for structure " + structure1.getPDBCode());
-			Chain c1 = structure1.findChain(chain);
+			Chain c1 = structure1.getPolyChainByPDB(chain);
 			tmp1.setPDBCode(structure1.getPDBCode());
 			tmp1.setPDBHeader(structure1.getPDBHeader());
 			tmp1.setPDBCode(structure1.getPDBCode());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/AminoAcidImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/AminoAcidImpl.java
index c0870437a3..f4aaf2dc59 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/AminoAcidImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/AminoAcidImpl.java
@@ -39,7 +39,8 @@ public class AminoAcidImpl extends HetatomImpl implements AminoAcid {
 	/** this is an Amino acid. type is "amino". */
 	public static final GroupType type = GroupType.AMINOACID;
 
-	/** IUPAC amino acid residue names
+	/**
+	 * IUPAC amino acid residue names
 	 */
 	private Character amino_char ;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Atom.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Atom.java
index 7b1c722bd9..2e19acb29a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Atom.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Atom.java
@@ -240,7 +240,8 @@ public interface Atom extends Cloneable, PDBRecord {
 	public void setBonds(List<Bond> bonds);
 
 
-	/** Test if another atom has a bond to this atom
+	/**
+	 * Test if another atom has a bond to this atom
 	 *
 	 * @param other
 	 * @return
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java
index 73827d2434..6ceba9fd61 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java
@@ -25,7 +25,6 @@
 
 import org.biojava.nbio.core.sequence.template.Sequence;
 import org.biojava.nbio.structure.chem.ChemComp;
-import org.biojava.nbio.structure.io.FileParsingParameters;
 
 import java.io.Serializable;
 import java.util.List;
@@ -33,7 +32,7 @@
 /**
  * <p>
  * Defines the interface for a Chain. A Chain corresponds to a Chain in a PDB file.
- * A chain consists out of a list of {@link Group} objects. A Group can either be
+ * A chain consists of a list of {@link Group} objects. A Group can either be
  * an {@link AminoAcid}, {@link HetatomImpl Hetatom} or {@link NucleotideImpl Nucleotide}.
  * </p>
  *
@@ -51,19 +50,22 @@
  */
 public interface Chain extends Serializable {
 
-	/** returns an identical copy of this Chain.
+	/**
+	 * Returns an identical copy of this Chain.
 	 * @return  an identical copy of this Chain
 	 */
 	Object clone();
 
-	/** add a group to the list of ATOM record group of this chain.
+	/**
+	 * Add a group to the list of ATOM record group of this chain.
 	 * To add SEQRES records a more complex alignment between ATOM and SEQRES residues
 	 * is required, please see SeqRes2AtomAligner for more details on that.
 	 * @param group  a Group object
 	 */
 	void addGroup(Group group);
 
-	/** Get the 'private' asymId (internal chain IDs in mmCif) for this chain.
+	/**
+	 * Get the 'private' asymId (internal chain IDs in mmCif) for this chain.
 	 *
 	 * @return the asymId
 	 * @see #setId(String)
@@ -227,50 +229,9 @@ public interface Chain extends Serializable {
 	 */
 	EntityInfo getEntityInfo();
 
-	/**
-	 * Sets the 'private' asymId of this chain (Chain id in PDB file ).
-	 * @param asymId  a String specifying the name value
-	 * @see #getChainID()
-	 * @deprecated  use {@link #setId(String asymId)} instead
-	 */
-	@Deprecated
-	void setChainID(String asymId);
-
-
-
-	/**
-	 * Gets the 'private' asymId of this chain.
-	 * @return a String representing the name value
-	 * @see #setChainID(String)
-	 * @deprecated  use getId() instead
-	 */
-	@Deprecated
-	String getChainID();
-
-
-	/**
-	 * If available, returns the internal chain ID that is used in mmCIF files (asym_id), otherwise null
-	 *
-	 * @return String or null
-	 * @since 3.0.5
-	 * @deprecated  use {@link #getId()} instead
-	 */
-	String getInternalChainID();
-
-	/**
-	 * Sets the internal chain ID that is used in mmCif files
-	 *
-	 * @param internalChainID
-	 * @since 3.0.5
-	 * @deprecated use {@link #setId()} instead
-	 */
-	void setInternalChainID(String internalChainID);
-
-
 	@Override
 	String toString();
 
-
 	/**
 	 * Converts the SEQRES groups of a Chain to a Biojava Sequence object.
 	 *
@@ -280,8 +241,6 @@ public interface Chain extends Serializable {
 
 	/**
 	 * Returns the sequence of amino acids as it has been provided in the ATOM records.
-	 * Non-standard residues will be present in the string only if the property
-	 * {@value org.biojava.nbio.structure.io.PDBFileReader#LOAD_CHEM_COMP_PROPERTY} has been set.
 	 * @return amino acid sequence as string
 	 * @see #getSeqResSequence()
 	 */
@@ -295,21 +254,6 @@ public interface Chain extends Serializable {
 	 */
 	String getSeqResSequence();
 
-	/**
-	 * Sets the Swissprot id of this chain.
-	 * @param sp_id  a String specifying the swissprot id value
-	 * @see #getSwissprotId()
-	 */
-	void setSwissprotId(String sp_id);
-
-	/**
-	 * Gets the Swissprot id of this chain.
-	 * @return a String representing the swissprot id value
-	 * @see #setSwissprotId(String sp_id)
-	 */
-	String getSwissprotId() ;
-
-
 	/**
 	 * Returns a List of all SEQRES groups of a special type, one of: {@link GroupType#AMINOACID},
 	 * {@link GroupType#HETATM} or {@link GroupType#NUCLEOTIDE}.
@@ -337,16 +281,6 @@ public interface Chain extends Serializable {
 	 */
 	void setSeqResGroups(List<Group> seqResGroups);
 
-	/**
-	 * Sets the back-reference to its parent Structure.
-	 * @param parent the parent Structure object for this Chain
-	 * @see #getStructure()
-	 * @deprecated  use setStructure instead
-	 *
-	 */
-	@Deprecated
-	 void setParent(Structure parent) ;
-
 	/**
 	 * Sets the back-reference to its parent Structure.
 	 *
@@ -354,17 +288,6 @@ public interface Chain extends Serializable {
 	 */
 	void setStructure(Structure parent) ;
 
-	/**
-	 * Returns the parent Structure of this chain.
-	 *
-	 * @return the parent Structure object
-	 * @see #setStructure(Structure)
-	 * @deprecated use getStructure(Structure) instead.
-	 */
-	@Deprecated
-	Structure getParent() ;
-
-
 	/**
 	 * Returns the parent Structure of this chain.
 	 *
@@ -373,18 +296,6 @@ public interface Chain extends Serializable {
 	 */
 	Structure getStructure() ;
 
-	/**
-	 * Gets all groups that are not polymer groups and that are not solvent groups.
-	 * Will automatically fetch Chemical Component files from the PDB web site, even if
-	 * {@link FileParsingParameters#setLoadChemCompInfo(boolean)} has not been set to true.
-	 * Otherwise the Ligands could not correctly be identified.
-	 * @return list of Groups that are ligands
-	 * @deprecated since biojava 5.0 this does not apply anymore. Chains contain either
-	 * polymeric groups or non-polymeric groups
-	 */
-	@Deprecated
-	List<Group> getAtomLigands();
-
 	/**
 	 * Convert this Chain to a String in PDB format
 	 * @return
@@ -408,7 +319,7 @@ public interface Chain extends Serializable {
 	/**
 	 * Gets annotated sequence mismatches for this chain. This is based on the STRUCT_REF_SEQ_DIF mmCif category
 	 *
-	 * @returns a list of sequence mismatches (or null if none found)
+	 * @return a list of sequence mismatches (or null if none found)
 	 */
 	List<SeqMisMatch> getSeqMisMatches();
 
@@ -419,13 +330,15 @@ public interface Chain extends Serializable {
 	 */
 	EntityType getEntityType();
 
-	/** Tests if a chain is consisting of water molecules only
+	/**
+	 * Tests if a chain is consisting of water molecules only
 	 *
 	 * @return true if there are only solvent molecules in this chain.
 	 */
 	public boolean isWaterOnly();
 
-	/**  Returns true if the given chain is composed of non-polymeric (including water) groups only.
+	/**
+	 * Returns true if the given chain is composed of non-polymeric (including water) groups only.
 	 *
 	 * @return true if only non-polymeric groups in this chain.
 	 */
@@ -435,7 +348,7 @@ public interface Chain extends Serializable {
 	 * Get the predominant {@link GroupType} for a given Chain, following these
 	 * rules: <li>if the ratio of number of residues of a certain
 	 * {@link GroupType} to total non-water residues is above the threshold
-	 * {@value #org.biojava.nbio.structure.StructureTools.RATIO_RESIDUES_TO_TOTAL}, then that {@link GroupType} is
+	 * {@value org.biojava.nbio.structure.StructureTools#RATIO_RESIDUES_TO_TOTAL}, then that {@link GroupType} is
 	 * returned</li> <li>if there is no {@link GroupType} that is above the
 	 * threshold then the {@link GroupType} with most members is chosen, logging
 	 * it</li>
@@ -446,9 +359,9 @@ public interface Chain extends Serializable {
 	 * their linking.
 	 * </p>
 	 *
-	 * @return
+	 * @return the predominant group type
 	 */
-	public GroupType getPredominantGroupType();
+	GroupType getPredominantGroupType();
 
 	/**
 	 * Tell whether given chain is a protein chain
@@ -456,7 +369,7 @@ public interface Chain extends Serializable {
 	 * @return true if protein, false if nucleotide or ligand
 	 * @see #getPredominantGroupType()
 	 */
-	public  boolean isProtein();
+	boolean isProtein();
 
 	/**
 	 * Tell whether given chain is DNA or RNA
@@ -464,5 +377,5 @@ public interface Chain extends Serializable {
 	 * @return true if nucleic acid, false if protein or ligand
 	 * @see #getPredominantGroupType()
 	 */
-	public  boolean isNucleicAcid();
+	boolean isNucleicAcid();
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
index 5a395ee417..4808ef0afb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
@@ -57,20 +57,19 @@ public class ChainImpl implements Chain {
 	 */
 	private static final String DEFAULT_CHAIN_ID = "A";
 
-	private String swissprot_id ;
 	private String authId; // the 'public' chain identifier as assigned by authors in PDB files
+	private String asymId; // the 'internal' chain identifier as used in mmCIF files
 
-	private List <Group> groups;
+	private List<Group> groups;
 	private List<Group> seqResGroups;
 
 	private EntityInfo entity;
 	private Structure parent;
 
-	private Map<String, Integer> pdbResnumMap;
-	private String asymId; // the 'internal' chain identifier as used in mmCIF files
+	private final Map<String, Integer> pdbResnumMap;
 
+	private List<SeqMisMatch> seqMisMatches;
 
-	private List<SeqMisMatch> seqMisMatches = null;
 	/**
 	 *  Constructs a ChainImpl object.
 	 */
@@ -86,86 +85,42 @@ public ChainImpl() {
 
 	}
 
-	/** {@inheritDoc}
-	 *
-	 */
 	@Override
 	public String getId() {
 		return asymId;
 	}
 
-	/** {@inheritDoc}
-	 *
-	 */
 	@Override
 	public void setId(String asymId) {
 		this.asymId = asymId;
 	}
 
-	/** {@inheritDoc}
-	 *
-	 */
 	@Override
 	public String getName() { return authId; }
 
-	/** {@inheritDoc}
-	 *
-	 */
 	@Override
 	public void setName(String authId) { this.authId = authId; }
 
-	/** {@inheritDoc}
-	 *
-	 */
-	@Override
-	@Deprecated
-	public void setParent(Structure parent) {
-		setStructure(parent);
-	}
-
-	/** {@inheritDoc}
-	 *
-	 */
 	@Override
 	public void setStructure(Structure parent){
 		this.parent = parent;
 	}
 
-	/** Returns the parent Structure of this chain.
-	 *
-	 * @return the parent Structure object
-	 */
 	@Override
 	public Structure getStructure() {
 
 		return parent;
 	}
 
-
-	/** Returns the parent Structure of this chain.
-	 *
-	 * @return the parent Structure object
-	 * @deprecated  use getStructure instead.
-	 */
-	@Override
-	@Deprecated
-	public Structure getParent() {
-
-		return getStructure();
-	}
-
-	/** Returns an identical copy of this Chain .
-	 * @return an identical copy of this Chain
-	 */
 	@Override
 	public Object clone() {
+
 		// go through all groups and add to new Chain.
 		ChainImpl n = new ChainImpl();
 		// copy chain data:
 
 		n.setId(getId());
 		n.setName(getName());
-		n.setSwissprotId ( getSwissprotId());
 
 		// NOTE the EntityInfo will be reset at the parent level (Structure) if cloning is happening from parent level
 		// here we don't deep-copy it and just keep the same reference, in case the cloning is happening at the Chain level only
@@ -213,43 +168,16 @@ public Object clone() {
 		return n ;
 	}
 
-	/** {@inheritDoc}
-	 *
-	 */
 	@Override
 	public void setEntityInfo(EntityInfo mol) {
 		this.entity = mol;
 	}
 
-	/** {@inheritDoc}
-	 *
-	 */
 	@Override
 	public EntityInfo getEntityInfo() {
 		return this.entity;
 	}
 
-	/** set the Swissprot id of this chains .
-	 * @param sp_id  a String specifying the swissprot id value
-	 * @see #getSwissprotId
-	 */
-	@Override
-	public void setSwissprotId(String sp_id){
-		swissprot_id = sp_id ;
-	}
-
-	/** get the Swissprot id of this chains .
-	 * @return a String representing the swissprot id value
-	 * @see #setSwissprotId
-	 */
-	@Override
-	public String getSwissprotId() {
-		return swissprot_id ;
-	}
-
-	/** {@inheritDoc}
-	 *
-	 */
 	@Override
 	public void addGroup(Group group) {
 
@@ -288,7 +216,7 @@ public void addGroup(Group group) {
 			if (  pdbResnumMap.containsKey(pdbResnum)) {
 
 				logger.warn("Adding residue {}({}) to chain {} but a residue with same residue number is already present: {}({}). Will add only the aminoacid residue (if any) to the lookup, lookups for that residue number won't work properly.",
-						pdbResnum, group.getPDBName(), getChainID(), groups.get(pdbResnumMap.get(pdbResnum)).getResidueNumber(), groups.get(pdbResnumMap.get(pdbResnum)).getPDBName());
+						pdbResnum, group.getPDBName(), getId(), groups.get(pdbResnumMap.get(pdbResnum)).getResidueNumber(), groups.get(pdbResnumMap.get(pdbResnum)).getPDBName());
 				if ( group instanceof AminoAcid)
 					pdbResnumMap.put(pdbResnum,pos);
 			} else
@@ -297,19 +225,12 @@ public void addGroup(Group group) {
 
 	}
 
-
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public Group getAtomGroup(int position) {
 
 		return groups.get(position);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public List<Group> getAtomGroups(GroupType type){
 
@@ -323,18 +244,11 @@ public List<Group> getAtomGroups(GroupType type){
 		return tmp ;
 	}
 
-
-	/** {@inheritDoc}
-	 *
-	 */
 	@Override
 	public List<Group> getAtomGroups(){
 		return groups ;
 	}
 
-	/** {@inheritDoc}
-	 *
-	 */
 	@Override
 	public void setAtomGroups(List<Group> groups){
 		for (Group g:groups){
@@ -348,10 +262,9 @@ public Group[] getGroupsByPDB(ResidueNumber start, ResidueNumber end, boolean ig
 			throws StructureException {
 		// Short-circut for include all groups
 		if(start == null && end == null) {
-			return groups.toArray(new Group[groups.size()]);
+			return groups.toArray(new Group[0]);
 		}
 
-
 		List<Group> retlst = new ArrayList<>();
 
 		boolean adding, foundStart;
@@ -364,7 +277,6 @@ public Group[] getGroupsByPDB(ResidueNumber start, ResidueNumber end, boolean ig
 			foundStart = false;
 		}
 
-
 		for (Group g: groups){
 
 			// Check for start
@@ -412,17 +324,11 @@ public Group[] getGroupsByPDB(ResidueNumber start, ResidueNumber end, boolean ig
 			throw new StructureException("did not find end PDB residue number " + end + " in chain " + authId);
 		}
 
-
 		//not checking if the end has been found in this case...
 
-		return retlst.toArray(new Group[retlst.size()] );
+		return retlst.toArray(new Group[0]);
 	}
 
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 */
 	@Override
 	public Group getGroupByPDB(ResidueNumber resNum) throws StructureException {
 		String pdbresnum = resNum.toString();
@@ -434,50 +340,23 @@ public Group getGroupByPDB(ResidueNumber resNum) throws StructureException {
 		}
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 */
 	@Override
 	public Group[] getGroupsByPDB(ResidueNumber start, ResidueNumber end)
 			throws StructureException {
 		return getGroupsByPDB(start, end, false);
 	}
 
-
-
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public int getSeqResLength() {
 		//new method returns the length of the sequence defined in the SEQRES records
 		return seqResGroups.size();
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void   setChainID(String asymId) { this.asymId = asymId;   }
-
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public String getChainID()           {	return this.asymId;  }
-
-
-
-	/** String representation.
-	 * @return String representation of the Chain
-	 */
 	@Override
 	public String toString(){
 		String newline = System.getProperty("line.separator");
 		StringBuilder str = new StringBuilder();
-		str.append("Chain asymId:").append(getChainID()).append(" authId:").append(getName()).append(newline);
+		str.append("Chain asymId:").append(getId()).append(" authId:").append(getName()).append(newline);
 		if ( entity != null ){
 			if ( entity.getDescription() != null){
 				str.append(entity.getDescription()).append(newline);
@@ -487,12 +366,8 @@ public String toString(){
 		.append(getAtomLength()).append(" residues ").append(newline);
 
 		return str.toString() ;
-
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public Sequence<?> getBJSequence()  {
 
@@ -508,16 +383,11 @@ public Sequence<?> getBJSequence()  {
 
 		//TODO: return a DNA sequence if the content is DNA...
 		return s;
-
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public String getAtomSequence(){
 
-
 		List<Group> groups = getAtomGroups();
 		StringBuilder sequence = new StringBuilder() ;
 
@@ -535,13 +405,8 @@ public String getAtomSequence(){
 
 		}
 		return sequence.toString();
-
-
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public String getSeqResSequence(){
 
@@ -549,7 +414,7 @@ public String getSeqResSequence(){
 		for (Group g : seqResGroups) {
 			ChemComp cc = g.getChemComp();
 			if ( cc == null) {
-				logger.warn("Could not load ChemComp for group: ", g);
+				logger.warn("Could not load ChemComp for group: {}", g);
 				str.append(StructureTools.UNKNOWN_GROUP_LABEL);
 			} else if ( PolymerType.PROTEIN_ONLY.contains(cc.getPolymerType()) ||
 					PolymerType.POLYNUCLEOTIDE_ONLY.contains(cc.getPolymerType())){
@@ -580,7 +445,7 @@ public String getSeqResOneLetterSeq(){
 		for (Group g : seqResGroups) {
 			ChemComp cc = g.getChemComp();
 			if ( cc == null) {
-				logger.warn("Could not load ChemComp for group: ", g);
+				logger.warn("Could not load ChemComp for group: {}", g);
 				str.append(StructureTools.UNKNOWN_GROUP_LABEL);
 			} else if ( PolymerType.PROTEIN_ONLY.contains(cc.getPolymerType()) ||
 					PolymerType.POLYNUCLEOTIDE_ONLY.contains(cc.getPolymerType())){
@@ -598,19 +463,11 @@ public String getSeqResOneLetterSeq(){
 		return str.toString();
 	}
 
-
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public Group getSeqResGroup(int position) {
-
 		return seqResGroups.get(position);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public List<Group> getSeqResGroups(GroupType type) {
 		List<Group> tmp = new ArrayList<>() ;
@@ -623,17 +480,11 @@ public List<Group> getSeqResGroups(GroupType type) {
 		return tmp ;
 	}
 
-	/** {@inheritDoc}
-	 *
-	 */
 	@Override
 	public List<Group> getSeqResGroups() {
 		return seqResGroups;
 	}
 
-	/** {@inheritDoc}
-	 *
-	 */
 	@Override
 	public void setSeqResGroups(List<Group> groups){
 		for (Group g: groups){
@@ -644,41 +495,12 @@ public void setSeqResGroups(List<Group> groups){
 		this.seqResGroups = groups;
 	}
 
-
-	/** {@inheritDoc}
-	 *
-	 */
 	@Override
 	public int getAtomLength() {
 
 		return groups.size();
 	}
 
-	/** {@inheritDoc}
-	 *
-	 */
-	@Override
-	public List<Group> getAtomLigands(){
-		List<Group> ligands = new ArrayList<>();
-
-		for (Group g : groups)
-			if (!seqResGroups.contains(g) && !g.isWater())
-				ligands.add(g);
-
-		return ligands;
-	}
-
-	@Override
-	public String getInternalChainID() {
-		return asymId;
-	}
-
-	@Override
-	public void setInternalChainID(String internalChainID) {
-		this.asymId = internalChainID;
-
-	}
-
 	@Override
 	public String toPDB() {
 		return FileConvert.toPDB(this);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityInfo.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityInfo.java
index cc52262b12..829e8abfc7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityInfo.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityInfo.java
@@ -77,7 +77,7 @@ public class EntityInfo implements Serializable {
 	 * Initialised lazily upon call to {@link #getAlignedResIndex(Group, Chain)}
 	 * Keys are asym_ids of chains, values maps of residue numbers to indices.
 	 */
-	private Map<String, Map<ResidueNumber,Integer>> chains2pdbResNums2ResSerials;
+	private final Map<String, Map<ResidueNumber,Integer>> chains2pdbResNums2ResSerials;
 
 	private String refChainId;
 	private String description = null;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBRecord.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBRecord.java
index eb3b2b3e5a..75d78c6030 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBRecord.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBRecord.java
@@ -30,14 +30,16 @@
  */
 public interface PDBRecord extends Serializable {
 
-	/** Returns a PDB file like representation of this record.
+	/**
+	 * Returns a PDB file like representation of this record.
 	 *
 	 * @return a String providing a PDB file like representation of the record.
 	 */
 	public String toPDB();
 
 
-	/** Appends a PDB file like representation of this record to the provided StringBuffer.
+	/**
+	 * Appends a PDB file like representation of this record to the provided StringBuffer.
 	 *
 	 */
 	public void toPDB(StringBuffer buf);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
index 88de6f152b..09ff74a252 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
@@ -410,29 +410,6 @@ public interface Structure extends Cloneable, Serializable {
 	 */
 	Chain getChainByIndex(int modelnr, int chainIndex);
 
-	/**
-	 * Request a particular chain from a structure.
-	 * by default considers only the first model.
-	 * @param authId name of a chain that should be returned
-	 * @return Chain the requested chain
-	 * @throws StructureException
-	 * @Deprecated use {@link #getPolyChainByPDB(String)} or {@link #getNonPolyChainsByPDB(String)} instead
-	 */
-	@Deprecated
-	Chain findChain(String authId) throws StructureException;
-
-	/**
-	 * Request a particular chain from a particular model
-	 * @param authId the name of a chain that should be returned
-	 * @param modelnr the number of the model to use
-	 * @return Chain the requested chain
-	 * @throws StructureException
-	 * @Deprecated use {@link #getPolyChainByPDB(String, int)} or {@link #getNonPolyChainsByPDB(String, int)} instead
-	 */
-	@Deprecated
-	Chain findChain(String authId, int modelnr) throws StructureException;
-
-
 	/**
 	 * Check if a chain with the chainId aymId is contained in this structure.
 	 *
@@ -480,36 +457,6 @@ public interface Structure extends Cloneable, Serializable {
 	 */
 	Group findGroup(String authId, String pdbResnum, int modelnr) throws StructureException;
 
-
-	/**
-	 * Request a chain by its public id (author id) for the first model.
-	 * Before 5.0 it returned a Chain that had both polymeric and non-polymeric groups
-	 * following the PDB-file data model.
-	 * Since 5.0 it only returns the polymeric part of the chain.
-	 *
-	 * @param authId the author id (chainName, public chain id)
-	 * @return the Chain that matches the authId
-	 * @throws StructureException if chain can't be found
-	 * @deprecated use {@link #getPolyChainByPDB(String)} instead
-	 */
-	@Deprecated
-	Chain getChainByPDB(String authId) throws StructureException;
-
-	/**
-	 * Request a chain by its public id (author id) for the given model index.
-	 * Before 5.0 it returned a Chain that had both polymeric and non-polymeric groups
-	 * following the PDB-file data model.
-	 * Since 5.0 it only returns the polymeric part of the chain.
-	 *
-	 * @param authId the author id (chainName, public chain id)
-	 * @param modelIdx the index of the required model (0-based)
-	 * @return the Chain that matches the authId in the model
-	 * @throws StructureException if chain can't be found
-	 * @deprecated use {@link #getPolyChainByPDB(String,int)} instead
-	 */
-	@Deprecated
-	Chain getChainByPDB(String authId, int modelIdx) throws StructureException;
-
 	/**
 	 * Retrieve a Chain (polymeric, non-polymeric or water) based on
 	 * the 'internal' chain id (asymId) for the first model
@@ -709,16 +656,6 @@ public interface Structure extends Cloneable, Serializable {
 	 */
 	List<DBRef> getDBRefs();
 
-	/**
-	 * Request a particular entity by its entity id (mol id in legacy PDB format)
-	 *
-	 * @param entityId the number of the entity
-	 * @return a entityInfo
-	 * @deprecated use {@link #getEntityById(int)} instead
-	 */
-	@Deprecated
-	EntityInfo getCompoundById(int entityId);
-
 	/**
 	 * Request a particular entity by its entity id (mol id in legacy PDB format)
 	 *
@@ -784,19 +721,6 @@ public interface Structure extends Cloneable, Serializable {
 	 */
 	void setPDBHeader(PDBHeader header);
 
-	/**
-	 * Get the ID used by Hibernate
-	 *
-	 * @return the ID used by Hibernate
-	 */
-	Long getId() ;
-
-	/** set the ID used by Hibernate
-	 *
-	 * @param id the id
-	 */
-	void setId(Long id) ;
-
 	/**
 	 * @param sites the sites to set in the structure
 	 */
@@ -849,28 +773,6 @@ public interface Structure extends Cloneable, Serializable {
 	@Deprecated
 	String getPdbId();
 
-	/**
-	 * Returns the list of {@link ResidueRange ResidueRanges} that this StructureIdentifier defines.
-	 * This is a unique representation.
-	 * @deprecated From BioJava 4.2, use
-	 *  <code>getStructureIdentifier().toCanonical().getResidueRanges()</code>
-	 */
-	@Deprecated
-	List<? extends ResidueRange> getResidueRanges();
-
-	/**
-	 * Returns a list of residue ranges. For example:
-	 * <pre>
-	 * getRanges().get(0): 'A'
-	 * getRanges().get(1): 'B_5-100'
-	 * </pre>
-	 * This is a unique representation.
-	 * @deprecated From BioJava 4.2, use
-	 *  <code>getStructureIdentifier().toCanonical().getRanges()</code>
-	 */
-	@Deprecated
-	List<String> getRanges();
-
 	/**
 	 * Get a string representing this structure's contents. The following places
 	 * are searched for a non-null value, with the first being returned:
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
index 39664983be..9f07e0338c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
@@ -61,7 +61,6 @@ public class StructureImpl implements Structure {
 
 	private PDBHeader pdbHeader;
 
-	private Long id;
 	private boolean biologicalAssembly;
 
 	/**
@@ -79,28 +78,8 @@ public StructureImpl() {
 		sites          = new ArrayList<>();
 	}
 
-
-	/** get the ID used by Hibernate
-	 *
-	 * @return the ID used by Hibernate
-	 */
-	@Override
-	public Long getId() {
-		return id;
-	}
-
-	/** set the ID used by Hibernate
-	 *
-	 * @param id the hibernate ID
-	 */
-	@Override
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-
-
-	/** Construct a Structure object that only contains a single group
+	/**
+	 * Construct a Structure object that only contains a single group
 	 *
 	 * @param g group object
 	 */
@@ -113,7 +92,8 @@ public StructureImpl(Group g){
 		addChain(c);
 	}
 
-	/** construct a Structure object that contains a particular chain
+	/**
+	 * Construct a Structure object that contains a particular chain
 	 *
 	 * @param c chain
 	 */
@@ -122,7 +102,8 @@ public StructureImpl(Chain c){
 		addChain(c);
 	}
 
-	/** returns an identical copy of this structure .
+	/**
+	 * Returns an identical copy of this structure .
 	 * @return an identical Structure object
 	 */
 	@Override
@@ -187,7 +168,6 @@ public Structure clone() {
 		return n ;
 	}
 
-
 	/** {@inheritDoc} */
 	@Override
 	public Group findGroup(String chainName, String pdbResnum, int modelnr)
@@ -246,26 +226,6 @@ public Group findGroup(String chainName, String pdbResnum) throws StructureExcep
 
 	}
 
-
-
-
-	/** {@inheritDoc} */
-	@Override
-	public Chain findChain(String chainName, int modelnr) throws StructureException {
-
-		return getChainByPDB(chainName, modelnr);
-
-	}
-
-
-	/** {@inheritDoc} */
-	@Override
-	public Chain findChain(String chainId) throws StructureException {
-
-		return findChain(chainId,0);
-	}
-
-
 	/** {@inheritDoc} */
 	@Override
 	public void setPDBCode (String pdb_id_) {
@@ -278,8 +238,6 @@ public String  getPDBCode () {
 		return pdb_id ;
 	}
 
-
-
 	/** {@inheritDoc} */
 	@Override
 	public void   setName(String nam) { name = nam; }
@@ -288,8 +246,6 @@ public String  getPDBCode () {
 	@Override
 	public String getName()           { return name;  }
 
-
-
 	/**
 	 * @return The StructureIdentifier used to create this structure
 	 */
@@ -650,20 +606,6 @@ public List<Chain> getModel(int modelnr) {
 		return models.get(modelnr).getChains();
 	}
 
-	/** {@inheritDoc} */
-	@Override
-	public Chain getChainByPDB(String authId, int modelnr)
-			throws StructureException{
-
-		Chain c = getPolyChainByPDB(authId, modelnr);
-
-		if (c==null ) {
-			throw new StructureException("Could not find chain with authId \"" + authId + "\"" + " for PDB id " + pdb_id + ", model "+modelnr);
-		}
-
-		return c;
-	}
-
 	/** {@inheritDoc} */
 	@Override
 	public Chain getChain(String asymId, int modelnr) {
@@ -686,16 +628,6 @@ public Chain getChain(String asymId) {
 
 	}
 
-	/** {@inheritDoc} */
-	@Override
-	public Chain getChainByPDB(String chainId)
-			throws StructureException{
-		if(nrModels() < 1 ) {
-			throw new StructureException("No chains are present.");
-		}
-		return getChainByPDB(chainId,0);
-	}
-
 	@Override
 	public Chain getPolyChain(String asymId) {
 		return getPolyChain(asymId, 0);
@@ -903,12 +835,6 @@ public List<EntityInfo> getEntityInfos() {
 		return entityInfos;
 	}
 
-	/** {@inheritDoc} */
-	@Override
-	public EntityInfo getCompoundById(int molId) {
-		return getEntityById(molId);
-	}
-
 	/** {@inheritDoc} */
 	@Override
 	public EntityInfo getEntityById(int entityId) {
@@ -1094,23 +1020,10 @@ public String getPdbId() {
 		return pdb_id;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void resetModels() {
 		models = new ArrayList<>();
 	}
-	/** {@inheritDoc} */
-	@Deprecated
-	@Override
-	public List<ResidueRange> getResidueRanges() {
-		return toCanonical().getResidueRanges();
-	}
-	/** {@inheritDoc} */
-	@Deprecated
-	@Override
-	public List<String> getRanges() {
-		return ResidueRange.toStrings(getResidueRanges());
-	}
 
 	/**
 	 * Creates a SubstructureIdentifier based on the residues in this Structure.
@@ -1154,8 +1067,4 @@ private SubstructureIdentifier toCanonical() {
 		return new SubstructureIdentifier(getPDBCode(),range);
 	}
 
-
-
-
-
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
index 86643a52e5..b1d3723108 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
@@ -27,6 +27,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -57,8 +58,7 @@
  */
 public class StructureTools {
 
-	private static final Logger logger = LoggerFactory
-			.getLogger(StructureTools.class);
+	private static final Logger logger = LoggerFactory.getLogger(StructureTools.class);
 
 	// Amino Acid backbone
 	/**
@@ -265,7 +265,7 @@ public class StructureTools {
 	 *            the structure object
 	 * @return the number of Atoms in this Structure
 	 */
-	public static final int getNrAtoms(Structure s) {
+	public static int getNrAtoms(Structure s) {
 
 		int nrAtoms = 0;
 
@@ -286,7 +286,7 @@ public static final int getNrAtoms(Structure s) {
 	 *            the structure object
 	 * @return the number of groups in the structure
 	 */
-	public static final int getNrGroups(Structure s) {
+	public static int getNrGroups(Structure s) {
 		int nrGroups = 0;
 
 		List<Chain> chains = s.getChains(0);
@@ -311,13 +311,13 @@ public static final int getNrGroups(Structure s) {
 	 *            contains the atom names to be used.
 	 * @return an Atom[] array
 	 */
-	public static final Atom[] getAtomArray(Structure s, String[] atomNames) {
+	public static Atom[] getAtomArray(Structure s, String[] atomNames) {
 		List<Chain> chains = s.getModel(0);
 
 		List<Atom> atoms = new ArrayList<Atom>();
 
 		extractAtoms(atomNames, chains, atoms);
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 
 	}
 
@@ -337,16 +337,16 @@ public static final Atom[] getAtomArray(Structure s, String[] atomNames) {
 	 *            contains the atom names to be used.
 	 * @return an Atom[] array
 	 */
-	public static final Atom[] getAtomArrayAllModels(Structure s,
+	public static Atom[] getAtomArrayAllModels(Structure s,
 			String[] atomNames) {
 
-		List<Atom> atoms = new ArrayList<Atom>();
+		List<Atom> atoms = new ArrayList<>();
 
 		for (int i = 0; i < s.nrModels(); i++) {
 			List<Chain> chains = s.getModel(i);
 			extractAtoms(atomNames, chains, atoms);
 		}
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 
 	}
 
@@ -357,15 +357,15 @@ public static final Atom[] getAtomArrayAllModels(Structure s,
 	 *            input structure
 	 * @return all atom array
 	 */
-	public static final Atom[] getAllAtomArray(Structure s) {
-		List<Atom> atoms = new ArrayList<Atom>();
+	public static Atom[] getAllAtomArray(Structure s) {
+		List<Atom> atoms = new ArrayList<>();
 
 		AtomIterator iter = new AtomIterator(s);
 		while (iter.hasNext()) {
 			Atom a = iter.next();
 			atoms.add(a);
 		}
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 	}
 	/**
 	 * Convert all atoms of the structure (specified model) into an Atom array
@@ -374,15 +374,15 @@ public static final Atom[] getAllAtomArray(Structure s) {
 	 *            input structure
 	 * @return all atom array
 	 */
-	public static final Atom[] getAllAtomArray(Structure s, int model) {
-		List<Atom> atoms = new ArrayList<Atom>();
+	public static Atom[] getAllAtomArray(Structure s, int model) {
+		List<Atom> atoms = new ArrayList<>();
 
 		AtomIterator iter = new AtomIterator(s,model);
 		while (iter.hasNext()) {
 			Atom a = iter.next();
 			atoms.add(a);
 		}
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 
 	}
 
@@ -394,17 +394,15 @@ public static final Atom[] getAllAtomArray(Structure s, int model) {
 	 *            input chain
 	 * @return all atom array
 	 */
-	public static final Atom[] getAllAtomArray(Chain c) {
-		List<Atom> atoms = new ArrayList<Atom>();
+	public static Atom[] getAllAtomArray(Chain c) {
+		List<Atom> atoms = new ArrayList<>();
 
 		for (Group g : c.getAtomGroups()) {
 			if (g.isWater())
 				continue;
-			for (Atom a : g.getAtoms()) {
-				atoms.add(a);
-			}
+			atoms.addAll(g.getAtoms());
 		}
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 	}
 
 	/**
@@ -417,8 +415,8 @@ public static final Atom[] getAllAtomArray(Chain c) {
 	 * @return
 	 */
 	public static List<Group> getUnalignedGroups(Atom[] ca) {
-		Set<Chain> chains = new HashSet<Chain>();
-		Set<Group> caGroups = new HashSet<Group>();
+		Set<Chain> chains = new HashSet<>();
+		Set<Group> caGroups = new HashSet<>();
 
 		// Create list of all chains in this structure
 		Structure s = null;
@@ -433,9 +431,7 @@ public static List<Group> getUnalignedGroups(Atom[] ca) {
 		}
 		if (s != null) {
 			// Add all chains from the structure
-			for (Chain c : s.getChains(0)) {
-				chains.add(c);
-			}
+			chains.addAll(s.getChains(0));
 		}
 
 		// Add groups and chains from ca
@@ -452,7 +448,7 @@ public static List<Group> getUnalignedGroups(Atom[] ca) {
 		}
 
 		// Iterate through all chains, finding groups not in ca
-		List<Group> unadded = new ArrayList<Group>();
+		List<Group> unadded = new ArrayList<>();
 		for (Chain c : chains) {
 			for (Group g : c.getAtomGroups()) {
 				if (!caGroups.contains(g)) {
@@ -523,64 +519,63 @@ public static List<Group> getLigandsByProximity(Collection<Group> target, Atom[]
 	 * @return the chain g was added to
 	 */
 	public static Chain addGroupToStructure(Structure s, Group g, int model, Chain chainGuess, boolean clone ) {
-		synchronized(s) {
-			// Find or create the chain
-			String chainId = g.getChainId();
-			assert !chainId.isEmpty();
-			Chain chain;
-			if(chainGuess != null && chainGuess.getId() == chainId) {
-				// previously guessed chain
-				chain = chainGuess;
-			} else {
-				// Try to guess
-				chain = s.getChain(chainId, model);
-				if(chain == null) {
-					// no chain found
-					chain = new ChainImpl();
-					chain.setId(chainId);
-
-					Chain oldChain = g.getChain();
-					chain.setName(oldChain.getName());
-
-					EntityInfo oldEntityInfo = oldChain.getEntityInfo();
-
-					EntityInfo newEntityInfo;
-					if(oldEntityInfo == null) {
-						newEntityInfo = new EntityInfo();
+		// Find or create the chain
+		String chainId = g.getChainId();
+		assert !chainId.isEmpty();
+		Chain chain;
+		if (chainGuess != null && chainGuess.getId().equals(chainId)) {
+			// previously guessed chain
+			chain = chainGuess;
+		} else {
+			// Try to guess
+			chain = s.getChain(chainId, model);
+			if (chain == null) {
+				// no chain found
+				chain = new ChainImpl();
+				chain.setId(chainId);
+
+				Chain oldChain = g.getChain();
+				chain.setName(oldChain.getName());
+
+				EntityInfo oldEntityInfo = oldChain.getEntityInfo();
+
+				EntityInfo newEntityInfo;
+				if (oldEntityInfo == null) {
+					newEntityInfo = new EntityInfo();
+					s.addEntityInfo(newEntityInfo);
+				} else {
+					newEntityInfo = s.getEntityById(oldEntityInfo.getMolId());
+					if (newEntityInfo == null) {
+						newEntityInfo = new EntityInfo(oldEntityInfo);
 						s.addEntityInfo(newEntityInfo);
-					} else {
-						newEntityInfo = s.getEntityById(oldEntityInfo.getMolId());
-						if( newEntityInfo == null ) {
-							newEntityInfo = new EntityInfo(oldEntityInfo);
-							s.addEntityInfo(newEntityInfo);
-						}
 					}
-					newEntityInfo.addChain(chain);
-					chain.setEntityInfo(newEntityInfo);
-
-					// TODO Do the seqres need to be cloned too? -SB 2016-10-7
-					chain.setSeqResGroups(oldChain.getSeqResGroups());
-					chain.setSeqMisMatches(oldChain.getSeqMisMatches());
-
-					s.addChain(chain,model);
 				}
-			}
+				newEntityInfo.addChain(chain);
+				chain.setEntityInfo(newEntityInfo);
+
+				// TODO Do the seqres need to be cloned too? -SB 2016-10-7
+				chain.setSeqResGroups(oldChain.getSeqResGroups());
+				chain.setSeqMisMatches(oldChain.getSeqMisMatches());
 
-			// Add cloned group
-			if(clone) {
-				g = (Group)g.clone();
+				s.addChain(chain, model);
 			}
-			chain.addGroup(g);
+		}
 
-			return chain;
+		// Add cloned group
+		if (clone) {
+			g = (Group) g.clone();
 		}
+		chain.addGroup(g);
+
+		return chain;
 	}
 
 	/**
 	 * Add a list of groups to a new structure. Chains will be automatically
 	 * created in the new structure as needed.
 	 * @param s structure to receive the group
-	 * @param g group to add
+	 * @param groups groups to add
+	 * @param model model number
 	 * @param clone Indicates whether the input groups should be cloned before
 	 *  being added to the new chain
 	 */
@@ -604,6 +599,7 @@ public static void addGroupsToStructure(Structure s, Collection<Group> groups, i
 	public static Set<Group> getAllGroupsFromSubset(Atom[] atoms) {
 		return getAllGroupsFromSubset(atoms,null);
 	}
+
 	/**
 	 * Expand a set of atoms into all groups from the same structure.
 	 *
@@ -685,12 +681,13 @@ public static final Atom[] getAllNonHAtomArray(Structure s, boolean hetAtoms) {
 	 * @param modelNr Model number to draw atoms from
 	 * @return
 	 */
-	public static final Atom[] getAllNonHAtomArray(Structure s, boolean hetAtoms, int modelNr) {
+	public static Atom[] getAllNonHAtomArray(Structure s, boolean hetAtoms, int modelNr) {
 		AtomIterator iter = new AtomIterator(s,modelNr);
 		return getAllNonHAtomArray(s, hetAtoms, iter);
 	}
-	private static final Atom[] getAllNonHAtomArray(Structure s, boolean hetAtoms, AtomIterator iter) {
-		List<Atom> atoms = new ArrayList<Atom>();
+
+	private static Atom[] getAllNonHAtomArray(Structure s, boolean hetAtoms, AtomIterator iter) {
+		List<Atom> atoms = new ArrayList<>();
 
 		while (iter.hasNext()) {
 			Atom a = iter.next();
@@ -707,7 +704,7 @@ private static final Atom[] getAllNonHAtomArray(Structure s, boolean hetAtoms, A
 
 			atoms.add(a);
 		}
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 	}
 
 	/**
@@ -719,8 +716,8 @@ private static final Atom[] getAllNonHAtomArray(Structure s, boolean hetAtoms, A
 	 *            if true HET atoms are included in array, if false they are not
 	 * @return
 	 */
-	public static final Atom[] getAllNonHAtomArray(Chain c, boolean hetAtoms) {
-		List<Atom> atoms = new ArrayList<Atom>();
+	public static Atom[] getAllNonHAtomArray(Chain c, boolean hetAtoms) {
+		List<Atom> atoms = new ArrayList<>();
 
 		for (Group g : c.getAtomGroups()) {
 			if (g.isWater())
@@ -736,7 +733,7 @@ public static final Atom[] getAllNonHAtomArray(Chain c, boolean hetAtoms) {
 				atoms.add(a);
 			}
 		}
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 	}
 
 	/**
@@ -748,8 +745,8 @@ public static final Atom[] getAllNonHAtomArray(Chain c, boolean hetAtoms) {
 	 *            if true HET atoms are included in array, if false they are not
 	 * @return
 	 */
-	public static final Point3d[] getAllNonHCoordsArray(Chain c, boolean hetAtoms) {
-		List<Point3d> atoms = new ArrayList<Point3d>();
+	public static Point3d[] getAllNonHCoordsArray(Chain c, boolean hetAtoms) {
+		List<Point3d> atoms = new ArrayList<>();
 
 		for (Group g : c.getAtomGroups()) {
 			if (g.isWater())
@@ -765,7 +762,7 @@ public static final Point3d[] getAllNonHCoordsArray(Chain c, boolean hetAtoms) {
 				atoms.add(a.getCoordsAsPoint3d());
 			}
 		}
-		return atoms.toArray(new Point3d[atoms.size()]);
+		return atoms.toArray(new Point3d[0]);
 	}
 
 	/**
@@ -777,8 +774,7 @@ public static final Point3d[] getAllNonHCoordsArray(Chain c, boolean hetAtoms) {
 	 * @param chains
 	 * @param atoms
 	 */
-	private static void extractAtoms(String[] atomNames, List<Chain> chains,
-			List<Atom> atoms) {
+	private static void extractAtoms(String[] atomNames, List<Chain> chains, List<Atom> atoms) {
 
 		for (Chain c : chains) {
 
@@ -800,11 +796,8 @@ private static void extractAtoms(String[] atomNames, List<Chain> chains,
 				}
 				if (thisGroupAllAtoms) {
 					// add the atoms of this group to the array.
-					for (Atom a : thisGroupAtoms) {
-						atoms.add(a);
-					}
+					atoms.addAll(thisGroupAtoms);
 				}
-
 			}
 		}
 	}
@@ -822,14 +815,14 @@ private static void extractAtoms(String[] atomNames, List<Chain> chains,
 	 *            contains the atom names to be used.
 	 * @return an Atom[] array
 	 */
-	public static final Atom[] getAtomArray(Chain c, String[] atomNames) {
+	public static Atom[] getAtomArray(Chain c, String[] atomNames) {
 
-		List<Atom> atoms = new ArrayList<Atom>();
+		List<Atom> atoms = new ArrayList<>();
 
 		for (Group g : c.getAtomGroups()) {
 
 			// a temp container for the atoms of this group
-			List<Atom> thisGroupAtoms = new ArrayList<Atom>();
+			List<Atom> thisGroupAtoms = new ArrayList<>();
 			// flag to check if this group contains all the requested atoms.
 			boolean thisGroupAllAtoms = true;
 			for (String atomName : atomNames) {
@@ -848,13 +841,11 @@ public static final Atom[] getAtomArray(Chain c, String[] atomNames) {
 
 			if (thisGroupAllAtoms) {
 				// add the atoms of this group to the array.
-				for (Atom a : thisGroupAtoms) {
-					atoms.add(a);
-				}
+				atoms.addAll(thisGroupAtoms);
 			}
 
 		}
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 
 	}
 
@@ -867,8 +858,8 @@ public static final Atom[] getAtomArray(Chain c, String[] atomNames) {
 	 * @return an Atom[] array
 	 * @see #getRepresentativeAtomArray(Chain)
 	 */
-	public static final Atom[] getAtomCAArray(Chain c) {
-		List<Atom> atoms = new ArrayList<Atom>();
+	public static Atom[] getAtomCAArray(Chain c) {
+		List<Atom> atoms = new ArrayList<>();
 
 		for (Group g : c.getAtomGroups()) {
 			if (g.hasAtom(CA_ATOM_NAME)
@@ -877,13 +868,13 @@ public static final Atom[] getAtomCAArray(Chain c) {
 			}
 		}
 
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 	}
 
 	/**
 	 * Gets a representative atom for each group that is part of the chain
 	 * backbone. Note that modified aminoacids won't be returned as part of the
-	 * backbone if the {@link org.biojava.nbio.structure.io.mmcif.ReducedChemCompProvider} was used to load the
+	 * backbone if the {@link org.biojava.nbio.structure.chem.ReducedChemCompProvider} was used to load the
 	 * structure.
 	 *
 	 * For amino acids, the representative is a CA carbon. For nucleotides, the
@@ -894,8 +885,8 @@ public static final Atom[] getAtomCAArray(Chain c) {
 	 * @return representative Atoms of the chain backbone
 	 * @since Biojava 4.1.0
 	 */
-	public static final Atom[] getRepresentativeAtomArray(Chain c) {
-		List<Atom> atoms = new ArrayList<Atom>();
+	public static Atom[] getRepresentativeAtomArray(Chain c) {
+		List<Atom> atoms = new ArrayList<>();
 
 		for (Group g : c.getAtomGroups()) {
 
@@ -916,7 +907,7 @@ public static final Atom[] getRepresentativeAtomArray(Chain c) {
 			}
 		}
 
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 
 	}
 
@@ -930,7 +921,7 @@ public static final Atom[] getRepresentativeAtomArray(Chain c) {
 	 * @return Atom array
 	 * @since Biojava 4.1.0
 	 */
-	public static final Atom[] cloneAtomArray(Atom[] ca) {
+	public static Atom[] cloneAtomArray(Atom[] ca) {
 		Atom[] newCA = new Atom[ca.length];
 
 		List<Chain> model = new ArrayList<Chain>();
@@ -1104,7 +1095,7 @@ public static Atom[] getAtomCAArray(Structure s) {
 	/**
 	 * Gets a representative atom for each group that is part of the chain
 	 * backbone. Note that modified aminoacids won't be returned as part of the
-	 * backbone if the {@link org.biojava.nbio.structure.io.mmcif.ReducedChemCompProvider} was used to load the
+	 * backbone if the {@link org.biojava.nbio.structure.chem.ReducedChemCompProvider} was used to load the
 	 * structure.
 	 *
 	 * For amino acids, the representative is a CA carbon. For nucleotides, the
@@ -1118,16 +1109,14 @@ public static Atom[] getAtomCAArray(Structure s) {
 	 */
 	public static Atom[] getRepresentativeAtomArray(Structure s) {
 
-		List<Atom> atoms = new ArrayList<Atom>();
+		List<Atom> atoms = new ArrayList<>();
 
 		for (Chain c : s.getChains()) {
 			Atom[] chainAtoms = getRepresentativeAtomArray(c);
-			for (Atom a : chainAtoms) {
-				atoms.add(a);
-			}
+			atoms.addAll(Arrays.asList(chainAtoms));
 		}
 
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 	}
 
 	/**
@@ -1140,7 +1129,7 @@ public static Atom[] getRepresentativeAtomArray(Structure s) {
 	 */
 	public static Atom[] getBackboneAtomArray(Structure s) {
 
-		List<Atom> atoms = new ArrayList<Atom>();
+		List<Atom> atoms = new ArrayList<>();
 
 		for (Chain c : s.getChains()) {
 			for (Group g : c.getAtomGroups()) {
@@ -1195,7 +1184,7 @@ public static Atom[] getBackboneAtomArray(Structure s) {
 
 		}
 
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 	}
 
 	/**
@@ -1208,9 +1197,9 @@ public static Atom[] getBackboneAtomArray(Structure s) {
 	 *         correspond to an amino acid code
 	 * @param groupCode3
 	 *            a three character amino acid representation String
-	 * @see {@link #get1LetterCode(String)}
+	 * @see #get1LetterCode(String)
 	 */
-	public static final Character get1LetterCodeAmino(String groupCode3) {
+	public static Character get1LetterCodeAmino(String groupCode3) {
 		return aminoAcids.get(groupCode3);
 	}
 
@@ -1225,7 +1214,7 @@ public static final Character get1LetterCodeAmino(String groupCode3) {
 	 *            three letter representation
 	 * @return The 1-letter abbreviation
 	 */
-	public static final Character get1LetterCode(String groupCode3) {
+	public static Character get1LetterCode(String groupCode3) {
 
 		Character code1;
 
@@ -1313,23 +1302,16 @@ public static Structure getReducedStructure(Structure s,
 
 		}
 
-		Chain c = null;
-		try {
-			c = s.getChainByPDB(chainId);
-		} catch (StructureException e) {
-			logger.warn(e.getMessage() + ". Chain id " + chainId
-					+ " did not match, trying upper case Chain id.");
-			c = s.getChainByPDB(chainId.toUpperCase());
+		Chain c = s.getPolyChainByPDB(chainId);
 
-		}
 		if (c != null) {
 			newS.addChain(c);
 			for (EntityInfo comp : s.getEntityInfos()) {
 				if (comp.getChainIds() != null
-						&& comp.getChainIds().contains(c.getChainID())) {
+						&& comp.getChainIds().contains(c.getId())) {
 					// found matching entity info. set description...
 					newS.getPDBHeader().setDescription(
-							"Chain " + c.getChainID() + " of " + s.getPDBCode()
+							"Chain " + c.getId() + " of " + s.getPDBCode()
 							+ " " + comp.getDescription());
 				}
 			}
@@ -1627,9 +1609,7 @@ public static Map<Group, Double> getGroupDistancesWithinShell(
 			}
 		} else {
 			// in this case we used getDistanceFast
-			for (Map.Entry<Group, Double> entry : distances.entrySet()) {
-				distances.put(entry.getKey(), Math.sqrt(entry.getValue()));
-			}
+			distances.replaceAll((k, v) -> Math.sqrt(v));
 		}
 
 		return distances;
@@ -1644,7 +1624,7 @@ public static Set<Group> getGroupsWithinShell(Structure structure,
 		// which returns the square of a distance.
 		distance = distance * distance;
 
-		Set<Group> returnSet = new LinkedHashSet<Group>();
+		Set<Group> returnSet = new LinkedHashSet<>();
 		for (Chain chain : structure.getChains()) {
 			groupLoop: for (Group chainGroup : chain.getAtomGroups()) {
 				if (!includeWater && chainGroup.isWater())
@@ -1691,9 +1671,9 @@ public static Set<Group> getGroupsWithinShell(Structure structure,
 	public static Set<Group> getGroupsWithinShell(Structure structure,
 			Group group, double distance, boolean includeWater) {
 
-		Set<Group> returnList = new LinkedHashSet<Group>();
+		Set<Group> returnList = new LinkedHashSet<>();
 
-		Set<ResidueNumber> excludeGroups = new HashSet<ResidueNumber>();
+		Set<ResidueNumber> excludeGroups = new HashSet<>();
 		excludeGroups.add(group.getResidueNumber());
 		for (Atom atom : group.getAtoms()) {
 			Set<Group> set = getGroupsWithinShell(structure, atom,
@@ -1742,7 +1722,7 @@ public static Structure removeModels(Structure s) {
 	 */
 	public static List<Group> filterLigands(List<Group> allGroups) {
 
-		List<Group> groups = new ArrayList<Group>();
+		List<Group> groups = new ArrayList<>();
 		for (Group g : allGroups) {
 
 			if ( g.isPolymeric())
@@ -1815,48 +1795,6 @@ public static Structure getStructure(String name, PDBFileParser parser,
 		}
 	}
 
-	/**
-	 * @deprecated  use {@link Chain#isProtein()} instead.
-	 */
-	@Deprecated
-	public static boolean isProtein(Chain c) {
-
-		return c.isProtein();
-	}
-
-	/**
-	 * @deprecated use {@link Chain#isNucleicAcid()} instead.
-	 */
-	@Deprecated
-	public static boolean isNucleicAcid(Chain c) {
-		return c.isNucleicAcid();
-	}
-
-	/**
-	 * @deprecated use {@link Chain#getPredominantGroupType()} instead.
-	 */
-	@Deprecated
-	public static GroupType getPredominantGroupType(Chain c) {
-		return c.getPredominantGroupType();
-	}
-
-	/**
-	 * @deprecated use {@link Chain#isWaterOnly()} instead.
-	 */
-	@Deprecated
-	public static boolean isChainWaterOnly(Chain c) {
-		return c.isWaterOnly();
-	}
-
-	/**
-	 * @deprecated  use {@link Chain#isPureNonPolymer()} instead.
-	 */
-	@Deprecated
-	public static boolean isChainPureNonPolymer(Chain c) {
-
-		return c.isPureNonPolymer();
-	}
-
 	/**
 	 * Cleans up the structure's alternate location (altloc) groups. All alternate location groups should have all atoms (except
 	 * in the case of microheterogenity) or when a deuterium exists.
@@ -1893,11 +1831,8 @@ public static void cleanUpAltLocs(Structure structure) {
 	 * @return true if the atom is deuterated and it's hydrogen equive exists.
 	 */
 	public static boolean hasNonDeuteratedEquiv(Atom atom, Group currentGroup) {
-		if(atom.getElement()==Element.D && currentGroup.hasAtom(replaceFirstChar(atom.getName(),'D', 'H'))) {
-			// If it's deuterated and has a non-deuterated brother
-			return true;
-		}
-		return false;
+		// If it's deuterated and has a non-deuterated brother
+		return atom.getElement() == Element.D && currentGroup.hasAtom(replaceFirstChar(atom.getName(), 'D', 'H'));
 	}
 
 	/**
@@ -1907,11 +1842,8 @@ public static boolean hasNonDeuteratedEquiv(Atom atom, Group currentGroup) {
 	 * @return true if the atom is hydrogen and it's Deuterium equiv exists.
 	 */
 	public static boolean hasDeuteratedEquiv(Atom atom, Group currentGroup) {
-		if(atom.getElement()==Element.H && currentGroup.hasAtom(replaceFirstChar(atom.getName(),'H', 'D'))) {
-			// If it's hydrogen and has a deuterated brother
-			return true;
-		}
-		return false;
+		// If it's hydrogen and has a deuterated brother
+		return atom.getElement() == Element.H && currentGroup.hasAtom(replaceFirstChar(atom.getName(), 'H', 'D'));
 	}
 
 	private static String replaceFirstChar(String name, char c, char d) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CAConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CAConverter.java
index 4ffc5f1883..6f57eb3a46 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CAConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CAConverter.java
@@ -65,7 +65,6 @@ public static Chain getRepresentativeAtomsOnly(Chain chain){
 		newChain.setId(chain.getId());
 		newChain.setName(chain.getName());
 		newChain.setEntityInfo(chain.getEntityInfo());
-		newChain.setSwissprotId(chain.getSwissprotId());
 
 		List<Group> groups = chain.getAtomGroups();
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
index 35654bcb17..11211b878b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileConvert.java
@@ -513,7 +513,6 @@ public void toDASStructure(XMLWriter xw)
 				Chain chain = structure.getChainByIndex(modelnr,chainnr);
 				xw.openTag("chain");
 				xw.attribute("id",chain.getId());
-				xw.attribute("SwissprotId",chain.getSwissprotId() );
 				if (structure.nrModels()>1){
 					xw.attribute("model",Integer.toString(modelnr+1));
 				}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileParsingParameters.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileParsingParameters.java
index 4f28294287..352c541f5b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileParsingParameters.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FileParsingParameters.java
@@ -52,7 +52,6 @@ public class FileParsingParameters implements Serializable
 	private static final long serialVersionUID = 5878292315163939027L;
 
 
-
 	/**
 	 * Flag to detect if the secondary structure info should be read
 	 *
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
index 3c884bbc2d..252c9422dc 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
@@ -83,7 +83,6 @@ public static Structure getSubstructureMatchingProteinSequence(ProteinSequence s
 				structure.addChain(chain);
 				chain.setEntityInfo(group.getChain().getEntityInfo());
 				chain.setStructure(structure);
-				chain.setSwissprotId(group.getChain().getSwissprotId());
 				chain.setId(group.getChain().getId());
 				chain.setName(group.getChain().getName());
 				currentChain = chain;

From 62f7d762d840cebdc1302167e66ef9c4c2e438b4 Mon Sep 17 00:00:00 2001
From: Michael L Heuer <heuermh@acm.org>
Date: Mon, 19 Apr 2021 10:30:46 -0500
Subject: [PATCH 079/599] Update guava dependency version to 30.1.1-jre.

---
 biojava-genome/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index c4d667cf50..2fb8e78426 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -75,7 +75,7 @@
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<scope>compile</scope>
-			<version>29.0-jre</version>
+			<version>30.1.1-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

From f666a3511fa1c83f923701841f5fcebaecd61b8e Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 9 Jun 2021 15:41:48 -0700
Subject: [PATCH 080/599] Using https as default PDB file sources

---
 .../nbio/structure/chem/DownloadChemCompProvider.java       | 2 +-
 .../org/biojava/nbio/structure/io/LocalPDBDirectory.java    | 6 +++---
 .../biojava/nbio/structure/io/TestURLBasedFileParsing.java  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
index e250a1ebd8..efbfb47810 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -44,7 +44,7 @@ public class DownloadChemCompProvider implements ChemCompProvider {
     private static final Logger logger = LoggerFactory.getLogger(DownloadChemCompProvider.class);
 
     public static final String CHEM_COMP_CACHE_DIRECTORY = "chemcomp";
-    public static final String DEFAULT_SERVER_URL = "http://files.rcsb.org/ligands/download/";
+    public static final String DEFAULT_SERVER_URL = "https://files.rcsb.org/ligands/download/";
     public static String serverBaseUrl = DEFAULT_SERVER_URL;
     /**
      * Use default RCSB server layout (true) or internal RCSB server layout (false)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index 2db30b046f..ced338dc1f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -43,7 +43,7 @@
 
 /**
  * Superclass for classes which download and interact with the PDB's FTP server,
- * specifically {@link PDBFileReader} and {@link MMCIFFileReader}. The basic
+ * specifically {@link PDBFileReader} and {@link CifFileReader}. The basic
  * functionality of downloading structure files from the FTP site is gathered
  * here, making the child classes responsible for only the specific paths and
  * file formats needed.
@@ -56,11 +56,11 @@ public abstract class LocalPDBDirectory implements StructureIOFile {
 	private static final Logger logger = LoggerFactory.getLogger(LocalPDBDirectory.class);
 
 	/**
-	 * The default server name, prefixed by the protocol string (http:// or ftp://).
+	 * The default server name, prefixed by the protocol string (http://, https:// or ftp://).
 	 * Note that we don't support file stamp retrieving for ftp protocol, thus some of the
 	 * fetch modes will not work properly with ftp protocol
 	 */
-	public static final String DEFAULT_PDB_FILE_SERVER = "http://ftp.wwpdb.org";
+	public static final String DEFAULT_PDB_FILE_SERVER = "https://ftp.wwpdb.org";
 	public static final String PDB_FILE_SERVER_PROPERTY = "PDB.FILE.SERVER";
 
 	/**
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestURLBasedFileParsing.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestURLBasedFileParsing.java
index 0d07e77c6e..2adb5ab358 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestURLBasedFileParsing.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestURLBasedFileParsing.java
@@ -37,7 +37,7 @@ public class TestURLBasedFileParsing {
 	@Test
 	public void testMMcifURL() throws StructureException, IOException{
 
-		String u = "http://ftp.wwpdb.org/pub/pdb/data/biounit/mmCIF/divided/nw/4nwr-assembly1.cif.gz";
+		String u = "https://ftp.wwpdb.org/pub/pdb/data/biounit/mmCIF/divided/nw/4nwr-assembly1.cif.gz";
 
 		Structure s = StructureIO.getStructure(u);
 

From 44506d3d302e3c9dd2bdff59d9ca5b12fcd7493d Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 9 Jun 2021 16:11:46 -0700
Subject: [PATCH 081/599] Fixing test

---
 .../biojava/nbio/structure/TestDownloadChemCompProvider.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java
index 58d70f6b82..0e7dc3d6e0 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java
@@ -58,7 +58,7 @@ public void testWeDontCacheGarbage() {
 		DownloadChemCompProvider prov = new DownloadChemCompProvider();
 
 		// a fake URL that should give a 404
-		DownloadChemCompProvider.serverBaseUrl = "http://www.rcsb.org/non-existent-ligand-url/";
+		DownloadChemCompProvider.serverBaseUrl = "https://www.rcsb.org/non-existent-ligand-url/";
 
 		ChemComp cc = prov.getChemComp("HEM");
 

From 7b76f8f47a09dcdf52b93735f45617edf94f8125 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 9 Jun 2021 16:18:56 -0700
Subject: [PATCH 082/599] Another https test fix

---
 .../test/java/org/biojava/nbio/genome/TestGenomeMapping.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-genome/src/test/java/org/biojava/nbio/genome/TestGenomeMapping.java b/biojava-genome/src/test/java/org/biojava/nbio/genome/TestGenomeMapping.java
index 8a19d041e4..c8c20780f1 100644
--- a/biojava-genome/src/test/java/org/biojava/nbio/genome/TestGenomeMapping.java
+++ b/biojava-genome/src/test/java/org/biojava/nbio/genome/TestGenomeMapping.java
@@ -41,7 +41,7 @@
  */
 public class TestGenomeMapping {
 
-	private static final String geneChromosomeFile = "http://cdn.rcsb.org/gene/hg38/geneChromosome38.tsf.gz";
+	private static final String geneChromosomeFile = "https://cdn.rcsb.org/gene/hg38/geneChromosome38.tsf.gz";
 
 	private List<GeneChromosomePosition> gcps = null;
 

From 288c6b81372eb2ff167a9b9c71715597c3c805f9 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Thu, 17 Jun 2021 01:59:00 +0800
Subject: [PATCH 083/599] Fix #934 Several file and path issues on windows

MS Windows has file and path problems:
1- spaces are not handled well in URL. Converting it to a URI handles
decoding the path well.
2- TestURLIdentifier fails because when the connection is to a file and
it contains parameters (e.g. ?format=PDB), they are perceived as part of
the file name. getting the path first fixes it.
3- TestMmtfStructureReader and TestMmtfStructureWriter fail because Path
does not handle drive specifier (e.g. C:) well, while File does.
---
 .../org/biojava/nbio/core/util/InputStreamProvider.java  | 9 +++++++++
 .../nbio/structure/io/mmtf/TestMmtfStructureReader.java  | 8 +++-----
 .../nbio/structure/io/mmtf/TestMmtfStructureWriter.java  | 3 +--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java
index f129dedb0b..f5977407e4 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java
@@ -23,6 +23,7 @@
 package org.biojava.nbio.core.util;
 
 import java.io.*;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.jar.JarEntry;
@@ -117,6 +118,14 @@ private int getMagicNumber(InputStream in)
 
 	public InputStream getInputStream(URL u)
 	throws IOException{
+		
+		if (u.getProtocol().equals("file")) {
+			try {
+				return getInputStream(new File(u.toURI().getPath()));
+			} catch (URISyntaxException e) {
+				throw new RuntimeException(e);
+			}
+		}
 
 		int magic = 0;
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java
index 095deecb64..3f6630dbac 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureReader.java
@@ -2,8 +2,8 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.io.File;
 import java.io.IOException;
-import java.nio.file.Paths;
 import java.util.List;
 
 import org.biojava.nbio.structure.Group;
@@ -39,8 +39,7 @@ public void testRead() throws IOException {
 		String resource = "org/biojava/nbio/structure/io/mmtf/4CUP.mmtf";
 
 		// Load the structure into memory
-		Structure structure = MmtfActions.readFromFile((
-				Paths.get(classLoader.getResource(resource).getPath())));
+		Structure structure = MmtfActions.readFromFile(new File(classLoader.getResource(resource).getPath()).toPath());
 
 		// Check header properties of the structure
 		assertEquals(structure.getPDBCode(), "4CUP");
@@ -61,8 +60,7 @@ public void compareMmcif() throws IOException, StructureException {
 		String resource = "org/biojava/nbio/structure/io/mmtf/4CUP";
 
 		// Load the structures into memory
-		Structure mmtf = MmtfActions.readFromFile((
-				Paths.get(classLoader.getResource(resource + ".mmtf").getPath())));
+		Structure mmtf = MmtfActions.readFromFile(new File(classLoader.getResource(resource + ".mmtf").getPath()).toPath());
 		Structure mmcif = StructureIO.getStructure(classLoader.getResource(resource + ".cif").getPath());
 
 		// Compare the dates of the structure
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureWriter.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureWriter.java
index efc9929916..2e9e55df92 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureWriter.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfStructureWriter.java
@@ -22,7 +22,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 
 import org.biojava.nbio.structure.AminoAcidImpl;
@@ -66,7 +65,7 @@ public class TestMmtfStructureWriter {
 	@Test
 	public void testRead() throws IOException {
 		ClassLoader classLoader = getClass().getClassLoader();
-		Structure structure = MmtfActions.readFromFile((Paths.get(classLoader.getResource("org/biojava/nbio/structure/io/mmtf/4CUP.mmtf").getPath())));
+		Structure structure = MmtfActions.readFromFile(new File(classLoader.getResource("org/biojava/nbio/structure/io/mmtf/4CUP.mmtf").getPath()).toPath());
 		assertEquals(structure.getPDBCode(),"4CUP");
 		assertEquals(structure.getChains().size(),6);
 	}

From 0a66b4ec102ec61b637d5892c9cedca092c6714d Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Thu, 17 Jun 2021 01:30:15 +0800
Subject: [PATCH 084/599] Fix #933 URLConnection to invalid HTTP URL is not
 detected as failure

When the httpConnection is invalid, the application does not detect it,
and it saves an empty (precisely a 20 bytes) file.
This fix detects when the connection is invalid or the file has no
contents.
Related to #703
---
 .../nbio/structure/chem/DownloadChemCompProvider.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
index efbfb47810..7e17d37d82 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -14,7 +14,6 @@
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -320,8 +319,13 @@ private static boolean downloadChemCompRecord(String recordName) {
             try (PrintWriter pw = new PrintWriter(new GZIPOutputStream(new FileOutputStream(newFile)));
                  BufferedReader fileBuffer = new BufferedReader(new InputStreamReader(uconn.getInputStream()))) {
                 String line;
+                boolean success = false;
                 while ((line = fileBuffer.readLine()) != null) {
                     pw.println(line);
+                    success = true;
+                }
+                if(!success) {
+                	throw new IOException("Could not read from URL "+url.toString());
                 }
 
                 pw.flush();

From 75b69fd5f28ccf6ee5dff2b373cb68d067328e42 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Thu, 17 Jun 2021 00:12:28 +0800
Subject: [PATCH 085/599] Fix #932 NullPointerException when parsing 3FDJ
 COMPND records

The problem is because a colon (:) is present in the first token and it
was not properly handled.
---
 .../nbio/structure/io/PDBFileParser.java      | 26 +++++++++----------
 .../nbio/structure/SourceCompoundTest.java    | 12 +++++++++
 .../src/test/resources/1hhbCMPND+SRC.ent      | 18 +++++++++++++
 .../src/test/resources/3fdjCMPND+SRC.ent      | 24 +++++++++++++++++
 4 files changed, 67 insertions(+), 13 deletions(-)
 create mode 100644 biojava-structure/src/test/resources/1hhbCMPND+SRC.ent
 create mode 100644 biojava-structure/src/test/resources/3fdjCMPND+SRC.ent

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index a1f16e27b6..a6fdcd1a9d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -931,26 +931,26 @@ private void pdb_COMPND_Handler(String line) {
 
 		String[] fieldList = line.trim().split("\\s+");
 		int fl = fieldList.length;
-		if ((fl >0 ) && compndFieldValues.contains(fieldList[0])) {
-
-			continuationField = fieldList[0];
-			if (previousContinuationField.equals("")) {
-				previousContinuationField = continuationField;
-			}
-
-		} else if (fl>0) {
-			// the ':' character indicates the end of a field name and should be invalid as part the first data token
-			// e.g. obsolete file 1hhb has a malformed COMPND line that can only be caught with this kind of check
-			if (fieldList[0].contains(":") ) {
+		if (fl > 0) {
+			String field0 = fieldList[0];
+			if (compndFieldValues.contains(field0)) {
+				continuationField = field0;
+				if (previousContinuationField.equals("")) {
+					previousContinuationField = continuationField;
+				}
+			} else if (field0.endsWith(";") && compndFieldValues.contains(field0.substring(0, field0.length()-1)) ) {
+				// the ':' character indicates the end of a field name and should be invalid as part the first data token
+				// e.g. obsolete file 1hhb has a malformed COMPND line that can only be caught with this kind of check
+				// UPDATE: There is no harm of having a ':' in the first data token. e.g. 3fdj contains a ':'.
+				//   The intended case occurs only if the token is a key followed by a colon and a semicolon without spaces, e.g. "COMPND   2 MOLECULE:;"
 				logger.info("COMPND line does not follow the PDB 3.0 format. Note that COMPND parsing is not supported any longer in format 2.3 or earlier");
 				return;
 			}
-
 		} else {
-
 			// the line will be added as data to the previous field
 		}
 
+
 		line = line.replace(continuationField, "").trim();
 
 		StringTokenizer compndTokens = new StringTokenizer(line);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/SourceCompoundTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/SourceCompoundTest.java
index 6eea0e0437..cf026d41d2 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/SourceCompoundTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/SourceCompoundTest.java
@@ -26,6 +26,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
@@ -48,6 +51,15 @@ private Structure getStructure(String fileName){
 		return structure;
 	}
 
+	@Test
+	public void testCompoundColonInFirstToken() {
+		Structure s1 = getStructure("/1hhbCMPND+SRC.ent");
+		assertNotNull(s1);
+		assertEquals(2, s1.getEntityInfos().size());
+		Structure s2 = getStructure("/3fdjCMPND+SRC.ent");
+		assertNotNull(s2);
+		assertEquals(1, s2.getEntityInfos().size());
+	}
 
 	@Test
 	public void testCompoundSourceStructure(){
diff --git a/biojava-structure/src/test/resources/1hhbCMPND+SRC.ent b/biojava-structure/src/test/resources/1hhbCMPND+SRC.ent
new file mode 100644
index 0000000000..48e3079a36
--- /dev/null
+++ b/biojava-structure/src/test/resources/1hhbCMPND+SRC.ent
@@ -0,0 +1,18 @@
+HEADER    OXYGEN TRANSPORT                        01-APR-75   1HHB              
+OBSLTE     18-JUL-84 1HHB      2HHB 3HHB 4HHB                                   
+TITLE     THREE-DIMENSIONAL FOURIER SYNTHESIS OF HUMAN                          
+TITLE    2 DEOXYHEMOGLOBIN AT 2.5 ANGSTROMS RESOLUTION, $I.X-RAY                
+TITLE    3 ANALYSIS                                                             
+COMPND    MOL_ID: 1;                                                            
+COMPND   2 MOLECULE:;                                                           
+COMPND   3 CHAIN: A;                                                            
+COMPND   4 ENGINEERED: YES;                                                     
+COMPND   5 MOL_ID: 2;                                                           
+COMPND   6 MOLECULE:;                                                           
+COMPND   7 CHAIN: B;                                                            
+COMPND   8 ENGINEERED: YES                                                      
+SOURCE    MOL_ID: 1;                                                            
+SOURCE   2 MOL_ID: 2                                                            
+KEYWDS    OXYGEN TRANSPORT                                                      
+EXPDTA    X-RAY DIFFRACTION                                                     
+AUTHOR    G.FERMI,M.F.PERUTZ                                                    
diff --git a/biojava-structure/src/test/resources/3fdjCMPND+SRC.ent b/biojava-structure/src/test/resources/3fdjCMPND+SRC.ent
new file mode 100644
index 0000000000..0ced967ecc
--- /dev/null
+++ b/biojava-structure/src/test/resources/3fdjCMPND+SRC.ent
@@ -0,0 +1,24 @@
+HEADER    STRUCTURAL GENOMICS, UNKNOWN FUNCTION   25-NOV-08   3FDJ              
+TITLE     THE STRUCTURE OF A DEGV FAMILY PROTEIN FROM EUBACTERIUM ELIGENS.      
+COMPND    MOL_ID: 1;                                                            
+COMPND   2 MOLECULE: DEGV FAMILY PROTEIN;                                       
+COMPND   3 CHAIN: A;                                                            
+COMPND   4 ENGINEERED: YES;                                                     
+COMPND   5 OTHER_DETAILS: ASSEMBLY.20070618:0-0:0-0                             
+COMPND   6 (ZVNW5VJFOAACMF8NLOPRFTMWH60:01:1-275) GENE                          
+SOURCE    MOL_ID: 1;                                                            
+SOURCE   2 ORGANISM_SCIENTIFIC: EUBACTERIUM ELIGENS;                            
+SOURCE   3 ORGANISM_TAXID: 39485;                                               
+SOURCE   4 GENE: ASSEMBLY.20070618:0-0:0-0 (ZVNW5VJFOAACMF8NLOPRFTMWH60:01:1-   
+SOURCE   5 275);                                                                
+SOURCE   6 EXPRESSION_SYSTEM: ESCHERICHIA COLI;                                 
+SOURCE   7 EXPRESSION_SYSTEM_TAXID: 562;                                        
+SOURCE   8 EXPRESSION_SYSTEM_STRAIN: BL21(DE3);                                 
+SOURCE   9 EXPRESSION_SYSTEM_VECTOR_TYPE: PLASMID;                              
+SOURCE  10 EXPRESSION_SYSTEM_PLASMID: PMCSG19                                   
+KEYWDS    DEGV, GUT MICROBIOME, STRUCTURAL GENOMICS, PSI-2, PROTEIN STRUCTURE   
+KEYWDS   2 INITIATIVE, MIDWEST CENTER FOR STRUCTURAL GENOMICS, MCSG, UNKNOWN    
+KEYWDS   3 FUNCTION                                                             
+EXPDTA    X-RAY DIFFRACTION                                                     
+AUTHOR    M.E.CUFF,R.HENDRICKS,L.FREEMAN,A.JOACHIMIAK,MIDWEST CENTER FOR        
+AUTHOR   2 STRUCTURAL GENOMICS (MCSG)                                           

From 76063854258ceff246d451a976b67979a4f6f524 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Thu, 17 Jun 2021 07:24:36 +0800
Subject: [PATCH 086/599] Just update of the format I write my name

---
 .../src/main/java/org/biojava/nbio/structure/PDBStatus.java     | 2 +-
 .../src/main/java/org/biojava/nbio/structure/Site.java          | 2 +-
 .../main/java/org/biojava/nbio/structure/io/PDBFileParser.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
index dd69115c91..b09b65020c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
@@ -43,7 +43,7 @@
  * <p>
  *
  * @author Spencer Bliven
- * @author Amr AL-Hossary
+ * @author Amr ALHOSSARY
  * @author Jose Duarte
  * @since 3.0.2
  */
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Site.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Site.java
index 3e1464cc2a..306b3a2cee 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Site.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Site.java
@@ -33,7 +33,7 @@
 	SITE     2 AC2 10 HIS D  37  ALA D  39  THR D 152  LEU D 153
 	SITE     3 AC2 10 SER D 154  GOL D 172
 	</pre>
- * @author Amr AL-Hossary
+ * @author Amr ALHOSSARY
  * @author Jules Jacobsen
  */
 public class Site implements PDBRecord, Comparable<Site> {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index a6fdcd1a9d..cdccfd2e91 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -2352,7 +2352,7 @@ private void pdb_LINK_Handler(String line) {
 	 * SITE     3 AC4 11 HOH A 572 HOH A  582  HOH A 635
 	 * </pre>
 	 * @param line the SITE line record being currently read
-	 * @author Amr AL-Hossary
+	 * @author Amr ALHOSSARY
 	 * @author Jules Jacobsen
 	 */
 	private void pdb_SITE_Handler(String line){

From c83ece275f53c3f48737f37e9fe6c37c030ca579 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 17 Jun 2021 09:32:55 -0700
Subject: [PATCH 087/599] Fix and test for issue #931

---
 .../nbio/structure/io/EntityFinder.java       |  52 +++++++-----------
 .../structure/io/TestNonDepositedFiles.java   |  26 +++++++++
 .../nbio/structure/io/3zyb_truncated.pdb.gz   | Bin 0 -> 8163 bytes
 3 files changed, 47 insertions(+), 31 deletions(-)
 create mode 100644 biojava-structure/src/test/resources/org/biojava/nbio/structure/io/3zyb_truncated.pdb.gz

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java
index c77f28d1a7..43b853f723 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java
@@ -238,39 +238,34 @@ private static boolean areResNumbersAligned(Chain c1, Chain c2) {
 
 	private static TreeMap<String,EntityInfo> findEntitiesFromAlignment(List<List<Chain>> polyModels) {
 
-
-
-		TreeMap<String, EntityInfo> chainIds2entities = new TreeMap<String,EntityInfo>();
+		TreeMap<String, EntityInfo> chainIds2entities = new TreeMap<>();
 
 		if (polyModels.isEmpty()) return chainIds2entities;
 
-		Set<Integer> polyChainIndices = new TreeSet<Integer>();
+		Set<Integer> polyChainIndices = new TreeSet<>();
 		for (int i=0;i<polyModels.get(0).size();i++) {
 			polyChainIndices.add(i);
 		}
 
-
 		int molId = 1;
 
 		outer:
 			for (int i:polyChainIndices) {
+				Chain c1 = polyModels.get(0).get(i);
+				// here we use false, which means that X will be used for unknown compounds
+				String str1 = SeqRes2AtomAligner.getFullAtomSequence(c1.getAtomGroups(), new HashMap<>(), false);
+
 				for (int j:polyChainIndices) {
 
 					if (j<=i) continue;
 
-					Chain c1 = polyModels.get(0).get(i);
 					Chain c2 = polyModels.get(0).get(j);
-
-					Map<Integer,Integer> positionIndex1 = new HashMap<Integer, Integer>();
-					Map<Integer,Integer> positionIndex2 = new HashMap<Integer, Integer>();
-					// here we use false, which means that X will be used for unknown compounds
-					String str1 = SeqRes2AtomAligner.getFullAtomSequence(c1.getAtomGroups(), positionIndex1, false);
-					String str2 = SeqRes2AtomAligner.getFullAtomSequence(c2.getAtomGroups(), positionIndex2, false);
+					String str2 = SeqRes2AtomAligner.getFullAtomSequence(c2.getAtomGroups(), new HashMap<>(), false);
 
 					int seq1Length = 0;
 					int seq2Length = 0;
 
-					SequencePair<?,?> pair = null;
+					SequencePair<?,?> pair;
 					if (isProteinSequence(str1) && isProteinSequence(str2)) {
 						ProteinSequence s1 = getProteinSequence(str1);
 						ProteinSequence s2 = getProteinSequence(str2);
@@ -296,11 +291,10 @@ private static TreeMap<String,EntityInfo> findEntitiesFromAlignment(List<List<Ch
 						pair = alignRNA(s1,s2);
 
 					} else {
-						logger.debug("Chains {},{} are either different kind of polymers or could not be recognized as protein or nucleotide polymers");
+						logger.debug("Chains {},{} are either different kind of polymers or could not be recognized as protein or nucleotide polymers", c1.getId(), c2.getId());
 						continue;
 					}
 
-
 					int numGaps = getNumGaps(pair);
 					int numGaps1 = getNumGapsQuery(pair);
 					int numGaps2 = getNumGapsTarget(pair);
@@ -318,7 +312,7 @@ private static TreeMap<String,EntityInfo> findEntitiesFromAlignment(List<List<Ch
 					if (identity > IDENTITY_THRESHOLD && gapCov1<GAP_COVERAGE_THRESHOLD && gapCov2<GAP_COVERAGE_THRESHOLD) {
 						if (	!chainIds2entities.containsKey(c1.getId()) &&
 								!chainIds2entities.containsKey(c2.getId())) {
-							logger.debug("Creating Compound with chains {},{}",c1.getId(),c2.getId());
+							logger.debug("Creating entity with chains {},{}",c1.getId(),c2.getId());
 
 							EntityInfo ent = new EntityInfo();
 							ent.addChain(c1);
@@ -330,27 +324,24 @@ private static TreeMap<String,EntityInfo> findEntitiesFromAlignment(List<List<Ch
 							chainIds2entities.put(c1.getId(), ent);
 							chainIds2entities.put(c2.getId(), ent);
 
-
 						} else {
+							Chain chainToAdd;
 							EntityInfo ent = chainIds2entities.get(c1.getId());
-
 							if (ent==null) {
-								logger.debug("Adding chain {} to entity {}",c1.getId(),c2.getId());
 								ent = chainIds2entities.get(c2.getId());
-								ent.addChain(c1);
-								c1.setEntityInfo(ent);
-								chainIds2entities.put(c1.getId(), ent);
-
+								chainToAdd = c1;
 							} else {
-								logger.debug("Adding chain {} to entity {}",c2.getId(),c1.getId());
-								ent.addChain(c2);
-								c2.setEntityInfo(ent);
-								chainIds2entities.put(c2.getId(), ent);
-
+								chainToAdd = c2;
+							}
+							if (!chainIds2entities.containsKey(chainToAdd.getId())) {
+								logger.debug("Adding chain {} to entity {}", chainToAdd.getId(), ent.getId());
+								ent.addChain(chainToAdd);
+								chainToAdd.setEntityInfo(ent);
+								chainIds2entities.put(chainToAdd.getId(), ent);
 							}
 						}
 						if (!areResNumbersAligned(c1, c2)) {
-							logger.warn("Including 100% identical chains {},{} in same Compound, although they have misaligned residue numbers",
+							logger.warn("Including 100% identical chains {},{} in same entity, although they have misaligned residue numbers",
 									c1.getId(),c2.getId());
 						}
 					}
@@ -370,7 +361,7 @@ private static TreeMap<String,EntityInfo> findEntitiesFromAlignment(List<List<Ch
 		for (int i:polyChainIndices) {
 			Chain c = polyModels.get(0).get(i);
 			if (!chainIds2entities.containsKey(c.getId())) {
-				logger.debug("Creating a 1-member Compound for chain {}",c.getId());
+				logger.debug("Creating a 1-member entity for chain {}",c.getId());
 
 				EntityInfo ent = new EntityInfo();
 				ent.addChain(c);
@@ -392,7 +383,6 @@ private static TreeMap<String,EntityInfo> findEntitiesFromAlignment(List<List<Ch
 			}
 		}
 
-
 		return chainIds2entities;
 	}
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
index a04deda47d..daad3f9504 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
@@ -300,6 +300,32 @@ public void testRefmacPdbFile() throws IOException {
 
 	}
 
+	/**
+	 * Making sure we find the right number of entities and that chains are assigned to entities correctly.
+	 * See https://github.com/biojava/biojava/issues/931
+	 */
+	@Test
+	public void testIssue931() throws IOException {
+		InputStream inStream = new GZIPInputStream(this.getClass().getResourceAsStream("/org/biojava/nbio/structure/io/3zyb_truncated.pdb.gz"));
+		PDBFileParser pdbpars = new PDBFileParser();
+		FileParsingParameters params = new FileParsingParameters();
+		params.setAlignSeqRes(true);
+		pdbpars.setFileParsingParameters(params);
+		Structure s = pdbpars.parsePDBFile(inStream);
+
+		assertEquals(2, s.getEntityInfos().size());
+		assertEquals(4, s.getEntityById(1).getChains().size());
+		assertEquals(3, s.getEntityById(2).getChains().size());
+
+		assertSame(s.getEntityById(1), s.getPolyChains().get(0).getEntityInfo());
+		assertSame(s.getEntityById(1), s.getPolyChains().get(1).getEntityInfo());
+		assertSame(s.getEntityById(1), s.getPolyChains().get(2).getEntityInfo());
+		assertSame(s.getEntityById(1), s.getPolyChains().get(3).getEntityInfo());
+		assertSame(s.getEntityById(2), s.getPolyChains().get(4).getEntityInfo());
+		assertSame(s.getEntityById(2), s.getPolyChains().get(5).getEntityInfo());
+		assertSame(s.getEntityById(2), s.getPolyChains().get(6).getEntityInfo());
+	}
+
 	/**
 	 * This test represents a common situation for a non-deposited structure.
 	 * When building with common crystallography software, the user often adds new
diff --git a/biojava-structure/src/test/resources/org/biojava/nbio/structure/io/3zyb_truncated.pdb.gz b/biojava-structure/src/test/resources/org/biojava/nbio/structure/io/3zyb_truncated.pdb.gz
new file mode 100644
index 0000000000000000000000000000000000000000..530cc4ca5c5c48824a0495a92bd68a7c8bb963aa
GIT binary patch
literal 8163
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
I2%w_+AL<_xhX4Qo

literal 0
HcmV?d00001


From 2eaa8a9ebc0f75a2542f874865f597908d5ebcbd Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 17 Jun 2021 09:52:22 -0700
Subject: [PATCH 088/599] Cosmetics

---
 .../biojava/nbio/structure/io/EntityFinder.java  | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java
index 43b853f723..96d52edee1 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java
@@ -43,7 +43,6 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -91,9 +90,7 @@ public class EntityFinder {
 	public static List<EntityInfo> findPolyEntities(List<List<Chain>> polyModels) {
 		TreeMap<String,EntityInfo> chainIds2entities = findEntitiesFromAlignment(polyModels);
 
-		List<EntityInfo> entities = findUniqueEntities(chainIds2entities);
-
-		return entities;
+		return findUniqueEntities(chainIds2entities);
 	}
 
 	/**
@@ -102,7 +99,7 @@ public static List<EntityInfo> findPolyEntities(List<List<Chain>> polyModels) {
 	 */
 	private static List<EntityInfo> findUniqueEntities(TreeMap<String,EntityInfo> chainIds2entities) {
 
-		List<EntityInfo> list = new ArrayList<EntityInfo>();
+		List<EntityInfo> list = new ArrayList<>();
 
 		for (EntityInfo cluster:chainIds2entities.values()) {
 			boolean present = false;
@@ -131,12 +128,7 @@ public static void createPurelyNonPolyEntities(List<List<Chain>> nonPolyModels,
 		// let's find first the max entity id to assign entity ids to the newly found entities
 		int maxMolId = 0;
 		if (!entities.isEmpty()) {
-			maxMolId = Collections.max(entities, new Comparator<EntityInfo>() {
-				@Override
-				public int compare(EntityInfo o1, EntityInfo o2) {
-					return new Integer(o1.getMolId()).compareTo(o2.getMolId());
-				}
-			}).getMolId();
+			maxMolId = Collections.max(entities, Comparator.comparingInt(EntityInfo::getMolId)).getMolId();
 		}
 		// we go one over the max
 		int molId = maxMolId + 1;
@@ -181,7 +173,6 @@ public int compare(EntityInfo o1, EntityInfo o2) {
 
 		}
 
-
 	}
 
 	private static EntityInfo findNonPolyEntityWithDescription(String description, List<EntityInfo> nonPolyEntities) {
@@ -221,7 +212,6 @@ private static boolean areResNumbersAligned(Chain c1, Chain c2) {
 			} catch (StructureException e) {
 				// the group doesn't exist (no density) in the chain, go on
 				countNonExisting++;
-				continue;
 			}
 		}
 

From 95dd0d2c96d2cc99f0c545a36435707e578d6ea1 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Fri, 18 Jun 2021 06:38:13 +0800
Subject: [PATCH 089/599] More specific error message

---
 .../biojava/nbio/structure/chem/DownloadChemCompProvider.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
index 7e17d37d82..7d889bf687 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -325,7 +325,7 @@ private static boolean downloadChemCompRecord(String recordName) {
                     success = true;
                 }
                 if(!success) {
-                	throw new IOException("Could not read from URL "+url.toString());
+                	throw new IOException("Malformed URL or no content found in "+url.toString());
                 }
 
                 pw.flush();

From f1f2b4fb44f69b59de8e3eacc46c9c31b318fb8b Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 18 Jun 2021 14:30:40 -0700
Subject: [PATCH 090/599] Dummy commit, to trigger travis

---
 .../biojava/nbio/structure/align/BioJavaStructureAlignment.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/BioJavaStructureAlignment.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/BioJavaStructureAlignment.java
index d0be76dfd8..b8f3d918cb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/BioJavaStructureAlignment.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/BioJavaStructureAlignment.java
@@ -105,8 +105,6 @@ public AFPChain align(Atom[] ca1, Atom[] ca2, Object params)
 			AlternativeAlignment altAlig = aligs[0];
 			// copy the results over!
 			copyResults(afpChain,altAlig,ca1,ca2);
-
-
 		}
 
 		return afpChain;

From 8c9ce2c38f09e83f23e8842478b7fabecf66b2b0 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 18 Jun 2021 15:00:06 -0700
Subject: [PATCH 091/599] Trigger status checks


From c804c4105c53e9e62d69cb973408b096587e3d80 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 18 Jun 2021 15:11:02 -0700
Subject: [PATCH 092/599] Trigger build - travis test


From cea40edea5bd523f7513adccb92f105a76a8a75f Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Thu, 24 Jun 2021 13:12:07 +0800
Subject: [PATCH 093/599] Trigger Build


From 293eebaa4d3dfbf54e3a60962829da30daee9c8e Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Thu, 24 Jun 2021 13:13:57 +0800
Subject: [PATCH 094/599] Trigger Build


From 1d20e26be02700cd7904976f7475b978551bdc95 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Thu, 24 Jun 2021 13:14:16 +0800
Subject: [PATCH 095/599] Trigger Build


From 16e80ea24d55859422d1bc34d558e0259517d6a8 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Fri, 25 Jun 2021 07:47:08 +0800
Subject: [PATCH 096/599] Relocating test files to proper place

---
 .../java/org/biojava/nbio/structure/SourceCompoundTest.java   | 4 ++--
 .../{ => org/biojava/nbio/structure/io}/1hhbCMPND+SRC.ent     | 0
 .../{ => org/biojava/nbio/structure/io}/3fdjCMPND+SRC.ent     | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename biojava-structure/src/test/resources/{ => org/biojava/nbio/structure/io}/1hhbCMPND+SRC.ent (100%)
 rename biojava-structure/src/test/resources/{ => org/biojava/nbio/structure/io}/3fdjCMPND+SRC.ent (100%)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/SourceCompoundTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/SourceCompoundTest.java
index cf026d41d2..68c95ec460 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/SourceCompoundTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/SourceCompoundTest.java
@@ -53,10 +53,10 @@ private Structure getStructure(String fileName){
 
 	@Test
 	public void testCompoundColonInFirstToken() {
-		Structure s1 = getStructure("/1hhbCMPND+SRC.ent");
+		Structure s1 = getStructure("/org/biojava/nbio/structure/io/1hhbCMPND+SRC.ent");
 		assertNotNull(s1);
 		assertEquals(2, s1.getEntityInfos().size());
-		Structure s2 = getStructure("/3fdjCMPND+SRC.ent");
+		Structure s2 = getStructure("/org/biojava/nbio/structure/io/3fdjCMPND+SRC.ent");
 		assertNotNull(s2);
 		assertEquals(1, s2.getEntityInfos().size());
 	}
diff --git a/biojava-structure/src/test/resources/1hhbCMPND+SRC.ent b/biojava-structure/src/test/resources/org/biojava/nbio/structure/io/1hhbCMPND+SRC.ent
similarity index 100%
rename from biojava-structure/src/test/resources/1hhbCMPND+SRC.ent
rename to biojava-structure/src/test/resources/org/biojava/nbio/structure/io/1hhbCMPND+SRC.ent
diff --git a/biojava-structure/src/test/resources/3fdjCMPND+SRC.ent b/biojava-structure/src/test/resources/org/biojava/nbio/structure/io/3fdjCMPND+SRC.ent
similarity index 100%
rename from biojava-structure/src/test/resources/3fdjCMPND+SRC.ent
rename to biojava-structure/src/test/resources/org/biojava/nbio/structure/io/3fdjCMPND+SRC.ent

From dc00a25fc935abb75aa219b7828359761225b8f8 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 25 Jun 2021 09:35:51 -0700
Subject: [PATCH 097/599] Another removal for 6.0.0

---
 CHANGELOG.md                                  |   1 +
 .../io/SandboxStyleStructureProvider.java     | 207 ------------------
 2 files changed, 1 insertion(+), 207 deletions(-)
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/io/SandboxStyleStructureProvider.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 748154949c..82bee86d6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ BioJava 6.0.0 (future release)
 * Removed from `org.biojava.nbio.structure.Chain` interface: `getParent()`, `setParent()`, `getAtomLigands()`, `getSwissprotId()`, `setSwissprotId()`, `getInternalChainID()`, `setInternalChainID()`, `getChainID()`, `setChainID()`
 * Removed from `org.biojava.nbio.structure.Structure` interface: `findChain()`, `getId()`, `setId()`, `getChainByPDB()`, `getCompoundById()`, `getResidueRanges()`, `getRanges()`
 * Removed from `org.biojava.nbio.structure.StructureTools` : `isNucleicAcid()`, `isProtein()`, `getPredominantGroupType()`, `isChainWaterOnly()`, `isChainPureNonPolymer()`
+* Removed `org.biojava.nbio.structure.io.SandboxStyleStructureProvider`
 
 ### Breaking API changes
 * Extracted `StructureIO.StructureFiletype` enum to `org.biojava.nbio.structure.io.StructureFiletype` (supports `PDB`, `MMTF`, `CIF`, and `BCIF`)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SandboxStyleStructureProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SandboxStyleStructureProvider.java
deleted file mode 100644
index 6dc3b9a1f0..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SandboxStyleStructureProvider.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io;
-
-import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.core.util.InputStreamProvider;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/** The "Sandbox" style of organizing files is  to have a directory structure like below, i.e. the files are organized into
- * <ul>
- * 	<li>directory with two characters, based on the two middle characters of a PDB ID</li>
- * 	<li>directory of PDB ID</li>
- * 	<li>several files that are available for this PDB ID</li>
- * </ul>
- *
- * <pre>
-a1/2a1v/2a1v.cif.gz
-a1/2a1v/2a1v.dssp.gz
-a1/2a1v/2a1v.pdb-250.jpg.gz
-a1/2a1v/2a1v.pdb-500.jpg.gz
-a1/2a1v/2a1v.pdb-65.jpg.gz
-a1/2a1v/2a1v.pdb-80.jpg.gz
-a1/2a1v/2a1v.pdb1-250.jpg.gz
-a1/2a1v/2a1v.pdb1-500.jpg.gz
-a1/2a1v/2a1v.pdb1-65.jpg.gz
-a1/2a1v/2a1v.pdb1-80.jpg.gz
-a1/2a1v/2a1v.pdb1.gz
-a1/2a1v/2a1v.stride.gz
-a1/2a1v/2a1v.xml.gz
-a1/2a1v/pdb2a1v.ent.gz
-a1/2a1v/r2a1vsf.ent.gz
-a1/2a1w/2a1w-deriv.cif.gz
-a1/2a1w/2a1w-extatom.xml.gz
-a1/2a1w/2a1w-noatom.xml.gz
-a1/2a1w/2a1w.cif.gz
-a1/2a1w/2a1w.dssp.gz
-a1/2a1w/2a1w.pdb-250.jpg.gz
-a1/2a1w/2a1w.pdb-500.jpg.gz
-a1/2a1w/2a1w.pdb-65.jpg.gz
-a1/2a1w/2a1w.pdb-80.jpg.gz
-a1/2a1w/2a1w.pdb1-250.jpg.gz
-a1/2a1w/2a1w.pdb1-500.jpg.gz
-a1/2a1w/2a1w.pdb1-65.jpg.gz
-a1/2a1w/2a1w.pdb1-80.jpg.gz
-a1/2a1w/2a1w.pdb1.gz
-a1/2a1w/2a1w.pdb2-250.jpg.gz
-a1/2a1w/2a1w.pdb2-500.jpg.gz
-a1/2a1w/2a1w.pdb2-65.jpg.gz
-a1/2a1w/2a1w.pdb2-80.jpg.gz
-a1/2a1w/2a1w.pdb2.gz
-a1/2a1w/2a1w.pdb3-250.jpg.gz
-a1/2a1w/2a1w.pdb3-500.jpg.gz
-a1/2a1w/2a1w.pdb3-65.jpg.gz
-a1/2a1w/2a1w.pdb3-80.jpg.gz
-a1/2a1w/2a1w.pdb3.gz
-a1/2a1w/2a1w.pdb4-250.jpg.gz
-a1/2a1w/2a1w.pdb4-500.jpg.gz
-a1/2a1w/2a1w.pdb4-65.jpg.gz
-a1/2a1w/2a1w.pdb4-80.jpg.gz
-a1/2a1w/2a1w.pdb4.gz
-a1/2a1w/2a1w.pdb5-250.jpg.gz
-a1/2a1w/2a1w.pdb5-500.jpg.gz
-a1/2a1w/2a1w.pdb5-65.jpg.gz
-a1/2a1w/2a1w.pdb5-80.jpg.gz
-a1/2a1w/2a1w.pdb5.gz
-a1/2a1w/2a1w.pdb6-250.jpg.gz
-a1/2a1w/2a1w.pdb6-500.jpg.gz
-a1/2a1w/2a1w.pdb6-65.jpg.gz
-a1/2a1w/2a1w.pdb6-80.jpg.gz
-a1/2a1w/2a1w.pdb6.gz
-a1/2a1w/2a1w.stride.gz
-a1/2a1w/2a1w.xml.gz
-a1/2a1w/pdb2a1w.ent.gz
-a1/2a1w/r2a1wsf.ent.gz
-a1/2a1x/2a1x-deriv.cif.gz
-a1/2a1x/2a1x-extatom.xml.gz
-a1/2a1x/2a1x-noatom.xml.gz
-</pre>
- *
- *
- * @author Andreas Prlic
- *
- *
- *@ since3.2
- */
-public class SandboxStyleStructureProvider implements StructureProvider {
-	FileParsingParameters params ;
-
-	String path;
-	public static final String fileSeparator = System.getProperty("file.separator");
-
-	public SandboxStyleStructureProvider() {
-		params = new FileParsingParameters();
-
-		UserConfiguration config = new UserConfiguration();
-
-		setPath(config.getPdbFilePath());
-	}
-
-	/** directory where to find PDB files */
-	public void setPath(String p){
-
-		path = p ;
-
-		if ( ! (path.endsWith(fileSeparator) ) )
-			path = path + fileSeparator;
-
-	}
-
-	@Override
-	public Structure getStructureById(String pdbId) throws IOException,StructureException {
-
-
-		if (pdbId == null || pdbId.length()< 4)
-			throw new StructureException("This does not look like a valid PDB ID! (" + pdbId + ")");
-
-		pdbId = pdbId.toLowerCase();
-
-		String middle = pdbId.substring(1,3).toLowerCase();
-
-		File f = new File(path + fileSeparator + middle + fileSeparator + pdbId  + fileSeparator + "pdb" + pdbId + ".ent.gz");
-
-		if (! f.exists()){
-
-		}
-
-
-		InputStreamProvider isp = new InputStreamProvider();
-
-		InputStream inputStream = isp.getInputStream(f);
-		PDBFileParser pdbpars = new PDBFileParser();
-		pdbpars.setFileParsingParameters(params);
-
-		Structure struc = pdbpars.parsePDBFile(inputStream) ;
-		return struc ;
-
-		// something is wrong with the file!
-		// it probably should be downloaded again...
-		// TODO: add auto-download functionality...
-	}
-
-	@Override
-	public void setFileParsingParameters(FileParsingParameters params) {
-		this.params = params;
-	}
-
-	@Override
-	public FileParsingParameters getFileParsingParameters() {
-		return params;
-	}
-
-	/** Returns a list of all PDB IDs that are available in this installation
-	 *
-	 * @return a list of PDB IDs
-	 */
-	public List<String> getAllPDBIDs() throws IOException{
-
-		File f = new File(path);
-		if ( ! f.isDirectory())
-			throw new IOException("Path " + path + " is not a directory!");
-
-		String[] dirName = f.list();
-
-		List<String>pdbIds = new ArrayList<String>();
-		for (String dir : dirName) {
-			File d2= new File(f,dir);
-			if ( ! d2.isDirectory())
-				continue;
-
-			String[] pdbDirs = d2.list();
-			for (String pdbId : pdbDirs) {
-				if ( ! pdbIds.contains(pdbId))
-					pdbIds.add(pdbId);
-
-			}
-		}
-
-		return pdbIds;
-	}
-
-}

From afdb8379821a5e708543ff4d7989fd33a66683ab Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 25 Jun 2021 10:02:02 -0700
Subject: [PATCH 098/599] Cosmetics

---
 .../nbio/structure/align/ce/CECalculator.java |  4 +-
 .../align/ce/CeCalculatorEnhanced.java        |  5 +-
 .../align/ce/OptimalCECPParameters.java       |  3 +-
 .../structure/align/ce/StartupParameters.java |  5 +-
 .../nbio/structure/align/client/PdbPair.java  |  5 +-
 .../align/fatcat/calc/AFPCalculator.java      |  7 +-
 .../align/fatcat/calc/FCAlignHelper.java      | 57 +++++------
 .../align/fatcat/calc/FatCatAligner.java      |  3 +-
 .../calc/StructureAlignmentOptimizer.java     | 50 +++++-----
 .../nbio/structure/align/model/AFP.java       | 31 +++---
 .../structure/align/model/AfpChainWriter.java | 21 +---
 .../align/xml/RepresentativeXMLConverter.java | 99 -------------------
 12 files changed, 84 insertions(+), 206 deletions(-)
 delete mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/RepresentativeXMLConverter.java

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java
index 2fb8b1184d..7e88bcb0b2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java
@@ -48,7 +48,8 @@
 
 
 
-/** This is based on the original Combinatorial Extension (CE) source code from 2003 or 2004 (CE version 2.3),
+/**
+ * This is based on the original Combinatorial Extension (CE) source code from 2003 or 2004 (CE version 2.3),
  * as has been originally developed by I. Shindyalov and P.Bourne (1998).
  * The original CE paper is available from here: <a href="http://peds.oxfordjournals.org/cgi/content/short/11/9/739">http://peds.oxfordjournals.org/cgi/content/short/11/9/739</a>.
  *
@@ -56,7 +57,6 @@
  * and not about Java style.
  *
  * @author Andreas Prlic
-
  *
  */
 public class CECalculator {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java
index 940111d3c8..05db803cf0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java
@@ -43,7 +43,8 @@
 
 
 
-/** This is based on the original Combinatorial Extension (CE) source code from 2003 or 2004 (CE version 2.3),
+/**
+ * This is based on the original Combinatorial Extension (CE) source code from 2003 or 2004 (CE version 2.3),
  * as has been originally developed by I. Shindyalov and P.Bourne (1998).
  * The original CE paper is available from here: <a href="http://peds.oxfordjournals.org/cgi/content/short/11/9/739">http://peds.oxfordjournals.org/cgi/content/short/11/9/739</a>.
  *
@@ -52,8 +53,6 @@
  *
  * @author Spencer Bliven
  * @author Andreas Prlic
- *
-
  *
  */
 public class CeCalculatorEnhanced {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/OptimalCECPParameters.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/OptimalCECPParameters.java
index 52b47b5efd..8b2924575a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/OptimalCECPParameters.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/OptimalCECPParameters.java
@@ -26,7 +26,8 @@
 
 import java.util.List;
 
-/** Contains the parameters that can be sent to CE
+/**
+ * Contains the parameters that can be sent to CE
  *
  * @author Andreas Prlic
  *
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/StartupParameters.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/StartupParameters.java
index 81779088ae..b6ee5e8ec5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/StartupParameters.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/StartupParameters.java
@@ -21,15 +21,14 @@
 package org.biojava.nbio.structure.align.ce;
 
 
-/** a simple bean that contains the parameters that can get set at startup
+/**
+ * A simple bean that contains the parameters that can get set at startup
  *
  * @author Andreas Prlic
  *
  */
 public class StartupParameters {
 
-
-
 	String pdbFilePath;
 	String cacheFilePath;
 	String outFile;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java
index a752a2c51d..5fc3bcfa6c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java
@@ -24,10 +24,9 @@
 
 /**
  * A pair for structure alignment
- *
- * @author Andreas Prlic
- *
+ * <p>
  * name1 is always < name2
+ * @author Andreas Prlic
  *
  */
 public class PdbPair implements Comparable<PdbPair> {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPCalculator.java
index 3fd3400800..a672cc9831 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPCalculator.java
@@ -35,7 +35,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/** a class that performs calculations on AFPCHains
+/**
+ * A class that performs calculations on AFPChains
  *
  * @author Andreas Prlic
  *
@@ -45,9 +46,7 @@ public class AFPCalculator
 	public static final boolean debug = FatCatAligner.debug;
 
 
-	public static final  void extractAFPChains(FatCatParameters params, AFPChain afpChain,Atom[] ca1,Atom[] ca2) throws StructureException {
-
-
+	public static void extractAFPChains(FatCatParameters params, AFPChain afpChain,Atom[] ca1,Atom[] ca2) throws StructureException {
 
 		List<AFP> afpSet = new ArrayList<AFP>();
 		afpChain.setAfpSet(afpSet);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FCAlignHelper.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FCAlignHelper.java
index 74c6d66ce5..8c3e1b1865 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FCAlignHelper.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FCAlignHelper.java
@@ -29,34 +29,35 @@
 public class FCAlignHelper
 {
 
-	int     M; //length of protein 1
-	int     N; //length of protein 2
-	double  g; //gap-create
-	double  h; //gap-extend
-	double  m; //g + h
-	double[][]  sij;
-	char[][]    trace; //trace-record
-	char[][]    etrace; //trace-record
-	char[][]    dtrace; //trace-record
-	int     B1; //beginning position of protein 1 in alignment
-	int     B2; //beginning position of protein 2 in alignment
-	int     E1; //end position of protein 1 in alignment
-	int     E2; //end position of protein 2 in alignment
-	double  alignScore;
-	double  identity;
-	double  similarity;
-	int[]   sapp;
-	int[]     sapp0;
-	int sappPos;
-	int     last;
-
-	char[]    seq1;
-	char[]    seq2;
-	char[]    aln1;
-	char[]    aln2;
-	char[]    mark;
-
-	/** do an alignment given the provided matrix sij0
+	private int     M; //length of protein 1
+	private int     N; //length of protein 2
+	private double  g; //gap-create
+	private double  h; //gap-extend
+	private double  m; //g + h
+	private double[][]  sij;
+	private char[][]    trace; //trace-record
+	private char[][]    etrace; //trace-record
+	private char[][]    dtrace; //trace-record
+	private int     B1; //beginning position of protein 1 in alignment
+	private int     B2; //beginning position of protein 2 in alignment
+	private int     E1; //end position of protein 1 in alignment
+	private int     E2; //end position of protein 2 in alignment
+	private double  alignScore;
+	private double  identity;
+	private double  similarity;
+	private int[]   sapp;
+	private int[]     sapp0;
+	private int sappPos;
+	private int     last;
+
+	private char[]    seq1;
+	private char[]    seq2;
+	private char[]    aln1;
+	private char[]    aln2;
+	private char[]    mark;
+
+	/**
+	 * do an alignment given the provided matrix sij0
 	 *
 	 * @param sij0 - the matrix to perform the calculations on.
 	 * @param M0
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FatCatAligner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FatCatAligner.java
index 9a7ea14cdc..d091e895eb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FatCatAligner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FatCatAligner.java
@@ -40,7 +40,8 @@
 import java.util.List;
 
 
-/** A class that does calculations on an AFPChain
+/**
+ * A class that does calculations on an AFPChain
  *
  * @author Andreas Prlic
  *
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/StructureAlignmentOptimizer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/StructureAlignmentOptimizer.java
index 89685fcbbd..d316e97746 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/StructureAlignmentOptimizer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/StructureAlignmentOptimizer.java
@@ -39,31 +39,31 @@ public class StructureAlignmentOptimizer
 
 	//private static final boolean showAlig = false;
 
-	int pro1Len;
-	int pro2Len;
-	int maxLen;
-	Atom[] cod1;
-	Atom[] cod2;
-
-	int[][] equSet;
-	int equLen;
-	int equLen0;
-	double[][]sij;
-
-	int maxKeepStep;
-	int keepStep;
-
-	double  Dc;   //the criteria for structural equivalent residues, eg. 3.0 (CE), 6.0(ProSup)
-	double  rmsdCut;//the criteria for stoping optimization
-	double  increase;
-	double  stopLenPer;
-	double  stopRmsdPer;
-	double  stopRmsd;
-
-	double  gapIni;
-	double  gapExt;
-
-	double rmsd;
+	private int pro1Len;
+	private int pro2Len;
+	private int maxLen;
+	private Atom[] cod1;
+	private Atom[] cod2;
+
+	private int[][] equSet;
+	private int equLen;
+	private int equLen0;
+	private double[][]sij;
+
+	private int maxKeepStep;
+	private int keepStep;
+
+	private double  Dc;   //the criteria for structural equivalent residues, eg. 3.0 (CE), 6.0(ProSup)
+	private double  rmsdCut;//the criteria for stoping optimization
+	private double  increase;
+	private double  stopLenPer;
+	private double  stopRmsdPer;
+	private double  stopRmsd;
+
+	private double  gapIni;
+	private double  gapExt;
+
+	private double rmsd;
 
 	private static final boolean debug = FatCatAligner.debug;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFP.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFP.java
index 7156d25c76..97eaef13b0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFP.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFP.java
@@ -24,38 +24,34 @@
 
 import java.io.Serializable;
 
-/** A class to represent a FATCAT AFP
+/**
+ * A class to represent a FATCAT aligned fragment pair (AFP)
  *
  * @author Andreas Prlic
  *
  */
-
 public class AFP implements Serializable {
 
-	/**
-	 *
-	 */
 	private static final long serialVersionUID = 3901209995477111829L;
-	int p1;
-	int p2;
-	int fragLen;
-	double rmsd;
-	Matrix m;
-	double[] t;
-	double score;
 
-	long id;
+	private int p1;
+	private int p2;
+	private int fragLen;
+	private double rmsd;
+	private Matrix m;
+	private double[] t;
+	private double score;
+
+	private long id;
 
 	@Override
-public String toString(){
+	public String toString(){
 
 		// we use the metric of
-
 		// Manfred J. Sippl
 		// On Distance and Similarity in Fold Space
 		// Bioinformatics, 24, pp. 872-873  (2008)
 
-
 		StringBuffer buf = new StringBuffer();
 		buf.append("AFP: p1:");
 		buf.append(p1);
@@ -124,7 +120,4 @@ public void setScore(double score) {
 		this.score = score;
 	}
 
-
-
-
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AfpChainWriter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AfpChainWriter.java
index ce527bc586..f4fb5a8478 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AfpChainWriter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AfpChainWriter.java
@@ -35,7 +35,8 @@
 import java.io.StringWriter;
 import java.util.List;
 
-/** A class to convert the data in an AfpChain object to various String outputs.
+/**
+ * A class to convert the data in an AfpChain object to various String outputs.
  *
  * @author Andreas Prlic
  *
@@ -45,7 +46,7 @@ public class AfpChainWriter
 
 	public static final String newline = System.getProperty("line.separator");
 
-	private static int LINELENGTH = 70;
+	private static final int LINELENGTH = 70;
 
 	public static String toFatCat(AFPChain afpChain, Atom[] ca1, Atom[] ca2)
 	{
@@ -1131,8 +1132,6 @@ public static String toRotMat(AFPChain afpChain)
 	public static String toCE(AFPChain afpChain, Atom[] ca1, Atom[] ca2)
 	{
 
-
-
 		String name1 = afpChain.getName1();
 		String name2 = afpChain.getName2();
 
@@ -1142,7 +1141,6 @@ public static String toCE(AFPChain afpChain, Atom[] ca1, Atom[] ca2)
 		int alnLength = afpChain.getAlnLength();
 		int gapLen = afpChain.getGapLen();
 
-
 		double similarity = afpChain.getSimilarity();
 		double identity = afpChain.getIdentity();
 		if (similarity <0 || identity <0  ){
@@ -1151,8 +1149,6 @@ public static String toCE(AFPChain afpChain, Atom[] ca1, Atom[] ca2)
 			identity = afpChain.getIdentity();
 		}
 
-
-
 		double probability = afpChain.getProbability();
 
 
@@ -1167,8 +1163,6 @@ public static String toCE(AFPChain afpChain, Atom[] ca1, Atom[] ca2)
 
 		// == end of extractation of data values from afpChain
 
-
-
 		StringBuffer txt = new StringBuffer();
 
 		txt.append("Chain 1: ");
@@ -1191,8 +1185,6 @@ public static String toCE(AFPChain afpChain, Atom[] ca1, Atom[] ca2)
 		String a;
 		String b;
 
-
-
 		int     t = 0;
 		int     ap = alnbeg1;
 		int     bp = alnbeg2;
@@ -1236,13 +1228,6 @@ public static String toCE(AFPChain afpChain, Atom[] ca1, Atom[] ca2)
 		txt.append(toRotMat(afpChain));
 
 		return txt.toString();
-
-
 	}
 
-
-
-
-
-
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/RepresentativeXMLConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/RepresentativeXMLConverter.java
deleted file mode 100644
index dccec37fb3..0000000000
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/RepresentativeXMLConverter.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.align.xml;
-
-import org.biojava.nbio.core.util.PrettyXMLWriter;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-public class RepresentativeXMLConverter {
-
-
-	public static final String toXML(SortedSet<String> representatives){
-		StringWriter sw = new StringWriter();
-		PrintWriter writer = new PrintWriter(sw);
-
-		PrettyXMLWriter xml = new PrettyXMLWriter(writer);
-		try {
-			xml.openTag("representatives");
-
-			for ( String repr : representatives){
-				xml.openTag("pdbChain");
-				xml.attribute("name", repr);
-				xml.closeTag("pdbChain");
-			}
-			xml.closeTag("representatives");
-		} catch(IOException ex){
-			ex.printStackTrace();
-		}
-		return sw.toString();
-	}
-
-	public static final SortedSet<String> fromXML(String xml){
-		SortedSet<String> representatives = new TreeSet<String>();
-		try {
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-			DocumentBuilder db = factory.newDocumentBuilder();
-			InputSource inStream = new InputSource();
-			inStream.setCharacterStream(new StringReader(xml));
-			Document doc = db.parse(inStream);
-
-			// normalize text representation
-			doc.getDocumentElement().normalize();
-
-
-			//Element rootElement = doc.getDocumentElement();
-
-			NodeList listOfPairs = doc.getElementsByTagName("pdbChain");
-			//int numArrays = listOfArrays.getLength();
-
-			// go over the blocks
-			for(int i=0; i<listOfPairs.getLength() ; i++)
-			{
-				Node pair       = listOfPairs.item(i);
-				//NodeList valList = pair.getChildNodes();
-				//int numChildren  = valList.getLength();
-
-				NamedNodeMap map = pair.getAttributes();
-
-				String name =  map.getNamedItem("name").getTextContent();
-				representatives.add(name);
-			}
-
-		} catch (Exception e){
-			e.printStackTrace();
-		}
-
-		return representatives;
-	}
-}

From 706a60a23f77fb763f37628ec1caa5ccf141dc48 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 25 Jun 2021 10:22:13 -0700
Subject: [PATCH 099/599] Cosmetics and possible bugfix

---
 .../nbio/structure/secstruc/SecStrucCalc.java        |  5 +++--
 .../nbio/structure/secstruc/SecStrucElement.java     |  6 +++---
 .../nbio/structure/secstruc/SecStrucGroup.java       |  2 +-
 .../nbio/structure/secstruc/SecStrucTools.java       | 12 ++++++------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucCalc.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucCalc.java
index 4696f3dc43..44f797fbda 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucCalc.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucCalc.java
@@ -51,7 +51,7 @@
  *
  * @author Andreas Prlic
  * @author Aleix Lafita
- * @autho Anthony Bradley
+ * @author Anthony Bradley
  *
  */
 public class SecStrucCalc {
@@ -83,7 +83,8 @@ public class SecStrucCalc {
 	/** higher limit for H-bond energy */
 	public static final double HBONDHIGHENERGY = -500.0;
 
-	/** constant for electrostatic energy
+	/**
+	 * constant for electrostatic energy
 	 * <pre>
 	 *      f  *  q1 *   q2  *  scale
 	 * Q = -332 * 0.42 * 0.20 * 1000.0
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucElement.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucElement.java
index da0dbd5095..c04b2de74e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucElement.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucElement.java
@@ -37,9 +37,9 @@ public class SecStrucElement implements Serializable  {
 
 	private static final long serialVersionUID = -8485685793171396131L;
 
-	private SecStrucType type;
-	private ResidueRangeAndLength range;
-	private int index;
+	private final SecStrucType type;
+	private final ResidueRangeAndLength range;
+	private final int index;
 
 	/**
 	 * Create a new SSE object. The start and end residue numbers cannot be the
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucGroup.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucGroup.java
index 0680d1b6e3..082a677b19 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucGroup.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucGroup.java
@@ -53,7 +53,7 @@ public SecStrucGroup() {
 	@Override
 	public String toString() {
 
-		StringBuffer str = new StringBuffer("SecStrucGroup ");
+		StringBuilder str = new StringBuilder("SecStrucGroup ");
 		str.append(residueNumber);
 		str.append(" ");
 		str.append(pdb_name);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucTools.java
index e2d1efd6ab..d90c5ba263 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucTools.java
@@ -50,7 +50,7 @@ public class SecStrucTools {
 	 */
 	public static List<SecStrucInfo> getSecStrucInfo(Structure s) {
 
-		List<SecStrucInfo> listSSI = new ArrayList<SecStrucInfo>();
+		List<SecStrucInfo> listSSI = new ArrayList<>();
 		GroupIterator iter = new GroupIterator(s);
 
 		while (iter.hasNext()) {
@@ -88,7 +88,7 @@ public static void assignSecStruc( Structure s,List<SecStrucInfo> listSSI){
 	 */
 	public static List<SecStrucElement> getSecStrucElements(Structure s) {
 
-		List<SecStrucElement> listSSE = new ArrayList<SecStrucElement>();
+		List<SecStrucElement> listSSE = new ArrayList<>();
 		GroupIterator iter = new GroupIterator(s);
 
 		// SecStruc information - initialize
@@ -114,7 +114,7 @@ public static List<SecStrucElement> getSecStrucElements(Structure s) {
 
 				if (count > 0) {
 					// If chain and type are equal increment counter
-					if (ss.type == type && chainId == g.getChainId()) {
+					if (ss.type == type && chainId.equals(g.getChainId())) {
 						previous = g.getResidueNumber();
 						count++;
 						continue;
@@ -161,7 +161,7 @@ public static List<SecStrucElement> getSecStrucElements(Structure s) {
 	 */
 	public static List<SecStrucElement> getSecStrucElements(List<Group> groups) {
 
-		List<SecStrucElement> listSSE = new ArrayList<SecStrucElement>();
+		List<SecStrucElement> listSSE = new ArrayList<>();
 
 		// SecStruc information - initialize
 		SecStrucType type = SecStrucType.coil;
@@ -171,7 +171,7 @@ public static List<SecStrucElement> getSecStrucElements(List<Group> groups) {
 		int count = 0; // counts the number of residues in SSE
 
 		// Create a map for the IDs of the SSE in the structure
-		Map<SecStrucType, Integer> ids = new TreeMap<SecStrucType, Integer>();
+		Map<SecStrucType, Integer> ids = new TreeMap<>();
 		for (SecStrucType t : SecStrucType.values())
 			ids.put(t, 1);
 
@@ -185,7 +185,7 @@ public static List<SecStrucElement> getSecStrucElements(List<Group> groups) {
 
 				if (count > 0) {
 					// If chain and type are equal increment counter
-					if (ss.type == type && chainId == g.getChainId()) {
+					if (ss.type == type && chainId.equals(g.getChainId())) {
 						previous = g.getResidueNumber();
 						count++;
 						continue;

From 4434be47eb3db739b31fa91f54af4f2a2ec9ab05 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 25 Jun 2021 10:41:10 -0700
Subject: [PATCH 100/599] [maven-release-plugin] prepare release
 biojava-6.0.0-alpha4

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 78344622b1..f4ac407a0b 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha4</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a22b560d19..e23155c7ba 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha4</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 6cc9c6c9af..0413c71f63 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 2fb8e78426..311bb549c7 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 0bd381f989..0070072c52 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha4</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -28,7 +28,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha4</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 4df1148dee..11d57a9fce 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha4</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha4</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 03787e7d7a..4542ede6e2 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha4</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 9153de3e05..dfe2fbd64e 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha4</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha4</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 154f7c229d..51efcc3262 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha4</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 87b34d4dcb..fa75d6e5fa 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha4</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha4</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8774d85478..6f1e37a73e 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0-alpha4</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 65b13c6730..1b3941438f 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha4</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 6d307acc49..90a22f63b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-SNAPSHOT</version>
+	<version>6.0.0-alpha4</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.0-alpha4</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From f1f863f3d817bb6395a09f8febd02171169238f9 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 25 Jun 2021 10:41:16 -0700
Subject: [PATCH 101/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index f4ac407a0b..78344622b1 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha4</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha4</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha4</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index e23155c7ba..a22b560d19 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha4</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha4</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 0413c71f63..6cc9c6c9af 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha4</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 311bb549c7..2fb8e78426 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha4</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha4</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha4</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 0070072c52..0bd381f989 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha4</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -28,7 +28,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha4</version>
+    	<version>6.0.0-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 11d57a9fce..4df1148dee 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha4</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha4</version>
+    	<version>6.0.0-SNAPSHOT</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 4542ede6e2..03787e7d7a 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-alpha4</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index dfe2fbd64e..9153de3e05 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha4</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha4</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 51efcc3262..154f7c229d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-alpha4</version>
+		<version>6.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha4</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha4</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index fa75d6e5fa..87b34d4dcb 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha4</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha4</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha4</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 6f1e37a73e..8774d85478 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-alpha4</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 1b3941438f..65b13c6730 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha4</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha4</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 90a22f63b7..6d307acc49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-alpha4</version>
+	<version>6.0.0-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.0-alpha4</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 7c260aae2f123b840c72bd904290b66a16f18e06 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 25 Jun 2021 16:53:33 -0700
Subject: [PATCH 102/599] Upgrade mmtf dependency

---
 CHANGELOG.md | 3 +++
 pom.xml      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82bee86d6e..35a2de798c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,9 @@ BioJava 6.0.0 (future release)
 * Moved all chem-comp parsing classes from `org.biojava.nbio.structure.io.mmcif.chem` to `org.biojava.nbio.structure.io.cif`
 * Moved classes in `org.biojava.nbio.structure.io.mmcif` to `org.biojava.nbio.structure.chem`
 
+### Fixed
+* Correct chain assignment to entities when parsing PDB/mmCIF without entity information (in cases with more than 3 chains per entity) #931
+
 BioJava 5.4.0
 =============
 ### Added
diff --git a/pom.xml b/pom.xml
index 6d307acc49..6e55a71501 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
 		<!-- needed for failsafe plugin in integrationtest module - JD 2018-03-08 -->
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maxmem>512M</maxmem>
-		<mmtf.version>1.0.9</mmtf.version>
+		<mmtf.version>1.0.10</mmtf.version>
 		<slf4j.version>1.7.30</slf4j.version>
 		<log4j.version>2.14.0</log4j.version>
 		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>

From eac22bc94bf684d92363dd0bff5ea705845af733 Mon Sep 17 00:00:00 2001
From: Richard Adams <richard@researchspace.com>
Date: Fri, 2 Jul 2021 17:05:20 +0100
Subject: [PATCH 103/599] test getTrace() to improve test coverage

---
 .../nbio/core/sequence/io/ABITracerTest.java        | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
index 89aef23cbb..df77b7c00a 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
@@ -21,9 +21,14 @@
 
 package org.biojava.nbio.core.sequence.io;
 
+import static org.junit.Assert.assertEquals;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.net.URL;
+import java.util.Arrays;
+
+import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
 import org.junit.*;
 
 /**
@@ -79,7 +84,8 @@ public void testLocal() throws Exception {
 		Assert.assertNotNull(tracer);
 
 		//Test length of tracer for file 3730.ab1
-		Assert.assertEquals(16302, tracer.getTraceLength());
+		final int EXPECTED_TRACE_LENGTH = 16302;
+		Assert.assertEquals(EXPECTED_TRACE_LENGTH, tracer.getTraceLength());
 		//Test length of sequence for file 3730.ab1
 		Assert.assertEquals(1165, tracer.getSequenceLength());
 
@@ -92,5 +98,10 @@ public void testLocal() throws Exception {
 		//Test image of tracer for file 3730.ab1
 		BufferedImage image = tracer.getImage(100,100);
 		Assert.assertNotNull(image);
+		
+		Assert.assertThrows(CompoundNotFoundException.class, ()->tracer.getTrace("D"));
+		for (String base: Arrays.asList(new String []{"A","T","C","G"})){
+		    assertEquals(EXPECTED_TRACE_LENGTH, tracer.getTrace(base).length);
+		}
 	}
 }

From d8d5a7b4519eef2807948733912c08fc159526ad Mon Sep 17 00:00:00 2001
From: Richard Adams <richard@researchspace.com>
Date: Fri, 2 Jul 2021 17:09:26 +0100
Subject: [PATCH 104/599] organise imports

---
 .../nbio/core/sequence/io/ABITracerTest.java  | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
index df77b7c00a..6d42ba48fc 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
@@ -21,7 +21,10 @@
 
 package org.biojava.nbio.core.sequence.io;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -66,9 +69,9 @@ public void tearDown() {
 	@Test
 	public void testURL() throws Exception {
 		URL resource = this.getClass().getResource("/3730.ab1");
-		Assert.assertNotNull(resource);
+		assertNotNull(resource);
 		ABITrace tracer = new ABITrace(resource);
-		Assert.assertNotNull(tracer);
+		assertNotNull(tracer);
 	}
 
 	/**
@@ -77,27 +80,27 @@ public void testURL() throws Exception {
 	@Test
 	public void testLocal() throws Exception {
 		URL resource = this.getClass().getResource("/3730.ab1");
-		Assert.assertNotNull(resource);
+		assertNotNull(resource);
 		File file = new File(resource.toURI());
-		Assert.assertNotNull(file);
+		assertNotNull(file);
 		ABITrace tracer = new ABITrace(file);
-		Assert.assertNotNull(tracer);
+		assertNotNull(tracer);
 
 		//Test length of tracer for file 3730.ab1
 		final int EXPECTED_TRACE_LENGTH = 16302;
-		Assert.assertEquals(EXPECTED_TRACE_LENGTH, tracer.getTraceLength());
+		assertEquals(EXPECTED_TRACE_LENGTH, tracer.getTraceLength());
 		//Test length of sequence for file 3730.ab1
-		Assert.assertEquals(1165, tracer.getSequenceLength());
+		assertEquals(1165, tracer.getSequenceLength());
 
 		//Test sequence of tracer for file 3730.ab1
-		Assert.assertTrue(sequence.equals(tracer.getSequence().getSequenceAsString()));
+		assertTrue(sequence.equals(tracer.getSequence().getSequenceAsString()));
 		//Test array that represents the quality of tracer for file 3730.ab1
-		Assert.assertArrayEquals(qual, tracer.getQcalls());
+		assertArrayEquals(qual, tracer.getQcalls());
 		//Test array that represents the baseline of tracer for file 3730.ab1
-		Assert.assertArrayEquals(base, tracer.getBasecalls());
+		assertArrayEquals(base, tracer.getBasecalls());
 		//Test image of tracer for file 3730.ab1
 		BufferedImage image = tracer.getImage(100,100);
-		Assert.assertNotNull(image);
+		assertNotNull(image);
 		
 		Assert.assertThrows(CompoundNotFoundException.class, ()->tracer.getTrace("D"));
 		for (String base: Arrays.asList(new String []{"A","T","C","G"})){

From 281e915d59aa359fdc3cad36d49b2fe094d945b7 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Sun, 4 Jul 2021 00:19:25 +0100
Subject: [PATCH 105/599] initial addition of junit 5

---
 biojava-core/pom.xml                          | 12 ++++++
 .../nbio/core/TestAmbiguityCompoundSet.java   | 14 ++++---
 pom.xml                                       | 42 ++++++++++++++++---
 3 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 6cc9c6c9af..4637ab6534 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -44,6 +44,18 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		   <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+    </dependency>
+        <dependency>
+        <groupId>org.junit.vintage</groupId>
+        <artifactId>junit-vintage-engine</artifactId>
+    </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
         	<groupId>org.slf4j</groupId>
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/TestAmbiguityCompoundSet.java b/biojava-core/src/test/java/org/biojava/nbio/core/TestAmbiguityCompoundSet.java
index 56abb5d802..6951fbc4d4 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/TestAmbiguityCompoundSet.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/TestAmbiguityCompoundSet.java
@@ -30,8 +30,10 @@
 import org.biojava.nbio.core.sequence.template.CompoundSet;
 import org.biojava.nbio.core.sequence.template.Sequence;
 import org.biojava.nbio.core.sequence.transcription.DNAToRNATranslator;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.DisplayName;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * A Test case for https://github.com/biojava/biojava/issues/344
@@ -39,9 +41,11 @@
  * Created by andreas on 12/4/15.
  */
 
+ 
 public class TestAmbiguityCompoundSet {
 
 	@Test
+	@DisplayName("Convert DNA to RNA")
 	public void testCompountSet() throws Exception {
 
 		CompoundSet<NucleotideCompound> dnaSet = AmbiguityDNACompoundSet.getDNACompoundSet();
@@ -49,13 +53,13 @@ public void testCompountSet() throws Exception {
 
 		DNASequence dna = new DNASequence("AGTCS", dnaSet);
 
-		Assert.assertEquals("AGTCS", dna.toString());
+		assertEquals("AGTCS", dna.toString());
 
 		RNASequence rna = dna.getRNASequence();
 
 		rna = new RNASequence(dna.getSequenceAsString().replaceAll("T", "U"), AmbiguityRNACompoundSet.getRNACompoundSet()); //fails with missing compound S
 
-		Assert.assertEquals("AGUCS", rna.toString());
+		assertEquals("AGUCS", rna.toString());
 
 		/* now, do the translation also using the underlying API (should not be needed for a user)
 		 *
@@ -65,7 +69,7 @@ public void testCompountSet() throws Exception {
 
 		Sequence<NucleotideCompound> translated = translator.createSequence(dna);
 
-		Assert.assertEquals("AGUCS", translated.toString());
+		assertEquals("AGUCS", translated.toString());
 
 
 	}
diff --git a/pom.xml b/pom.xml
index 6e55a71501..d5a7d30e65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -239,6 +239,24 @@
 					</configuration>
 
 				</plugin>
+				        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>3.0.0-M5</version>
+            <configuration>
+                <statelessTestsetReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5Xml30StatelessReporter">
+                    <usePhrasedTestSuiteClassName>true</usePhrasedTestSuiteClassName>
+                    <usePhrasedTestCaseClassName>true</usePhrasedTestCaseClassName>
+                    <usePhrasedTestCaseMethodName>true</usePhrasedTestCaseMethodName>
+					<usePhrasedFileName>true</usePhrasedFileName>
+                </statelessTestsetReporter>
+                <statelessTestsetInfoReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5StatelessTestsetInfoReporter">
+                    <usePhrasedClassNameInRunning>true</usePhrasedClassNameInRunning>
+					<usePhrasedFileName>true</usePhrasedFileName>
+                    <usePhrasedClassNameInTestCaseSummary>true</usePhrasedClassNameInTestCaseSummary>
+                </statelessTestsetInfoReporter>
+            </configuration>
+        </plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
@@ -313,11 +331,7 @@
 					<artifactId>maven-install-plugin</artifactId>
 					<version>3.0.0-M1</version>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.0.0-M5</version>
-				</plugin>
+			
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
@@ -404,6 +418,24 @@
 				<version>4.13.2</version>
 				<scope>test</scope>
 			</dependency>
+			<dependency>
+                                 <groupId>org.junit.vintage</groupId>
+                                 <artifactId>junit-vintage-engine</artifactId>
+                                 <version>5.7.2</version>
+                                 <scope>test</scope>
+                        </dependency>
+		   <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <version>5.7.2</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>5.7.2</version>
+        <scope>test</scope>
+    </dependency>	
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>

From 30cd5ef614166827ce672fcac32a35ecdbc7f4ba Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Sun, 4 Jul 2021 10:29:24 +0100
Subject: [PATCH 106/599] refactor 2 tests to use junit5 features

---
 biojava-core/pom.xml                          | 25 ++++----
 .../nbio/core/TestAmbiguityCompoundSet.java   |  3 +-
 .../nbio/core/sequence/io/ABITracerTest.java  | 60 ++++++++++---------
 pom.xml                                       | 52 +++++++---------
 4 files changed, 64 insertions(+), 76 deletions(-)

diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 4637ab6534..b61e45194a 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -42,20 +42,19 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<scope>test</scope>
 		</dependency>
-		   <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-api</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-engine</artifactId>
-    </dependency>
         <dependency>
-        <groupId>org.junit.vintage</groupId>
-        <artifactId>junit-vintage-engine</artifactId>
-    </dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+        </dependency>
+	    <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+	    </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+        </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
         	<groupId>org.slf4j</groupId>
@@ -76,5 +75,3 @@
   		</dependency>
 	</dependencies>
 </project>
-
-
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/TestAmbiguityCompoundSet.java b/biojava-core/src/test/java/org/biojava/nbio/core/TestAmbiguityCompoundSet.java
index 6951fbc4d4..9fad78d7b0 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/TestAmbiguityCompoundSet.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/TestAmbiguityCompoundSet.java
@@ -45,18 +45,17 @@
 public class TestAmbiguityCompoundSet {
 
 	@Test
-	@DisplayName("Convert DNA to RNA")
 	public void testCompountSet() throws Exception {
 
 		CompoundSet<NucleotideCompound> dnaSet = AmbiguityDNACompoundSet.getDNACompoundSet();
 		CompoundSet<NucleotideCompound> rnaSet = AmbiguityRNACompoundSet.getRNACompoundSet();
 
+
 		DNASequence dna = new DNASequence("AGTCS", dnaSet);
 
 		assertEquals("AGTCS", dna.toString());
 
 		RNASequence rna = dna.getRNASequence();
-
 		rna = new RNASequence(dna.getSequenceAsString().replaceAll("T", "U"), AmbiguityRNACompoundSet.getRNACompoundSet()); //fails with missing compound S
 
 		assertEquals("AGUCS", rna.toString());
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
index 6d42ba48fc..dce9cc7b58 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
@@ -21,10 +21,11 @@
 
 package org.biojava.nbio.core.sequence.io;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.*;
+import  org.junit.jupiter.api.*;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.junit.jupiter.params.ParameterizedTest;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -32,35 +33,31 @@
 import java.util.Arrays;
 
 import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
-import org.junit.*;
 
 /**
  * Test file 3730.ab1 is from https://github.com/biopython/biopython/blob/master/Tests/Abi/3730.ab1
  * The test data for comparing the results from ABITrace.java for file 3730.ab1 is from https://github.com/biopython/biopython/blob/master/Tests/Abi/test_data
  */
 public class ABITracerTest {
+	
 
 	private String sequence = "GGGCGAGCKYYAYATTTTGGCAAGAATTGAGCTCTATGGCCACAACCATGGTGAGCAAGGGCGAGGAGGATAACATGGCCATCATCAAGGAGTTCATGCGCTTCAAGGTGCACATGGAGGGCTCCGTGAACGGCCACGAGTTCGAGATCGAGGGCGAGGGCGAGGGCCGCCCCTACGAGGGCACCCAGACCGCCAAGCTGAAGGTGACCAAGGGTGGCCCCCTGCCCTTCGCCTGGGACATCCTGTCCCCTCAGTTCATGTACGGCTCCAAGGCCTACGTGAAGCACCCCGCCGACATCCCCGACTACTTGAAGCTGTCCTTCCCCGAGGGCTTCAAGTGGGAGCGCGTGATGAACTTCGAGGACGGCGGCGTGGTGACCGTGACCCAGGACTCCTCCCTGCAGGACGGCGAGTTCATCTACAAGGTGAAGCTGCGCGGCACCAACTTCCCCTCCGACGGCCCCGTAATGCAGAAGAAGACCATGGGCTGGGAGGCCTCCTCCGAGCGGATGTACCCCGAGGACGGCGCCCTGAAGGGCGAGATCAAGCAGAGGCTGAAGCTGAAGGACGGCGGCCACTACGACGCTGAGGTCAAGACCACCTACAAGGCCAAGAAGCCCGTGCAGCTGCCCGGCGCCTACAACGTCAACATCAAGTTGGACATCACCTCCCACAACGAGGACTACACCATCGTGGAACAGTACGAACGCGCCGAGGGCCGCCACTCCACCGGCGGCATGGACGAGCTGTACAAGGGCGGCAGCGGCATGGTGAGCAAGGGCGAGGAGCTGTTCACCGGGGTGGTGCCCATCCTGGTCGAGCTGGACGGCGACGTAAACGGCCACAAGTTCAGCGTGTCCGGCGAGGGCGAGGGCGATGCCACCTACGGCAAGCTGACCCTGAAGTTCATCTGCACCACCGGCAAGCTGCCCGTGCCCTGGCCCACCCTCGTGACCACCCTGACCTACGGCGTGCAGTGCTTCAGCCGCTACCCCGACCACATGAAGCAGCACGACTTCTTCAAGTCCGCCATGCCCGAAGGCTACGTCCAGGAGCGCACCATCTTCTTCAAGGACGACGGCAACTACAARACCCGCGCCGAGGTGAARTTCGAGGGCGACACCCTGGTGAACCGCATCGAGCTGAAAGGGGCAYCGCACCTTTC";
 	private int[] qual = {20, 3, 4, 4, 4, 6, 4, 4, 0, 0, 0, 6, 0, 10, 20, 26, 22, 17, 21, 31, 29, 32, 28, 18, 23, 17, 19, 35, 36, 50, 39, 50, 50, 50, 50, 50, 25, 35, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 35, 39, 33, 20, 35, 31, 50, 50, 50, 50, 50, 50, 50, 50, 50, 31, 50, 35, 31, 23, 28, 31, 21, 43, 39, 35, 24, 30, 26, 35, 31, 50, 50, 50, 50, 50, 50, 50, 50, 50, 39, 31, 24, 39, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 31, 31, 43, 43, 50, 50, 50, 50, 50, 31, 31, 31, 31, 50, 50, 50, 50, 50, 50, 50, 50, 31, 31, 35, 50, 50, 50, 50, 31, 36, 55, 55, 55, 55, 36, 55, 55, 55, 55, 55, 36, 55, 55, 55, 55, 55, 36, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 40, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 36, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 40, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 43, 43, 50, 43, 43, 50, 43, 43, 50, 43, 43, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 43, 43, 50, 43, 43, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 28, 28, 35, 28, 28, 35, 28, 28, 35, 28, 28, 35, 28, 28, 35, 28, 21, 28, 35, 28, 28, 35, 35, 35, 35, 35, 37, 38, 21, 28, 35, 28, 28, 35, 35, 35, 35, 35, 35, 35, 36, 36, 21, 39, 35, 35, 35, 39, 35, 37, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 28, 28, 35, 35, 28, 28, 35, 35, 35, 36, 36, 22, 39, 35, 35, 35, 35, 35, 35, 37, 38, 28, 35, 21, 36, 36, 37, 35, 35, 20, 39, 39, 35, 35, 35, 35, 37, 38, 28, 35, 37, 34, 35, 24, 24, 27, 25, 20, 24, 37, 35, 27, 21, 20, 21, 27, 17, 20, 24, 32, 26, 20, 12, 20, 10, 20, 24, 25, 23, 20, 32, 24, 24, 23, 20, 24, 23, 18, 34, 34, 34, 22, 26, 24, 24, 18, 22, 22, 23, 25, 20, 12, 20, 24, 23, 24, 23, 22, 20, 20, 0, 20, 24, 23, 20, 8, 10, 4, 20, 20, 3, 7, 19, 20, 4, 4, 7, 7, 0, 7, 11, 18, 8, 3, 23, 23, 20, 11, 4, 20, 18, 12, 20, 20, 20, 4, 20, 4, 2, 3, 21, 21, 21, 21, 10, 15, 14, 15, 19, 2, 4, 3, 6, 11, 3, 4, 6, 21, 16, 20, 11, 1, 4, 12, 0, 15, 8, 1, 3, 3, 12, 1, 11, 20, 4};
 	private int[] base = {2, 13, 38, 51, 67, 78, 92, 118, 138, 162, 181, 191, 210, 222, 239, 253, 266, 280, 288, 304, 317, 333, 347, 359, 375, 386, 394, 406, 418, 433, 444, 457, 472, 482, 496, 506, 519, 529, 544, 557, 569, 579, 590, 601, 614, 626, 638, 649, 663, 673, 686, 706, 715, 731, 740, 753, 765, 777, 787, 799, 813, 826, 838, 854, 863, 876, 892, 901, 913, 929, 937, 948, 960, 970, 981, 993, 1004, 1017, 1034, 1045, 1056, 1068, 1080, 1091, 1103, 1115, 1126, 1138, 1148, 1160, 1177, 1187, 1199, 1211, 1222, 1232, 1243, 1254, 1268, 1279, 1294, 1307, 1319, 1330, 1341, 1352, 1362, 1374, 1388, 1398, 1411, 1422, 1433, 1444, 1456, 1466, 1479, 1497, 1506, 1519, 1531, 1543, 1556, 1567, 1578, 1589, 1604, 1614, 1630, 1641, 1651, 1662, 1675, 1688, 1700, 1711, 1721, 1732, 1748, 1758, 1772, 1784, 1795, 1806, 1820, 1830, 1844, 1855, 1866, 1877, 1892, 1902, 1914, 1926, 1939, 1950, 1965, 1974, 1986, 1999, 2011, 2023, 2037, 2047, 2059, 2072, 2084, 2096, 2107, 2120, 2132, 2144, 2156, 2169, 2180, 2191, 2202, 2217, 2227, 2239, 2251, 2264, 2275, 2286, 2297, 2309, 2321, 2332, 2347, 2358, 2369, 2381, 2394, 2406, 2417, 2429, 2439, 2452, 2465, 2476, 2490, 2501, 2512, 2524, 2536, 2546, 2560, 2570, 2581, 2593, 2605, 2616, 2628, 2640, 2653, 2664, 2676, 2688, 2700, 2712, 2723, 2735, 2748, 2759, 2772, 2784, 2795, 2808, 2820, 2831, 2842, 2854, 2866, 2878, 2888, 2901, 2913, 2927, 2936, 2947, 2958, 2970, 2982, 2994, 3005, 3019, 3030, 3041, 3053, 3064, 3077, 3088, 3099, 3110, 3123, 3135, 3146, 3157, 3168, 3179, 3192, 3203, 3214, 3226, 3238, 3251, 3263, 3275, 3286, 3297, 3308, 3320, 3331, 3344, 3356, 3368, 3380, 3391, 3402, 3415, 3426, 3440, 3451, 3462, 3474, 3485, 3496, 3508, 3520, 3532, 3543, 3556, 3569, 3580, 3593, 3604, 3615, 3626, 3638, 3650, 3661, 3673, 3684, 3698, 3709, 3721, 3732, 3744, 3756, 3767, 3779, 3792, 3803, 3814, 3827, 3838, 3850, 3862, 3873, 3885, 3897, 3909, 3920, 3932, 3943, 3955, 3966, 3980, 3990, 4002, 4014, 4026, 4038, 4050, 4061, 4072, 4083, 4095, 4107, 4119, 4131, 4143, 4156, 4167, 4179, 4191, 4203, 4215, 4227, 4238, 4252, 4262, 4274, 4287, 4298, 4310, 4321, 4333, 4345, 4356, 4370, 4381, 4393, 4406, 4417, 4428, 4440, 4453, 4464, 4477, 4489, 4500, 4513, 4524, 4536, 4548, 4560, 4573, 4583, 4595, 4607, 4620, 4631, 4645, 4655, 4667, 4679, 4690, 4702, 4714, 4728, 4739, 4750, 4762, 4774, 4786, 4798, 4810, 4821, 4833, 4845, 4857, 4869, 4880, 4892, 4905, 4916, 4927, 4940, 4952, 4963, 4977, 4988, 5000, 5012, 5023, 5034, 5045, 5057, 5069, 5081, 5093, 5104, 5115, 5127, 5139, 5151, 5163, 5176, 5188, 5199, 5211, 5223, 5235, 5247, 5259, 5272, 5283, 5296, 5308, 5320, 5331, 5343, 5354, 5366, 5378, 5390, 5402, 5414, 5426, 5438, 5450, 5462, 5474, 5486, 5497, 5510, 5521, 5532, 5544, 5557, 5569, 5581, 5592, 5604, 5617, 5629, 5641, 5652, 5663, 5676, 5687, 5699, 5712, 5724, 5735, 5748, 5760, 5771, 5784, 5794, 5806, 5817, 5829, 5841, 5853, 5866, 5879, 5891, 5903, 5916, 5928, 5941, 5952, 5964, 5976, 5988, 6000, 6012, 6024, 6036, 6048, 6060, 6072, 6085, 6096, 6109, 6121, 6133, 6146, 6157, 6168, 6180, 6192, 6203, 6215, 6227, 6239, 6251, 6265, 6276, 6289, 6302, 6313, 6325, 6337, 6349, 6361, 6374, 6386, 6398, 6410, 6422, 6436, 6448, 6459, 6471, 6483, 6495, 6507, 6520, 6532, 6545, 6555, 6567, 6579, 6591, 6603, 6615, 6627, 6640, 6652, 6664, 6676, 6688, 6700, 6713, 6726, 6738, 6749, 6761, 6774, 6786, 6799, 6811, 6823, 6835, 6848, 6859, 6871, 6883, 6895, 6907, 6920, 6933, 6945, 6956, 6968, 6980, 6992, 7005, 7016, 7030, 7042, 7053, 7066, 7079, 7091, 7104, 7115, 7128, 7140, 7152, 7163, 7175, 7187, 7200, 7212, 7224, 7235, 7248, 7260, 7272, 7285, 7297, 7309, 7321, 7333, 7345, 7358, 7370, 7382, 7394, 7406, 7419, 7431, 7443, 7455, 7468, 7480, 7492, 7505, 7517, 7530, 7542, 7554, 7566, 7578, 7591, 7603, 7615, 7628, 7640, 7653, 7666, 7677, 7690, 7702, 7714, 7727, 7738, 7750, 7762, 7775, 7786, 7799, 7812, 7823, 7836, 7848, 7859, 7871, 7884, 7896, 7909, 7921, 7933, 7946, 7958, 7971, 7984, 7996, 8007, 8019, 8032, 8044, 8056, 8069, 8081, 8094, 8107, 8119, 8131, 8143, 8155, 8167, 8179, 8192, 8205, 8218, 8230, 8244, 8255, 8267, 8279, 8291, 8303, 8315, 8328, 8340, 8353, 8366, 8378, 8392, 8404, 8417, 8431, 8443, 8455, 8467, 8479, 8492, 8504, 8516, 8529, 8543, 8555, 8567, 8580, 8593, 8606, 8619, 8632, 8644, 8658, 8670, 8683, 8695, 8708, 8721, 8733, 8746, 8759, 8771, 8783, 8795, 8808, 8821, 8833, 8845, 8858, 8871, 8885, 8898, 8910, 8923, 8936, 8949, 8960, 8973, 8986, 9000, 9012, 9025, 9038, 9051, 9064, 9076, 9089, 9102, 9114, 9126, 9139, 9151, 9164, 9177, 9191, 9204, 9217, 9230, 9243, 9255, 9268, 9281, 9294, 9307, 9320, 9333, 9345, 9358, 9371, 9384, 9398, 9412, 9424, 9437, 9450, 9462, 9475, 9488, 9501, 9514, 9528, 9542, 9554, 9567, 9581, 9593, 9606, 9619, 9632, 9645, 9658, 9671, 9682, 9695, 9708, 9721, 9735, 9749, 9762, 9776, 9789, 9802, 9815, 9828, 9842, 9855, 9867, 9880, 9893, 9906, 9920, 9933, 9947, 9960, 9974, 9987, 10000, 10014, 10027, 10040, 10054, 10067, 10081, 10095, 10107, 10120, 10134, 10148, 10161, 10175, 10188, 10201, 10214, 10228, 10241, 10254, 10267, 10280, 10294, 10309, 10322, 10335, 10348, 10362, 10374, 10387, 10401, 10415, 10428, 10441, 10455, 10469, 10482, 10497, 10510, 10523, 10537, 10551, 10565, 10579, 10593, 10606, 10621, 10634, 10647, 10661, 10675, 10689, 10704, 10719, 10732, 10746, 10760, 10774, 10788, 10802, 10815, 10829, 10843, 10856, 10871, 10884, 10898, 10913, 10927, 10940, 10955, 10970, 10984, 10999, 11013, 11027, 11042, 11056, 11071, 11086, 11100, 11114, 11128, 11142, 11158, 11171, 11186, 11200, 11213, 11228, 11241, 11255, 11270, 11284, 11299, 11314, 11328, 11342, 11356, 11370, 11385, 11399, 11413, 11429, 11445, 11460, 11474, 11489, 11503, 11518, 11533, 11549, 11563, 11577, 11592, 11607, 11621, 11637, 11651, 11665, 11680, 11694, 11708, 11725, 11740, 11754, 11768, 11784, 11798, 11813, 11828, 11843, 11858, 11874, 11888, 11904, 11920, 11933, 11948, 11964, 11979, 11993, 12009, 12024, 12041, 12058, 12071, 12087, 12102, 12117, 12132, 12148, 12165, 12179, 12195, 12210, 12226, 12241, 12256, 12273, 12288, 12304, 12320, 12335, 12350, 12365, 12382, 12398, 12414, 12430, 12446, 12462, 12478, 12495, 12511, 12525, 12541, 12556, 12575, 12591, 12605, 12622, 12638, 12653, 12671, 12686, 12705, 12721, 12739, 12756, 12772, 12788, 12806, 12822, 12839, 12855, 12873, 12890, 12908, 12923, 12941, 12960, 12975, 12992, 13009, 13024, 13040, 13059, 13076, 13092, 13109, 13128, 13145, 13161, 13179, 13194, 13216, 13233, 13249, 13266, 13287, 13303, 13322, 13337, 13357, 13375, 13392, 13410, 13424, 13446, 13465, 13480, 13499, 13517, 13533, 13559, 13575, 13595, 13612, 13632, 13650, 13670, 13687, 13706, 13726, 13744, 13765, 13783, 13803, 13822, 13841, 13860, 13879, 13897, 13917, 13936, 13960, 13979, 13996, 14019, 14040, 14057, 14077, 14102, 14122, 14141, 14163, 14184, 14202, 14225, 14244, 14265, 14287, 14312, 14336, 14356, 14375, 14393, 14420, 14438, 14465, 14483, 14500, 14536, 14555, 14575, 14604, 14619, 14648, 14668, 14691, 14725, 14748, 14770, 14788, 14818, 14840, 14862, 14888, 14921, 14939, 14969, 14996, 15022, 15051, 15075, 15098, 15130, 15149, 15167, 15218, 15237, 15276, 15297, 15333, 15356, 15379, 15418, 15447, 15481, 15508, 15530, 15574, 15599, 15643, 15680, 15697, 15743, 15759, 15775, 15813, 15845, 15877, 15911, 15931, 15968, 16014, 16049, 16077, 16088, 16138, 16149, 16185, 16200, 16241, 16280, 16296};
 
-	public ABITracerTest() {
-	}
+	private ABITrace tracer = null;
+	//Test length of tracer for file 3730.ab1
+	static final int EXPECTED_TRACE_LENGTH = 16302;
 
-	@BeforeClass
-	public static void setUpClass() throws Exception {
-	}
-
-	@AfterClass
-	public static void tearDownClass() throws Exception {
-	}
-
-	@Before
-	public void setUp() {
+	@BeforeEach
+	 void setUp() throws Exception {
+		URL resource = this.getClass().getResource("/3730.ab1");
+		assertNotNull(resource);
+		tracer = new ABITrace(resource);
 	}
 
-	@After
-	public void tearDown() {
+	@AfterEach
+	 void tearDown() {
 	}
 
 	/**
@@ -68,9 +65,6 @@ public void tearDown() {
 	 */
 	@Test
 	public void testURL() throws Exception {
-		URL resource = this.getClass().getResource("/3730.ab1");
-		assertNotNull(resource);
-		ABITrace tracer = new ABITrace(resource);
 		assertNotNull(tracer);
 	}
 
@@ -78,7 +72,7 @@ public void testURL() throws Exception {
 	 * Test of Local file method, of class ABITracer.
 	 */
 	@Test
-	public void testLocal() throws Exception {
+	 void testLocal() throws Exception {
 		URL resource = this.getClass().getResource("/3730.ab1");
 		assertNotNull(resource);
 		File file = new File(resource.toURI());
@@ -86,8 +80,7 @@ public void testLocal() throws Exception {
 		ABITrace tracer = new ABITrace(file);
 		assertNotNull(tracer);
 
-		//Test length of tracer for file 3730.ab1
-		final int EXPECTED_TRACE_LENGTH = 16302;
+		
 		assertEquals(EXPECTED_TRACE_LENGTH, tracer.getTraceLength());
 		//Test length of sequence for file 3730.ab1
 		assertEquals(1165, tracer.getSequenceLength());
@@ -102,9 +95,18 @@ public void testLocal() throws Exception {
 		BufferedImage image = tracer.getImage(100,100);
 		assertNotNull(image);
 		
-		Assert.assertThrows(CompoundNotFoundException.class, ()->tracer.getTrace("D"));
-		for (String base: Arrays.asList(new String []{"A","T","C","G"})){
-		    assertEquals(EXPECTED_TRACE_LENGTH, tracer.getTrace(base).length);
-		}
+
+	}
+
+	@DisplayName("getTrace rejects invalid bases")
+	@Test
+	void testGetTraceThrowsCNFE() throws Exception {
+		assertThrows(CompoundNotFoundException.class, ()->tracer.getTrace("D"));
+	}
+
+	@ParameterizedTest
+    @ValueSource(strings = {"A","T","C", "G" })
+	void testGetTrace(String base) throws Exception {;
+		assertEquals(EXPECTED_TRACE_LENGTH, tracer.getTrace(base).length);
 	}
 }
diff --git a/pom.xml b/pom.xml
index d5a7d30e65..3866c8753e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
 		<mmtf.version>1.0.10</mmtf.version>
 		<slf4j.version>1.7.30</slf4j.version>
 		<log4j.version>2.14.0</log4j.version>
+		<junit-jupiter.version>5.7.2</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>
 		<ciftools.version>2.0.2</ciftools.version>
 	</properties>
@@ -243,20 +244,8 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <version>3.0.0-M5</version>
-            <configuration>
-                <statelessTestsetReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5Xml30StatelessReporter">
-                    <usePhrasedTestSuiteClassName>true</usePhrasedTestSuiteClassName>
-                    <usePhrasedTestCaseClassName>true</usePhrasedTestCaseClassName>
-                    <usePhrasedTestCaseMethodName>true</usePhrasedTestCaseMethodName>
-					<usePhrasedFileName>true</usePhrasedFileName>
-                </statelessTestsetReporter>
-                <statelessTestsetInfoReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5StatelessTestsetInfoReporter">
-                    <usePhrasedClassNameInRunning>true</usePhrasedClassNameInRunning>
-					<usePhrasedFileName>true</usePhrasedFileName>
-                    <usePhrasedClassNameInTestCaseSummary>true</usePhrasedClassNameInTestCaseSummary>
-                </statelessTestsetInfoReporter>
-            </configuration>
-        </plugin>
+            
+             </plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
@@ -419,23 +408,24 @@
 				<scope>test</scope>
 			</dependency>
 			<dependency>
-                                 <groupId>org.junit.vintage</groupId>
-                                 <artifactId>junit-vintage-engine</artifactId>
-                                 <version>5.7.2</version>
-                                 <scope>test</scope>
-                        </dependency>
-		   <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-api</artifactId>
-        <version>5.7.2</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-engine</artifactId>
-        <version>5.7.2</version>
-        <scope>test</scope>
-    </dependency>	
+                <groupId>org.junit.vintage</groupId>
+                <artifactId>junit-vintage-engine</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>
+		  
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>
+	        <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-params</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <scope>test</scope>
+            </dependency>	
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>

From 00bd3b2c610e60dded181e85a8781be588e7b991 Mon Sep 17 00:00:00 2001
From: Richard Adams <richard@researchspace.com>
Date: Sun, 4 Jul 2021 10:43:38 +0100
Subject: [PATCH 107/599] formatting

---
 .../nbio/core/sequence/io/ABITracerTest.java  | 159 +++++++++++++++---
 1 file changed, 131 insertions(+), 28 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
index dce9cc7b58..3024940a07 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
@@ -21,9 +21,8 @@
 
 package org.biojava.nbio.core.sequence.io;
 
-
 import static org.junit.jupiter.api.Assertions.*;
-import  org.junit.jupiter.api.*;
+import org.junit.jupiter.api.*;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.jupiter.params.ParameterizedTest;
 
@@ -35,31 +34,138 @@
 import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
 
 /**
- * Test file 3730.ab1 is from https://github.com/biopython/biopython/blob/master/Tests/Abi/3730.ab1
- * The test data for comparing the results from ABITrace.java for file 3730.ab1 is from https://github.com/biopython/biopython/blob/master/Tests/Abi/test_data
+ * Test file 3730.ab1 is from https://github.com/biopython/biopython/blob/master/Tests/Abi/3730.ab1 The test data for
+ * comparing the results from ABITrace.java for file 3730.ab1 is from
+ * https://github.com/biopython/biopython/blob/master/Tests/Abi/test_data
  */
 public class ABITracerTest {
-	
 
 	private String sequence = "GGGCGAGCKYYAYATTTTGGCAAGAATTGAGCTCTATGGCCACAACCATGGTGAGCAAGGGCGAGGAGGATAACATGGCCATCATCAAGGAGTTCATGCGCTTCAAGGTGCACATGGAGGGCTCCGTGAACGGCCACGAGTTCGAGATCGAGGGCGAGGGCGAGGGCCGCCCCTACGAGGGCACCCAGACCGCCAAGCTGAAGGTGACCAAGGGTGGCCCCCTGCCCTTCGCCTGGGACATCCTGTCCCCTCAGTTCATGTACGGCTCCAAGGCCTACGTGAAGCACCCCGCCGACATCCCCGACTACTTGAAGCTGTCCTTCCCCGAGGGCTTCAAGTGGGAGCGCGTGATGAACTTCGAGGACGGCGGCGTGGTGACCGTGACCCAGGACTCCTCCCTGCAGGACGGCGAGTTCATCTACAAGGTGAAGCTGCGCGGCACCAACTTCCCCTCCGACGGCCCCGTAATGCAGAAGAAGACCATGGGCTGGGAGGCCTCCTCCGAGCGGATGTACCCCGAGGACGGCGCCCTGAAGGGCGAGATCAAGCAGAGGCTGAAGCTGAAGGACGGCGGCCACTACGACGCTGAGGTCAAGACCACCTACAAGGCCAAGAAGCCCGTGCAGCTGCCCGGCGCCTACAACGTCAACATCAAGTTGGACATCACCTCCCACAACGAGGACTACACCATCGTGGAACAGTACGAACGCGCCGAGGGCCGCCACTCCACCGGCGGCATGGACGAGCTGTACAAGGGCGGCAGCGGCATGGTGAGCAAGGGCGAGGAGCTGTTCACCGGGGTGGTGCCCATCCTGGTCGAGCTGGACGGCGACGTAAACGGCCACAAGTTCAGCGTGTCCGGCGAGGGCGAGGGCGATGCCACCTACGGCAAGCTGACCCTGAAGTTCATCTGCACCACCGGCAAGCTGCCCGTGCCCTGGCCCACCCTCGTGACCACCCTGACCTACGGCGTGCAGTGCTTCAGCCGCTACCCCGACCACATGAAGCAGCACGACTTCTTCAAGTCCGCCATGCCCGAAGGCTACGTCCAGGAGCGCACCATCTTCTTCAAGGACGACGGCAACTACAARACCCGCGCCGAGGTGAARTTCGAGGGCGACACCCTGGTGAACCGCATCGAGCTGAAAGGGGCAYCGCACCTTTC";
-	private int[] qual = {20, 3, 4, 4, 4, 6, 4, 4, 0, 0, 0, 6, 0, 10, 20, 26, 22, 17, 21, 31, 29, 32, 28, 18, 23, 17, 19, 35, 36, 50, 39, 50, 50, 50, 50, 50, 25, 35, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 35, 39, 33, 20, 35, 31, 50, 50, 50, 50, 50, 50, 50, 50, 50, 31, 50, 35, 31, 23, 28, 31, 21, 43, 39, 35, 24, 30, 26, 35, 31, 50, 50, 50, 50, 50, 50, 50, 50, 50, 39, 31, 24, 39, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 31, 31, 43, 43, 50, 50, 50, 50, 50, 31, 31, 31, 31, 50, 50, 50, 50, 50, 50, 50, 50, 31, 31, 35, 50, 50, 50, 50, 31, 36, 55, 55, 55, 55, 36, 55, 55, 55, 55, 55, 36, 55, 55, 55, 55, 55, 36, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 40, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 36, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 40, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 43, 43, 50, 43, 43, 50, 43, 43, 50, 43, 43, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 43, 43, 50, 43, 43, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 28, 28, 35, 28, 28, 35, 28, 28, 35, 28, 28, 35, 28, 28, 35, 28, 21, 28, 35, 28, 28, 35, 35, 35, 35, 35, 37, 38, 21, 28, 35, 28, 28, 35, 35, 35, 35, 35, 35, 35, 36, 36, 21, 39, 35, 35, 35, 39, 35, 37, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 28, 28, 35, 35, 28, 28, 35, 35, 35, 36, 36, 22, 39, 35, 35, 35, 35, 35, 35, 37, 38, 28, 35, 21, 36, 36, 37, 35, 35, 20, 39, 39, 35, 35, 35, 35, 37, 38, 28, 35, 37, 34, 35, 24, 24, 27, 25, 20, 24, 37, 35, 27, 21, 20, 21, 27, 17, 20, 24, 32, 26, 20, 12, 20, 10, 20, 24, 25, 23, 20, 32, 24, 24, 23, 20, 24, 23, 18, 34, 34, 34, 22, 26, 24, 24, 18, 22, 22, 23, 25, 20, 12, 20, 24, 23, 24, 23, 22, 20, 20, 0, 20, 24, 23, 20, 8, 10, 4, 20, 20, 3, 7, 19, 20, 4, 4, 7, 7, 0, 7, 11, 18, 8, 3, 23, 23, 20, 11, 4, 20, 18, 12, 20, 20, 20, 4, 20, 4, 2, 3, 21, 21, 21, 21, 10, 15, 14, 15, 19, 2, 4, 3, 6, 11, 3, 4, 6, 21, 16, 20, 11, 1, 4, 12, 0, 15, 8, 1, 3, 3, 12, 1, 11, 20, 4};
-	private int[] base = {2, 13, 38, 51, 67, 78, 92, 118, 138, 162, 181, 191, 210, 222, 239, 253, 266, 280, 288, 304, 317, 333, 347, 359, 375, 386, 394, 406, 418, 433, 444, 457, 472, 482, 496, 506, 519, 529, 544, 557, 569, 579, 590, 601, 614, 626, 638, 649, 663, 673, 686, 706, 715, 731, 740, 753, 765, 777, 787, 799, 813, 826, 838, 854, 863, 876, 892, 901, 913, 929, 937, 948, 960, 970, 981, 993, 1004, 1017, 1034, 1045, 1056, 1068, 1080, 1091, 1103, 1115, 1126, 1138, 1148, 1160, 1177, 1187, 1199, 1211, 1222, 1232, 1243, 1254, 1268, 1279, 1294, 1307, 1319, 1330, 1341, 1352, 1362, 1374, 1388, 1398, 1411, 1422, 1433, 1444, 1456, 1466, 1479, 1497, 1506, 1519, 1531, 1543, 1556, 1567, 1578, 1589, 1604, 1614, 1630, 1641, 1651, 1662, 1675, 1688, 1700, 1711, 1721, 1732, 1748, 1758, 1772, 1784, 1795, 1806, 1820, 1830, 1844, 1855, 1866, 1877, 1892, 1902, 1914, 1926, 1939, 1950, 1965, 1974, 1986, 1999, 2011, 2023, 2037, 2047, 2059, 2072, 2084, 2096, 2107, 2120, 2132, 2144, 2156, 2169, 2180, 2191, 2202, 2217, 2227, 2239, 2251, 2264, 2275, 2286, 2297, 2309, 2321, 2332, 2347, 2358, 2369, 2381, 2394, 2406, 2417, 2429, 2439, 2452, 2465, 2476, 2490, 2501, 2512, 2524, 2536, 2546, 2560, 2570, 2581, 2593, 2605, 2616, 2628, 2640, 2653, 2664, 2676, 2688, 2700, 2712, 2723, 2735, 2748, 2759, 2772, 2784, 2795, 2808, 2820, 2831, 2842, 2854, 2866, 2878, 2888, 2901, 2913, 2927, 2936, 2947, 2958, 2970, 2982, 2994, 3005, 3019, 3030, 3041, 3053, 3064, 3077, 3088, 3099, 3110, 3123, 3135, 3146, 3157, 3168, 3179, 3192, 3203, 3214, 3226, 3238, 3251, 3263, 3275, 3286, 3297, 3308, 3320, 3331, 3344, 3356, 3368, 3380, 3391, 3402, 3415, 3426, 3440, 3451, 3462, 3474, 3485, 3496, 3508, 3520, 3532, 3543, 3556, 3569, 3580, 3593, 3604, 3615, 3626, 3638, 3650, 3661, 3673, 3684, 3698, 3709, 3721, 3732, 3744, 3756, 3767, 3779, 3792, 3803, 3814, 3827, 3838, 3850, 3862, 3873, 3885, 3897, 3909, 3920, 3932, 3943, 3955, 3966, 3980, 3990, 4002, 4014, 4026, 4038, 4050, 4061, 4072, 4083, 4095, 4107, 4119, 4131, 4143, 4156, 4167, 4179, 4191, 4203, 4215, 4227, 4238, 4252, 4262, 4274, 4287, 4298, 4310, 4321, 4333, 4345, 4356, 4370, 4381, 4393, 4406, 4417, 4428, 4440, 4453, 4464, 4477, 4489, 4500, 4513, 4524, 4536, 4548, 4560, 4573, 4583, 4595, 4607, 4620, 4631, 4645, 4655, 4667, 4679, 4690, 4702, 4714, 4728, 4739, 4750, 4762, 4774, 4786, 4798, 4810, 4821, 4833, 4845, 4857, 4869, 4880, 4892, 4905, 4916, 4927, 4940, 4952, 4963, 4977, 4988, 5000, 5012, 5023, 5034, 5045, 5057, 5069, 5081, 5093, 5104, 5115, 5127, 5139, 5151, 5163, 5176, 5188, 5199, 5211, 5223, 5235, 5247, 5259, 5272, 5283, 5296, 5308, 5320, 5331, 5343, 5354, 5366, 5378, 5390, 5402, 5414, 5426, 5438, 5450, 5462, 5474, 5486, 5497, 5510, 5521, 5532, 5544, 5557, 5569, 5581, 5592, 5604, 5617, 5629, 5641, 5652, 5663, 5676, 5687, 5699, 5712, 5724, 5735, 5748, 5760, 5771, 5784, 5794, 5806, 5817, 5829, 5841, 5853, 5866, 5879, 5891, 5903, 5916, 5928, 5941, 5952, 5964, 5976, 5988, 6000, 6012, 6024, 6036, 6048, 6060, 6072, 6085, 6096, 6109, 6121, 6133, 6146, 6157, 6168, 6180, 6192, 6203, 6215, 6227, 6239, 6251, 6265, 6276, 6289, 6302, 6313, 6325, 6337, 6349, 6361, 6374, 6386, 6398, 6410, 6422, 6436, 6448, 6459, 6471, 6483, 6495, 6507, 6520, 6532, 6545, 6555, 6567, 6579, 6591, 6603, 6615, 6627, 6640, 6652, 6664, 6676, 6688, 6700, 6713, 6726, 6738, 6749, 6761, 6774, 6786, 6799, 6811, 6823, 6835, 6848, 6859, 6871, 6883, 6895, 6907, 6920, 6933, 6945, 6956, 6968, 6980, 6992, 7005, 7016, 7030, 7042, 7053, 7066, 7079, 7091, 7104, 7115, 7128, 7140, 7152, 7163, 7175, 7187, 7200, 7212, 7224, 7235, 7248, 7260, 7272, 7285, 7297, 7309, 7321, 7333, 7345, 7358, 7370, 7382, 7394, 7406, 7419, 7431, 7443, 7455, 7468, 7480, 7492, 7505, 7517, 7530, 7542, 7554, 7566, 7578, 7591, 7603, 7615, 7628, 7640, 7653, 7666, 7677, 7690, 7702, 7714, 7727, 7738, 7750, 7762, 7775, 7786, 7799, 7812, 7823, 7836, 7848, 7859, 7871, 7884, 7896, 7909, 7921, 7933, 7946, 7958, 7971, 7984, 7996, 8007, 8019, 8032, 8044, 8056, 8069, 8081, 8094, 8107, 8119, 8131, 8143, 8155, 8167, 8179, 8192, 8205, 8218, 8230, 8244, 8255, 8267, 8279, 8291, 8303, 8315, 8328, 8340, 8353, 8366, 8378, 8392, 8404, 8417, 8431, 8443, 8455, 8467, 8479, 8492, 8504, 8516, 8529, 8543, 8555, 8567, 8580, 8593, 8606, 8619, 8632, 8644, 8658, 8670, 8683, 8695, 8708, 8721, 8733, 8746, 8759, 8771, 8783, 8795, 8808, 8821, 8833, 8845, 8858, 8871, 8885, 8898, 8910, 8923, 8936, 8949, 8960, 8973, 8986, 9000, 9012, 9025, 9038, 9051, 9064, 9076, 9089, 9102, 9114, 9126, 9139, 9151, 9164, 9177, 9191, 9204, 9217, 9230, 9243, 9255, 9268, 9281, 9294, 9307, 9320, 9333, 9345, 9358, 9371, 9384, 9398, 9412, 9424, 9437, 9450, 9462, 9475, 9488, 9501, 9514, 9528, 9542, 9554, 9567, 9581, 9593, 9606, 9619, 9632, 9645, 9658, 9671, 9682, 9695, 9708, 9721, 9735, 9749, 9762, 9776, 9789, 9802, 9815, 9828, 9842, 9855, 9867, 9880, 9893, 9906, 9920, 9933, 9947, 9960, 9974, 9987, 10000, 10014, 10027, 10040, 10054, 10067, 10081, 10095, 10107, 10120, 10134, 10148, 10161, 10175, 10188, 10201, 10214, 10228, 10241, 10254, 10267, 10280, 10294, 10309, 10322, 10335, 10348, 10362, 10374, 10387, 10401, 10415, 10428, 10441, 10455, 10469, 10482, 10497, 10510, 10523, 10537, 10551, 10565, 10579, 10593, 10606, 10621, 10634, 10647, 10661, 10675, 10689, 10704, 10719, 10732, 10746, 10760, 10774, 10788, 10802, 10815, 10829, 10843, 10856, 10871, 10884, 10898, 10913, 10927, 10940, 10955, 10970, 10984, 10999, 11013, 11027, 11042, 11056, 11071, 11086, 11100, 11114, 11128, 11142, 11158, 11171, 11186, 11200, 11213, 11228, 11241, 11255, 11270, 11284, 11299, 11314, 11328, 11342, 11356, 11370, 11385, 11399, 11413, 11429, 11445, 11460, 11474, 11489, 11503, 11518, 11533, 11549, 11563, 11577, 11592, 11607, 11621, 11637, 11651, 11665, 11680, 11694, 11708, 11725, 11740, 11754, 11768, 11784, 11798, 11813, 11828, 11843, 11858, 11874, 11888, 11904, 11920, 11933, 11948, 11964, 11979, 11993, 12009, 12024, 12041, 12058, 12071, 12087, 12102, 12117, 12132, 12148, 12165, 12179, 12195, 12210, 12226, 12241, 12256, 12273, 12288, 12304, 12320, 12335, 12350, 12365, 12382, 12398, 12414, 12430, 12446, 12462, 12478, 12495, 12511, 12525, 12541, 12556, 12575, 12591, 12605, 12622, 12638, 12653, 12671, 12686, 12705, 12721, 12739, 12756, 12772, 12788, 12806, 12822, 12839, 12855, 12873, 12890, 12908, 12923, 12941, 12960, 12975, 12992, 13009, 13024, 13040, 13059, 13076, 13092, 13109, 13128, 13145, 13161, 13179, 13194, 13216, 13233, 13249, 13266, 13287, 13303, 13322, 13337, 13357, 13375, 13392, 13410, 13424, 13446, 13465, 13480, 13499, 13517, 13533, 13559, 13575, 13595, 13612, 13632, 13650, 13670, 13687, 13706, 13726, 13744, 13765, 13783, 13803, 13822, 13841, 13860, 13879, 13897, 13917, 13936, 13960, 13979, 13996, 14019, 14040, 14057, 14077, 14102, 14122, 14141, 14163, 14184, 14202, 14225, 14244, 14265, 14287, 14312, 14336, 14356, 14375, 14393, 14420, 14438, 14465, 14483, 14500, 14536, 14555, 14575, 14604, 14619, 14648, 14668, 14691, 14725, 14748, 14770, 14788, 14818, 14840, 14862, 14888, 14921, 14939, 14969, 14996, 15022, 15051, 15075, 15098, 15130, 15149, 15167, 15218, 15237, 15276, 15297, 15333, 15356, 15379, 15418, 15447, 15481, 15508, 15530, 15574, 15599, 15643, 15680, 15697, 15743, 15759, 15775, 15813, 15845, 15877, 15911, 15931, 15968, 16014, 16049, 16077, 16088, 16138, 16149, 16185, 16200, 16241, 16280, 16296};
+	private int[] qual = { 20, 3, 4, 4, 4, 6, 4, 4, 0, 0, 0, 6, 0, 10, 20, 26, 22, 17, 21, 31, 29, 32, 28, 18, 23, 17,
+			19, 35, 36, 50, 39, 50, 50, 50, 50, 50, 25, 35, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 35, 39, 33, 20, 35,
+			31, 50, 50, 50, 50, 50, 50, 50, 50, 50, 31, 50, 35, 31, 23, 28, 31, 21, 43, 39, 35, 24, 30, 26, 35, 31, 50,
+			50, 50, 50, 50, 50, 50, 50, 50, 39, 31, 24, 39, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+			50, 50, 50, 50, 50, 50, 50, 50, 50, 31, 31, 43, 43, 50, 50, 50, 50, 50, 31, 31, 31, 31, 50, 50, 50, 50, 50,
+			50, 50, 50, 31, 31, 35, 50, 50, 50, 50, 31, 36, 55, 55, 55, 55, 36, 55, 55, 55, 55, 55, 36, 55, 55, 55, 55,
+			55, 36, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 40, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			36, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 40, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
+			55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 50, 50,
+			50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+			50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+			50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+			50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+			50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+			50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+			50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+			50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+			50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+			50, 43, 43, 50, 43, 43, 50, 43, 43, 50, 43, 43, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+			50, 50, 50, 50, 50, 50, 43, 43, 50, 43, 43, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 35, 35, 35, 35, 35, 35,
+			35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 28, 28, 35, 28, 28, 35, 28, 28, 35, 28, 28, 35, 28, 28, 35, 28,
+			21, 28, 35, 28, 28, 35, 35, 35, 35, 35, 37, 38, 21, 28, 35, 28, 28, 35, 35, 35, 35, 35, 35, 35, 36, 36, 21,
+			39, 35, 35, 35, 39, 35, 37, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 28, 28, 35, 35, 28, 28, 35, 35,
+			35, 36, 36, 22, 39, 35, 35, 35, 35, 35, 35, 37, 38, 28, 35, 21, 36, 36, 37, 35, 35, 20, 39, 39, 35, 35, 35,
+			35, 37, 38, 28, 35, 37, 34, 35, 24, 24, 27, 25, 20, 24, 37, 35, 27, 21, 20, 21, 27, 17, 20, 24, 32, 26, 20,
+			12, 20, 10, 20, 24, 25, 23, 20, 32, 24, 24, 23, 20, 24, 23, 18, 34, 34, 34, 22, 26, 24, 24, 18, 22, 22, 23,
+			25, 20, 12, 20, 24, 23, 24, 23, 22, 20, 20, 0, 20, 24, 23, 20, 8, 10, 4, 20, 20, 3, 7, 19, 20, 4, 4, 7, 7,
+			0, 7, 11, 18, 8, 3, 23, 23, 20, 11, 4, 20, 18, 12, 20, 20, 20, 4, 20, 4, 2, 3, 21, 21, 21, 21, 10, 15, 14,
+			15, 19, 2, 4, 3, 6, 11, 3, 4, 6, 21, 16, 20, 11, 1, 4, 12, 0, 15, 8, 1, 3, 3, 12, 1, 11, 20, 4 };
+	private int[] base = { 2, 13, 38, 51, 67, 78, 92, 118, 138, 162, 181, 191, 210, 222, 239, 253, 266, 280, 288, 304,
+			317, 333, 347, 359, 375, 386, 394, 406, 418, 433, 444, 457, 472, 482, 496, 506, 519, 529, 544, 557, 569,
+			579, 590, 601, 614, 626, 638, 649, 663, 673, 686, 706, 715, 731, 740, 753, 765, 777, 787, 799, 813, 826,
+			838, 854, 863, 876, 892, 901, 913, 929, 937, 948, 960, 970, 981, 993, 1004, 1017, 1034, 1045, 1056, 1068,
+			1080, 1091, 1103, 1115, 1126, 1138, 1148, 1160, 1177, 1187, 1199, 1211, 1222, 1232, 1243, 1254, 1268, 1279,
+			1294, 1307, 1319, 1330, 1341, 1352, 1362, 1374, 1388, 1398, 1411, 1422, 1433, 1444, 1456, 1466, 1479, 1497,
+			1506, 1519, 1531, 1543, 1556, 1567, 1578, 1589, 1604, 1614, 1630, 1641, 1651, 1662, 1675, 1688, 1700, 1711,
+			1721, 1732, 1748, 1758, 1772, 1784, 1795, 1806, 1820, 1830, 1844, 1855, 1866, 1877, 1892, 1902, 1914, 1926,
+			1939, 1950, 1965, 1974, 1986, 1999, 2011, 2023, 2037, 2047, 2059, 2072, 2084, 2096, 2107, 2120, 2132, 2144,
+			2156, 2169, 2180, 2191, 2202, 2217, 2227, 2239, 2251, 2264, 2275, 2286, 2297, 2309, 2321, 2332, 2347, 2358,
+			2369, 2381, 2394, 2406, 2417, 2429, 2439, 2452, 2465, 2476, 2490, 2501, 2512, 2524, 2536, 2546, 2560, 2570,
+			2581, 2593, 2605, 2616, 2628, 2640, 2653, 2664, 2676, 2688, 2700, 2712, 2723, 2735, 2748, 2759, 2772, 2784,
+			2795, 2808, 2820, 2831, 2842, 2854, 2866, 2878, 2888, 2901, 2913, 2927, 2936, 2947, 2958, 2970, 2982, 2994,
+			3005, 3019, 3030, 3041, 3053, 3064, 3077, 3088, 3099, 3110, 3123, 3135, 3146, 3157, 3168, 3179, 3192, 3203,
+			3214, 3226, 3238, 3251, 3263, 3275, 3286, 3297, 3308, 3320, 3331, 3344, 3356, 3368, 3380, 3391, 3402, 3415,
+			3426, 3440, 3451, 3462, 3474, 3485, 3496, 3508, 3520, 3532, 3543, 3556, 3569, 3580, 3593, 3604, 3615, 3626,
+			3638, 3650, 3661, 3673, 3684, 3698, 3709, 3721, 3732, 3744, 3756, 3767, 3779, 3792, 3803, 3814, 3827, 3838,
+			3850, 3862, 3873, 3885, 3897, 3909, 3920, 3932, 3943, 3955, 3966, 3980, 3990, 4002, 4014, 4026, 4038, 4050,
+			4061, 4072, 4083, 4095, 4107, 4119, 4131, 4143, 4156, 4167, 4179, 4191, 4203, 4215, 4227, 4238, 4252, 4262,
+			4274, 4287, 4298, 4310, 4321, 4333, 4345, 4356, 4370, 4381, 4393, 4406, 4417, 4428, 4440, 4453, 4464, 4477,
+			4489, 4500, 4513, 4524, 4536, 4548, 4560, 4573, 4583, 4595, 4607, 4620, 4631, 4645, 4655, 4667, 4679, 4690,
+			4702, 4714, 4728, 4739, 4750, 4762, 4774, 4786, 4798, 4810, 4821, 4833, 4845, 4857, 4869, 4880, 4892, 4905,
+			4916, 4927, 4940, 4952, 4963, 4977, 4988, 5000, 5012, 5023, 5034, 5045, 5057, 5069, 5081, 5093, 5104, 5115,
+			5127, 5139, 5151, 5163, 5176, 5188, 5199, 5211, 5223, 5235, 5247, 5259, 5272, 5283, 5296, 5308, 5320, 5331,
+			5343, 5354, 5366, 5378, 5390, 5402, 5414, 5426, 5438, 5450, 5462, 5474, 5486, 5497, 5510, 5521, 5532, 5544,
+			5557, 5569, 5581, 5592, 5604, 5617, 5629, 5641, 5652, 5663, 5676, 5687, 5699, 5712, 5724, 5735, 5748, 5760,
+			5771, 5784, 5794, 5806, 5817, 5829, 5841, 5853, 5866, 5879, 5891, 5903, 5916, 5928, 5941, 5952, 5964, 5976,
+			5988, 6000, 6012, 6024, 6036, 6048, 6060, 6072, 6085, 6096, 6109, 6121, 6133, 6146, 6157, 6168, 6180, 6192,
+			6203, 6215, 6227, 6239, 6251, 6265, 6276, 6289, 6302, 6313, 6325, 6337, 6349, 6361, 6374, 6386, 6398, 6410,
+			6422, 6436, 6448, 6459, 6471, 6483, 6495, 6507, 6520, 6532, 6545, 6555, 6567, 6579, 6591, 6603, 6615, 6627,
+			6640, 6652, 6664, 6676, 6688, 6700, 6713, 6726, 6738, 6749, 6761, 6774, 6786, 6799, 6811, 6823, 6835, 6848,
+			6859, 6871, 6883, 6895, 6907, 6920, 6933, 6945, 6956, 6968, 6980, 6992, 7005, 7016, 7030, 7042, 7053, 7066,
+			7079, 7091, 7104, 7115, 7128, 7140, 7152, 7163, 7175, 7187, 7200, 7212, 7224, 7235, 7248, 7260, 7272, 7285,
+			7297, 7309, 7321, 7333, 7345, 7358, 7370, 7382, 7394, 7406, 7419, 7431, 7443, 7455, 7468, 7480, 7492, 7505,
+			7517, 7530, 7542, 7554, 7566, 7578, 7591, 7603, 7615, 7628, 7640, 7653, 7666, 7677, 7690, 7702, 7714, 7727,
+			7738, 7750, 7762, 7775, 7786, 7799, 7812, 7823, 7836, 7848, 7859, 7871, 7884, 7896, 7909, 7921, 7933, 7946,
+			7958, 7971, 7984, 7996, 8007, 8019, 8032, 8044, 8056, 8069, 8081, 8094, 8107, 8119, 8131, 8143, 8155, 8167,
+			8179, 8192, 8205, 8218, 8230, 8244, 8255, 8267, 8279, 8291, 8303, 8315, 8328, 8340, 8353, 8366, 8378, 8392,
+			8404, 8417, 8431, 8443, 8455, 8467, 8479, 8492, 8504, 8516, 8529, 8543, 8555, 8567, 8580, 8593, 8606, 8619,
+			8632, 8644, 8658, 8670, 8683, 8695, 8708, 8721, 8733, 8746, 8759, 8771, 8783, 8795, 8808, 8821, 8833, 8845,
+			8858, 8871, 8885, 8898, 8910, 8923, 8936, 8949, 8960, 8973, 8986, 9000, 9012, 9025, 9038, 9051, 9064, 9076,
+			9089, 9102, 9114, 9126, 9139, 9151, 9164, 9177, 9191, 9204, 9217, 9230, 9243, 9255, 9268, 9281, 9294, 9307,
+			9320, 9333, 9345, 9358, 9371, 9384, 9398, 9412, 9424, 9437, 9450, 9462, 9475, 9488, 9501, 9514, 9528, 9542,
+			9554, 9567, 9581, 9593, 9606, 9619, 9632, 9645, 9658, 9671, 9682, 9695, 9708, 9721, 9735, 9749, 9762, 9776,
+			9789, 9802, 9815, 9828, 9842, 9855, 9867, 9880, 9893, 9906, 9920, 9933, 9947, 9960, 9974, 9987, 10000,
+			10014, 10027, 10040, 10054, 10067, 10081, 10095, 10107, 10120, 10134, 10148, 10161, 10175, 10188, 10201,
+			10214, 10228, 10241, 10254, 10267, 10280, 10294, 10309, 10322, 10335, 10348, 10362, 10374, 10387, 10401,
+			10415, 10428, 10441, 10455, 10469, 10482, 10497, 10510, 10523, 10537, 10551, 10565, 10579, 10593, 10606,
+			10621, 10634, 10647, 10661, 10675, 10689, 10704, 10719, 10732, 10746, 10760, 10774, 10788, 10802, 10815,
+			10829, 10843, 10856, 10871, 10884, 10898, 10913, 10927, 10940, 10955, 10970, 10984, 10999, 11013, 11027,
+			11042, 11056, 11071, 11086, 11100, 11114, 11128, 11142, 11158, 11171, 11186, 11200, 11213, 11228, 11241,
+			11255, 11270, 11284, 11299, 11314, 11328, 11342, 11356, 11370, 11385, 11399, 11413, 11429, 11445, 11460,
+			11474, 11489, 11503, 11518, 11533, 11549, 11563, 11577, 11592, 11607, 11621, 11637, 11651, 11665, 11680,
+			11694, 11708, 11725, 11740, 11754, 11768, 11784, 11798, 11813, 11828, 11843, 11858, 11874, 11888, 11904,
+			11920, 11933, 11948, 11964, 11979, 11993, 12009, 12024, 12041, 12058, 12071, 12087, 12102, 12117, 12132,
+			12148, 12165, 12179, 12195, 12210, 12226, 12241, 12256, 12273, 12288, 12304, 12320, 12335, 12350, 12365,
+			12382, 12398, 12414, 12430, 12446, 12462, 12478, 12495, 12511, 12525, 12541, 12556, 12575, 12591, 12605,
+			12622, 12638, 12653, 12671, 12686, 12705, 12721, 12739, 12756, 12772, 12788, 12806, 12822, 12839, 12855,
+			12873, 12890, 12908, 12923, 12941, 12960, 12975, 12992, 13009, 13024, 13040, 13059, 13076, 13092, 13109,
+			13128, 13145, 13161, 13179, 13194, 13216, 13233, 13249, 13266, 13287, 13303, 13322, 13337, 13357, 13375,
+			13392, 13410, 13424, 13446, 13465, 13480, 13499, 13517, 13533, 13559, 13575, 13595, 13612, 13632, 13650,
+			13670, 13687, 13706, 13726, 13744, 13765, 13783, 13803, 13822, 13841, 13860, 13879, 13897, 13917, 13936,
+			13960, 13979, 13996, 14019, 14040, 14057, 14077, 14102, 14122, 14141, 14163, 14184, 14202, 14225, 14244,
+			14265, 14287, 14312, 14336, 14356, 14375, 14393, 14420, 14438, 14465, 14483, 14500, 14536, 14555, 14575,
+			14604, 14619, 14648, 14668, 14691, 14725, 14748, 14770, 14788, 14818, 14840, 14862, 14888, 14921, 14939,
+			14969, 14996, 15022, 15051, 15075, 15098, 15130, 15149, 15167, 15218, 15237, 15276, 15297, 15333, 15356,
+			15379, 15418, 15447, 15481, 15508, 15530, 15574, 15599, 15643, 15680, 15697, 15743, 15759, 15775, 15813,
+			15845, 15877, 15911, 15931, 15968, 16014, 16049, 16077, 16088, 16138, 16149, 16185, 16200, 16241, 16280,
+			16296 };
 
 	private ABITrace tracer = null;
-	//Test length of tracer for file 3730.ab1
+	
+	// Test length of tracer for file 3730.ab1
 	static final int EXPECTED_TRACE_LENGTH = 16302;
 
 	@BeforeEach
-	 void setUp() throws Exception {
+	void setUp() throws Exception {
 		URL resource = this.getClass().getResource("/3730.ab1");
 		assertNotNull(resource);
 		tracer = new ABITrace(resource);
 	}
 
-	@AfterEach
-	 void tearDown() {
-	}
-
 	/**
 	 * Test of URL method, of class ABITracer.
 	 */
@@ -72,41 +178,38 @@ public void testURL() throws Exception {
 	 * Test of Local file method, of class ABITracer.
 	 */
 	@Test
-	 void testLocal() throws Exception {
+	void testLocal() throws Exception {
 		URL resource = this.getClass().getResource("/3730.ab1");
-		assertNotNull(resource);
 		File file = new File(resource.toURI());
 		assertNotNull(file);
 		ABITrace tracer = new ABITrace(file);
 		assertNotNull(tracer);
 
-		
 		assertEquals(EXPECTED_TRACE_LENGTH, tracer.getTraceLength());
-		//Test length of sequence for file 3730.ab1
+		// Test length of sequence for file 3730.ab1
 		assertEquals(1165, tracer.getSequenceLength());
 
-		//Test sequence of tracer for file 3730.ab1
+		// Test sequence of tracer for file 3730.ab1
 		assertTrue(sequence.equals(tracer.getSequence().getSequenceAsString()));
-		//Test array that represents the quality of tracer for file 3730.ab1
+		// Test array that represents the quality of tracer for file 3730.ab1
 		assertArrayEquals(qual, tracer.getQcalls());
-		//Test array that represents the baseline of tracer for file 3730.ab1
+		// Test array that represents the baseline of tracer for file 3730.ab1
 		assertArrayEquals(base, tracer.getBasecalls());
-		//Test image of tracer for file 3730.ab1
-		BufferedImage image = tracer.getImage(100,100);
+		// Test image of tracer for file 3730.ab1
+		BufferedImage image = tracer.getImage(100, 100);
 		assertNotNull(image);
-		
-
 	}
 
 	@DisplayName("getTrace rejects invalid bases")
 	@Test
 	void testGetTraceThrowsCNFE() throws Exception {
-		assertThrows(CompoundNotFoundException.class, ()->tracer.getTrace("D"));
+		assertThrows(CompoundNotFoundException.class, () -> tracer.getTrace("D"));
 	}
 
-	@ParameterizedTest
-    @ValueSource(strings = {"A","T","C", "G" })
-	void testGetTrace(String base) throws Exception {;
+	@DisplayName("Traces are equal length for 4 nucleotides")
+	@ParameterizedTest(name="Base: {0}")
+	@ValueSource(strings = { "A", "T", "C", "G" })
+	void testGetTrace(String base) throws Exception {
 		assertEquals(EXPECTED_TRACE_LENGTH, tracer.getTrace(base).length);
 	}
 }

From 3669911f7f109833607be9b09691fa104e9197b2 Mon Sep 17 00:00:00 2001
From: Richard Adams <richard@researchspace.com>
Date: Sun, 4 Jul 2021 10:56:56 +0100
Subject: [PATCH 108/599] more formatting

---
 .../nbio/core/TestAmbiguityCompoundSet.java       |  6 ++----
 .../nbio/core/sequence/io/ABITracerTest.java      | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/TestAmbiguityCompoundSet.java b/biojava-core/src/test/java/org/biojava/nbio/core/TestAmbiguityCompoundSet.java
index 9fad78d7b0..714f418280 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/TestAmbiguityCompoundSet.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/TestAmbiguityCompoundSet.java
@@ -20,7 +20,8 @@
  */
 package org.biojava.nbio.core;
 
-import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.biojava.nbio.core.sequence.DNASequence;
 import org.biojava.nbio.core.sequence.RNASequence;
 import org.biojava.nbio.core.sequence.compound.AmbiguityDNACompoundSet;
@@ -31,9 +32,6 @@
 import org.biojava.nbio.core.sequence.template.Sequence;
 import org.biojava.nbio.core.sequence.transcription.DNAToRNATranslator;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.DisplayName;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * A Test case for https://github.com/biojava/biojava/issues/344
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
index 3024940a07..be87905e04 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/ABITracerTest.java
@@ -21,17 +21,22 @@
 
 package org.biojava.nbio.core.sequence.io;
 
-import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.*;
-import org.junit.jupiter.params.provider.ValueSource;
-import org.junit.jupiter.params.ParameterizedTest;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.net.URL;
-import java.util.Arrays;
 
 import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 /**
  * Test file 3730.ab1 is from https://github.com/biopython/biopython/blob/master/Tests/Abi/3730.ab1 The test data for

From 704bda6c582d049dab109586fe0949e7b8e63ab2 Mon Sep 17 00:00:00 2001
From: Richard Adams <richard@researchspace.com>
Date: Sun, 4 Jul 2021 11:32:26 +0100
Subject: [PATCH 109/599] update junit3->junit4 test, remove doc references to
 ju3

---
 .../nbio/structure/test/TestSECalignment.java    | 16 +++++++++++-----
 .../test/align/ce/OptimalCECPMainTest.java       |  8 +-------
 .../org/biojava/nbio/structure/ElementTest.java  |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/TestSECalignment.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/TestSECalignment.java
index 6a9516251b..b8ec8ed89c 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/TestSECalignment.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/TestSECalignment.java
@@ -22,7 +22,14 @@
  */
 package org.biojava.nbio.structure.test;
 
-import junit.framework.TestCase;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.InputStream;
+
+import org.biojava.nbio.core.util.StringManipulationHelper;
 import org.biojava.nbio.structure.Atom;
 import org.biojava.nbio.structure.align.StructureAlignment;
 import org.biojava.nbio.structure.align.StructureAlignmentFactory;
@@ -33,9 +40,7 @@
 import org.biojava.nbio.structure.align.xml.AFPChainXMLParser;
 import org.biojava.nbio.structure.test.align.fatcat.FlipAFPChainTest;
 import org.biojava.nbio.structure.test.util.StringManipulationTestsHelper;
-import org.biojava.nbio.core.util.StringManipulationHelper;
-
-import java.io.InputStream;
+import org.junit.Test;
 
 /** This test makes sure that the new representation of selenocysteins as SEC amino acids does not
  * affect the structure alignment results.
@@ -43,8 +48,9 @@
  * @author andreas
  *
  */
-public class TestSECalignment extends  TestCase {
+public class TestSECalignment {
 
+	@Test
 	public void testOldSecOutput() throws Exception {
 
 		String fileName = "/ce_1fdo.A_2iv2.X.out";
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/ce/OptimalCECPMainTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/ce/OptimalCECPMainTest.java
index bf7ee56be4..81eb35c9b9 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/ce/OptimalCECPMainTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/ce/OptimalCECPMainTest.java
@@ -46,13 +46,7 @@ public class OptimalCECPMainTest {
 
 	private AtomCache cache = new AtomCache();
 
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	@Before
-	public void setUp() throws Exception {
-	}
-
+	
 	/**
 	 * Basic test that alignPermuted(..., 0) is equivalent to a normal CE alignment.
 	 *
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/ElementTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/ElementTest.java
index 81ce22d087..7dd8cda993 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/ElementTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/ElementTest.java
@@ -21,7 +21,7 @@
 
 package org.biojava.nbio.structure;
 
-import junit.framework.TestCase;
+
 import org.junit.Assert;
 import org.junit.Test;
 

From 3cc243e6660acc3d0ca98320d1863a58841c04ca Mon Sep 17 00:00:00 2001
From: Richard Adams <richard@researchspace.com>
Date: Fri, 9 Jul 2021 18:34:48 +0100
Subject: [PATCH 110/599] example of new nested test, with bug in
 SequenceTools#permuteCyclic detected and fixed

---
 .../biojava/nbio/core/util/SequenceTools.java | 15 ++++
 .../nbio/core/util/SequenceToolsTest.java     | 74 +++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/util/SequenceToolsTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java
index f23d4e7417..2dd32af6c9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java
@@ -50,6 +50,21 @@ public static String permuteCyclic(String string, int n) {
 		return String.valueOf(p);
 	}
 
+	/**
+	 * Improved implementation that is generally 10-100x faster, and fixes some edge-case bugs.
+	 * @param string The string to permute
+	 * @param n The number of characters to permute by; can be positive or negative; values greater than the length of the array are acceptable
+	 * @return
+	 */
+	public static String permuteCyclic2(String string, int n) {
+		String toMutate = string + string;
+		n = n % string.length();
+		if (n < 0) {
+			n = string.length() + n;
+		}
+		return toMutate.substring(n, n + string.length());
+	}
+
 	/**
 	 * Cyclically permute {@code array} <em>forward</em> by {@code n} elements.
 	 * @param array The original result; will not be changed
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/SequenceToolsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/SequenceToolsTest.java
new file mode 100644
index 0000000000..819c40e9b0
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/SequenceToolsTest.java
@@ -0,0 +1,74 @@
+package org.biojava.nbio.core.util;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Random;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+class SequenceToolsTest {
+
+	String randomDNA(int n) {
+		String[] nucs = new String[] { "A", "T", "C", "G" };
+		Random r = new Random();
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < n; i++) {
+			sb.append(nucs[r.nextInt(4)]);
+		}
+		return sb.toString();
+	}
+
+	@Nested
+	class PermuteCyclic {
+
+		@ParameterizedTest
+		@CsvSource(value = { "ATCGT,1,TCGTA", "ATCGT,-1,TATCG", "ATCGT,0,ATCGT", "ATCGT,25,ATCGT","12345,1,23451" })
+		void permuteCyclicBasic(String original, int n, String expected) {
+			assertEquals(expected, SequenceTools.permuteCyclic(original, n));
+		}
+		
+		@ParameterizedTest
+		@CsvSource(value = { "ATCGT,CGTAT", "ATCGT,CGTAT" })
+		@Disabled("fails with current implementation")
+		void permuteCycleIntMaxMin(String original, String expected) {
+			assertAll(
+					()->assertEquals(expected, SequenceTools.permuteCyclic(original, Integer.MAX_VALUE)),
+					()->assertEquals(expected, SequenceTools.permuteCyclic(original, Integer.MIN_VALUE))
+				);
+		}
+		
+		@ParameterizedTest
+		@CsvSource(value = { "ATCGT,CGTAT", "ATCGT,CGTAT" })
+		@DisplayName("Edge case fixed")
+		void permuteCycleIntMaxMin2(String original, String expected) {
+			assertAll(
+					()->assertEquals(expected, SequenceTools.permuteCyclic2(original, Integer.MAX_VALUE)),
+					()->assertEquals(expected, SequenceTools.permuteCyclic2(original, Integer.MIN_VALUE))
+				);
+		}
+		
+		@Test
+		void permuteCyclicPerformance() {
+			String dna = randomDNA(10_000_000);
+			long start = System.currentTimeMillis();
+			String rotated = SequenceTools.permuteCyclic(dna, 5_000_000);
+			long end = System.currentTimeMillis();
+			System.err.println(end-start);
+			
+			long start2 = System.currentTimeMillis();
+			String rotated2 = SequenceTools.permuteCyclic2(dna, 5_000_000);
+			long end2 = System.currentTimeMillis();
+			System.err.println(end2-start2);
+			assertTrue((end-start)/(end2-start2) > 5);
+		}
+
+	}
+
+}

From 43fafd0a40a523422c1f8d16d7a2a0b504881a01 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Sat, 10 Jul 2021 21:41:39 +0100
Subject: [PATCH 111/599] add tests for other SequenceToolsMethods

---
 .gitignore                                    |  1 +
 .../biojava/nbio/core/util/SequenceTools.java | 18 ++++
 .../nbio/core/util/SequenceToolsTest.java     | 95 +++++++++++++++++++
 3 files changed, 114 insertions(+)

diff --git a/.gitignore b/.gitignore
index 4c968aac08..89345576ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .profile
 .settings
 .classpath
+.factorypath
 .DS_Store
 .idea
 *.iml
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java
index 2dd32af6c9..61f7e44135 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java
@@ -119,6 +119,23 @@ public static boolean isNucleotideSequence(String sequence)
 			return true;
 	}
 
+	/**
+	 * Attempts to parse String as a DNA sequence first.<br/>
+	 * If this fails it tries to  parse as a ProteinSequence.
+	 * <br/>
+	 * This method does not attempt to create an RNASequence.
+	 * <p>
+	 * Also, a sequence such as 'ATCGTA' which is both a
+	 * peptide sequence and a DNA sequence, will always be returned 
+	 * as a DNA sequence.
+	 * </p>
+	 * <p>
+	 * An empty string argument returns a ProteinSequence of length 0.
+	 * A null argument throws a {@link NullPointerException}
+	 * @param sequence
+	 * @return Either a DNASequence or a ProteinSequence
+	 * @throws CompoundNotFoundException
+	 */
 	public Sequence<?> getSequenceFromString(String sequence) throws CompoundNotFoundException {
 
 
@@ -126,6 +143,7 @@ public Sequence<?> getSequenceFromString(String sequence) throws CompoundNotFoun
 			return  new DNASequence(sequence);
 		} else {
 			return new ProteinSequence(sequence);
+
 		}
 
 	}
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/SequenceToolsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/SequenceToolsTest.java
index 819c40e9b0..420e574c28 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/SequenceToolsTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/SequenceToolsTest.java
@@ -1,17 +1,25 @@
 package org.biojava.nbio.core.util;
 
+import static org.junit.Assert.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Random;
 
+import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
+import org.biojava.nbio.core.sequence.ProteinSequence;
+import org.biojava.nbio.core.sequence.template.Sequence;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.EmptySource;
+import org.junit.jupiter.params.provider.NullAndEmptySource;
+import org.junit.jupiter.params.provider.NullSource;
 
 class SequenceToolsTest {
 
@@ -68,7 +76,94 @@ void permuteCyclicPerformance() {
 			System.err.println(end2-start2);
 			assertTrue((end-start)/(end2-start2) > 5);
 		}
+	}
+
+	@Nested
+	class PercentNucleotideContent {
+
+		@ParameterizedTest
+		@NullAndEmptySource
+		@DisplayName("percent nucleotide sequence returns 0 for null "+
+		 "or empty string")
+		void nucleotideContentInvalidValues(String empty){
+			assertEquals(0, SequenceTools.percentNucleotideSequence(empty));
+		}
+
+		@Test
+		void nucleotideContentTest(){
+			assertEquals(100, SequenceTools.percentNucleotideSequence("ATCGCAA"));
+			assertEquals(100, SequenceTools.percentNucleotideSequence("UUACG"));
+			assertEquals(100, SequenceTools.percentNucleotideSequence(randomDNA(1_000_000)));
+			assertEquals(50, SequenceTools.percentNucleotideSequence("123CCG"));
+			assertEquals(66, SequenceTools.percentNucleotideSequence("12TTAC"));				assertEquals(0, SequenceTools.percentNucleotideSequence("  HH"));
+			assertEquals(0, SequenceTools.percentNucleotideSequence("actg"));
+			}
+
+		@Test
+		void isNucleotideSequence () {
+			assertTrue(SequenceTools.isNucleotideSequence("AACGAA"));
+			assertFalse(SequenceTools.isNucleotideSequence("aacgaa"));
+			assertFalse(SequenceTools.isNucleotideSequence("  HH"));
+		}
 
+		@ParameterizedTest
+		@NullAndEmptySource
+		@DisplayName("isNucleotide is false for null "+
+			 "or empty string")
+		void isnucleotideInvalidValues(String empty){
+			assertFalse(SequenceTools.isNucleotideSequence(empty));
+		}
 	}
+	@Nested
+	@DisplayName("SequenceFromString")
+	class SequenceFromString{
+		SequenceTools tools = new SequenceTools();
 
+		@Test
+		void acceptsUpperCaseDNA() throws CompoundNotFoundException  {
+			Sequence<?>nuc = tools.getSequenceFromString("ATCG");
+			assertEquals(4, nuc.getLength());
+		}
+
+		@Test
+		void acceptsLowerCaseDNA() throws CompoundNotFoundException  {
+			Sequence<?>nuc = tools.getSequenceFromString("atcg");
+			assertEquals(4, nuc.getLength());
+		}
+
+		@Test
+		void rejectsRNA()throws CompoundNotFoundException {
+			assertThrows(CompoundNotFoundException.class,
+				 ()->tools.getSequenceFromString("AUCG"));
+		}
+
+		@Test
+		void acceptsSingleLetterProtein()throws CompoundNotFoundException {
+			Sequence<?> protein = tools.getSequenceFromString("HYDESS");
+			assertEquals(6, protein.getLength());
+		}
+
+		@Test
+		void interpets3LetterAACodeAsSingleLetter()throws CompoundNotFoundException {
+			Sequence<?> protein = tools.getSequenceFromString("AlaGlySer");
+			assertEquals(9, protein.getLength());
+		}
+
+		@EmptySource
+		@ParameterizedTest
+		@DisplayName("empty string return 0-length protein sequence")
+		void emptyString(String empty) throws CompoundNotFoundException{
+			Sequence<?> protein = tools.getSequenceFromString(empty);
+			assertEquals(0, protein.getLength());
+			assertTrue(protein instanceof ProteinSequence);
+		}
+
+		@NullSource
+		@ParameterizedTest
+		@DisplayName("null string throws NPE")
+		void nullString(String nullStr) throws CompoundNotFoundException{
+			assertThrows(NullPointerException.class,
+			 ()-> tools.getSequenceFromString(nullStr));
+		}
+	}
 }

From 190b55fc016fe78a9d0d11295e2fbe03d5e146c9 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Wed, 21 Jul 2021 23:08:28 +0100
Subject: [PATCH 112/599] padleft/right tests

---
 .../core/util/StringManipulationHelper.java   | 47 ++++++++++++++-----
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
index f8aef6b35e..ca7edcb3b2 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
@@ -23,6 +23,19 @@
  */
 package org.biojava.nbio.core.util;
 
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.AbstractCollection;
+import java.util.Iterator;
+import java.util.Scanner;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -31,14 +44,6 @@
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.*;
-import java.util.AbstractCollection;
-import java.util.Iterator;
-import java.util.Scanner;
-
 
 /**
  * A utility class for common {@link String} manipulation tasks.
@@ -62,10 +67,6 @@ private StringManipulationHelper() {
 		// to prevent instantiation
 	}
 
-
-
-
-
 	/**
 	 * @author andreas
 	 * @param stream
@@ -174,14 +175,36 @@ public static boolean equalsToXml(String expected, String actual) {
 		throw new UnsupportedOperationException("not yet implemented");
 	}
 
+	/**
+	 * Adds padding to left of supplied string
+	 * @param s The String to pad
+	 * @param n an integer >= 1
+	 * @return The left-padded string. 
+	 * @throws IllegalArgumentException if n <= 0
+	 */
 	public static String padLeft(String s, int n) {
+		validatePadding(n);
 	    return String.format("%1$" + n + "s", s);
 	}
 
+	/**
+	 * Adds padding to right of supplied string
+	 * @param s The String to pad
+	 * @param n an integer >= 1
+	 * @return The right-padded string. 
+	 * @throws IllegalArgumentException if n <= 0
+	 */
 	public static String padRight(String s, int n) {
+		validatePadding(n);
 	     return String.format("%1$-" + n + "s", s);
 	}
 
+	private static void validatePadding(int n) {
+		if (n <=0 ) {
+			throw new IllegalArgumentException("padding must be >= 1");
+		}
+	}
+
 	public static String join(AbstractCollection<String> s, String delimiter) {
 	    if (s == null || s.isEmpty()) return "";
 	    Iterator<String> iter = s.iterator();

From fda5184389db3e05b9d825e03ab0049b958af60a Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Thu, 22 Jul 2021 09:12:01 +0100
Subject: [PATCH 113/599] tests and docs for convertStreamToString

---
 .../core/util/StringManipulationHelper.java   | 22 +++--
 .../util/StringManipulationHelperTest.java    | 83 +++++++++++++++++++
 2 files changed, 97 insertions(+), 8 deletions(-)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
index ca7edcb3b2..88f100b4d2 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
@@ -68,9 +68,18 @@ private StringManipulationHelper() {
 	}
 
 	/**
+	 * Converts an InputStream of text to a String, closing the stream
+	 * before returning.
+	 * <ul>
+	 * <li> Newlines are converted to Unix newlines (\n)
+	 * <li> Default charset encoding is used to read the stream.
+	 * <li> Any IOException reading the stream is 'squashed' and not made
+	 *   available to caller
+	 * <li> An additional newline is appended at the end of the string.
+	 * <ul>
 	 * @author andreas
 	 * @param stream
-	 * @return
+	 * @return a possibly empty but non-null String
 	 */
 	public static String convertStreamToString(InputStream stream) {
 		BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
@@ -79,8 +88,7 @@ public static String convertStreamToString(InputStream stream) {
 		String line = null;
 		try {
 			while ((line = reader.readLine()) != null) {
-
-		sb.append(line).append(UNIX_NEWLINE);
+			    sb.append(line).append(UNIX_NEWLINE);
 			}
 		} catch (IOException e) {
 			// logger.error("Exception: ", e);
@@ -91,7 +99,6 @@ public static String convertStreamToString(InputStream stream) {
 				logger.error("Exception: ", e);
 			}
 		}
-
 		return sb.toString();
 	}
 
@@ -196,7 +203,7 @@ public static String padLeft(String s, int n) {
 	 */
 	public static String padRight(String s, int n) {
 		validatePadding(n);
-	     return String.format("%1$-" + n + "s", s);
+	    return String.format("%1$-" + n + "s", s);
 	}
 
 	private static void validatePadding(int n) {
@@ -209,9 +216,8 @@ public static String join(AbstractCollection<String> s, String delimiter) {
 	    if (s == null || s.isEmpty()) return "";
 	    Iterator<String> iter = s.iterator();
 	    StringBuilder builder = new StringBuilder(iter.next());
-	    while( iter.hasNext() )
-	    {
-		builder.append(delimiter).append(iter.next());
+	    while( iter.hasNext() ){
+		    builder.append(delimiter).append(iter.next());
 	    }
 	    return builder.toString();
 	}
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
new file mode 100644
index 0000000000..6393aaaa72
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
@@ -0,0 +1,83 @@
+package org.biojava.nbio.core.util;
+import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+class StringManipulationHelperTest {
+
+    @Nested
+    class PaddingTest {
+	    @Test
+        void padLeft() {
+            assertEquals("     ",
+            StringManipulationHelper.padLeft("",5));
+            assertEquals("   xx",
+                StringManipulationHelper.padLeft("xx",5));
+            assertEquals("xxxxxx", StringManipulationHelper.padLeft("xxxxxx",5));
+        }
+
+        @Test
+        void padRight() {
+            assertEquals("     ",
+            StringManipulationHelper.padRight("",5));
+            assertEquals("xx   ",
+                StringManipulationHelper.padRight("xx",5));
+            assertEquals("xxxxxx", StringManipulationHelper.padRight("xxxxxx",5));
+        }
+
+        @ParameterizedTest
+        @ValueSource(ints = {0,-1,-2})
+        @DisplayName("invalid padding arguments throw IAE")
+        void padInvalidValues(int invalidPadding) {
+            assertThrows(IllegalArgumentException.class, 
+              ()->StringManipulationHelper.padLeft(
+               "anystring",invalidPadding));
+            assertThrows(IllegalArgumentException.class, 
+               ()->StringManipulationHelper.padRight(
+                "anystring",invalidPadding));
+        }
+    
+   }
+   @Nested
+   class InputStreamToString {
+
+        @Test
+        void basicString(){
+           String singleLine = "hello";
+           ByteArrayInputStream bais = new ByteArrayInputStream(singleLine.getBytes());
+           assertEquals("hello\n", StringManipulationHelper.convertStreamToString(bais));
+        }
+
+        @ParameterizedTest
+        @DisplayName("Newlines are converted to Unix newlines")
+        @ValueSource(strings={"line1\r\nline2", "line1\nline2", "line1\rline2"})
+        void multiLineConvertedToUnixNewLine(String multiline){
+           ByteArrayInputStream bais = new ByteArrayInputStream(multiline.getBytes());
+           assertEquals("line1\nline2\n", StringManipulationHelper.convertStreamToString(bais));
+        }
+
+        @Test
+        void streamIsClosedAfterCompletion() throws IOException{
+            // this is a stream that will throw IOException
+            // if called after closing
+            InputStream is = InputStream.nullInputStream();
+            StringManipulationHelper.convertStreamToString(is);
+            // attempt to read again after closing
+            assertThrows(IOException.class, ()->is.read());
+        }
+
+        @Test
+        void emptyStreamGeneratesEmptyString() {
+            assertEquals("", StringManipulationHelper.convertStreamToString(
+                new ByteArrayInputStream(new byte [0])));
+        }
+    }
+}
\ No newline at end of file

From 7122ab37477e4a42d09eaeadb716c20b9423e65b Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Thu, 22 Jul 2021 17:22:24 +0100
Subject: [PATCH 114/599] multi-line string comparison + bugfix

---
 .../core/util/StringManipulationHelper.java   | 28 ++++++++-----
 .../util/StringManipulationHelperTest.java    | 42 +++++++++++++++++++
 2 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
index 88f100b4d2..583f11451a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
@@ -103,8 +103,10 @@ public static String convertStreamToString(InputStream stream) {
 	}
 
 	/**
-	 * compares two strings for equality, line by line, ignoring any difference
-	 * of end line delimiters contained within the 2 Strings. This method should
+	 * Compares two strings in a case-sensitive manner for equality, line by line, ignoring any difference
+	 * of end line delimiters contained within the 2 Strings.
+	 * <br/>
+	 * This method should
 	 * be used if and only if two Strings are considered identical when all nodes
 	 * are identical including their relative order. Generally useful when
 	 * asserting identity of <b>automatically regenerated</b> XML or PDB.
@@ -124,24 +126,30 @@ public static boolean equalsToIgnoreEndline(String expected, String actual) {
 		String line1, line2;
 		while (scanner1.hasNextLine()) {
 			line1 = scanner1.nextLine();
-			line2 = scanner2.nextLine();
-			if (! line1.equals(line2)) {
-				scanner1.close();
-				scanner2.close();
+			if(scanner2.hasNextLine()) {
+				line2 = scanner2.nextLine();
+				if (! line1.equals(line2)) {
+					closeScanners(scanner1, scanner2);
+					return false;
+				}
+			} else {
+				closeScanners(scanner1, scanner2);
 				return false;
 			}
 		}
 		if (scanner2.hasNextLine()) {
-			scanner1.close();
-			scanner2.close();
+			closeScanners(scanner1, scanner2);
 			return false;
 		}
 
-		scanner1.close();
-		scanner2.close();
+		closeScanners(scanner1, scanner2);
 		return true;
 	}
 
+	private static void closeScanners(Scanner s1, Scanner s2) {
+		s1.close();
+		s2.close();
+	}
 
 	public static boolean equalsToXml(String expected, String actual) {
 		Document expectedDocument=null;
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
index 6393aaaa72..ef9b805aeb 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
@@ -1,6 +1,9 @@
 package org.biojava.nbio.core.util;
+import static org.biojava.nbio.core.util.StringManipulationHelper.equalsToIgnoreEndline;
 import static org.junit.Assert.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -80,4 +83,43 @@ void emptyStreamGeneratesEmptyString() {
                 new ByteArrayInputStream(new byte [0])));
         }
     }
+
+    @Nested
+    class equalsToIgnoreEndline{
+        @Test
+        void emptyOrNullStringsAreEqual() {
+            assertTrue(equalsToIgnoreEndline("",""));
+            assertTrue(equalsToIgnoreEndline(null, null));
+        }
+
+        @Test
+        void emptyVsNullStringsAreNotEqual() {
+            assertFalse(equalsToIgnoreEndline(null,""));
+        }
+
+        @Test
+        @DisplayName("multiline strings with different line terminators are equal")
+        void differentLineTerminatorsAreEqual() {
+            assertTrue(equalsToIgnoreEndline("ab\ncd\nef","ab\r\ncd\r\nef"));
+            assertTrue(equalsToIgnoreEndline("ab\r\ncd\nef","ab\rcd\ref"));
+        }
+
+        @Test
+        @DisplayName("comparison is case-sensitive")
+        void caseSensitive() {
+            assertFalse(equalsToIgnoreEndline("ab\ncd\nef","ab\nCD\nef"));
+        }
+
+        @Test
+        @DisplayName("multiline strings with different lengths are  unequal")
+        void s2LongerThanS1() {
+            assertFalse(equalsToIgnoreEndline("ab\ncd\nef","ab\ncd\nef\nextra-line"));
+        }
+
+        @Test
+        @DisplayName("multiline strings with different lengths are  unequal")
+        void s1LongerThanS2() {
+            assertFalse(equalsToIgnoreEndline("ab\ncd\nef\nextra","ab\ncd\nef"));
+        }
+    }
 }
\ No newline at end of file

From 030ae0ea29ffb94136ab05bf20b9d92fde57a6ac Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Thu, 22 Jul 2021 17:53:33 +0100
Subject: [PATCH 115/599] test for join

---
 .../core/util/StringManipulationHelper.java   | 14 +++++++--
 .../util/StringManipulationHelperTest.java    | 29 +++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
index 583f11451a..bc087b7b82 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
@@ -28,7 +28,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.AbstractCollection;
 import java.util.Iterator;
 import java.util.Scanner;
 
@@ -220,9 +219,18 @@ private static void validatePadding(int n) {
 		}
 	}
 
-	public static String join(AbstractCollection<String> s, String delimiter) {
-	    if (s == null || s.isEmpty()) return "";
+	/**
+	 * Joins Strings together with a delimiter
+	 * @param s An {@link Iterable} of Strings
+	 * @param delimiter
+	 * @return
+	 */
+	public static String join(Iterable<String> s, String delimiter) {
+	    if (s == null) return "";
 	    Iterator<String> iter = s.iterator();
+		if(!iter.hasNext()){
+			return "";
+		}
 	    StringBuilder builder = new StringBuilder(iter.next());
 	    while( iter.hasNext() ){
 		    builder.append(delimiter).append(iter.next());
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
index ef9b805aeb..1afb15e4e9 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
@@ -8,6 +8,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -122,4 +124,31 @@ void s1LongerThanS2() {
             assertFalse(equalsToIgnoreEndline("ab\ncd\nef\nextra","ab\ncd\nef"));
         }
     }
+    @Nested
+    class JoinString{   
+        List<String> empty = new ArrayList<>();
+        List<String> items =  new ArrayList<>();
+        void populateItems() {
+            items.add("a");
+            items.add("b");
+            items.add("c");
+        }
+        @Test
+        void join() {
+
+            assertEquals("", StringManipulationHelper.join(empty,","));
+            items.add("a");
+            assertEquals("a", StringManipulationHelper.join(items,","));
+            items.add("b");
+            items.add("c");
+            assertEquals("a,b,c", StringManipulationHelper.join(items,","));
+            assertEquals("abc", StringManipulationHelper.join(items,""));
+        }
+        @Test
+        void delimiterCanBeAnyLength(){
+            populateItems();
+            assertEquals("a---b---c", StringManipulationHelper.join(items,"---"));
+            
+        }
+    }
 }
\ No newline at end of file

From 75b189a0fff0e9b8c029d7944ebd4252fc51cdc5 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Thu, 22 Jul 2021 21:03:26 +0100
Subject: [PATCH 116/599] xmlEqualsTest

---
 .../nbio/core/util/StringManipulationHelper.java    | 10 +++++++++-
 .../core/util/StringManipulationHelperTest.java     | 13 +++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
index bc087b7b82..63db50f207 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
@@ -150,6 +150,14 @@ private static void closeScanners(Scanner s1, Scanner s2) {
 		s2.close();
 	}
 
+	/**
+	 * This method is not implemented or used, never returns true
+	 * and should probably be removed.
+	 * @param expected
+	 * @param actual
+	 * @return
+	 * @throws UnsupportedOperationException in most cases
+	 */
 	public static boolean equalsToXml(String expected, String actual) {
 		Document expectedDocument=null;
 		Document actualDocument=null;
@@ -220,7 +228,7 @@ private static void validatePadding(int n) {
 	}
 
 	/**
-	 * Joins Strings together with a delimiter
+	 * Joins Strings together with a delimiter to a single
 	 * @param s An {@link Iterable} of Strings
 	 * @param delimiter
 	 * @return
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
index 1afb15e4e9..4b92cbacb3 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
@@ -151,4 +151,17 @@ void delimiterCanBeAnyLength(){
             
         }
     }
+
+    @Nested
+    class EqualsToXml {
+
+        String docType ="<!DOCTYPE " +
+        "ex  [ <!ENTITY foo \"foo\"> <!ENTITY bar"+
+        " \"bar\">]> <ex/>";
+        @Test
+        void isNotImplemented() {
+            assertThrows(UnsupportedOperationException.class, 
+            ()->StringManipulationHelper.equalsToXml(docType, docType));
+        }
+    }
 }
\ No newline at end of file

From f1a293839bccca35e989a4932d8a9eade879ca2d Mon Sep 17 00:00:00 2001
From: Richard Adams <richard@researchspace.com>
Date: Fri, 23 Jul 2021 17:32:55 +0100
Subject: [PATCH 117/599] fix input stream test for java8

---
 .../core/util/StringManipulationHelper.java   |  3 ++-
 .../util/StringManipulationHelperTest.java    | 23 ++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
index 63db50f207..b62496c50a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
@@ -28,6 +28,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.Scanner;
 
@@ -233,7 +234,7 @@ private static void validatePadding(int n) {
 	 * @param delimiter
 	 * @return
 	 */
-	public static String join(Iterable<String> s, String delimiter) {
+	public static String join(Collection<String> s, String delimiter) {
 	    if (s == null) return "";
 	    Iterator<String> iter = s.iterator();
 		if(!iter.hasNext()){
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
index 4b92cbacb3..d341e3c853 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/StringManipulationHelperTest.java
@@ -68,12 +68,29 @@ void multiLineConvertedToUnixNewLine(String multiline){
            ByteArrayInputStream bais = new ByteArrayInputStream(multiline.getBytes());
            assertEquals("line1\nline2\n", StringManipulationHelper.convertStreamToString(bais));
         }
+        // in java11 there is a NullInputStream for this
+        class InputStreamTss extends InputStream {
+        	boolean closed = false;
+			@Override
+			public int read() throws IOException {
+				if (closed) {
+					throw  new IOException();
+				}
+				return -1;
+			}
+			public void close() throws IOException {
+				closed = true;
+			}
+        	
+        }
+        
 
         @Test
         void streamIsClosedAfterCompletion() throws IOException{
             // this is a stream that will throw IOException
             // if called after closing
-            InputStream is = InputStream.nullInputStream();
+            InputStream is =  new InputStreamTss();
+
             StringManipulationHelper.convertStreamToString(is);
             // attempt to read again after closing
             assertThrows(IOException.class, ()->is.read());
@@ -137,6 +154,7 @@ void populateItems() {
         void join() {
 
             assertEquals("", StringManipulationHelper.join(empty,","));
+            assertEquals("", StringManipulationHelper.join(null,","));
             items.add("a");
             assertEquals("a", StringManipulationHelper.join(items,","));
             items.add("b");
@@ -147,8 +165,7 @@ void join() {
         @Test
         void delimiterCanBeAnyLength(){
             populateItems();
-            assertEquals("a---b---c", StringManipulationHelper.join(items,"---"));
-            
+            assertEquals("a---b---c", StringManipulationHelper.join(items,"---"));      
         }
     }
 

From b207aa795039ce305d06d189dcd79037fa78203d Mon Sep 17 00:00:00 2001
From: Richard Adams <richard@researchspace.com>
Date: Fri, 23 Jul 2021 17:33:44 +0100
Subject: [PATCH 118/599] use java8 streams for joining

---
 .../nbio/core/util/StringManipulationHelper.java    | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
index b62496c50a..562fabcf20 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
@@ -31,6 +31,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Scanner;
+import java.util.stream.Collectors;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -235,16 +236,8 @@ private static void validatePadding(int n) {
 	 * @return
 	 */
 	public static String join(Collection<String> s, String delimiter) {
-	    if (s == null) return "";
-	    Iterator<String> iter = s.iterator();
-		if(!iter.hasNext()){
-			return "";
-		}
-	    StringBuilder builder = new StringBuilder(iter.next());
-	    while( iter.hasNext() ){
-		    builder.append(delimiter).append(iter.next());
-	    }
-	    return builder.toString();
+		if (s==null) return "";
+		return s.stream().collect(Collectors.joining(delimiter));
 	}
 
 }

From cc80fe9b93bf1acdcd14fbf4f3cebe035581f886 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Mon, 26 Jul 2021 16:50:45 +0800
Subject: [PATCH 119/599] Parsed PDB KEWODS record

They are parsed from PDB and added to Structure.
Not parsed from mmCIF yet.
---
 .../org/biojava/nbio/structure/Structure.java |  14 +++++
 .../biojava/nbio/structure/StructureImpl.java |  13 +++++
 .../structure/SubstructureIdentifier.java     |   1 +
 .../nbio/structure/io/PDBFileParser.java      |  54 ++++++++++++++++++
 .../biojava/nbio/structure/TestKeywords.java  |  41 +++++++++++++
 .../src/test/resources/pdb6elw.ent.gz         | Bin 0 -> 72674 bytes
 6 files changed, 123 insertions(+)
 create mode 100644 biojava-structure/src/test/java/org/biojava/nbio/structure/TestKeywords.java
 create mode 100644 biojava-structure/src/test/resources/pdb6elw.ent.gz

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
index 09ff74a252..6e67f8aa4b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
@@ -788,4 +788,18 @@ public interface Structure extends Cloneable, Serializable {
 	 *  returned the same value as {@link #getPDBCode()}
 	 */
 	String getIdentifier();
+	
+	/**
+	 * Gets the keywords (KEYWODS) record of the structure
+	 * @return The keywords in a <code>List&lt;String&gt;</code>
+	 * @since 6.0.0
+	 */
+	List<String> getKeywords();
+	
+	/**
+	 * Sets the KEYWODS record of the structure.
+	 * @param keywords The keywords in a <code>List&lt;String&gt; to set.</code>
+	 * @since 6.0.0
+	 */
+	void setKeywords(List<String> keywords);
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
index 9f07e0338c..3716a48346 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
@@ -57,6 +57,7 @@ public class StructureImpl implements Structure {
 	private List<Bond> ssbonds;
 	private List<Site> sites;
 	private String name ;
+	private List<String> keywords;
 	private StructureIdentifier structureIdentifier;
 
 	private PDBHeader pdbHeader;
@@ -76,6 +77,7 @@ public StructureImpl() {
 		pdbHeader      = new PDBHeader();
 		ssbonds        = new ArrayList<>();
 		sites          = new ArrayList<>();
+		keywords       = new ArrayList<>();
 	}
 
 	/**
@@ -122,6 +124,7 @@ public Structure clone() {
 		n.setPDBHeader(pdbHeader);
 		n.setDBRefs(this.getDBRefs());
 		n.setSites(getSites());
+		n.setKeywords(this.getKeywords());
 
 
 		// go through each chain and clone chain
@@ -1020,6 +1023,16 @@ public String getPdbId() {
 		return pdb_id;
 	}
 
+	/** {@inheritDoc} */
+	public List<String> getKeywords() {
+		return keywords;
+	}
+
+	/** {@inheritDoc} */
+	public void setKeywords(List<String> keywords) {
+		this.keywords = keywords;
+	}
+
 	@Override
 	public void resetModels() {
 		models = new ArrayList<>();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
index da9c1e1dee..2d9f262891 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
@@ -186,6 +186,7 @@ public Structure reduce(Structure s) throws StructureException {
 		newS.setName(this.toString());
 		newS.setDBRefs(s.getDBRefs());
 		newS.setBiologicalAssembly(s.isBiologicalAssembly());
+		newS.setKeywords(s.getKeywords());
 		newS.getPDBHeader().setDescription(
 				"sub-range " + ranges + " of "  + newS.getPDBCode() + " "
 						+ s.getPDBHeader().getDescription());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index cdccfd2e91..d2875139a1 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -181,6 +181,7 @@ public class PDBFileParser  {
 	private List<String> compndLines = new ArrayList<String>();
 	private List<String> sourceLines = new ArrayList<String>();
 	private List<String> journalLines = new ArrayList<String>();
+	private List<String> keywordsLines = new ArrayList<String>();
 	private List<DBRef> dbrefs;
 	private Map<String, Site> siteMap = new LinkedHashMap<String, Site>();
 	private Map<String, List<ResidueNumber>> siteToResidueMap = new LinkedHashMap<String, List<ResidueNumber>>();
@@ -2442,6 +2443,8 @@ private void pdb_SITE_Handler(String line){
 
 	//Site variable related to parsing the REMARK 800 records.
 	Site site;
+
+	private String[] keywords;
 	private void pdb_REMARK_800_Handler(String line){
 
 		if (params.isHeaderOnly()) return;
@@ -2595,6 +2598,7 @@ public  Structure parsePDBFile(BufferedReader buf)
 		current_compound = null;
 		sourceLines.clear();
 		compndLines.clear();
+		keywordsLines.clear();
 		isLastCompndLine = false;
 		isLastSourceLine = false;
 		prevMolId = -1;
@@ -2660,6 +2664,8 @@ else if (recordName.equals("SOURCE"))
 					sourceLines.add(line); //pdb_SOURCE_Handler
 				else if (recordName.equals("COMPND"))
 					compndLines.add(line); //pdb_COMPND_Handler
+				else if (recordName.equals("KEYWDS"))
+					keywordsLines.add(line);
 				else if (recordName.equals("JRNL"))
 					pdb_JRNL_Handler(line);
 				else if (recordName.equals("EXPDTA"))
@@ -2693,6 +2699,8 @@ else if ( params.isParseSecStruc()) {
 		}
 
 		makeCompounds(compndLines, sourceLines);
+		
+		handlePDBKeywords(keywordsLines);
 
 		triggerEndFileChecks();
 
@@ -2757,6 +2765,52 @@ private void makeCompounds(List<String> compoundList,
 
 	}
 
+	/**Parse KEYWODS record of the PDF file.<br>
+	 * A keyword may be split over two lines. whether a keyword ends by the end 
+	 * of a line or it is aplit over two lines, a <code>space</code> is added 
+	 * between the 2 lines's contents, unless the first line ends in 
+	 * a '-' character.
+	 * <pre>
+	 * Record Format
+	 * COLUMNS       DATA  TYPE     FIELD         DEFINITION 
+	 *	---------------------------------------------------------------------------------
+	 *	 1 -  6       Record name    "KEYWDS" 
+	 *	 9 - 10       Continuation   continuation  Allows concatenation of records if necessary.
+	 *	11 - 79       List           keywds        Comma-separated list of keywords relevant
+	 *	                                           to the entry.      
+	 * Example
+	 * 	         1         2         3         4         5         6         7         8
+	 *	12345678901234567890123456789012345678901234567890123456789012345678901234567890
+	 *	KEYWDS    LYASE,  TRICARBOXYLIC ACID CYCLE, MITOCHONDRION, OXIDATIVE
+	 *	KEYWDS   2 METABOLISM
+	 * </pre>
+	 * @param lines The KEWODS record lines.
+	 * @author Amr ALHOSSARY
+	 */
+	private void handlePDBKeywords(List<String> lines) {
+		StringBuilder fullList = new StringBuilder();
+		for (String line : lines) {
+			String kwList = line.substring(10).trim();
+			if(kwList.length() > 0) {
+				if(fullList.length() > 0 && fullList.indexOf("-", fullList.length()-1) < 0) {
+					fullList.append(' ');
+				}
+				fullList.append(kwList);
+			}
+		}
+		String fulllengthList = fullList.toString();
+		keywords = fulllengthList.split("( )*,( )*");
+		ArrayList<String> lst = new ArrayList<String>(keywords.length);
+		for (String keyword : keywords) {
+			if(keyword.length() == 0) {
+				logger.warn("Keyword empty in structure "+ structure.getIdentifier().toString());
+				continue;
+			}
+			lst.add(keyword);
+		}
+		structure.setKeywords(lst);
+	}
+	
 	/**
 	 * Handles creation of all bonds. Looks at LINK records, SSBOND (Disulfide
 	 * bonds), peptide bonds, and intra-residue bonds.
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestKeywords.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestKeywords.java
new file mode 100644
index 0000000000..5a92fd71b5
--- /dev/null
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestKeywords.java
@@ -0,0 +1,41 @@
+package org.biojava.nbio.structure;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.zip.GZIPInputStream;
+
+import org.biojava.nbio.structure.io.PDBFileParser;
+import org.junit.Test;
+
+public class TestKeywords {
+
+	@Test
+	public void testKeywordsOnFiveLines () throws IOException {
+		String fileName = "/3cdl.pdb";
+		InputStream inStream = this.getClass().getResourceAsStream(fileName);
+
+		PDBFileParser pdbpars = new PDBFileParser();
+		Structure structure = pdbpars.parsePDBFile(inStream);
+		List<String> keywords = structure.getKeywords();
+		assertEquals(keywords.size(), 12);
+		assertEquals(keywords.get(11), "TRANSCRIPTION REGULATOR");
+	}
+
+	@Test
+	public void testDash() throws IOException {
+		String fileName;
+		fileName = "/pdb6elw.ent.gz";
+		InputStream resourceAsStream = getClass().getResourceAsStream(fileName);
+		GZIPInputStream inStream = new GZIPInputStream(resourceAsStream);
+		
+		Structure structure =  new PDBFileParser().parsePDBFile(inStream);
+		
+		List<String> keywords = structure.getKeywords();
+		assertEquals(keywords.size(), 6);
+		assertEquals(keywords.get(3), "THIOREDOXIN-FOLD");
+		assertEquals(keywords.get(4), "ANTI-OXIDATVE DEFENSE SYSTEM");
+	}
+}
diff --git a/biojava-structure/src/test/resources/pdb6elw.ent.gz b/biojava-structure/src/test/resources/pdb6elw.ent.gz
new file mode 100644
index 0000000000000000000000000000000000000000..de6d694a17ca45a0fb0f934827e9f218ac29a8e6
GIT binary patch
literal 72674
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
J-rMz!1OW6U^>hFL

literal 0
HcmV?d00001


From 2ee559d75640ab3e5d72c23e3b71f2e403cda41b Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Sat, 31 Jul 2021 11:02:25 +0100
Subject: [PATCH 120/599] author tag

---
 .../org/biojava/nbio/core/util/StringManipulationHelper.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
index 63db50f207..e1fb38ce3c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
@@ -18,7 +18,7 @@
  *      http://www.biojava.org/
  *
  * Created on Sep 14, 2011
- * Author: Amr AL-Hossary
+ * Author: Amr AL-Hossary, Richard Adams
  *
  */
 package org.biojava.nbio.core.util;
@@ -49,6 +49,7 @@
  * All functions are static methods.
  *
  * @author Amr AL-Hossary
+ * @author Richard Adams
  */
 public class StringManipulationHelper  {
 

From e7ca188348332da5a80afe2c582d8405dcdca47d Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Sat, 31 Jul 2021 11:04:08 +0100
Subject: [PATCH 121/599] remove unused import

---
 .../org/biojava/nbio/core/util/StringManipulationHelper.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
index 292521e17a..22f9b4730d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
@@ -29,7 +29,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Scanner;
 import java.util.stream.Collectors;
 

From 6f64f2718c6c5b3a7b17832c076469a8b3802d55 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Sat, 31 Jul 2021 12:01:08 +0100
Subject: [PATCH 122/599] test for crc64checksum

---
 .../biojava/nbio/core/util/CRC64Checksum.java |  1 +
 .../nbio/core/util/CRC64ChecksumTest.java     | 96 +++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/CRC64Checksum.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/CRC64Checksum.java
index 3e99fec10b..9513d52655 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/CRC64Checksum.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/CRC64Checksum.java
@@ -56,6 +56,7 @@ public void update(int b) {
 		crc = low ^ high;
 	}
 
+	// condition loop should be i < offset + length
 	@Override
 	public void update(byte[] b, int offset, int length) {
 		for (int i = offset; i < length; ++i)
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
new file mode 100644
index 0000000000..887988cca8
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
@@ -0,0 +1,96 @@
+package org.biojava.nbio.core.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
+/** 
+*  
+* @author Richard Adams
+*/
+class CRC64ChecksumTest {
+    CRC64Checksum crc64 = null;
+    private final String helloInCrc64Hex = "53C1111D27800000";
+    private final Long helloInCrc64Decimal = 6035123792567599104L;
+
+    @BeforeEach
+    void before (){
+         crc64 = new CRC64Checksum();
+    }
+
+    @Test
+    @DisplayName("Default value is 0")
+    void initialBehaviour() {
+        assertEquals(0, crc64.getValue());
+        assertEquals("0000000000000000", crc64.toString());
+    }
+
+    @RepeatedTest(10)
+    void sameInputRepeatedlyGeneratesSameOutput(){
+        crc64.update("hello");
+        assertEquals(helloInCrc64Decimal, crc64.getValue());
+        assertEquals(helloInCrc64Hex, crc64.toString());
+    }
+
+    @Test
+    void afterResettingCrcIsZero(){
+        crc64.update("hello");
+        crc64.reset();
+        assertEquals(0, crc64.getValue());
+    }
+
+    @Test
+    void addingIncrementallyIsSameAsAllAtOnce(){
+        crc64.update("h");
+        crc64.update("e");
+        crc64.update("l");
+        crc64.update("l");
+        crc64.update("o");
+        assertEquals(helloInCrc64Hex, crc64.toString());
+    }
+
+    @Test
+    void allbyteRange (){
+        byte [] testBytes = new byte [] {1,2,3,4,5};
+        crc64.update(testBytes, 0, testBytes.length);
+        String allBytesHex = crc64.toString();
+        crc64.reset();
+        for (byte b: testBytes) {
+            crc64.update(b);
+        }
+        assertEquals(allBytesHex, crc64.toString());
+    }
+
+    @Test
+    void allRangeIsSameAsAllArray (){
+        byte [] testBytes = new byte [] {1,2,3,4,5};
+        crc64.update(testBytes, 0, testBytes.length);
+        Long valueFromAllRange = crc64.getValue();
+        crc64.reset();
+        crc64.update(testBytes);
+        assertEquals(valueFromAllRange, crc64.getValue());
+    }
+
+    @Test 
+    //@Disabled
+    // this doesn't work as expected
+    // and doesn't behave according to interface. The 3rd argument
+    // is treated as an index rather than a number of bytes to include
+    void partialbyteRange (){
+        byte [] testBytes = new byte [] {1,2,3,4,5};
+        // should update with testBytes[2] but doesn't
+        crc64.update(testBytes, 2, 1);
+        String partialBytesHex = crc64.toString();
+        crc64.reset();
+        crc64.update(testBytes[2]);
+        assertEquals(partialBytesHex, crc64.toString());
+    }
+
+    @Test
+    void hexStringIsEqualToValue(){
+        Long value = Long.parseLong(helloInCrc64Hex, 16);
+        assertEquals(helloInCrc64Decimal, value);
+    }
+}
\ No newline at end of file

From 718abdb2824bfc01ec9899435a5941d75f81780a Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Sat, 31 Jul 2021 12:04:13 +0100
Subject: [PATCH 123/599] disable failing test that exposes bug

---
 .../java/org/biojava/nbio/core/util/CRC64ChecksumTest.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
index 887988cca8..92d434008a 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
@@ -74,7 +75,7 @@ void allRangeIsSameAsAllArray (){
     }
 
     @Test 
-    //@Disabled
+    @Disabled
     // this doesn't work as expected
     // and doesn't behave according to interface. The 3rd argument
     // is treated as an index rather than a number of bytes to include

From a806279dc0f9020a919f67d17ac22a65377b3509 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Sat, 31 Jul 2021 17:56:51 +0100
Subject: [PATCH 124/599] tests for Equals

---
 .../org/biojava/nbio/core/util/Equals.java    |   4 +-
 .../biojava/nbio/core/util/EqualsTest.java    | 106 ++++++++++++++++++
 2 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/util/EqualsTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/Equals.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/Equals.java
index 85beddf1de..e8f78243ed 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/Equals.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/Equals.java
@@ -44,6 +44,8 @@ public static boolean equal(boolean one, boolean two) {
 
 	/**
 	 * Does not compare class types.
+	 * However, if the two arguments are non-null references to distinct objects,
+	 *  the object's equals() method is called - which may well compare class types.
 	 * @see #classEqual(Object, Object)
 	 */
 	public static boolean equal(Object one, Object two) {
@@ -78,7 +80,7 @@ public static boolean equal(Object one, Object two) {
 	 *          The first object to test
 	 * @param two
 	 *          The second object to test
-	 * @return A boolean indicating if the logic agrees that these two objects are
+	 * @return A boolean indicating if  these two objects are
 	 *         equal at the class level
 	 */
 	public static boolean classEqual(Object one, Object two) {
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/EqualsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/EqualsTest.java
new file mode 100644
index 0000000000..7e240450b3
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/EqualsTest.java
@@ -0,0 +1,106 @@
+package org.biojava.nbio.core.util;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.LocalDate;
+import java.time.Month;
+import java.time.temporal.Temporal;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+class EqualsTest {
+
+    @Test
+    void equalsInt(){
+        assertTrue(Equals.equal(1, 1));
+        assertTrue(Equals.equal(Integer.MAX_VALUE, Integer.MAX_VALUE));
+        assertTrue(Equals.equal(Integer.valueOf(1), Integer.valueOf(1)));
+        assertFalse(Equals.equal(1, 2));
+    }
+
+    void equalsBool(){
+        assertTrue(Equals.equal(true, true));
+        assertTrue(Equals.equal(Boolean.valueOf(true), Boolean.valueOf(true)));
+        assertFalse(Equals.equal(true, false));
+    }
+
+    void equalsLong(){
+        assertTrue(Equals.equal(1L, 1L));
+        assertTrue(Equals.equal(Long.valueOf(1L), Long.valueOf(1L)));
+        assertTrue(Equals.equal(Long.MAX_VALUE, Long.MAX_VALUE));
+        assertFalse(Equals.equal(1L, 1L));
+    }
+
+    @Nested
+    class ObjectEquals {
+        Object o1 = new Object();
+        Object o1Ref = o1;
+        Object o2 = new Object();
+
+        @Test
+        void twoNullsAreEqual(){
+            assertTrue(Equals.equal(null, null));
+        }
+        @Test
+        void objectWithNullIsNotEqual(){
+            assertFalse(Equals.equal(o1, null));
+            assertFalse(Equals.equal(null, o1));
+        }
+
+        @Test
+        void identicalObjectIsEquals(){
+            assertTrue(Equals.equal(o1, o1));
+            assertTrue(Equals.equal(o1, o1Ref));
+            assertFalse(Equals.equal(o1, o2));
+        }
+
+        @Test
+        void equalsBasedOnProperties(){
+            LocalDate date = LocalDate.of(2021, Month.APRIL, 21);
+            LocalDate sameDate =  LocalDate.of(2021, Month.APRIL, 21);
+            LocalDate differentDate =  LocalDate.of(2022, Month.APRIL, 21);
+            assertTrue(Equals.equal(date, sameDate));
+            assertFalse(Equals.equal(date, differentDate));
+        }
+    }
+
+    @Nested
+    class ClassEquals {
+        LocalDate nowDate = LocalDate.now();
+        LocalDate different = nowDate.plusDays(5);
+        @Test
+        void identicalClassesAreEqual() {  
+            assertTrue(Equals.classEqual(nowDate, different));
+        }
+        @Test
+        void classComparisonIsByActualTypeNotReferenceType() {
+            Temporal temporal = (Temporal) nowDate;
+            assertTrue(Equals.classEqual(temporal, different));
+        }
+
+        @Test
+        void genericsAreIgnored() {
+            List<String> listOfStrings = new ArrayList<>();
+            List<Integer> listOfInts = new ArrayList<>();
+            assertTrue(Equals.classEqual(listOfStrings, listOfInts));
+        }
+
+        class ASuperclass {
+            Integer a, b = 0;
+        }
+        class ASubclass extends ASuperclass {
+            Integer c, d = 0;
+        }
+        @Test
+        void membersOfClassHierarchyAreNotEqual() {
+            ASuperclass superObject = new ASuperclass();
+            ASuperclass subObject = new ASubclass();
+            assertFalse(Equals.classEqual(superObject, subObject));
+            assertFalse(Equals.classEqual(subObject, superObject));
+        }   
+    }  
+}

From 5ef6a0ab57651e1627fd31ed9dbe1ffd135ab31b Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Sat, 31 Jul 2021 18:23:11 +0100
Subject: [PATCH 125/599] start FileDownloadUtilsTest

---
 .../nbio/core/util/FileDownloadUtilsTest.java | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
new file mode 100644
index 0000000000..8cd89d46e2
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
@@ -0,0 +1,52 @@
+package org.biojava.nbio.core.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+class FileDownloadUtilsTest {
+
+    @Nested
+    class FileCopy {   
+        
+        private File createSrcFile () throws IOException {
+            byte [] toSave = new byte []{1,2,3,4,5};
+            File src = File.createTempFile("test", ".dat");
+            try (FileOutputStream fos = new FileOutputStream(src);){
+                fos.write(toSave);
+            }
+            return src;
+        }
+
+        @Test
+        void copyFile() throws IOException {
+            File src = createSrcFile();
+            //sanity check
+            assertEquals(5, src.length());
+            File dest = File.createTempFile("dest", ".dat");
+            assertEquals(0, dest.length());
+            FileDownloadUtils.copy(src, dest);
+            assertEquals(5, dest.length());
+
+            //original is unaffected
+            assertEquals(5, src.length());
+            
+            // bytes are identical
+            try (FileInputStream fis1 = new FileInputStream(src);
+                FileInputStream fis2 =  new FileInputStream(dest)) {
+                int b = -1;
+                while (( b = fis1.read()) != -1) {
+                    int b2 = fis2.read();
+                    assertEquals (b, b2);
+                }
+            }
+        }
+
+    }
+}

From 5f007ec36694513380ae0721187b95e2e001405b Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Sat, 31 Jul 2021 23:09:55 +0200
Subject: [PATCH 126/599] Force US Locale for floats.

#918 showed that locales which use commas for floating-point numbers
can cause problems with output formats. This commit fixes a number
of other cases.

- Force Locale.US when outputting floats to files/streams
- Usually don't force Locale.US when outputting floats to standard out &
  logging (would lead to more consistent logs but breaks localization)
- Replace some `println(String.format(` calls with Java 5 `printf`
---
 .../core/util/SingleLinkageClusterer.java     |  7 +--
 .../java/org/biojava/nbio/ronn/ORonn.java     |  4 +-
 .../org/biojava/nbio/ronn/ORonnModel.java     |  3 +-
 .../structure/PDBCrystallographicInfo.java    |  3 +-
 .../align/fatcat/calc/AFPChainer.java         |  2 +-
 .../align/fatcat/calc/FCAlignHelper.java      |  6 +-
 .../nbio/structure/align/model/AFPChain.java  | 15 ++---
 .../structure/align/model/AfpChainWriter.java | 57 ++++++++++---------
 .../align/multiple/MultipleAlignmentImpl.java |  3 +-
 .../util/MultipleAlignmentWriter.java         |  7 ++-
 .../structure/align/util/RotationAxis.java    |  9 +--
 .../align/xml/AFPChainXMLConverter.java       | 13 +++--
 .../basepairs/BasePairParameters.java         |  5 +-
 .../nbio/structure/contact/BoundingBox.java   |  3 +-
 .../structure/domain/pdp/ClusterDomains.java  | 24 ++++----
 .../nbio/structure/domain/pdp/Cut.java        | 10 ++--
 .../nbio/structure/domain/pdp/CutDomain.java  |  2 +-
 .../structure/secstruc/SecStrucState.java     | 16 +++---
 .../nbio/structure/xtal/CrystalCell.java      |  2 +-
 .../nbio/structure/xtal/CrystalTransform.java |  3 +-
 .../nbio/structure/xtal/SpaceGroup.java       |  6 +-
 21 files changed, 106 insertions(+), 94 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java
index ca58257f48..7c4b15f65a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java
@@ -69,7 +69,7 @@ public String toString() {
 			if (closestDistance==Double.MAX_VALUE) {
 				closestDistStr = String.format("%6s", "inf");
 			} else {
-				closestDistStr = String.format("%6.2f",closestDistance);
+				closestDistStr = String.format(Locale.US, "%6.2f",closestDistance);
 			}
 
 			return "["+first+","+second+"-"+closestDistStr+"]";
@@ -386,11 +386,11 @@ private String matrixToString() {
 				}
 				else if (i<j) {
 					if (matrix[i][j]==Double.MAX_VALUE) sb.append(String.format("%6s ","inf"));
-					else sb.append(String.format("%6.2f ",matrix[i][j]));
+					else sb.append(String.format(Locale.US, "%6.2f ",matrix[i][j]));
 				}
 				else {
 					if (matrix[j][i]==Double.MAX_VALUE) sb.append(String.format("%6s ","inf"));
-					else sb.append(String.format("%6.2f ",matrix[j][i]));
+					else sb.append(String.format(Locale.US, "%6.2f ",matrix[j][i]));
 				}
 			}
 			sb.append("\n");
@@ -400,4 +400,3 @@ else if (i<j) {
 	}
 
 }
-
diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java
index f5c745aa20..c93170cb31 100644
--- a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java
+++ b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java
@@ -111,8 +111,8 @@ void writeResults(final float[] meanScores, final char[] seqs) {
 			out.println(">" + sequence.getId());
 			if (layout == ResultLayout.VERTICAL) {
 				for (int i = 0; i < meanScores.length; i++) {
-					out.printf("%c\t%.2f%n", seqs[i], meanScores[i]);
-					//out.printf("%c\t%f%n", seqs[i], meanScores[i]);
+					out.printf(Locale.US, "%c\t%.2f%n", seqs[i], meanScores[i]);
+					//out.printf(Locale.US, "%c\t%f%n", seqs[i], meanScores[i]);
 				}
 			} else {
 				final StringBuilder seqLine = new StringBuilder();
diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonnModel.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonnModel.java
index 41253be8c1..a78e66f728 100644
--- a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonnModel.java
+++ b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonnModel.java
@@ -32,6 +32,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
+import java.util.Locale;
 
 
 
@@ -133,7 +134,7 @@ public void getScores(final File outfile) throws FileNotFoundException {
 		}
 	}
 	for (int i = 0; i < scores.length; i++) {
-		output.printf("%c\t%f\n", query[i], scores[i]);
+		output.printf(Locale.US, "%c\t%f\n", query[i], scores[i]);
 	}
 	output.close();
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBCrystallographicInfo.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBCrystallographicInfo.java
index 8e1d0cc823..17cd39f0fa 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBCrystallographicInfo.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBCrystallographicInfo.java
@@ -25,6 +25,7 @@
 
 import javax.vecmath.Matrix4d;
 import java.io.Serializable;
+import java.util.Locale;
 
 /**
  * A class to hold crystallographic information about a PDB structure.
@@ -233,7 +234,7 @@ public String toString() {
 				(sg==null?"no SG":sg.getShortSymbol())+" - "+
 
 				(cell==null?"no Cell":
-				String.format("%.2f %.2f %.2f, %.2f %.2f %.2f",
+				String.format(Locale.US, "%.2f %.2f %.2f, %.2f %.2f %.2f",
 						cell.getA(),cell.getB(),cell.getC(),cell.getAlpha(),cell.getBeta(),cell.getGamma()) )+
 				(ncsOperators==null? "" : String.format(" - %d NCS operators",ncsOperators.length) )+
 				"]";
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPChainer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPChainer.java
index 0f9c2254d9..1d1628b51e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPChainer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPChainer.java
@@ -151,7 +151,7 @@ public static void doChainAfp(FatCatParameters params, AFPChain afpChain,Atom[]
 
 		int     currafp = maxafp;
 		if(debug)
-			System.out.println(String.format("maximum score %f, %d\n", maxsco, twi[currafp]));
+			System.out.printf("maximum score %f, %d%n%n", maxsco, twi[currafp]);
 
 		//trace-back from maxafp (maxsco)
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FCAlignHelper.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FCAlignHelper.java
index 8c3e1b1865..7497f5d899 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FCAlignHelper.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FCAlignHelper.java
@@ -252,11 +252,11 @@ private void rep()
 	private void checkAlign(){
 
 		if(sapp[0] != 0)        {
-			System.err.println(String.format("warn: not a local-alignment result, first operation %d\n", sapp[0]));
+			System.err.printf("warn: not a local-alignment result, first operation %d%n%n", sapp[0]);
 		}
 		double  sco = checkScore();
 		if(Math.abs(sco - alignScore) > 1e-3)       {
-			System.err.println(String.format("FCAlignHelper: warn: alignment scores are different %f(check) %f(align)\n", sco, alignScore));
+			System.err.printf("FCAlignHelper: warn: alignment scores are different %f(check) %f(align)%n%n", sco, alignScore);
 		}
 	}
 
@@ -330,5 +330,3 @@ else if (op > 0) {
 	}
 
 }
-
-
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
index 38844a0963..bd4013ada3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
@@ -28,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -366,22 +367,22 @@ public String toString(){
 		str.append(this.getCa1Length());
 		str.append("\tLen2:");
 		str.append(this.getCa2Length());
-		str.append(String.format("\tscore: %.2f",this.getAlignScore()));
+		str.append(String.format(Locale.US, "\tscore: %.2f",this.getAlignScore()));
 		str.append("\t");
 		if ( algorithmName.equalsIgnoreCase(CeMain.algorithmName) || algorithmName.equalsIgnoreCase(CeSideChainMain.algorithmName)){
 			str.append("Z-score:");
-			str.append(String.format("%.2f",this.getProbability()));
+			str.append(String.format(Locale.US, "%.2f",this.getProbability()));
 		} else {
 			str.append("Probability:");
-			str.append(String.format("%.2e",this.getProbability()));
+			str.append(String.format(Locale.US, "%.2e",this.getProbability()));
 		}
 		str.append("\tRMSD:");
-		str.append(String.format("%.2f",this.getTotalRmsdOpt()));
+		str.append(String.format(Locale.US, "%.2f",this.getTotalRmsdOpt()));
 
 		str.append("\tSeqID:");
-		str.append(String.format("%.0f",getIdentity()*100));
+		str.append(String.format(Locale.US, "%.0f",getIdentity()*100));
 		str.append("%\tSeqSim:");
-		str.append(String.format("%.0f",getSimilarity()*100));
+		str.append(String.format(Locale.US, "%.0f",getSimilarity()*100));
 		str.append("%\tCov1:");
 		str.append(this.getCoverage1());
 		str.append("%\tCov2:");
@@ -390,7 +391,7 @@ public String toString(){
 
 		if (  tmScore != -1)  {
 			str.append("\ttmScore:");
-			str.append(String.format("%.2f",tmScore));
+			str.append(String.format(Locale.US, "%.2f",tmScore));
 		}
 		str.append(newline);
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AfpChainWriter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AfpChainWriter.java
index f4fb5a8478..76fa8748ac 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AfpChainWriter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AfpChainWriter.java
@@ -34,6 +34,7 @@
 
 import java.io.StringWriter;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * A class to convert the data in an AfpChain object to various String outputs.
@@ -67,7 +68,7 @@ public static String toScoresList(AFPChain afpChain){
 
 		if ( afpChain.getAlgorithmName().startsWith("CE")) {
 			writer.append("Z-score " );
-			writer.append(String.format("%.2f", afpChain.getProbability()));
+			writer.append(String.format(Locale.US, "%.2f", afpChain.getProbability()));
 			writer.append(newline);
 		}
 
@@ -196,10 +197,10 @@ public static String toFatCatCore(
 			txt.append("Short match");
 			return txt.toString();
 		}
-		//txt.append(String.format("raw-score: %.2f norm.-score: %.2f ", alignScore, normAlignScore));
+		//txt.append(String.format(Locale.US, "raw-score: %.2f norm.-score: %.2f ", alignScore, normAlignScore));
 
 		if ( longHeader ) {
-			txt.append(String.format( "Twists %d ini-len %d ini-rmsd %.2f opt-equ %d opt-rmsd %.2f chain-rmsd %.2f Score %.2f align-len %d gaps %d (%.2f%%)",
+			txt.append(String.format(Locale.US, "Twists %d ini-len %d ini-rmsd %.2f opt-equ %d opt-rmsd %.2f chain-rmsd %.2f Score %.2f align-len %d gaps %d (%.2f%%)",
 					blockNum - 1, totalLenIni, totalRmsdIni, optLength, totalRmsdOpt, chainRmsd, alignScore,
 					alnLength, gapLen, (100.0 * gapLen/alnLength)) );
 			txt.append(newline);
@@ -213,12 +214,12 @@ public static String toFatCatCore(
 		}
 
 
-		//txt.append(String.format("P-value %.2e Afp-num %d Identity %.2f%% Similarity %.2f%% norm.-score: %.2f"+newline, probability, afpNum, identity * 100, similarity * 100, normAlignScore));
+		//txt.append(String.format(Locale.US, "P-value %.2e Afp-num %d Identity %.2f%% Similarity %.2f%% norm.-score: %.2f"+newline, probability, afpNum, identity * 100, similarity * 100, normAlignScore));
 
 		if ( longHeader) {
 			printScore(txt,algorithmName,probability,longHeader);
 
-			txt.append(String.format("Afp-num %d Identity %.2f%% Similarity %.2f%%", afpNum, identity * 100, similarity * 100));
+			txt.append(String.format(Locale.US, "Afp-num %d Identity %.2f%% Similarity %.2f%%", afpNum, identity * 100, similarity * 100));
 			txt.append(newline);
 		}
 
@@ -229,7 +230,7 @@ public static String toFatCatCore(
 			int fragLen = 8 ; // FatCatParameters.DEFAULT_FRAGLEN;
 			for(i = 0; i < blockNum; i ++)  {
 				gap = blockGap[i] /( (double)blockGap[i] + fragLen * blockSize[i]);
-				txt.append(String.format( "Block %2d afp %2d score %5.2f rmsd %5.2f gap %d (%.2f%%)",
+				txt.append(String.format(Locale.US, "Block %2d afp %2d score %5.2f rmsd %5.2f gap %d (%.2f%%)",
 						i, blockSize[i], blockScore[i], blockRmsd[i], blockGap[i], gap));
 				txt.append(newline);
 			}
@@ -389,29 +390,29 @@ public static void printScoresInLines(AFPChain afpChain, int blockNum, int optLe
 			int alnLength, int gapLen, double identity, double similarity, StringBuffer txt)
 	{
 		if ( blockNum - 1 > 0) {
-			txt.append(String.format( "Twists %d ", blockNum -1 ));
+			txt.append(String.format(Locale.US, "Twists %d ", blockNum -1 ));
 			txt.append(newline);
 		}
 
-		txt.append(String.format("Equ: %d ", optLength));
+		txt.append(String.format(Locale.US, "Equ: %d ", optLength));
 		txt.append(newline);
-		txt.append(String.format("RMSD: %.2f ", totalRmsdOpt));
+		txt.append(String.format(Locale.US, "RMSD: %.2f ", totalRmsdOpt));
 		txt.append(newline);
-		txt.append(String.format("Score: %.2f ", alignScore));
+		txt.append(String.format(Locale.US, "Score: %.2f ", alignScore));
 		txt.append(newline);
-		txt.append(String.format("Align-len: %d ", alnLength));
+		txt.append(String.format(Locale.US, "Align-len: %d ", alnLength));
 		txt.append(newline);
-		txt.append(String.format("Gaps: %d (%.2f%%)",
+		txt.append(String.format(Locale.US, "Gaps: %d (%.2f%%)",
 				gapLen, (100.0 * gapLen/alnLength)) );
 		txt.append(newline);
 		if ( afpChain.getTMScore() >= 0) {
-			txt.append(String.format("TM-score: %.2f",afpChain.getTMScore()));
+			txt.append(String.format(Locale.US, "TM-score: %.2f",afpChain.getTMScore()));
 			txt.append(newline);
 		}
 		txt.append(newline);
-		txt.append(String.format("Identity: %.2f%% ", identity * 100 ));
+		txt.append(String.format(Locale.US, "Identity: %.2f%% ", identity * 100 ));
 		txt.append(newline);
-		txt.append(String.format("Similarity: %.2f%%", similarity * 100));
+		txt.append(String.format(Locale.US, "Similarity: %.2f%%", similarity * 100));
 		txt.append(newline);
 	}
 
@@ -421,16 +422,16 @@ private static void printScore(StringBuffer txt,
 			boolean longHeader)
 	{
 		if ( algorithmName.equalsIgnoreCase(CeMain.algorithmName) || algorithmName.equalsIgnoreCase(CeSideChainMain.algorithmName) ){
-			txt.append(String.format("Z-score %.2f ", probability));
+			txt.append(String.format(Locale.US, "Z-score %.2f ", probability));
 			if ( ! longHeader)
 				txt.append(newline);
 		} else if ( algorithmName.equalsIgnoreCase(SmithWaterman3Daligner.algorithmName)) {
 
 		} else {
 			if ( longHeader ){
-				txt.append(String.format("P-value %.2e ",probability));
+				txt.append(String.format(Locale.US, "P-value %.2e ",probability));
 			}  else {
-				txt.append(String.format("P-value: %.2e ",probability));
+				txt.append(String.format(Locale.US, "P-value: %.2e ",probability));
 				txt.append(newline);
 			}
 		}
@@ -1065,15 +1066,15 @@ public static String toDBSearchResult(AFPChain afpChain)
 		str.append("\t");
 		str.append(afpChain.getName2());
 		str.append("\t");
-		str.append(String.format("%.2f",afpChain.getAlignScore()));
+		str.append(String.format(Locale.US, "%.2f",afpChain.getAlignScore()));
 		str.append("\t");
 		if ( afpChain.getAlgorithmName().equalsIgnoreCase(CeMain.algorithmName)){
-			str.append(String.format("%.2f",afpChain.getProbability()));
+			str.append(String.format(Locale.US, "%.2f",afpChain.getProbability()));
 		} else {
-			str.append(String.format("%.2e",afpChain.getProbability()));
+			str.append(String.format(Locale.US, "%.2e",afpChain.getProbability()));
 		}
 		str.append("\t");
-		str.append(String.format("%.2f",afpChain.getTotalRmsdOpt()));
+		str.append(String.format(Locale.US, "%.2f",afpChain.getTotalRmsdOpt()));
 		str.append("\t");
 		str.append(afpChain.getCa1Length());
 		str.append("\t");
@@ -1083,7 +1084,7 @@ public static String toDBSearchResult(AFPChain afpChain)
 		str.append("\t");
 		str.append(afpChain.getCoverage2());
 		str.append("\t");
-		str.append(String.format("%.2f",afpChain.getIdentity()));
+		str.append(String.format(Locale.US, "%.2f",afpChain.getIdentity()));
 		str.append("\t");
 		str.append(afpChain.getDescription2());
 		str.append("\t");
@@ -1119,11 +1120,11 @@ public static String toRotMat(AFPChain afpChain)
 				origString = String.valueOf(blockNr);
 
 
-			txt.append(String.format("     X"+(blockNr+1)+" = (%9.6f)*X"+ origString +" + (%9.6f)*Y"+ origString +" + (%9.6f)*Z"+ origString +" + (%12.6f)",m.get(0,0),m.get(1,0), m.get(2,0), shift.getX()));
+			txt.append(String.format(Locale.US, "     X"+(blockNr+1)+" = (%9.6f)*X"+ origString +" + (%9.6f)*Y"+ origString +" + (%9.6f)*Z"+ origString +" + (%12.6f)",m.get(0,0),m.get(1,0), m.get(2,0), shift.getX()));
 			txt.append( newline);
-			txt.append(String.format("     Y"+(blockNr+1)+" = (%9.6f)*X"+ origString +" + (%9.6f)*Y"+ origString +" + (%9.6f)*Z"+ origString +" + (%12.6f)",m.get(0,1),m.get(1,1), m.get(2,1), shift.getY()));
+			txt.append(String.format(Locale.US, "     Y"+(blockNr+1)+" = (%9.6f)*X"+ origString +" + (%9.6f)*Y"+ origString +" + (%9.6f)*Z"+ origString +" + (%12.6f)",m.get(0,1),m.get(1,1), m.get(2,1), shift.getY()));
 			txt.append( newline);
-			txt.append(String.format("     Z"+(blockNr+1)+" = (%9.6f)*X"+ origString +" + (%9.6f)*Y"+ origString +" + (%9.6f)*Z"+ origString +" + (%12.6f)",m.get(0,2),m.get(1,2), m.get(2,2), shift.getZ()));
+			txt.append(String.format(Locale.US, "     Z"+(blockNr+1)+" = (%9.6f)*X"+ origString +" + (%9.6f)*Y"+ origString +" + (%9.6f)*Z"+ origString +" + (%12.6f)",m.get(0,2),m.get(1,2), m.get(2,2), shift.getZ()));
 			txt.append(newline);
 		}
 		return txt.toString();
@@ -1178,8 +1179,8 @@ public static String toCE(AFPChain afpChain, Atom[] ca1, Atom[] ca2)
 		txt.append(")");
 		txt.append(newline);
 		txt.append(newline);
-		txt.append(String.format("Alignment length = %d Rmsd = %.2fA Z-Score = %.1f",optLength,totalRmsdOpt,probability));
-		txt.append(String.format(" Gaps = %d(%.1f%%) CPU = %d ms. Sequence identities = %.1f%%",gapLen,( gapLen*100.0/optLength),calculationTime,identity*100));
+		txt.append(String.format(Locale.US, "Alignment length = %d Rmsd = %.2fA Z-Score = %.1f",optLength,totalRmsdOpt,probability));
+		txt.append(String.format(Locale.US, " Gaps = %d(%.1f%%) CPU = %d ms. Sequence identities = %.1f%%",gapLen,( gapLen*100.0/optLength),calculationTime,identity*100));
 
 		int     linelen = 70;
 		String a;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
index e2131449fd..91d087b8b8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
@@ -23,6 +23,7 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import org.biojava.nbio.structure.Atom;
 import org.biojava.nbio.structure.StructureException;
@@ -138,7 +139,7 @@ public String toString() {
 				+ " \nCore Length: " + getCoreLength();
 		for (String score : getScores()) {
 			resume += " \n" + score + ": ";
-			resume += String.format("%.2f", getScore(score));
+			resume += String.format(Locale.US, "%.2f", getScore(score));
 		}
 		return resume;
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java
index d20a884a62..b844b3b6b8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java
@@ -25,6 +25,7 @@
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import javax.vecmath.Matrix4d;
 
@@ -215,7 +216,7 @@ public static String toTransformMatrices(MultipleAlignment alignment) {
 			for (int str = 0; str < alignment.size(); str++) {
 				String origString = "ref";
 
-				txt.append(String.format("     X"+(str+1)+ " = (%9.6f)*X"+
+				txt.append(String.format(Locale.US, "     X"+(str+1)+ " = (%9.6f)*X"+
 						origString +" + (%9.6f)*Y"+
 						origString +" + (%9.6f)*Z"+
 						origString +" + (%12.6f)",
@@ -224,7 +225,7 @@ public static String toTransformMatrices(MultipleAlignment alignment) {
 						btransforms.get(str).getElement(0,2),
 						btransforms.get(str).getElement(0,3)));
 				txt.append( "\n");
-				txt.append(String.format("     Y"+(str+1)+" = (%9.6f)*X"+
+				txt.append(String.format(Locale.US, "     Y"+(str+1)+" = (%9.6f)*X"+
 						origString +" + (%9.6f)*Y"+
 						origString +" + (%9.6f)*Z"+
 						origString +" + (%12.6f)",
@@ -233,7 +234,7 @@ public static String toTransformMatrices(MultipleAlignment alignment) {
 						btransforms.get(str).getElement(1,2),
 						btransforms.get(str).getElement(1,3)));
 				txt.append( "\n");
-				txt.append(String.format("     Z"+(str+1)+" = (%9.6f)*X"+
+				txt.append(String.format(Locale.US, "     Z"+(str+1)+" = (%9.6f)*X"+
 						origString +" + (%9.6f)*Y"+
 						origString +" + (%9.6f)*Z"+
 						origString +" + (%12.6f)",
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/RotationAxis.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/RotationAxis.java
index 74b361ba87..6e00e1d434 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/RotationAxis.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/RotationAxis.java
@@ -21,6 +21,7 @@
 package org.biojava.nbio.structure.align.util;
 
 import java.io.StringWriter;
+import java.util.Locale;
 
 import javax.vecmath.AxisAngle4d;
 import javax.vecmath.Matrix3d;
@@ -460,7 +461,7 @@ public String getJmolScript(Atom[] atoms, int axisID){
 
 		// draw axis of rotation
 		result.append(
-				String.format("draw ID rot"+axisID+" CYLINDER {%f,%f,%f} {%f,%f,%f} WIDTH %f COLOR %s ;",
+				String.format(Locale.US, "draw ID rot"+axisID+" CYLINDER {%f,%f,%f} {%f,%f,%f} WIDTH %f COLOR %s ;",
 						axisMin.getX(),axisMin.getY(),axisMin.getZ(),
 						axisMax.getX(),axisMax.getY(),axisMax.getZ(), width, axisColor ));
 
@@ -468,14 +469,14 @@ public String getJmolScript(Atom[] atoms, int axisID){
 		boolean positiveScrew = Math.signum(rotationAxis.getX()) == Math.signum(screwTranslation.getX());
 		if( positiveScrew ) {
 			// screw is in the same direction as the axis
-			result.append( String.format(
+			result.append( String.format(Locale.US,
 					"draw ID screw"+axisID+" VECTOR {%f,%f,%f} {%f,%f,%f} WIDTH %f COLOR %s ;",
 					axisMax.getX(),axisMax.getY(),axisMax.getZ(),
 					screwTranslation.getX(),screwTranslation.getY(),screwTranslation.getZ(),
 					width, screwColor ));
 		} else {
 			// screw is in the opposite direction as the axis
-			result.append( String.format(
+			result.append( String.format(Locale.US,
 					"draw ID screw"+axisID+" VECTOR {%f,%f,%f} {%f,%f,%f} WIDTH %f COLOR %s ;",
 					axisMin.getX(),axisMin.getY(),axisMin.getZ(),
 					screwTranslation.getX(),screwTranslation.getY(),screwTranslation.getZ(),
@@ -485,7 +486,7 @@ public String getJmolScript(Atom[] atoms, int axisID){
 		// draw angle of rotation
 		if(rotationPos != null) {
 			result.append(System.getProperty("line.separator"));
-			result.append(String.format("draw ID rotArc"+axisID+" ARC {%f,%f,%f} {%f,%f,%f} {0,0,0} {0,%f,%d} SCALE 500 DIAMETER %f COLOR %s;",
+			result.append(String.format(Locale.US, "draw ID rotArc"+axisID+" ARC {%f,%f,%f} {%f,%f,%f} {0,0,0} {0,%f,%d} SCALE 500 DIAMETER %f COLOR %s;",
 					axisMin.getX(),axisMin.getY(),axisMin.getZ(),
 					axisMax.getX(),axisMax.getY(),axisMax.getZ(),
 					Math.toDegrees(theta),
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLConverter.java
index f8be1609c8..6cd29bcc07 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLConverter.java
@@ -30,6 +30,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.Locale;
 
 
 
@@ -187,8 +188,8 @@ private static void printXMLBlockHeader(PrettyXMLWriter xml,
 
 		xml.attribute("blockNr", String.valueOf(bk));
 		xml.attribute("blockSize", String.valueOf(blockSize[bk]));
-		xml.attribute("blockScore", String.format("%5.2f",blockScore[bk]).trim());
-		xml.attribute("blockRmsd", String.format("%5.2f",blockRmsd[bk]).trim());
+		xml.attribute("blockScore", String.format(Locale.US, "%5.2f",blockScore[bk]).trim());
+		xml.attribute("blockRmsd", String.format(Locale.US, "%5.2f",blockRmsd[bk]).trim());
 		xml.attribute("blockGap", String.valueOf(blockGap[bk]));
 
 	}
@@ -210,7 +211,7 @@ private static void printXMLMatrixShift(PrettyXMLWriter xml,
 		for (int x=0;x<3;x++){
 			for (int y=0;y<3;y++){
 				String key = "mat"+(x+1)+(y+1);
-				xml.attribute(key,String.format("%.6f",matrix.get(x,y)));
+				xml.attribute(key,String.format(Locale.US, "%.6f",matrix.get(x,y)));
 			}
 		}
 		xml.closeTag("matrix");
@@ -218,9 +219,9 @@ private static void printXMLMatrixShift(PrettyXMLWriter xml,
 		Atom[]   shifts = afpChain.getBlockShiftVector();
 		Atom shift = shifts[blockNr];
 		xml.openTag("shift");
-		xml.attribute("x", String.format("%.3f",shift.getX()));
-		xml.attribute("y", String.format("%.3f",shift.getY()));
-		xml.attribute("z", String.format("%.3f",shift.getZ()));
+		xml.attribute("x", String.format(Locale.US, "%.3f",shift.getX()));
+		xml.attribute("y", String.format(Locale.US, "%.3f",shift.getY()));
+		xml.attribute("z", String.format(Locale.US, "%.3f",shift.getZ()));
 		xml.closeTag("shift");
 
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/basepairs/BasePairParameters.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/basepairs/BasePairParameters.java
index 6427447d75..161c752c74 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/basepairs/BasePairParameters.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/basepairs/BasePairParameters.java
@@ -36,6 +36,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.List;
+import java.util.Locale;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Map;
@@ -635,9 +636,9 @@ public String toString() {
 		for (int i = 0; i < pairingParameters.length; i++) {
 			result.append(pairingNames.get(i)+": ");
 			for (int j = 0; j < 6; j++)
-				result.append(String.format("%5.4f", pairingParameters[i][j]) + " ");
+				result.append(String.format(Locale.US, "%5.4f", pairingParameters[i][j]) + " ");
 			for (int j = 0; j < 6; j++)
-				result.append(String.format("%5.4f", stepParameters[i][j]) + " ");
+				result.append(String.format(Locale.US, "%5.4f", stepParameters[i][j]) + " ");
 			result.append("\n");
 		}
 		return result.toString();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java
index cdc124ad86..7b227822ec 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java
@@ -27,6 +27,7 @@
 import javax.vecmath.Vector3d;
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Locale;
 
 
 /**
@@ -246,6 +247,6 @@ public double[] getMinMax(double[] array) {
 
 	@Override
 	public String toString() {
-		return String.format("[(%7.2f,%7.2f),(%7.2f,%7.2f),(%7.2f,%7.2f)]", xmin,xmax,ymin,ymax,zmin,zmax);
+		return String.format(Locale.US, "[(%7.2f,%7.2f),(%7.2f,%7.2f),(%7.2f,%7.2f)]", xmin,xmax,ymin,ymax,zmin,zmax);
 	}
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java
index 9c80bc8b3a..46a5243416 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java
@@ -99,9 +99,11 @@ public static List<Domain> cluster(List<Domain> domains, PDPDistanceMatrix pdpDi
 					 */
 
 					double S_value= total_contacts/(double)total_max_contacts;
-					if(verbose) System.out.println(String.format(" size1=%d size2=%d minDomSize=%5.2f maxDomSize=%5.2f total_contacts = %d ", size1,size2,minDomSize,maxDomSize,total_contacts));
-					if(verbose) System.out.println(String.format(" total_contacts = %d total_max_contacts = %d", total_contacts, total_max_contacts));
-					if(verbose) System.out.println(String.format(" maximum_value = %f S_value = %f\n",maximum_value, S_value));
+					if(verbose) {
+						System.out.printf(" size1=%d size2=%d minDomSize=%5.2f maxDomSize=%5.2f total_contacts = %d %n", size1,size2,minDomSize,maxDomSize,total_contacts);
+						System.out.printf(" total_contacts = %d total_max_contacts = %d%n", total_contacts, total_max_contacts);
+						System.out.printf(" maximum_value = %f S_value = %f%n%n",maximum_value, S_value);
+					}
 
 					if (S_value > maximum_value) {
 						maximum_value = S_value;
@@ -134,8 +136,8 @@ public static List<Domain> cluster(List<Domain> domains, PDPDistanceMatrix pdpDi
 			avd=(domains.get(Si).avd+domains.get(Sj).avd)/2;
 				 */
 				if(verbose) System.out.println(" Criteria 1 matched");
-				if(verbose) System.out.println(String.format(" maximum_value = %f", maximum_value));
-				if(verbose) System.out.println(String.format(" Si = %d Sj = %d ", Si, Sj));
+				if(verbose) System.out.printf(" maximum_value = %f%n", maximum_value);
+				if(verbose) System.out.printf(" Si = %d Sj = %d %n", Si, Sj);
 				domains = combine(domains,Si, Sj, maximum_value);
 				maximum_value = PDPParameters.CUT_OFF_VALUE1-.1;
 				maximum_values = PDPParameters.CUT_OFF_VALUE1S-.1;
@@ -152,8 +154,8 @@ else if (maximum_valuem > PDPParameters.CUT_OFF_VALUE1M) {
 			avd=(domains[Sim].avd+domains[Sjm].avd)/2;
 				 */
 				if(verbose) System.out.println(" Criteria 2 matched");
-				if(verbose) System.out.println(String.format(" maximum_values = %f", maximum_valuem));
-				if(verbose) System.out.println(String.format(" Sim = %d Sjm = %d", Sim, Sjm));
+				if(verbose) System.out.printf(" maximum_values = %f%n", maximum_valuem);
+				if(verbose) System.out.printf(" Sim = %d Sjm = %d%n", Sim, Sjm);
 				domains = combine(domains, Sim, Sjm, maximum_valuem);
 				maximum_value =  PDPParameters.CUT_OFF_VALUE1-.1;
 				maximum_values = PDPParameters.CUT_OFF_VALUE1S-.1;
@@ -170,8 +172,8 @@ else if (maximum_values > PDPParameters.CUT_OFF_VALUE1S) {
 			avd=(domains[Sis].avd+domains[Sjs].avd)/2;
 				 */
 				if(verbose) System.out.println(" Criteria 3 matched");
-				if(verbose) System.out.println(String.format(" maximum_values = %f", maximum_values));
-				if(verbose) System.out.println(String.format(" Sis = %d Sjs = %d", Sis, Sjs));
+				if(verbose) System.out.printf(" maximum_values = %f%n", maximum_values);
+				if(verbose) System.out.printf(" Sis = %d Sjs = %d%n", Sis, Sjs);
 				domains = combine(domains, Sis, Sjs, maximum_values);
 				maximum_value = PDPParameters.CUT_OFF_VALUE1-.1;
 				maximum_values = PDPParameters.CUT_OFF_VALUE1S-.1;
@@ -180,11 +182,11 @@ else if (maximum_values > PDPParameters.CUT_OFF_VALUE1S) {
 			domains[Sis].avd=domcont(domains[Sis]);
 			domains[Sjs].avd=domcont(domains[Sjs]);
 				 */
-				if(verbose) System.out.println(String.format(" Listing the domains after combining..."));
+				if(verbose) System.out.println(" Listing the domains after combining...");
 				if(verbose) listdomains(domains);
 			}
 			else {
-				if(verbose) System.out.println(String.format(" Maximum value is less than cut off value. (max:" + maximum_value+")" ));
+				if(verbose) System.out.printf(" Maximum value is less than cut off value. (max:%d)%n", maximum_value);
 				maximum_value = -1.0;
 				maximum_values = -1.0;
 				maximum_valuem = -1.0;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/Cut.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/Cut.java
index 38bace0f14..7d39a7f537 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/Cut.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/Cut.java
@@ -167,11 +167,11 @@ public int cut( Atom[] ca, Domain dom, CutValues val, int[][] dist, PDPDistanceM
 			}
 		}
 		average_density/=size0;
-		if(verbose) System.out.println(String.format("  --- Trying to cut domain of size %d having %d segments and  average cont_density %f\n",dom.size,dom.nseg,average_density));
+		if(verbose) System.out.printf("  --- Trying to cut domain of size %d having %d segments and  average cont_density %f%n%n",dom.size,dom.nseg,average_density);
 
 		if ( verbose )
 			for(kseg=0;kseg<dom.nseg;kseg++)
-				System.out.println(String.format("	--- segment %d from %d to %d",kseg,dom.getSegmentAtPos(kseg).getFrom(),dom.getSegmentAtPos(kseg).getTo()) + " av density: " + average_density);
+				System.out.printf("  --- segment %d from %d to %d av density: %f%n",kseg,dom.getSegmentAtPos(kseg).getFrom(),dom.getSegmentAtPos(kseg).getTo(), average_density);
 
 
 		if(val.first_cut) {
@@ -180,7 +180,7 @@ public int cut( Atom[] ca, Domain dom, CutValues val, int[][] dist, PDPDistanceM
 			printf("%d	%s	%d	%d	%d	%d	%f\n",k,protein.res[k].type,k-from,to-k,contacts[k],max_contacts[k],contact_density[k]);
 			 */
 			val.AD = average_density;
-			if(verbose)	System.out.println(String.format("  --- AD=%f", average_density));
+			if(verbose) System.out.printf("  --- AD=%f%n", average_density);
 			/*
 			 */
 		}
@@ -188,7 +188,7 @@ public int cut( Atom[] ca, Domain dom, CutValues val, int[][] dist, PDPDistanceM
 
 		val.s_min/=val.AD;
 
-		if(verbose) System.out.println(String.format("  --- after single cut: s_min = %f site_min = %d",val.s_min,site_min));
+		if(verbose) System.out.printf("  --- after single cut: s_min = %f site_min = %d%n",val.s_min,site_min);
 
 		///
 		k=0;
@@ -391,7 +391,7 @@ public int cut( Atom[] ca, Domain dom, CutValues val, int[][] dist, PDPDistanceM
 		}
 		val.first_cut=false;
 		if(verbose)
-			System.out.println(String.format("  --- E ... at the end of cut: s_min %f CUTOFF %f site_min %d *site2 %d",val.s_min,PDPParameters.CUT_OFF_VALUE,site_min,val.site2));
+			System.out.printf("  --- E ... at the end of cut: s_min %f CUTOFF %f site_min %d *site2 %d%n",val.s_min,PDPParameters.CUT_OFF_VALUE,site_min,val.site2);
 		if(val.s_min> PDPParameters.CUT_OFF_VALUE) return -1;
 
 		return(site_min);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/CutDomain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/CutDomain.java
index 839fdec1c4..5855cd2e77 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/CutDomain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/CutDomain.java
@@ -85,7 +85,7 @@ public  void cutDomain(Domain dom, CutSites cut_sites, PDPDistanceMatrix pdpMatr
 		}
 
 		if(verbose)
-			System.out.println(String.format("   C ... Cutting at position(s): %d %d %f\n",site,val.site2,dom.score));
+			System.out.printf("   C ... Cutting at position(s): %d %d %f%n%n",site,val.site2,dom.score);
 
 		cut_sites.cut_sites[cut_sites.ncuts++] = site;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucState.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucState.java
index 8ba6193eed..33bdc7c931 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucState.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucState.java
@@ -20,6 +20,8 @@
  */
 package org.biojava.nbio.structure.secstruc;
 
+import java.util.Locale;
+
 import org.biojava.nbio.structure.Atom;
 import org.biojava.nbio.structure.Group;
 import org.biojava.nbio.structure.StructureTools;
@@ -321,44 +323,44 @@ else if (bp2 < 1000)
 		double e1 = (accept1.getEnergy() / 1000.0);
 		if (e1 < 0.0)
 			p1 -= index;
-		buf.append(String.format("%6d,%4.1f", p1, e1));
+		buf.append(String.format(Locale.US, "%6d,%4.1f", p1, e1));
 
 		// O-->H-N
 		int p2 = donor1.getPartner();
 		double e2 = (donor1.getEnergy() / 1000.0);
 		if (e2 < 0.0)
 			p2 -= index;
-		buf.append(String.format("%6d,%4.1f", p2, e2));
+		buf.append(String.format(Locale.US, "%6d,%4.1f", p2, e2));
 
 		// N-H-->O
 		int p3 = accept2.getPartner();
 		double e3 = (accept2.getEnergy() / 1000.0);
 		if (e3 < 0.0)
 			p3 -= index;
-		buf.append(String.format("%6d,%4.1f", p3, e3));
+		buf.append(String.format(Locale.US, "%6d,%4.1f", p3, e3));
 
 		// O-->H-N
 		int p4 = donor2.getPartner();
 		double e4 = (donor2.getEnergy() / 1000.0);
 		if (e4 < 0.0)
 			p4 -= index;
-		buf.append(String.format("%6d,%4.1f", p4, e4));
+		buf.append(String.format(Locale.US, "%6d,%4.1f", p4, e4));
 
 		// TCO TODO
 		buf.append("        ");
 
 		// KAPPA
-		buf.append(String.format("%6.1f", kappa));
+		buf.append(String.format(Locale.US, "%6.1f", kappa));
 
 		// ALPHA TODO
 		buf.append("      ");
 
 		// PHI PSI
-		buf.append(String.format("%6.1f %6.1f ", phi, psi));
+		buf.append(String.format(Locale.US, "%6.1f %6.1f ", phi, psi));
 
 		// X-CA Y-CA Z-CA
 		Atom ca = parent.getAtom("CA");
-		buf.append(String.format("%6.1f %6.1f %6.1f", ca.getX(), ca.getY(),
+		buf.append(String.format(Locale.US, "%6.1f %6.1f %6.1f", ca.getX(), ca.getY(),
 				ca.getZ()));
 
 		return buf.toString();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalCell.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalCell.java
index 3850c0b87b..c36e051469 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalCell.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalCell.java
@@ -593,6 +593,6 @@ public boolean isCellReasonable() {
 
 	@Override
 	public String toString() {
-		return String.format("a%7.2f b%7.2f c%7.2f alpha%6.2f beta%6.2f gamma%6.2f", a, b, c, alpha, beta, gamma);
+		return String.format(Locale.US, "a%7.2f b%7.2f c%7.2f alpha%6.2f beta%6.2f gamma%6.2f", a, b, c, alpha, beta, gamma);
 	}
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalTransform.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalTransform.java
index df3938fca6..3926c9223a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalTransform.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalTransform.java
@@ -25,6 +25,7 @@
 import javax.vecmath.Point3i;
 import javax.vecmath.Vector3d;
 import java.io.Serializable;
+import java.util.Locale;
 
 import static java.lang.Math.abs;
 
@@ -451,7 +452,7 @@ private String formatCoef(double coef) {
 		}
 
 		// Give up and use floating point;
-		return String.format("%.3f", coef);
+		return String.format(Locale.US, "%.3f", coef);
 	}
 
 	/**
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
index e2e713c023..b7be721a87 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
@@ -43,6 +43,7 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -433,9 +434,9 @@ private static String formatAlg(double xcoef, double ycoef, double zcoef, double
 
 	private static String formatCoef(double c, boolean leading) {
 		if (leading) {
-			return (deltaComp(Math.abs(c),1,DELTA)?(c>0?"":"-"):String.format("%4.2f",c));
+			return (deltaComp(Math.abs(c),1,DELTA)?(c>0?"":"-"):String.format(Locale.US, "%4.2f",c));
 		} else {
-			return (deltaComp(Math.abs(c),1,DELTA)?(c>0?"+":"-"):String.format("%+4.2f",c));
+			return (deltaComp(Math.abs(c),1,DELTA)?(c>0?"+":"-"):String.format(Locale.US, "%+4.2f",c));
 		}
 	}
 
@@ -719,4 +720,3 @@ public void setBravLattice(BravaisLattice bravLattice) {
 	}
 
 }
-

From 7378662055650b35d9d2def6ac4d67b35084ee90 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Sun, 1 Aug 2021 00:45:10 +0200
Subject: [PATCH 127/599] Add uncommitted changes

---
 .../align/xml/AFPChainXMLConverter.java       | 20 +++++++++----------
 .../nbio/structure/xtal/CrystalCell.java      |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLConverter.java
index 6cd29bcc07..141947c2be 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLConverter.java
@@ -244,24 +244,24 @@ public static void printXMLHeader(PrettyXMLWriter xml, AFPChain afpChain) throws
 		xml.attribute("optLength", afpChain.getOptLength() + "");
 		xml.attribute("totalLenIni", afpChain.getTotalLenIni() + "");
 
-		xml.attribute("alignScore", String.format("%5.2f", afpChain.getAlignScore() ).trim());
-		xml.attribute("chainRmsd",  String.format("%5.2f", afpChain.getChainRmsd() ).trim());
-		xml.attribute("identity",String.format("%5.4f", afpChain.getIdentity() ).trim());
-		xml.attribute("normAlignScore", String.format("%5.2f",afpChain.getNormAlignScore()).trim());
-		xml.attribute("probability", String.format("%.2e", afpChain.getProbability() ).trim());
-		xml.attribute("similarity", String.format("%5.4f", afpChain.getSimilarity() ).trim());
+		xml.attribute("alignScore", String.format(Locale.US, "%5.2f", afpChain.getAlignScore() ).trim());
+		xml.attribute("chainRmsd",  String.format(Locale.US, "%5.2f", afpChain.getChainRmsd() ).trim());
+		xml.attribute("identity",String.format(Locale.US, "%5.4f", afpChain.getIdentity() ).trim());
+		xml.attribute("normAlignScore", String.format(Locale.US, "%5.2f",afpChain.getNormAlignScore()).trim());
+		xml.attribute("probability", String.format(Locale.US, "%.2e", afpChain.getProbability() ).trim());
+		xml.attribute("similarity", String.format(Locale.US, "%5.4f", afpChain.getSimilarity() ).trim());
 
 		xml.attribute("similarity1", afpChain.getCoverage1() + "");
 		xml.attribute("similarity2", afpChain.getCoverage2() + "");
-		xml.attribute("totalRmsdIni", String.format("%5.2f",afpChain.getTotalRmsdIni() ).trim());
-		xml.attribute("totalRmsdOpt", String.format("%5.2f",afpChain.getTotalRmsdOpt() ).trim());
+		xml.attribute("totalRmsdIni", String.format(Locale.US, "%5.2f",afpChain.getTotalRmsdIni() ).trim());
+		xml.attribute("totalRmsdOpt", String.format(Locale.US, "%5.2f",afpChain.getTotalRmsdOpt() ).trim());
 		xml.attribute("ca1Length", afpChain.getCa1Length()+"");
 		xml.attribute("ca2Length", afpChain.getCa2Length()+"");
 		xml.attribute("afpNum",afpChain.getAfpSet().size()+"");
-		xml.attribute("alignScoreUpdate",String.format("%5.2f",afpChain.getAlignScoreUpdate()).trim());
+		xml.attribute("alignScoreUpdate",String.format(Locale.US, "%5.2f",afpChain.getAlignScoreUpdate()).trim());
 		xml.attribute("time", String.format("%d",afpChain.getCalculationTime()));
 		if ( afpChain.getTMScore() != -1){
-			xml.attribute("tmScore", String.format("%.2f",afpChain.getTMScore()));
+			xml.attribute("tmScore", String.format(Locale.US, "%.2f",afpChain.getTMScore()));
 		}
 
 		// test if alignment is CP:
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalCell.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalCell.java
index c36e051469..b1449475f0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalCell.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalCell.java
@@ -24,6 +24,7 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Locale;
 
 //import org.slf4j.Logger;
 //import org.slf4j.LoggerFactory;

From dbd2eeef5dd136c1109d93cb7fcf0f37f94bc25f Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Sun, 1 Aug 2021 11:31:00 +0100
Subject: [PATCH 128/599] additional tests for utility methods

---
 .../nbio/core/util/FileDownloadUtils.java     | 31 +++++--
 .../nbio/core/util/FileDownloadUtilsTest.java | 89 +++++++++++++++++++
 2 files changed, 111 insertions(+), 9 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index 2fd6f3f9e0..1241595dbd 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -80,6 +80,12 @@ public static void copy(File src, File dst) throws IOException {
 		}
 	}
 
+	/**
+	 * Gets the file extension of a file, excluding '.'.
+	 * If the file name has no extension the file name is returned.
+	 * @param f a File
+	 * @return The extension
+	 */
 	public static String getFileExtension(File f) {
 		String fileName = f.getName();
 		String ext = "";
@@ -88,14 +94,20 @@ public static String getFileExtension(File f) {
 		return ext;
 	}
 
+	/**
+	 * Gets the file name up to and excluding the first
+	 * '.' character. If there is no extension, the full filename
+	 * is returned.
+	 * @param f A file
+	 * @return A possibly empty but non-null String.
+	 */
 	public static String getFilePrefix(File f) {
 		String fileName = f.getName();
-		String fname = "";
-
 		int mid = fileName.indexOf(".");
-		fname = fileName.substring(0, mid);
-
-		return fname;
+		if (mid < 0) {
+			return fileName;
+		}
+		return fileName.substring(0, mid);
 	}
 
 	/**
@@ -152,7 +164,7 @@ public static void downloadFile(URL url, File destination) throws IOException {
 
 	/**
 	 * Converts path to Unix convention and adds a terminating slash if it was
-	 * omitted
+	 * omitted. 
 	 *
 	 * @param path original platform dependent path
 	 * @return path in Unix convention
@@ -179,10 +191,11 @@ public static String toUnixPath(String path) {
 	 *
 	 * <p>
 	 * This does not work for some special cases for paths: Other users' homes
-	 * (~user/...), and Tilde expansion within the path (/.../~/...)
+	 * (~user/...), and Tilde expansion within the path (/.../~/...). In these cases
+	 *  the original argument is returned.
 	 *
-	 * @param file
-	 * @return
+	 * @param file A filepath starting with a tilde
+	 * @return An absolute path
 	 */
 	public static String expandUserHome(String file) {
 		if (file.startsWith("~" + File.separator)) {
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
index 8cd89d46e2..00009be7c0 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
@@ -1,5 +1,7 @@
 package org.biojava.nbio.core.util;
 
+import static org.biojava.nbio.core.util.FileDownloadUtils.getFileExtension;
+import static org.biojava.nbio.core.util.FileDownloadUtils.getFilePrefix;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
@@ -47,6 +49,93 @@ void copyFile() throws IOException {
                 }
             }
         }
+    }
+
+    @Nested
+    class FileExtension {
+        @Test
+        void getExtensionHappyCase(){
+            File someFile = new File("sequence.fasta");
+            assertEquals("fasta", getFileExtension(someFile));
+        }
+
+        @Test
+        void lastSuffixOnlyReturned(){
+            File someFile = new File("sequence.1.a.fasta");
+            assertEquals("fasta", getFileExtension(someFile));
+        }
+        
+        @Test
+        void fileNameEndingInDotReturnsEmptyString(){
+            File someFile = new File("noExtension.");
+            assertEquals("", getFileExtension(someFile));
+        }
 
+        @Test
+        void hiddenFile(){
+            File someFile = new File(".m2");
+            assertEquals("m2", getFileExtension(someFile));
+        }
+
+        @Test
+        void noExtension(){
+            File someFile = new File("nameOnly");
+            assertEquals("nameOnly", getFileExtension(someFile));
+        }        
+    }
+
+    @Nested
+    class GetFilePrefix{
+        @Test
+        void standardFileName(){
+            File someFile = new File("sequence.fasta");
+            assertEquals("sequence", getFilePrefix(someFile));
+        }
+        @Test
+        void prefixIsUpToFirstDot(){
+            File someFile = new File("sequence.1.2.fasta");
+            assertEquals("sequence", getFilePrefix(someFile));
+        }
+
+        @Test
+        void noExtension(){
+            File someFile = new File("nameOnly");
+            assertEquals("nameOnly", getFilePrefix(someFile));
+        }
+
+        @Test
+        void hiddenFile(){
+            File someFile = new File(".m2");
+            assertEquals("", getFilePrefix(someFile));
+        }
+    }
+
+    @Nested
+    class ToUnixPath {
+        @Test
+        void windowsToUnixAddsTrailingSlash(){
+            String winPath = "C:\\a\\b\\c";
+            assertEquals("C:/a/b/c/", FileDownloadUtils.toUnixPath(winPath));
+        }
+        @Test
+        void unixPathReturnedUnchanged(){
+            String path = "/a/b/c/";
+            assertEquals(path, FileDownloadUtils.toUnixPath(path));
+        }
+    }
+
+    @Nested
+    class ToUserHome {
+        String currUserHome = System.getProperty("user.home");
+        @Test
+        void simplePath (){
+            String path="~/sequence.gb";
+            assertEquals(currUserHome+File.separator+"sequence.gb", FileDownloadUtils.expandUserHome(path));
+        }
+        @Test
+        void nestedPath (){
+            String path="~/a/b/c/sequence.gb";
+            assertEquals(currUserHome+File.separator+"a/b/c/sequence.gb", FileDownloadUtils.expandUserHome(path));
+        }  
     }
 }

From c7ba62e6288bdf86736e9cd94fa2012f7dba0347 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Sun, 1 Aug 2021 13:03:30 +0100
Subject: [PATCH 129/599] filedownloadutils-tests

---
 .../nbio/core/util/FileDownloadUtils.java     |  2 +-
 .../nbio/core/util/FileDownloadUtilsTest.java | 44 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index 1241595dbd..f1217274ec 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -113,7 +113,7 @@ public static String getFilePrefix(File f) {
 	/**
 	 * Download the content provided at URL url and store the result to a local
 	 * file, using a temp file to cache the content in case something goes wrong
-	 * in download
+	 * in download. A timeout of 60 seconds is hard-coded and 10 retries are attempted.
 	 *
 	 * @param url
 	 * @param destination
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
index 00009be7c0..e917fdce0f 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
@@ -3,11 +3,14 @@
 import static org.biojava.nbio.core.util.FileDownloadUtils.getFileExtension;
 import static org.biojava.nbio.core.util.FileDownloadUtils.getFilePrefix;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -125,7 +128,7 @@ void unixPathReturnedUnchanged(){
     }
 
     @Nested
-    class ToUserHome {
+    class ExpandUserHome {
         String currUserHome = System.getProperty("user.home");
         @Test
         void simplePath (){
@@ -138,4 +141,43 @@ void nestedPath (){
             assertEquals(currUserHome+File.separator+"a/b/c/sequence.gb", FileDownloadUtils.expandUserHome(path));
         }  
     }
+
+    @Nested
+    class URLMethods {
+        final String availableUrl = "https://www.google.com";
+
+        @Test
+        void pingGoogleOK(){
+            assertTrue(FileDownloadUtils.ping(availableUrl, 1000));
+        }
+
+        @Test
+        void pingNonExistentFalse(){
+            assertFalse(FileDownloadUtils.ping("https://non-existent.biojava", 1));
+        }
+    }
+    @Nested
+    class DeleteDirectory {
+
+        private File createDirectoryTree () throws IOException {
+
+            File tmpdir = Files.createTempDirectory("tmpDirPrefix").toFile();
+            File child1 = new File(tmpdir, "a");
+            File child2 = new File(child1, "b");
+            File child3 = new File(child2, "c");
+            File f = new File(child3, "seq.fa");
+            child3.mkdirs();
+            f.createNewFile();
+            return tmpdir;
+        }
+
+        @Test
+        void deleteFolderTree() throws IOException{
+            File toDelete = createDirectoryTree();
+            assertTrue(toDelete.exists());
+
+            FileDownloadUtils.deleteDirectory(toDelete.getAbsolutePath());
+            assertFalse(toDelete.exists());
+        }
+    }
 }

From 7fa3e62245ff9359b270f1176e78482375572cb2 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Mon, 2 Aug 2021 21:44:18 +0100
Subject: [PATCH 130/599] basic test for linkage clusterer

---
 .../core/util/SingleLinkageClustererTest.java | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/util/SingleLinkageClustererTest.java

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/SingleLinkageClustererTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/SingleLinkageClustererTest.java
new file mode 100644
index 0000000000..abafeb8d5d
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/SingleLinkageClustererTest.java
@@ -0,0 +1,51 @@
+package org.biojava.nbio.core.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+
+class SingleLinkageClustererTest {
+    
+    // from wikipedia example
+    // https://en.wikipedia.org/wiki/Single-linkage_clustering
+    double [][] matrix = new double[][]{
+        {0, 17, 21,31,23},
+        {17,0,30,34,21},
+        {21,30,0,28,39},
+        {31,34,28,0,43},
+        {23,21,39,43,0}
+        };
+
+
+    @Test
+    void squareMatrixRequired() {
+        double [][] non_square_matrix = new double[][]{{1,2},{1,2,3},{1}};
+        assertThrows(IllegalArgumentException.class, ()->new SingleLinkageClusterer(non_square_matrix, false));
+    }
+    @Test
+    void clusterWikipediaExampleDistanceMatrix(){
+        SingleLinkageClusterer clusterer = new SingleLinkageClusterer(matrix, false);
+        Map<Integer, Set<Integer>> result = clusterer.getClusters(Double.MAX_VALUE);
+        assertEquals(5, result.get(1).size());
+
+        result = clusterer.getClusters(0);
+        assertEquals(1, result.get(1).size());
+    }
+
+    @Test
+    void clusterWikipediaExampleScoreMatrix(){
+        SingleLinkageClusterer clusterer = new SingleLinkageClusterer(matrix, true);
+        Map<Integer, Set<Integer>> result = clusterer.getClusters(0);
+        assertEquals(5, result.get(1).size());
+        result = clusterer.getClusters(Double.MAX_VALUE);
+        assertEquals(1, result.get(1).size());
+
+
+    }
+
+    
+}

From 72367c43d1fff51f4c2d958938e86553bf3bce9f Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Mon, 2 Aug 2021 21:47:58 +0100
Subject: [PATCH 131/599] basic test for linkage clusterer

---
 .../org/biojava/nbio/core/util/SingleLinkageClustererTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/SingleLinkageClustererTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/SingleLinkageClustererTest.java
index abafeb8d5d..4721c69019 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/SingleLinkageClustererTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/SingleLinkageClustererTest.java
@@ -12,6 +12,7 @@ class SingleLinkageClustererTest {
     
     // from wikipedia example
     // https://en.wikipedia.org/wiki/Single-linkage_clustering
+    // it should produce clusters ((0,1),2,4),3 at distance 8.5, 10.5 and 14
     double [][] matrix = new double[][]{
         {0, 17, 21,31,23},
         {17,0,30,34,21},
@@ -43,8 +44,6 @@ void clusterWikipediaExampleScoreMatrix(){
         assertEquals(5, result.get(1).size());
         result = clusterer.getClusters(Double.MAX_VALUE);
         assertEquals(1, result.get(1).size());
-
-
     }
 
     

From dfd228efb5c91a860769ed44fca6ed5d76bd930c Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Tue, 3 Aug 2021 09:05:00 +0100
Subject: [PATCH 132/599] Fixed length argument bug, addressed PR comments

---
 CHANGELOG.md                                  |  2 ++
 .../biojava/nbio/core/util/CRC64Checksum.java | 21 +++++++++++--
 .../nbio/core/util/CRC64ChecksumTest.java     | 31 ++++++++++++++-----
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35a2de798c..f3bbd01682 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,8 @@ BioJava 6.0.0 (future release)
 * Moved all chem-comp model classes from `org.biojava.nbio.structure.io.mmcif.chem` to `org.biojava.nbio.structure.chem`
 * Moved all chem-comp parsing classes from `org.biojava.nbio.structure.io.mmcif.chem` to `org.biojava.nbio.structure.io.cif`
 * Moved classes in `org.biojava.nbio.structure.io.mmcif` to `org.biojava.nbio.structure.chem`
+* Fixed `CRC64Checksum#public void update(byte[] b, int offset, int length)` to use
+the `length` argument correctly as specified in `java.util.zip.Checksum` interface.
 
 ### Fixed
 * Correct chain assignment to entities when parsing PDB/mmCIF without entity information (in cases with more than 3 chains per entity) #931
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/CRC64Checksum.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/CRC64Checksum.java
index 9513d52655..9b0afc5132 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/CRC64Checksum.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/CRC64Checksum.java
@@ -56,10 +56,27 @@ public void update(int b) {
 		crc = low ^ high;
 	}
 
-	// condition loop should be i < offset + length
+	 /**
+     * Updates the CRC-64 checksum with the specified array of bytes.
+	 * <br/>
+	 * Note that BioJava before version 6.0 implemented this method incorrectly,
+	 * using {@code length} as an index.
+     *
+     * @throws IllegalArgumentException
+     *         if {@code offset} is negative, or {@code length} is negative, or
+     *         {@code offset+length} is negative or greater than the length of
+     *         the array {@code b}.
+     */
 	@Override
 	public void update(byte[] b, int offset, int length) {
-		for (int i = offset; i < length; ++i)
+		if (b == null) {
+            throw new IllegalArgumentException("byte array cannot be null");
+        }
+        if (offset < 0 || length < 0 || offset > b.length - length) {
+            throw new IllegalArgumentException("Offset and length must be non-negative"+
+			 " and their sum cannot be greater than length of byte array");
+        }
+		for (int i = offset; i < length + offset; ++i)
 			update(b[i]);
 	}
 
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
index 92d434008a..22a846befa 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
@@ -1,9 +1,10 @@
 package org.biojava.nbio.core.util;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
@@ -75,13 +76,8 @@ void allRangeIsSameAsAllArray (){
     }
 
     @Test 
-    @Disabled
-    // this doesn't work as expected
-    // and doesn't behave according to interface. The 3rd argument
-    // is treated as an index rather than a number of bytes to include
-    void partialbyteRange (){
+    void partialByteRange (){
         byte [] testBytes = new byte [] {1,2,3,4,5};
-        // should update with testBytes[2] but doesn't
         crc64.update(testBytes, 2, 1);
         String partialBytesHex = crc64.toString();
         crc64.reset();
@@ -89,6 +85,27 @@ void partialbyteRange (){
         assertEquals(partialBytesHex, crc64.toString());
     }
 
+    @Test 
+    void partialByteRangeRejectsInvalidInput (){
+        byte [] testBytes = new byte [] {1,2,3,4,5};
+        assertAll(
+            ()->assertThrows(IllegalArgumentException.class,
+                ()->crc64.update(testBytes, -1, 0)),
+            ()->assertThrows(IllegalArgumentException.class,
+                ()->crc64.update(testBytes, 0, -1)),
+            ()->assertThrows(IllegalArgumentException.class,
+                ()->crc64.update(testBytes, 0, testBytes.length+1)),
+            ()->assertThrows(IllegalArgumentException.class,
+                ()->crc64.update(testBytes,  testBytes.length, 1))
+        );
+        crc64.update(testBytes, 2, 1);
+        String partialBytesHex = crc64.toString();
+        crc64.reset();
+        crc64.update(testBytes[2]);
+        assertEquals(partialBytesHex, crc64.toString());
+    }
+
+
     @Test
     void hexStringIsEqualToValue(){
         Long value = Long.parseLong(helloInCrc64Hex, 16);

From dd39bcd1362627b24822a21b9ae2d035250de793 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Tue, 3 Aug 2021 09:08:59 +0100
Subject: [PATCH 133/599] removed duplicated test

---
 .../java/org/biojava/nbio/core/util/CRC64ChecksumTest.java   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
index 22a846befa..d8d34ba99b 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
@@ -98,11 +98,6 @@ void partialByteRangeRejectsInvalidInput (){
             ()->assertThrows(IllegalArgumentException.class,
                 ()->crc64.update(testBytes,  testBytes.length, 1))
         );
-        crc64.update(testBytes, 2, 1);
-        String partialBytesHex = crc64.toString();
-        crc64.reset();
-        crc64.update(testBytes[2]);
-        assertEquals(partialBytesHex, crc64.toString());
     }
 
 

From 840ca74307eb7d6c83d459545eb93daf3c29d503 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Tue, 3 Aug 2021 19:14:06 +0800
Subject: [PATCH 134/599] Smaller test file size

---
 .../biojava/nbio/structure/TestKeywords.java    |   2 +-
 .../src/test/resources/pdb6elw-26lines.ent.gz   | Bin 0 -> 628 bytes
 .../src/test/resources/pdb6elw.ent.gz           | Bin 72674 -> 0 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 biojava-structure/src/test/resources/pdb6elw-26lines.ent.gz
 delete mode 100644 biojava-structure/src/test/resources/pdb6elw.ent.gz

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestKeywords.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestKeywords.java
index 5a92fd71b5..8adaefb219 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestKeywords.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestKeywords.java
@@ -27,7 +27,7 @@ public void testKeywordsOnFiveLines () throws IOException {
 	@Test
 	public void testDash() throws IOException {
 		String fileName;
-		fileName = "/pdb6elw.ent.gz";
+		fileName = "/pdb6elw-26lines.ent.gz";
 		InputStream resourceAsStream = getClass().getResourceAsStream(fileName);
 		GZIPInputStream inStream = new GZIPInputStream(resourceAsStream);
 		
diff --git a/biojava-structure/src/test/resources/pdb6elw-26lines.ent.gz b/biojava-structure/src/test/resources/pdb6elw-26lines.ent.gz
new file mode 100644
index 0000000000000000000000000000000000000000..99a495c64d7af804e499969c37924546c672f6b8
GIT binary patch
literal 628
zcmV-)0*n10iwFpDA_-vx0B~etHf3ygEiyK2X>Mh6E@f_X0IikXuG%mR$M1OxUv5&1
z+MdGU<0>Sk38YDtq#Sz1`@hAU!YCVT6gF3tqNe%DcI>|;GJy`r>`@8pP_#TSkMKt;
zmZ`@k%|B^9NB#Bd?j)$7&!?rTBsla|w?SD0J~(2x4#950qef$S=L0H(z^w^P8D%Pv
zZOsf+&9OWKxvd)`;<C2-q{IsHHT;7Oz#<Znw;ET_NbBj<s!;-DC!B52#grga<Ub2i
zS@QGpkrI?V0DeHNg5}a0;S|&Fx;X$#;F8j^0`@NJH{c9>XRPV!7%}BIc^n*+N#$j8
zOw08X;2e<CjZE`=N>A~wn*;C@&{R|s=#Z|uL;oIf04|`8AyR}r4&Jnhx2@v{|E~_O
zzyhqRm{Gnyd9Kg|wN;c<X=@9fHS}dv5(ePM0Hie36#2QU#!wyt%K;eJF~+`}XY&_v
zx4;=xXmHiH`OBDlU|)yFhQ!9xJ)eA(6)JJ`T%uE4Dh8Z-8#cPgzX|;KzJ3b)yaQfi
zFXziFTa0si04^Q?4~%regjJNo&1z4&M~XPhaXkjOd;~-utUHCSiJGRFua#Jj^f1pJ
z051%JVMz1YCgt(U{tnz@_a*v98?-#RmClR$H_k@&Pax_KwL5K_bZfOpfRdupdtd=Q
zA{-C|ZmBO2&VDAN$5#)eI7MJ_c}yMaK&b83G2V}<cWlDiAZ<TJchf!7wNKb|V_hu2
zkjUx2l_qJXu^iFSxP599hX;z2Rt3FTneJMh=8NmV%`gA$oY64Gege-&i;RHg7MQ_{
OHu(YbWdf`^2mk=x?k_+9

literal 0
HcmV?d00001

diff --git a/biojava-structure/src/test/resources/pdb6elw.ent.gz b/biojava-structure/src/test/resources/pdb6elw.ent.gz
deleted file mode 100644
index de6d694a17ca45a0fb0f934827e9f218ac29a8e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72674
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
J-rMz!1OW6U^>hFL


From 86cb4687039df450553b21f8e5feecc82ef7e806 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Tue, 3 Aug 2021 19:18:31 +0800
Subject: [PATCH 135/599] Parse/write Keywords from/to mmCIF files

Updated unit tests as well
---
 .../cif/CifFileSupplierIntegrationTest.java   | 17 +++++++
 .../io/cif/AbstractCifFileSupplier.java       |  4 ++
 .../io/cif/CifStructureConsumerImpl.java      | 48 ++++++++++++++-----
 3 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
index 5cda83225d..cf7e493ed1 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
@@ -21,6 +21,7 @@
 import java.net.URL;
 import java.util.Arrays;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -47,6 +48,18 @@ public void test1A2C() throws IOException {
         testRoundTrip("1A2C");
     }
 
+    @Test
+    public void test3CDL() throws IOException {
+    	// a structure with insertion codes
+    	testRoundTrip("3CDL");
+    }
+    
+    @Test
+    public void test6ELW() throws IOException {
+    	// a structure with insertion codes
+    	testRoundTrip("6ELW");
+    }
+    
     private static void testRoundTrip(String pdbId) throws IOException {
         URL url = new URL("https://files.rcsb.org/download/" + pdbId + ".cif");
         Structure originalStruct = CifStructureConverter.fromURL(url);
@@ -57,6 +70,10 @@ private static void testRoundTrip(String pdbId) throws IOException {
         assertNotNull(readStruct);
         assertEquals(originalStruct.getChains().size(), readStruct.getChains().size());
         assertEquals(originalStruct.nrModels(), readStruct.nrModels());
+        
+        assertArrayEquals("Keywords Are not preserved", 
+        		originalStruct.getKeywords().toArray(), 
+        		readStruct.getKeywords().toArray());
 
         for (int i = 0; i < originalStruct.nrModels(); i++) {
             assertEquals(originalStruct.getModel(i).size(), readStruct.getModel(i).size());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
index 4b9c3045b6..fbe422f1db 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
@@ -45,6 +45,10 @@ protected CifFile getInternal(Structure structure, List<WrappedAtom> wrappedAtom
         MmCifBlockBuilder blockBuilder = CifBuilder.enterFile(StandardSchemata.MMCIF)
                 .enterBlock(structure.getPDBCode());
 
+        blockBuilder.enterStructKeywords().enterText()
+        .add(structure.getKeywords().toArray(new String[structure.getKeywords().size()]))
+        .leaveColumn().leaveCategory();
+
         if (atomSite.isDefined() && atomSite.getRowCount() > 0) {
             // set atom site
             blockBuilder.addCategory(atomSite);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 146281d0dd..3c9cc9f2d0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -1,5 +1,25 @@
 package org.biojava.nbio.structure.io.cif;
 
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import javax.vecmath.Matrix4d;
+
 import org.biojava.nbio.structure.AminoAcid;
 import org.biojava.nbio.structure.AminoAcidImpl;
 import org.biojava.nbio.structure.Atom;
@@ -88,15 +108,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.vecmath.Matrix4d;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
 /**
  * An implementation of a CifFileConsumer for BioJava. Will process the information provided by a CifFile instance and
  * use it to build up a {@link Structure} object.
@@ -885,11 +896,26 @@ public void consumeStructConnType(StructConnType structConnType) {
 
     @Override
     public void consumeStructKeywords(StructKeywords structKeywords) {
+    	//There may be a simpler implementation or a better implementation using
+    	// Java streams. However, I am not sure about the returned value from 
+    	// getText().values()
+    	ArrayList<String> keywordsList = new ArrayList<String>();
+    	Iterator<String> iterator = structKeywords.getText().values().iterator();
+    	while (iterator.hasNext()) {
+			String longString = (String) iterator.next();
+			String[] strings = longString.split(" *, *");
+			for (String string : strings) {
+				keywordsList.add(string.trim());
+			}
+		}
+    	structure.setKeywords(keywordsList);
+
         StrColumn pdbxKeywords = structKeywords.getPdbxKeywords();
-        // TODO what is the correct format for these?
         if (pdbxKeywords.isDefined()) {
+        	//TODO I think no need for the Collectors.joining(", ") part.
             String keywords = pdbxKeywords.values().collect(Collectors.joining(", "));
-            pdbHeader.setDescription(keywords);
+            //TODO What is the right place to fill this field from?
+//        	pdbHeader.setDescription(keywords);
             pdbHeader.setClassification(keywords);
         }
     }

From 918d218e969065b38fbbd28223c52caf6765736c Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Tue, 3 Aug 2021 23:17:25 +0100
Subject: [PATCH 136/599] hashcoder test

---
 .../org/biojava/nbio/core/HashcoderTest.java  | 134 ++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/HashcoderTest.java

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/HashcoderTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/HashcoderTest.java
new file mode 100644
index 0000000000..84f0b45f01
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/HashcoderTest.java
@@ -0,0 +1,134 @@
+package org.biojava.nbio.core;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.biojava.nbio.core.util.Hashcoder;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
+
+class HashcoderTest {
+
+    int seed = Hashcoder.SEED;
+    @RepeatedTest(10)
+    void hashcodeBool() {
+        final int EXPECTED_TRUE = 712;
+        final int EXPECTED_FALSE = 711;
+
+        assertEquals(EXPECTED_TRUE, Hashcoder.hash(seed, true));
+        assertFalse(EXPECTED_TRUE == Hashcoder.hash(seed, Boolean.TRUE));
+
+        assertEquals(EXPECTED_FALSE, Hashcoder.hash(seed, false));
+        assertFalse(EXPECTED_FALSE == Hashcoder.hash(seed, Boolean.FALSE));
+    }
+
+    @Test
+    void hashcodeIntProducesUniqueValues() {
+        Set<Integer> hashCodes = new HashSet<>();
+        for (int i =0; i< 1000; i++) {
+            hashCodes.add(Hashcoder.hash(seed, i));
+        }
+        assertEquals(1000, hashCodes.size());
+    }
+
+    @Test
+    void extremeIntValuesHashed(){
+        assertTrue(Hashcoder.hash(seed, Integer.MAX_VALUE) != 0);
+        assertTrue(Hashcoder.hash(seed, Integer.MIN_VALUE) != 0);
+    }
+
+    @Test
+    void hashcodeLongProducesUniqueValues() {
+        Set<Integer> hashCodes = new HashSet<>();
+        for (int i =0; i< 1000; i++) {
+            hashCodes.add(Hashcoder.hash(seed, (long)i));
+        }
+        assertEquals(1000, hashCodes.size());
+      
+    }
+
+    @Test
+    void extremeLongValuesHashed(){
+        assertTrue(Hashcoder.hash(seed, Long.MAX_VALUE) != 0);
+        assertTrue(Hashcoder.hash(seed, Long.MIN_VALUE) != 0);
+    }
+
+    @Test
+    void hashcodeCharProducesUniqueValues() {
+        final int NUM_CHAR=65535;
+        Set<Integer> hashCodes = new HashSet<>();
+        for (int i =0; i< Character.MAX_VALUE; i++) {
+            char [] codes = Character.toChars(i);
+            hashCodes.add(Hashcoder.hash(seed, codes[0]));
+        }
+        assertEquals(NUM_CHAR, hashCodes.size());
+    }
+
+    @Test
+    void hashcodeFloatDifferentPrecisionSameHash() {
+        Set<Integer> hashCodes = new HashSet<>();
+        float [] floats = new float [] {1, 1.0f, 1.00f, 1.000f};
+        for (float f: floats) {
+            hashCodes.add(Hashcoder.hash(seed, f));
+        }
+        assertEquals(1, hashCodes.size());
+    }
+
+    @Test
+    void hashcodeDoubleDifferentPrecisionSameHash() {
+        Set<Integer> hashCodes = new HashSet<>();
+        double [] doubles = new double [] {1, 1.0f, 1.00f, 1.000f};
+        for (double d: doubles) {
+            hashCodes.add(Hashcoder.hash(seed, d));
+        }
+        assertEquals(1, hashCodes.size());
+    }
+
+    @Test
+    void hashcodeLong() {
+        Set<Integer> hashCodes = new HashSet<>();
+        double [] doubles = new double [] {1, 1.0f, 1.00f, 1.000f};
+        for (double d: doubles) {
+            hashCodes.add(Hashcoder.hash(seed, d));
+        }
+        assertEquals(1, hashCodes.size());
+    }
+
+    static class TestObject {
+        // test spies
+        boolean hashcodeInvoked = false;
+        static int totalHashcodeInvocations = 0;
+
+        public int hashCode() {
+            totalHashcodeInvocations++;
+            hashcodeInvoked = true;
+            return 1;
+        }   
+    }
+
+    @Test
+    void hashCodeObjectInvokesObjectsHashcode(){
+        TestObject test = new TestObject();
+        Hashcoder.hash(seed, test);
+        assertTrue(test.hashcodeInvoked);
+    }
+
+    @Test
+    void hashCodeArrayInvokesHashcodeOnEachObject(){
+        // 3 element array
+        TestObject [] testObjects = new TestObject[]{new TestObject(),
+             new TestObject(), new TestObject()};
+        Hashcoder.hash(seed, testObjects);
+        assertEquals(3, TestObject.totalHashcodeInvocations); 
+    }
+
+    @Test
+    void hashcodeOfEmptyArrayReturnsSeed(){
+        assertEquals(seed, Hashcoder.hash(seed, new TestObject[]{}));
+    }
+    
+}

From 76cf580d244c1feb071c853eb91207a7b5db0c2c Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Thu, 5 Aug 2021 03:08:03 +0800
Subject: [PATCH 137/599] Updated Keywords parsing in mmCIF files

---
 .../test/io/TestLongPdbVsMmCifParsing.java    |  2 +-
 .../io/cif/AbstractCifFileSupplier.java       |  2 +-
 .../io/cif/CifStructureConsumerImpl.java      | 32 ++++++++-----------
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestLongPdbVsMmCifParsing.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestLongPdbVsMmCifParsing.java
index 3d788e830c..a69e9513b4 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestLongPdbVsMmCifParsing.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestLongPdbVsMmCifParsing.java
@@ -287,7 +287,7 @@ private void testHeader(Structure sPdb, Structure sCif) {
 		// description is set in CIF parser to same as classification (_struct_keywords.pdbx_keywords field)
 		// while in PDB parser it is simply not set
 		//assertNotNull("pdb description null",hPdb.getDescription());
-		assertNotNull("cif description null",hCif.getDescription());
+		//assertNotNull("cif description null",hCif.getDescription());  //If we will enable this test again, we may use assertNull instead
 		//assertEquals("failed getDescription:",hPdb.getDescription().toLowerCase(), hCif.getDescription().toLowerCase());
 
 		assertEquals("failed getDepDate:",hPdb.getDepDate(), hCif.getDepDate());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
index fbe422f1db..2599342edd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
@@ -46,7 +46,7 @@ protected CifFile getInternal(Structure structure, List<WrappedAtom> wrappedAtom
                 .enterBlock(structure.getPDBCode());
 
         blockBuilder.enterStructKeywords().enterText()
-        .add(structure.getKeywords().toArray(new String[structure.getKeywords().size()]))
+        .add(String.join(", ", structure.getKeywords()))
         .leaveColumn().leaveCategory();
 
         if (atomSite.isDefined() && atomSite.getRowCount() > 0) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 3c9cc9f2d0..b0643e03dc 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -7,7 +7,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
@@ -896,27 +895,24 @@ public void consumeStructConnType(StructConnType structConnType) {
 
     @Override
     public void consumeStructKeywords(StructKeywords structKeywords) {
-    	//There may be a simpler implementation or a better implementation using
-    	// Java streams. However, I am not sure about the returned value from 
-    	// getText().values()
-    	ArrayList<String> keywordsList = new ArrayList<String>();
-    	Iterator<String> iterator = structKeywords.getText().values().iterator();
-    	while (iterator.hasNext()) {
-			String longString = (String) iterator.next();
-			String[] strings = longString.split(" *, *");
-			for (String string : strings) {
-				keywordsList.add(string.trim());
-			}
-		}
-    	structure.setKeywords(keywordsList);
+        ArrayList<String> keywordsList = new ArrayList<String>();
+
+        StrColumn text = structKeywords.getText();
+        if (text.isDefined()) {
+            String keywords = text.get(0);
+            String[] strings = keywords.split(" *, *");
+            for (String string : strings) {
+                keywordsList.add(string.trim());
+            }
+        }
+        structure.setKeywords(keywordsList);
 
         StrColumn pdbxKeywords = structKeywords.getPdbxKeywords();
         if (pdbxKeywords.isDefined()) {
-        	//TODO I think no need for the Collectors.joining(", ") part.
-            String keywords = pdbxKeywords.values().collect(Collectors.joining(", "));
-            //TODO What is the right place to fill this field from?
-//        	pdbHeader.setDescription(keywords);
+            String keywords = pdbxKeywords.get(0);
             pdbHeader.setClassification(keywords);
+            //This field should be left empty
+//          pdbHeader.setDescription(keywords);
         }
     }
 

From 33d0c2880288369046be3ac891b156c1fae0ccd8 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Wed, 4 Aug 2021 22:30:48 +0100
Subject: [PATCH 138/599] softhashmap partial test

---
 .../biojava/nbio/core/util/SoftHashMap.java   | 119 +++---------------
 .../nbio/core/{ => util}/HashcoderTest.java   |   3 +-
 .../nbio/core/util/SoftHashMapTest.java       |  54 ++++++++
 3 files changed, 71 insertions(+), 105 deletions(-)
 rename biojava-core/src/test/java/org/biojava/nbio/core/{ => util}/HashcoderTest.java (98%)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/util/SoftHashMapTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
index b13c246baa..516e1d0d37 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
@@ -19,18 +19,21 @@
 
 package org.biojava.nbio.core.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.SoftReference;
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /** A in memory cache using soft references. (can be garbage collected)
- *
  * This code is based on: http://java-interview-faqs.blogspot.com/2008/09/building-faster-and-efficient-cache.html
- * */
+ */
 
 
 public class SoftHashMap<K, V> extends AbstractMap<K, V> {
@@ -40,189 +43,113 @@ public class SoftHashMap<K, V> extends AbstractMap<K, V> {
 	public static final int DEFAULT_LIMIT = 1;
 
 	/** The internal HashMap that stores SoftReference to actual data. */
-
 	private final Map<K, SoftReference<V>> map = new HashMap<K, SoftReference<V>>();
 
 	/** Maximum Number of references you dont want GC to collect. */
-
 	private final int max_limit;
 
 	/** The FIFO list of hard references, order of last access. */
-
 	private final LinkedList<V> hardCache = new LinkedList<V>();
 
 	/** Reference queue for cleared SoftReference objects. */
-
 	private final ReferenceQueue<V> queue = new ReferenceQueue<V>();
 
 	public SoftHashMap() {
-
 		this(1000);
-
 	}
 
 	public SoftHashMap(int hardSize) {
-
 		max_limit = hardSize;
-
 	}
 
 	@Override
-public V get(Object key) {
+	public V get(Object key) {
 
 		V result = null;
 
 		// We get the SoftReference represented by that key
-
 		SoftReference<V> soft_ref = map.get(key);
 
 		if (soft_ref != null) {
-
 			try {
-
 				// From the SoftReference we get the value, which can be
-
 				// null if it was not in the map, or it was removed in
-
 				// the clearGCCollected() method defined below
 
 				result = soft_ref.get();
-
 				if (result == null) {
-
 					// If the value has been garbage collected, remove the
-
 					// entry from the HashMap.
-
 					map.remove(key);
-
 				} else {
-
 					// We now add this object to the beginning of the hard
-
 					// reference queue. One reference can occur more than
-
 					// once, because lookups of the FIFO queue are slow, so
-
 					// we don't want to search through it each time to remove
-
 					// duplicates.
 
 					synchronized (hardCache){
 						hardCache.addFirst(result);
-
 						if (hardCache.size() > max_limit) {
-
 							// Remove the last entry if list greater than MAX_LIMIT
-
 							hardCache.removeLast();
-
 						}
 					}
-
 				}
 			} catch (Exception e){
-			 logger.error("Exception: ", e);
+				logger.error("Exception: ", e);
 			}
-
 		}
-
 		return result;
-
 	}
 
-
-
 	/**
-
 	 * We define our own subclass of SoftReference which contains not only the
-
 	 * value but also the key to make it easier to find the entry in the HashMap
-
 	 * after it's been garbage collected.
-
 	 */
-
 	private static class SoftValue<K, V> extends SoftReference<V> {
 
 		private final Object key; // always make data member final
-
-
-
+		
 		/**
-
 		 * Did you know that an outer class can access private data members and
-
 		 * methods of an inner class? I didn't know that! I thought it was only
-
 		 * the inner class who could access the outer class's private
-
 		 * information. An outer class can also access private members of an
-
 		 * inner class inside its inner class.
-
 		 */
-
 		private SoftValue(V k, K key, ReferenceQueue<? super V> q) {
-
 			super(k, q);
-
 			this.key = key;
-
 		}
-
 	}
 
-
-
 	/**
-
 	 * Here we go through the ReferenceQueue and remove garbage collected
-
 	 * SoftValue objects from the HashMap by looking them up using the
-
 	 * SoftValue.key data member.
-
 	 */
-
 	@SuppressWarnings("unchecked") // every Reference in queue is stored as a SoftValue
 	private void clearGCCollected() {
-
 		SoftValue<K, V> sv;
-
 		while ((sv = (SoftValue<K, V>) queue.poll()) != null) {
-
 			map.remove(sv.key); // we can access private data!
-
 		}
-
 	}
 
-
-
 	/**
-
 	 * Here we put the key, value pair into the HashMap using a SoftValue
-
 	 * object.
-
 	 */
-
 	@Override
-public synchronized V put(K key, V value) {
-
+	public synchronized V put(K key, V value) {
 		clearGCCollected();
-
 		logger.debug("Putting {} on cache. size: {}", key, size());
-
 		map.put(key, new SoftValue<K, V>(value, key, queue));
-
 		return value;
-
 	}
 
-
-
 	@Override
 	public V remove(Object key) {
 		clearGCCollected();
@@ -230,11 +157,8 @@ public V remove(Object key) {
 		return map.remove(key).get();
 	}
 
-
-
 	@Override
-public void clear() {
-
+	public void clear() {
 		synchronized (hardCache){
 			hardCache.clear();
 		}
@@ -242,27 +166,16 @@ public void clear() {
 		clearGCCollected();
 		logger.debug("clearing cache");
 		map.clear();
-
 	}
 
-
-
 	@Override
-public int size() {
-
+	public int size() {
 		clearGCCollected();
-
 		return map.size();
-
 	}
 
-
-
 	@Override
-public Set<Map.Entry<K, V>> entrySet() {
-
+	public Set<Map.Entry<K, V>> entrySet() {
 		throw new UnsupportedOperationException();
-
 	}
-
 }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/HashcoderTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/HashcoderTest.java
similarity index 98%
rename from biojava-core/src/test/java/org/biojava/nbio/core/HashcoderTest.java
rename to biojava-core/src/test/java/org/biojava/nbio/core/util/HashcoderTest.java
index 84f0b45f01..bf1b320593 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/HashcoderTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/HashcoderTest.java
@@ -1,4 +1,4 @@
-package org.biojava.nbio.core;
+package org.biojava.nbio.core.util;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -7,7 +7,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.biojava.nbio.core.util.Hashcoder;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/SoftHashMapTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/SoftHashMapTest.java
new file mode 100644
index 0000000000..7a18669da5
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/SoftHashMapTest.java
@@ -0,0 +1,54 @@
+package org.biojava.nbio.core.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+class SoftHashMapTest {
+
+    static class TestObject  {
+        private String name;
+        public TestObject(String string) {
+            this.name=string;
+        }
+        String getName(){
+            return name;
+        }
+    }
+    
+    @Test
+    void basicMapOperations() throws InterruptedException{
+        
+        SoftHashMap<String, TestObject> map = new SoftHashMap<>(1);
+        TestObject s1= new TestObject("1");
+        TestObject s2= new TestObject("2");
+        TestObject s3= new TestObject("3");
+    
+        map.put("1", s1);
+        map.put("2", s2);
+        map.put("3", s3);
+        assertEquals(3, map.size());
+
+        map.put("3", new TestObject("4"));
+        assertEquals(3, map.size());
+
+        assertEquals(s1, map.remove("1"));
+        assertEquals(2, map.size());
+
+        map.clear();
+        assertEquals(0, map.size());
+    }
+    @Test
+    void manyMapOperationsAreUnsupported() throws Exception{
+        SoftHashMap<String, TestObject> map = new SoftHashMap<>(1);
+        TestObject s1= new TestObject("1");
+        map.put("1", null);
+        // these all use entrySet internally and throw USOException
+        assertThrows(UnsupportedOperationException.class, ()->map.containsValue(s1));
+        assertThrows(UnsupportedOperationException.class, ()->map.containsKey("1"));
+        assertThrows(UnsupportedOperationException.class, ()->map.values().iterator());
+        assertThrows(UnsupportedOperationException.class, ()->map.getOrDefault("1", new TestObject("2")));     
+    }
+        
+}

From 17216371760249c47c49d3755f662912b5c7a450 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Thu, 5 Aug 2021 22:18:59 +0100
Subject: [PATCH 139/599] softhashmap gc collecion testing

---
 .../biojava/nbio/core/util/SoftHashMap.java   | 11 ++-
 .../biojava/nbio/core/util/HashcoderTest.java |  4 +-
 .../nbio/core/util/SoftHashMapTest.java       | 91 +++++++++++++++++--
 3 files changed, 94 insertions(+), 12 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
index 516e1d0d37..b0ac87519c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
@@ -33,9 +33,12 @@
 
 /** A in memory cache using soft references. (can be garbage collected)
  * This code is based on: http://java-interview-faqs.blogspot.com/2008/09/building-faster-and-efficient-cache.html
+ * <p/>
+ * Note that entrySet() is not implemented and therefore many methods such as keySet(),
+ * containsKey(), values() etc do not work.
+ * <p/>
+ * This class is therefore best used as a cache simply to put and get items by a known key
  */
-
-
 public class SoftHashMap<K, V> extends AbstractMap<K, V> {
 
 	private final static Logger logger = LoggerFactory.getLogger(SoftHashMap.class);
@@ -58,6 +61,10 @@ public SoftHashMap() {
 		this(1000);
 	}
 
+	/**
+	 * @param hardSize A maximum number of items to maintain hard references to
+	 * that will not be eligible for garbage collection
+	 */
 	public SoftHashMap(int hardSize) {
 		max_limit = hardSize;
 	}
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/HashcoderTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/HashcoderTest.java
index bf1b320593..6385c0f829 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/HashcoderTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/HashcoderTest.java
@@ -43,8 +43,8 @@ void extremeIntValuesHashed(){
     @Test
     void hashcodeLongProducesUniqueValues() {
         Set<Integer> hashCodes = new HashSet<>();
-        for (int i =0; i< 1000; i++) {
-            hashCodes.add(Hashcoder.hash(seed, (long)i));
+        for (long i =0; i< 1000; i++) {
+            hashCodes.add(Hashcoder.hash(seed, i));
         }
         assertEquals(1000, hashCodes.size());
       
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/SoftHashMapTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/SoftHashMapTest.java
index 7a18669da5..89c73c863c 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/SoftHashMapTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/SoftHashMapTest.java
@@ -2,35 +2,110 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.jupiter.api.Test;
+import java.util.Map;
 
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+/** 
+ * Includes a disabled test that asserts behaviour of collecting
+ * SoftReferences, run using -Xmx=5M to expose this behaviour.
+ */
 class SoftHashMapTest {
 
     static class TestObject  {
+        /*
+        *Create an object occupying negligible memory
+        */
+        static TestObject small(String name){
+            return new TestObject(name, 100);
+        }
+
+        /*
+        *Create a test object occupying significant memory(100kB)
+        */
+        static TestObject large(String name){
+            return new TestObject(name, 100_000);
+        }
         private String name;
-        public TestObject(String string) {
+        private int [] internalArray = null; 
+        public TestObject(String string, int capacity) {
             this.name=string;
+            this.internalArray = new int [capacity];
         }
         String getName(){
             return name;
         }
+        public String toString(){
+            return name;
+        }
+    }
+
+    // This test needs to be run with restricted memory in order
+    // to expose the behaviour of SoftHashMap in deleting entries 
+    // when under memory pressure. By setting -Xmx=5M the test can
+    // assert that entries are deleted. We don't want to risk throwing
+    // OOM errors during normal test execution so this is disabled
+    @Test
+    @Disabled("requires to run in conditions nearly throwing an OOM")
+    void softMapRemovesRefsToSaveMemory() throws InterruptedException{
+       
+        //Using a regular Map with hard references will probably
+        // cause an OOM error if running with -Xmx=5M. Uncomment this
+        // and comment out the next line to observe this.
+        //Map<String, TestObject> map =new HashMap<>(1);
+
+        // set the maximum number of hard references to 1 (minimum)
+        // to expose behaviour of soft references better. 
+        Map<String, TestObject> map = new SoftHashMap<>(1);
+        int totalPuts =5;
+        for (int i = 0; i < totalPuts; i++) {
+
+            TestObject myObject = TestObject.large(""+i);
+            map.put(myObject.getName(),myObject);
+            //allocate a little slowly
+            // enables GC time to work
+            Thread.sleep(10);
+        }
+        int nonNullValues = countNonNullMapReferences(map, totalPuts);
+        // some but not all references should be removed.
+        assertTrue(nonNullValues > 0 && nonNullValues < totalPuts);
     }
+
+    private int countNonNullMapReferences(Map<String, TestObject> map, int totalPuts) {
+        try {
+            //sleep a little in case if finalizers are currently running
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        // we can't iterate over map as keySet() isn't implemented
+        int nonNullValues = 0;
+        for (int i = 0; i< totalPuts; i++) {
+            if(map.get("" + i ) != null) {
+                nonNullValues++;
+            }
+        } 
+        return nonNullValues;
+    }
+
+    
     
     @Test
     void basicMapOperations() throws InterruptedException{
         
         SoftHashMap<String, TestObject> map = new SoftHashMap<>(1);
-        TestObject s1= new TestObject("1");
-        TestObject s2= new TestObject("2");
-        TestObject s3= new TestObject("3");
+        TestObject s1= TestObject.small("1");
+        TestObject s2= TestObject.small("2");
+        TestObject s3= TestObject.small("3");
     
         map.put("1", s1);
         map.put("2", s2);
         map.put("3", s3);
         assertEquals(3, map.size());
 
-        map.put("3", new TestObject("4"));
+        map.put("3", TestObject.small("4"));
         assertEquals(3, map.size());
 
         assertEquals(s1, map.remove("1"));
@@ -42,13 +117,13 @@ void basicMapOperations() throws InterruptedException{
     @Test
     void manyMapOperationsAreUnsupported() throws Exception{
         SoftHashMap<String, TestObject> map = new SoftHashMap<>(1);
-        TestObject s1= new TestObject("1");
+        TestObject s1= TestObject.small("1");
         map.put("1", null);
         // these all use entrySet internally and throw USOException
         assertThrows(UnsupportedOperationException.class, ()->map.containsValue(s1));
         assertThrows(UnsupportedOperationException.class, ()->map.containsKey("1"));
         assertThrows(UnsupportedOperationException.class, ()->map.values().iterator());
-        assertThrows(UnsupportedOperationException.class, ()->map.getOrDefault("1", new TestObject("2")));     
+        assertThrows(UnsupportedOperationException.class, ()->map.getOrDefault("1", TestObject.small("2")));     
     }
         
 }

From cc79ce808bcfb7dac12d372160cead8104980f11 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Fri, 6 Aug 2021 19:40:37 +0100
Subject: [PATCH 140/599] FlatFileCache Test

---
 .../biojava/nbio/core/util/FlatFileCache.java | 38 +++++++--
 .../nbio/core/util/FlatFileCacheTest.java     | 79 +++++++++++++++++++
 .../nbio/core/util/SoftHashMapTest.java       |  6 +-
 3 files changed, 111 insertions(+), 12 deletions(-)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
index e8feeec8ac..7107156198 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
@@ -24,11 +24,15 @@
 
 package org.biojava.nbio.core.util;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
-
 /**
  * Provides a cache for storing multiple small files in memory. Can be used to e.g cache gzip compressed PDB files
  * for avoiding disk IO bottlenecks.
@@ -52,11 +56,17 @@ private FlatFileCache(){
 
 	}
 
-
+	/**
+	 * The file is read and the bytes stored immediately.
+	 * <p/>
+	 * Once added, {@code fileToCache} can be modified or deleted and the cached values will not change.
+	 * @param key
+	 * @param fileToCache A readable file, of Integer.MAX bytes length or less.
+	 */
 	public  static void addToCache(String key, File fileToCache){
 		//logger.debug("storing " + key + " on file cache (cache size: " + cache.size() + ")");
-		try {
-			InputStream is = new FileInputStream(fileToCache);
+		try (InputStream is = new FileInputStream(fileToCache)){
+			
 			// Get the size of the file
 			long length = fileToCache.length();
 
@@ -66,6 +76,7 @@ public  static void addToCache(String key, File fileToCache){
 			// to ensure that file is not larger than Integer.MAX_VALUE.
 			if (length > Integer.MAX_VALUE) {
 				// File is too large
+				throw new IllegalArgumentException("File must be <= " + Integer.MAX_VALUE + "bytes long");
 			}
 
 			// Create the byte array to hold the data
@@ -94,7 +105,12 @@ public  static void addToCache(String key, File fileToCache){
 			logger.error("Error adding to cache! " + e.getMessage(), e);
 		}
 	}
-
+	/**
+	 * Gets the cached file as an InputStream.
+	 * Clients should check for null as the item might have expired in the  cache.
+	 * @param key
+	 * @return An {@code InputStream} or null. 
+	 */
 	public  static InputStream getInputStream(String key){
 		//logger.debug("returning " + key + " from file cache (cache size: " + cache.size() + ")");
 		byte[] bytes = cache.get(key);
@@ -105,6 +121,11 @@ public  static InputStream getInputStream(String key){
 
 	}
 
+	/**
+	 * Returns the number of items in the cache.
+	 * If the cache is {@}, returns -1
+	 * @return
+	 */
 	public static int size() {
 		if ( cache != null)
 			return cache.size();
@@ -112,10 +133,11 @@ public static int size() {
 			return -1;
 	}
 
+	/**
+	 * Removes all elements from the cache
+	 */
 	public static void clear(){
 	   cache.clear();
 	}
 
-
-
 }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
new file mode 100644
index 0000000000..47a0d72468
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
@@ -0,0 +1,79 @@
+package org.biojava.nbio.core.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class FlatFileCacheTest {
+
+    final String aDNA = "ATCG";
+    final String aProtein = "WCTH";
+
+    @BeforeEach
+    void before(){
+        FlatFileCache.clear();
+    }
+
+    File createSmallTmpFile() throws IOException{
+        File f = File.createTempFile("flatFile","txt");
+        Files.writeString(Path.of(f.getAbsolutePath()), aDNA);
+        return f;
+    }
+
+    int seed = Hashcoder.SEED;
+    @Test
+    void flatFileRetrieve () throws IOException {
+        File anyFile = createSmallTmpFile();
+        assertEquals(0, FlatFileCache.size());
+        FlatFileCache.addToCache("key", anyFile);
+        assertEquals(1, FlatFileCache.size());
+
+        InputStream is = FlatFileCache.getInputStream("key");
+        assertNotNull(is);
+        byte [] b = new byte[1024];
+        int read = is.read(b);
+        assertEquals(anyFile.length(), (long)read );
+        assertEquals(aDNA, new String(b, "UTF8").substring(0,4));
+    }
+
+    @Test
+    void clearRemovesAllItems () throws IOException {
+        for (int i = 0; i< 10; i++) {
+            FlatFileCache.addToCache(""+i, createSmallTmpFile());
+        }
+        assertEquals(10, FlatFileCache.size());
+        FlatFileCache.clear();
+        assertEquals(0, FlatFileCache.size());
+
+
+    }
+
+    @Test
+    void nullReturnedIfNoValueForKey () throws IOException {
+        assertNull(FlatFileCache.getInputStream("nonexistent"));
+    }
+
+    @Test
+    void fileCanBeModifiedButCachedValueIsUnchanged() throws IOException{
+        File anyFile = createSmallTmpFile();
+        FlatFileCache.addToCache("key", anyFile);
+        Files.writeString(Path.of(anyFile.getAbsolutePath()), aProtein);
+        InputStream is = FlatFileCache.getInputStream("key");
+        byte [] b = new byte[1024];
+        int read = is.read(b);
+        assertEquals(aDNA.length(), (long)read );
+        assertEquals(aDNA, new String(b, "UTF8").substring(0,4));
+    }
+
+    
+    
+}
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/SoftHashMapTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/SoftHashMapTest.java
index 89c73c863c..172525a6c5 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/SoftHashMapTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/SoftHashMapTest.java
@@ -51,10 +51,10 @@ public String toString(){
     @Disabled("requires to run in conditions nearly throwing an OOM")
     void softMapRemovesRefsToSaveMemory() throws InterruptedException{
        
-        //Using a regular Map with hard references will probably
+        // Using a regular Map with hard references will probably
         // cause an OOM error if running with -Xmx=5M. Uncomment this
         // and comment out the next line to observe this.
-        //Map<String, TestObject> map =new HashMap<>(1);
+        // Map<String, TestObject> map =new HashMap<>(1);
 
         // set the maximum number of hard references to 1 (minimum)
         // to expose behaviour of soft references better. 
@@ -89,8 +89,6 @@ private int countNonNullMapReferences(Map<String, TestObject> map, int totalPuts
         } 
         return nonNullValues;
     }
-
-    
     
     @Test
     void basicMapOperations() throws InterruptedException{

From d0e584491f6e0195c23b5693bf069b02128a0318 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Fri, 6 Aug 2021 21:45:57 +0100
Subject: [PATCH 141/599] self-review

---
 .../biojava/nbio/core/util/FlatFileCache.java |  4 ++--
 .../nbio/core/util/FlatFileCacheTest.java     | 23 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
index 7107156198..6808ef01fb 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
@@ -58,7 +58,7 @@ private FlatFileCache(){
 
 	/**
 	 * The file is read and the bytes stored immediately.
-	 * <p/>
+	 * <p/> 
 	 * Once added, {@code fileToCache} can be modified or deleted and the cached values will not change.
 	 * @param key
 	 * @param fileToCache A readable file, of Integer.MAX bytes length or less.
@@ -76,7 +76,7 @@ public  static void addToCache(String key, File fileToCache){
 			// to ensure that file is not larger than Integer.MAX_VALUE.
 			if (length > Integer.MAX_VALUE) {
 				// File is too large
-				throw new IllegalArgumentException("File must be <= " + Integer.MAX_VALUE + "bytes long");
+				throw new IllegalArgumentException("File must be <= " + Integer.MAX_VALUE + " bytes long");
 			}
 
 			// Create the byte array to hold the data
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
index 47a0d72468..787b830659 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
@@ -32,16 +32,16 @@ File createSmallTmpFile() throws IOException{
     int seed = Hashcoder.SEED;
     @Test
     void flatFileRetrieve () throws IOException {
-        File anyFile = createSmallTmpFile();
+        File aDNAFile = createSmallTmpFile();
         assertEquals(0, FlatFileCache.size());
-        FlatFileCache.addToCache("key", anyFile);
+        FlatFileCache.addToCache("key", aDNAFile);
         assertEquals(1, FlatFileCache.size());
 
         InputStream is = FlatFileCache.getInputStream("key");
         assertNotNull(is);
         byte [] b = new byte[1024];
         int read = is.read(b);
-        assertEquals(anyFile.length(), (long)read );
+        assertEquals(aDNAFile.length(), (long)read );
         assertEquals(aDNA, new String(b, "UTF8").substring(0,4));
     }
 
@@ -53,8 +53,6 @@ void clearRemovesAllItems () throws IOException {
         assertEquals(10, FlatFileCache.size());
         FlatFileCache.clear();
         assertEquals(0, FlatFileCache.size());
-
-
     }
 
     @Test
@@ -64,16 +62,19 @@ void nullReturnedIfNoValueForKey () throws IOException {
 
     @Test
     void fileCanBeModifiedButCachedValueIsUnchanged() throws IOException{
-        File anyFile = createSmallTmpFile();
-        FlatFileCache.addToCache("key", anyFile);
-        Files.writeString(Path.of(anyFile.getAbsolutePath()), aProtein);
+        File aDNAFile = createSmallTmpFile();
+        FlatFileCache.addToCache("key", aDNAFile);
+        long originalLength = aDNAFile.length();
+        
+        // write new content to original file
+        Files.writeString(Path.of(aDNAFile.getAbsolutePath()), aProtein);
+
+        // retrieve from cache, is unchanged
         InputStream is = FlatFileCache.getInputStream("key");
         byte [] b = new byte[1024];
         int read = is.read(b);
-        assertEquals(aDNA.length(), (long)read );
+        assertEquals(originalLength, (long)read );
         assertEquals(aDNA, new String(b, "UTF8").substring(0,4));
     }
 
-    
-    
 }

From 5f32e0fcaa1c878846e66b87739973042da53719 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Fri, 6 Aug 2021 21:47:02 +0100
Subject: [PATCH 142/599] remove unwanted code

---
 .../test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
index 787b830659..b041098783 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
@@ -29,7 +29,6 @@ File createSmallTmpFile() throws IOException{
         return f;
     }
 
-    int seed = Hashcoder.SEED;
     @Test
     void flatFileRetrieve () throws IOException {
         File aDNAFile = createSmallTmpFile();

From f8a158629c713c55cce1f5ce9d66f73638e253ed Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Tue, 10 Aug 2021 22:41:02 +0100
Subject: [PATCH 143/599] a

---
 a.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 a.txt

diff --git a/a.txt b/a.txt
new file mode 100644
index 0000000000..e69de29bb2

From 839e7a5b28b51648b73fb8ae32644a7a1ede1fa6 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Tue, 10 Aug 2021 22:42:46 +0100
Subject: [PATCH 144/599] a

---
 a.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/a.txt b/a.txt
index e69de29bb2..7898192261 100644
--- a/a.txt
+++ b/a.txt
@@ -0,0 +1 @@
+a

From 8f97789e0e12c667d153e72fd6c97e0f22cc6bed Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Tue, 10 Aug 2021 22:48:39 +0100
Subject: [PATCH 145/599] removed a.txt

---
 a.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 a.txt

diff --git a/a.txt b/a.txt
deleted file mode 100644
index 7898192261..0000000000
--- a/a.txt
+++ /dev/null
@@ -1 +0,0 @@
-a

From d68e4ee8fbfd80bb4daf3be0d8e8d371724f9da2 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Wed, 11 Aug 2021 22:14:26 +0100
Subject: [PATCH 146/599] start XML helper tests

---
 .../org/biojava/nbio/core/util/XMLHelper.java | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
index 7d9e1cad63..34155b0ccd 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
@@ -50,13 +50,24 @@
  */
 public class XMLHelper {
 
-	static public Element addChildElement(Element parentElement, String elementName) {
+	/**
+	 * Creates a new elemend called {@code}elementName{@code} and adds it to {@code}parentElement{@code}
+	 * @param parentElement
+	 * @param elementName
+	 * @return the new child element
+	 */
+	public static Element addChildElement(Element parentElement, String elementName) {
 		Element childElement = parentElement.getOwnerDocument().createElement(elementName);
 		parentElement.appendChild(childElement);
 		return childElement;
 	}
 
-	static public Document getNewDocument() throws ParserConfigurationException  {
+	/**
+	 * Create a new, empty {@code}org.w3c.dom.Document{@code}
+	 * @return a new {@code}org.w3c.dom.Document{@code}
+	 * @throws ParserConfigurationException
+	 */
+	public static Document getNewDocument() throws ParserConfigurationException  {
 
 		//Create instance of DocumentBuilderFactory
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -67,14 +78,22 @@ static public Document getNewDocument() throws ParserConfigurationException  {
 		return doc;
 	}
 
-	static public Document loadXML(String fileName) throws SAXException, IOException, ParserConfigurationException  {
+	public static Document loadXML(String fileName) throws SAXException, IOException, ParserConfigurationException  {
 		InputStream is = openFile(new File(fileName));
 		Document doc = inputStreamToDocument(new BufferedInputStream(is));
 		close(is);
 		return doc;
 	}
 
-	static public Document inputStreamToDocument(InputStream inputStream) throws SAXException, IOException, ParserConfigurationException  {
+	/**
+	 * Creates an {@code}org.w3c.dom.Document{@code} from the content of the {@code}inputStream{@code}
+	 * @param inputStream
+	 * @return a {@code}Document{@code}
+	 * @throws SAXException
+	 * @throws IOException
+	 * @throws ParserConfigurationException
+	 */
+	public static Document inputStreamToDocument(InputStream inputStream) throws SAXException, IOException, ParserConfigurationException  {
 		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 
 		DocumentBuilder db = dbf.newDocumentBuilder();
@@ -85,7 +104,7 @@ static public Document inputStreamToDocument(InputStream inputStream) throws SAX
 		return doc;
 	}
 
-	static public void outputToStream(Document document, OutputStream outputStream) throws TransformerException {
+	public static void outputToStream(Document document, OutputStream outputStream) throws TransformerException {
 		// Use a Transformer for output
 		TransformerFactory tFactory = TransformerFactory.newInstance();
 		Transformer transformer = tFactory.newTransformer();
@@ -98,7 +117,7 @@ static public void outputToStream(Document document, OutputStream outputStream)
 
 	}
 
-	static public void outputToStream(Element document, OutputStream outputStream) throws TransformerException  {
+	public static void outputToStream(Element document, OutputStream outputStream) throws TransformerException  {
 		// Use a Transformer for output
 		TransformerFactory tFactory = TransformerFactory.newInstance();
 		Transformer transformer = tFactory.newTransformer();
@@ -111,7 +130,7 @@ static public void outputToStream(Element document, OutputStream outputStream) t
 	}
 	//static XPath xpath = XPathFactory.newInstance().newXPath();
 
-	static public Element selectParentElement(Element element, String parentName) {
+	public static Element selectParentElement(Element element, String parentName) {
 		Element parentElement = (Element) element.getParentNode();
 		if (parentElement == null) {
 			return null;
@@ -122,7 +141,7 @@ static public Element selectParentElement(Element element, String parentName) {
 		return selectParentElement(parentElement, parentName);
 	}
 
-	static public Element selectSingleElement(Element element, String xpathExpression) throws XPathExpressionException {
+	public static Element selectSingleElement(Element element, String xpathExpression) throws XPathExpressionException {
 		if (xpathExpression.indexOf("/") == -1) {
 			NodeList nodeList = element.getChildNodes();
 			for (int i = 0; i < nodeList.getLength(); i++) {
@@ -144,7 +163,7 @@ static public Element selectSingleElement(Element element, String xpathExpressio
 		}
 	}
 
-	static public ArrayList<Element> selectElements(Element element, String xpathExpression) throws XPathExpressionException {
+	public static ArrayList<Element> selectElements(Element element, String xpathExpression) throws XPathExpressionException {
 		ArrayList<Element> resultVector = new ArrayList<Element>();
 		if (element == null) {
 			return resultVector;

From 8dceeb1a301f7bd56100640ce68d93675cef6a0e Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Wed, 11 Aug 2021 22:15:23 +0100
Subject: [PATCH 147/599] test

---
 .../biojava/nbio/core/util/XMLHelperTest.java | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
new file mode 100644
index 0000000000..a4103a0e3e
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
@@ -0,0 +1,78 @@
+package org.biojava.nbio.core.util;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
+class XMLHelperTest {
+    
+    final String TEST_XML = "<root><list><a id='1'/> <a id='2'/> </list></root>";
+    
+     @Test
+    @DisplayName("Create empty w3dom Document")
+    void getNewDocument() throws ParserConfigurationException{
+        Document d = XMLHelper.getNewDocument();
+        assertNotNull(d);
+        assertFalse(d.hasChildNodes());
+        assertNull(d.getInputEncoding());
+    }
+
+
+    @Test
+    @DisplayName("Create empty w3dom Document")
+    void addChildDocument() throws ParserConfigurationException, DOMException{
+             
+        Document d = createDocumentWithRootElement();
+        Element root = (Element)d.getChildNodes().item(0);
+
+        Element added = XMLHelper.addChildElement(root, "myelement");
+        assertNotNull(added);
+        assertEquals(root, added.getParentNode());
+        assertEquals(added, root.getChildNodes().item(0));
+    }
+
+    @Test
+    void inputStreamToDocument() throws SAXException, IOException, ParserConfigurationException{
+        ByteArrayInputStream bArrayInputStream = new ByteArrayInputStream(TEST_XML.getBytes());
+        Document doc = XMLHelper.inputStreamToDocument(bArrayInputStream);
+        assertParsedDocument(doc);
+
+    }
+
+    @Test 
+    void  fileToDocument () throws IOException, SAXException, ParserConfigurationException{
+        File tmpFile = File.createTempFile("xml", ".xml");
+        Files.write(Path.of(tmpFile.getAbsolutePath()), TEST_XML.getBytes());
+        Document doc = XMLHelper.loadXML(tmpFile.getAbsolutePath());
+        assertParsedDocument(doc);
+   
+    }
+    void assertParsedDocument (Document doc){
+        assertNotNull(doc);
+        assertEquals(2, doc.getElementsByTagName("a").getLength());
+        assertEquals(1, doc.getElementsByTagName("list").getLength());
+    }
+
+    Document createDocumentWithRootElement() throws ParserConfigurationException{
+        Document d = XMLHelper.getNewDocument();
+        Element root = d.createElement("root");
+        d.appendChild(root);
+        return d;
+    }
+}
\ No newline at end of file

From 3148a9e31b126caac0a82e3e3e06bd30fad46aa3 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Thu, 12 Aug 2021 22:44:23 +0100
Subject: [PATCH 148/599] more XML helper tests; improve resilience of
 selectParentElement

---
 .../org/biojava/nbio/core/util/XMLHelper.java | 49 +++++++++++++------
 .../biojava/nbio/core/util/XMLHelperTest.java | 34 +++++++++++--
 2 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
index 34155b0ccd..9775cfa2e5 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
@@ -45,7 +45,7 @@
 import static org.biojava.nbio.core.sequence.io.util.IOUtils.openFile;
 
 /**
- *
+ * Helper methods to simplify boilerplate XML parsing code for  {@code}org.w3c.dom{@code} XML objects
  * @author Scooter
  */
 public class XMLHelper {
@@ -78,6 +78,14 @@ public static Document getNewDocument() throws ParserConfigurationException  {
 		return doc;
 	}
 
+	/**
+	 * Given a path to an XML file, parses into an {@code}org.w3c.dom.Document{@code} 
+	 * @param fileName path to a readable XML file
+	 * @return
+	 * @throws SAXException
+	 * @throws IOException
+	 * @throws ParserConfigurationException
+	 */
 	public static Document loadXML(String fileName) throws SAXException, IOException, ParserConfigurationException  {
 		InputStream is = openFile(new File(fileName));
 		Document doc = inputStreamToDocument(new BufferedInputStream(is));
@@ -104,6 +112,12 @@ public static Document inputStreamToDocument(InputStream inputStream) throws SAX
 		return doc;
 	}
 
+	/**
+	 * Given an {@code}org.w3c.dom.Document{@code}, writes it to the given {@code}outputStream{@code}
+	 * @param document
+	 * @param outputStream
+	 * @throws TransformerException
+	 */
 	public static void outputToStream(Document document, OutputStream outputStream) throws TransformerException {
 		// Use a Transformer for output
 		TransformerFactory tFactory = TransformerFactory.newInstance();
@@ -113,26 +127,29 @@ public static void outputToStream(Document document, OutputStream outputStream)
 		DOMSource source = new DOMSource(document);
 		StreamResult result = new StreamResult(outputStream);
 		transformer.transform(source, result);
-
-
 	}
 
-	public static void outputToStream(Element document, OutputStream outputStream) throws TransformerException  {
-		// Use a Transformer for output
-		TransformerFactory tFactory = TransformerFactory.newInstance();
-		Transformer transformer = tFactory.newTransformer();
-		//     transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-
-		DOMSource source = new DOMSource(document);
-		StreamResult result = new StreamResult(outputStream);
-		transformer.transform(source, result);
-
-	}
 	//static XPath xpath = XPathFactory.newInstance().newXPath();
 
+	/**
+	 * Given an element, searches upwards through ancestor Elements till the first Element
+	 * matching the requests {@code}parentName{@code} is found.
+	 * @param element The starting element
+	 * @param parentName The tag name of the requested Element.
+	 * @return The found element, or {@code}null{@code} if no matching element is found,
+	 */
 	public static Element selectParentElement(Element element, String parentName) {
-		Element parentElement = (Element) element.getParentNode();
-		if (parentElement == null) {
+		
+	    Node parentNode =  element.getParentNode();
+		if (parentNode == null) {
+			return null;
+		}
+		// chek that parent is actually an element, else return null
+		// this is to prevent ClassCastExceptions if 'element's parent is not an Element.
+		Element parentElement = null;
+		if (Node.ELEMENT_NODE == parentNode.getNodeType()){
+			parentElement = (Element)parentNode;
+		} else {
 			return null;
 		}
 		if (parentElement.getTagName().equals(parentName)) {
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
index a4103a0e3e..13a00fc762 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
@@ -6,23 +6,26 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
 class XMLHelperTest {
     
-    final String TEST_XML = "<root><list><a id='1'/> <a id='2'/> </list></root>";
+    final String TEST_XML = "<root><list><a id=\"1\"/> <a id=\"2\"/> </list></root>";
     
      @Test
     @DisplayName("Create empty w3dom Document")
@@ -49,10 +52,13 @@ void addChildDocument() throws ParserConfigurationException, DOMException{
 
     @Test
     void inputStreamToDocument() throws SAXException, IOException, ParserConfigurationException{
-        ByteArrayInputStream bArrayInputStream = new ByteArrayInputStream(TEST_XML.getBytes());
-        Document doc = XMLHelper.inputStreamToDocument(bArrayInputStream);
+        Document doc = readTestDoc();
         assertParsedDocument(doc);
+    }
 
+    Document readTestDoc() throws SAXException, IOException, ParserConfigurationException{
+        ByteArrayInputStream bArrayInputStream = new ByteArrayInputStream(TEST_XML.getBytes());
+        return XMLHelper.inputStreamToDocument(bArrayInputStream);
     }
 
     @Test 
@@ -61,7 +67,27 @@ void  fileToDocument () throws IOException, SAXException, ParserConfigurationExc
         Files.write(Path.of(tmpFile.getAbsolutePath()), TEST_XML.getBytes());
         Document doc = XMLHelper.loadXML(tmpFile.getAbsolutePath());
         assertParsedDocument(doc);
-   
+    }
+
+    @Test
+    void documentToOutputStream() throws SAXException, IOException, ParserConfigurationException, TransformerException{
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(100);
+        Document doc = readTestDoc();
+        XMLHelper.outputToStream(doc, baos);
+        assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" +
+             TEST_XML, new String(baos.toByteArray()));
+    }
+
+    @Test
+    void selectParentElement() throws SAXException, IOException, ParserConfigurationException{
+        Document doc = readTestDoc();
+        NodeList nodes = doc.getElementsByTagName("a");
+        Element el = (Element)nodes.item(0);
+        Element root = XMLHelper.selectParentElement(el, "root");
+        assertNotNull(root);
+        assertNull(XMLHelper.selectParentElement(el, "notexisting"));
+        assertNull(XMLHelper.selectParentElement(root, "notexisting"));
+
     }
     void assertParsedDocument (Document doc){
         assertNotNull(doc);

From b0f2ac914df86c3dea81e2ce354ab39d299b03f0 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Thu, 12 Aug 2021 23:54:18 +0100
Subject: [PATCH 149/599] test for selectSingleElement

---
 .../org/biojava/nbio/core/util/XMLHelper.java | 11 +++++++
 .../biojava/nbio/core/util/XMLHelperTest.java | 29 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
index 9775cfa2e5..e97b70231a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
@@ -158,6 +158,17 @@ public static Element selectParentElement(Element element, String parentName) {
 		return selectParentElement(parentElement, parentName);
 	}
 
+	/**
+	 * If {@code}xpathExpression{@code} is a plain string with no '/' characterr, this is 
+	 * interpreted as a child element name to search for. 
+	 * <b/>
+	 * If {@code}xpathExpression{@code} is an XPath expression, this is evaluated and is assumed
+	 * to identify a single element.
+	 * @param element
+	 * @param xpathExpression
+	 * @return A single element or null if no match or the 1st match if matches more than 1
+	 * @throws XPathExpressionException
+	 */
 	public static Element selectSingleElement(Element element, String xpathExpression) throws XPathExpressionException {
 		if (xpathExpression.indexOf("/") == -1) {
 			NodeList nodeList = element.getChildNodes();
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
index 13a00fc762..a42ae422f8 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
@@ -14,6 +14,7 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
+import javax.xml.xpath.XPathExpressionException;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -81,14 +82,42 @@ void documentToOutputStream() throws SAXException, IOException, ParserConfigurat
     @Test
     void selectParentElement() throws SAXException, IOException, ParserConfigurationException{
         Document doc = readTestDoc();
+        // get a a grandchild element
         NodeList nodes = doc.getElementsByTagName("a");
+        // can get root node
         Element el = (Element)nodes.item(0);
         Element root = XMLHelper.selectParentElement(el, "root");
         assertNotNull(root);
+        // non-existing element or if is root node returns null
         assertNull(XMLHelper.selectParentElement(el, "notexisting"));
         assertNull(XMLHelper.selectParentElement(root, "notexisting"));
 
     }
+
+    @Test
+    void selectSingleElement() throws SAXException, IOException, ParserConfigurationException, XPathExpressionException{
+        Document doc = readTestDoc();
+        Element root = (Element)doc.getElementsByTagName("root").item(0);
+
+        // not direct child
+        assertNull(XMLHelper.selectSingleElement(root, "a"));
+
+        // direct child
+        assertNotNull(XMLHelper.selectSingleElement(root, "list"));
+
+        // xpath match
+        Element found = XMLHelper.selectSingleElement(root, "/root/list/a[@id = \"2\"]");
+        assertNotNull(found);
+        assertEquals("2", found.getAttribute("id"));
+
+        // xpath no match
+        Element Notfound = XMLHelper.selectSingleElement(root, "/root/list/a[@id = \"45\"]");
+        assertNull(Notfound);
+
+        // xpath returning multiple elements returns 1st element
+        Element mult = XMLHelper.selectSingleElement(root, "/root/list/a");
+        assertNotNull(mult);
+    }
     void assertParsedDocument (Document doc){
         assertNotNull(doc);
         assertEquals(2, doc.getElementsByTagName("a").getLength());

From 22dfa0a68a2ab881b0a459b11b1dd42e60107b25 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sat, 14 Aug 2021 10:56:39 +0100
Subject: [PATCH 150/599] test selectElements()

---
 .../org/biojava/nbio/core/util/XMLHelper.java |  13 ++
 .../biojava/nbio/core/util/XMLHelperTest.java | 132 +++++++++++++-----
 2 files changed, 108 insertions(+), 37 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
index e97b70231a..30c93fe85b 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
@@ -170,6 +170,9 @@ public static Element selectParentElement(Element element, String parentName) {
 	 * @throws XPathExpressionException
 	 */
 	public static Element selectSingleElement(Element element, String xpathExpression) throws XPathExpressionException {
+		if (element == null) {
+			return null;
+		}
 		if (xpathExpression.indexOf("/") == -1) {
 			NodeList nodeList = element.getChildNodes();
 			for (int i = 0; i < nodeList.getLength(); i++) {
@@ -191,6 +194,16 @@ public static Element selectSingleElement(Element element, String xpathExpressio
 		}
 	}
 
+	/**
+	 * Gets a list of elements matching {@code}xpathExpression{@code}. If xpathExpression lacks
+	 * a '/' character, only immediate children o {@code}element{@code} are searched over.
+	 * <br/>
+	 * If {@code}xpathExpression{@code} contains an '/' character, a full XPath search is made
+	 * @param element
+	 * @param xpathExpression
+	 * @return A possibly empty but non-null {@code}ArrayList{@code}
+	 * @throws XPathExpressionException
+	 */
 	public static ArrayList<Element> selectElements(Element element, String xpathExpression) throws XPathExpressionException {
 		ArrayList<Element> resultVector = new ArrayList<Element>();
 		if (element == null) {
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
index a42ae422f8..d3dc65d3a3 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
@@ -11,12 +11,15 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.xpath.XPathExpressionException;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.Document;
@@ -25,25 +28,24 @@
 import org.xml.sax.SAXException;
 
 class XMLHelperTest {
-    
+
     final String TEST_XML = "<root><list><a id=\"1\"/> <a id=\"2\"/> </list></root>";
-    
-     @Test
+
+    @Test
     @DisplayName("Create empty w3dom Document")
-    void getNewDocument() throws ParserConfigurationException{
+    void getNewDocument() throws ParserConfigurationException {
         Document d = XMLHelper.getNewDocument();
         assertNotNull(d);
         assertFalse(d.hasChildNodes());
         assertNull(d.getInputEncoding());
     }
 
-
     @Test
     @DisplayName("Create empty w3dom Document")
-    void addChildDocument() throws ParserConfigurationException, DOMException{
-             
+    void addChildDocument() throws ParserConfigurationException, DOMException {
+
         Document d = createDocumentWithRootElement();
-        Element root = (Element)d.getChildNodes().item(0);
+        Element root = (Element) d.getChildNodes().item(0);
 
         Element added = XMLHelper.addChildElement(root, "myelement");
         assertNotNull(added);
@@ -52,18 +54,18 @@ void addChildDocument() throws ParserConfigurationException, DOMException{
     }
 
     @Test
-    void inputStreamToDocument() throws SAXException, IOException, ParserConfigurationException{
+    void inputStreamToDocument() throws SAXException, IOException, ParserConfigurationException {
         Document doc = readTestDoc();
         assertParsedDocument(doc);
     }
 
-    Document readTestDoc() throws SAXException, IOException, ParserConfigurationException{
+    Document readTestDoc() throws SAXException, IOException, ParserConfigurationException {
         ByteArrayInputStream bArrayInputStream = new ByteArrayInputStream(TEST_XML.getBytes());
         return XMLHelper.inputStreamToDocument(bArrayInputStream);
     }
 
-    @Test 
-    void  fileToDocument () throws IOException, SAXException, ParserConfigurationException{
+    @Test
+    void fileToDocument() throws IOException, SAXException, ParserConfigurationException {
         File tmpFile = File.createTempFile("xml", ".xml");
         Files.write(Path.of(tmpFile.getAbsolutePath()), TEST_XML.getBytes());
         Document doc = XMLHelper.loadXML(tmpFile.getAbsolutePath());
@@ -71,21 +73,21 @@ void  fileToDocument () throws IOException, SAXException, ParserConfigurationExc
     }
 
     @Test
-    void documentToOutputStream() throws SAXException, IOException, ParserConfigurationException, TransformerException{
+    void documentToOutputStream() throws SAXException, IOException, ParserConfigurationException, TransformerException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream(100);
         Document doc = readTestDoc();
         XMLHelper.outputToStream(doc, baos);
-        assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" +
-             TEST_XML, new String(baos.toByteArray()));
+        assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" + TEST_XML,
+                new String(baos.toByteArray()));
     }
 
     @Test
-    void selectParentElement() throws SAXException, IOException, ParserConfigurationException{
+    void selectParentElement() throws SAXException, IOException, ParserConfigurationException {
         Document doc = readTestDoc();
         // get a a grandchild element
         NodeList nodes = doc.getElementsByTagName("a");
         // can get root node
-        Element el = (Element)nodes.item(0);
+        Element el = (Element) nodes.item(0);
         Element root = XMLHelper.selectParentElement(el, "root");
         assertNotNull(root);
         // non-existing element or if is root node returns null
@@ -94,37 +96,93 @@ void selectParentElement() throws SAXException, IOException, ParserConfiguration
 
     }
 
-    @Test
-    void selectSingleElement() throws SAXException, IOException, ParserConfigurationException, XPathExpressionException{
-        Document doc = readTestDoc();
-        Element root = (Element)doc.getElementsByTagName("root").item(0);
+    @Nested
+    class SelectSingleElement {
+        @Test
+        void selectSingleElement()
+                throws SAXException, IOException, ParserConfigurationException, XPathExpressionException {
+            Document doc = readTestDoc();
+            Element root = (Element) doc.getElementsByTagName("root").item(0);
+
+            // not direct child
+            assertNull(XMLHelper.selectSingleElement(root, "a"));
 
-        // not direct child
-        assertNull(XMLHelper.selectSingleElement(root, "a"));
+            // direct child
+            assertNotNull(XMLHelper.selectSingleElement(root, "list"));
 
-        // direct child
-        assertNotNull(XMLHelper.selectSingleElement(root, "list"));
+            // xpath match
+            Element found = XMLHelper.selectSingleElement(root, "/root/list/a[@id = \"2\"]");
+            assertNotNull(found);
+            assertEquals("2", found.getAttribute("id"));
 
-        // xpath match
-        Element found = XMLHelper.selectSingleElement(root, "/root/list/a[@id = \"2\"]");
-        assertNotNull(found);
-        assertEquals("2", found.getAttribute("id"));
+            // xpath no match
+            Element Notfound = XMLHelper.selectSingleElement(root, "/root/list/a[@id = \"45\"]");
+            assertNull(Notfound);
 
-        // xpath no match
-        Element Notfound = XMLHelper.selectSingleElement(root, "/root/list/a[@id = \"45\"]");
-        assertNull(Notfound);
+            // xpath returning multiple elements returns 1st element
+            Element mult = XMLHelper.selectSingleElement(root, "/root/list/a");
+            assertNotNull(mult);
+        }
+
+        @Test
+        void invalidInput() throws XPathExpressionException {
+            assertNull(XMLHelper.selectSingleElement(null, "root"));
+        }
 
-        // xpath returning multiple elements returns 1st element
-        Element mult = XMLHelper.selectSingleElement(root, "/root/list/a");
-        assertNotNull(mult);
     }
-    void assertParsedDocument (Document doc){
+
+    @Nested
+    class SelectElements {
+
+       private Document doc = null;
+       private Element root = null;
+
+        @BeforeEach
+        void before() throws SAXException, IOException, ParserConfigurationException {
+             doc = readTestDoc();
+             root = (Element) doc.getElementsByTagName("root").item(0);
+        }
+
+        @Test
+        void selectMultipleElementsWithXPath()
+                throws  XPathExpressionException {
+            ArrayList<Element> selected = XMLHelper.selectElements(root, "/root/list/a");
+            assertEquals(2, selected.size());
+        }
+        @Test
+        void selectMultipleElementsWithXPathSearchesWholeTree()
+                throws  XPathExpressionException {
+            Element a1  = (Element) doc.getElementsByTagName("a").item(0);
+            
+            ArrayList<Element> selected = XMLHelper.selectElements(a1, "/root");
+            assertEquals(1, selected.size());
+            assertEquals("root", selected.get(0).getTagName());
+        }
+
+        @Test
+        void selectBySimpleTagName() throws XPathExpressionException {
+            // search by simple name doesn't search past children
+            assertEquals(0, XMLHelper.selectElements(root, "a").size());
+            Element list = (Element) doc.getElementsByTagName("list").item(0);
+
+            // 'list' is immediate parent of 'a'
+            assertEquals(2, XMLHelper.selectElements(list, "a").size());
+        }
+
+        @Test
+        void invalidInputtoSelectElements() throws XPathExpressionException {
+            assertEquals(0, XMLHelper.selectElements(null, "root").size());
+        }
+
+    }
+
+    void assertParsedDocument(Document doc) {
         assertNotNull(doc);
         assertEquals(2, doc.getElementsByTagName("a").getLength());
         assertEquals(1, doc.getElementsByTagName("list").getLength());
     }
 
-    Document createDocumentWithRootElement() throws ParserConfigurationException{
+    Document createDocumentWithRootElement() throws ParserConfigurationException {
         Document d = XMLHelper.getNewDocument();
         Element root = d.createElement("root");
         d.appendChild(root);

From 119a3284d9506a01a184e08a63d4464c9a1b59ab Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sat, 14 Aug 2021 11:00:24 +0100
Subject: [PATCH 151/599] removed unecessary public modifiers in interface

---
 .../org/biojava/nbio/core/util/XMLWriter.java | 62 ++++++++++---------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLWriter.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLWriter.java
index b6d51d1f25..141ddba640 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLWriter.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLWriter.java
@@ -32,64 +32,64 @@
 
 public interface XMLWriter {
 	/**
-	 * Send raw data to the stream.  Mainly useful for things like DOCTYPE
-	 * declarations.  Use with care!
+	 * Send raw data to the stream. Mainly useful for things like DOCTYPE
+	 * declarations. Use with care!
 	 *
 	 * @param s a string of data to include verbatim in the XML stream
 	 */
 
-	public void printRaw(String s) throws IOException;
+	void printRaw(String s) throws IOException;
 
 	/**
 	 * Open a new namespace-qualified XML tag.
 	 *
-	 * @param nsURI A URI for the namespace to use
+	 * @param nsURI     A URI for the namespace to use
 	 * @param localName The name of the tag
 	 */
 
-	public void openTag(String nsURI, String localName) throws IOException;
+	void openTag(String nsURI, String localName) throws IOException;
 
 	/**
-	 * Open a new unqualified XML tag.  This may also be used if you want
-	 * to do namespace management yourself, independantly of the XMLWriter
+	 * Open a new unqualified XML tag. This may also be used if you want to do
+	 * namespace management yourself, independantly of the XMLWriter
 	 *
 	 * @param name The name of the tag.
 	 */
 
-	public void openTag(String name) throws IOException;
+	void openTag(String name) throws IOException;
 
 	/**
-	 * Add an attribute to an element.  This will throw an exception if it's not
+	 * Add an attribute to an element. This will throw an exception if it's not
 	 * called immediately after an <code>openTag</code> command.
 	 *
-	 * @param nsURI A URI for the namespace to use
+	 * @param nsURI     A URI for the namespace to use
 	 * @param localName The name of the attribute
-	 * @param value The textual value of the attribute
+	 * @param value     The textual value of the attribute
 	 */
 
-	public void attribute(String nsURI, String localName, String value) throws IOException;
+	void attribute(String nsURI, String localName, String value) throws IOException;
 
 	/**
-	 * Add an un-qualified attribute to an element.  This will throw an exception if it's not
-	 * called immediately after an <code>openTag</code> command.
+	 * Add an un-qualified attribute to an element. This will throw an exception if
+	 * it's not called immediately after an <code>openTag</code> command.
 	 *
 	 * @param qName The name of the attribute to set
 	 * @param value The textual value of the attribute
 	 */
 
-	public void attribute(String qName, String value) throws IOException;
+	void attribute(String qName, String value) throws IOException;
 
 	/**
 	 * Prints some textual content in an element.
 	 */
 
-	public void print(String data) throws IOException;
+	void print(String data) throws IOException;
 
 	/**
 	 * Prints some textual content, terminated with a newline character.
 	 */
 
-	public void println(String data) throws IOException;
+	void println(String data) throws IOException;
 
 	/**
 	 * Closes an element
@@ -98,7 +98,7 @@ public interface XMLWriter {
 	 * @param qName The name of the tag
 	 */
 
-	public void closeTag(String nsURI, String qName) throws IOException;
+	void closeTag(String nsURI, String qName) throws IOException;
 
 	/**
 	 * Closes an un-qualified element.
@@ -106,28 +106,30 @@ public interface XMLWriter {
 	 * @param name The tag name
 	 */
 
-	public void closeTag(String name) throws IOException;
+	void closeTag(String name) throws IOException;
 
 	/**
-	 * Hints that a namespace is going to be used in a sub-tree.  Use this method
-	 * to avoid namespaces that are used only in leaf-nodes of a tree being re-defined
-	 * every time they are used.  The XMLWriter will generally try to use the suggested
-	 * prefix for this namespace, but there is no guarentee of this.  In particular, if
-	 * the namespace is already in use, the current prefix will still be used.  Similarly
-	 * if the suggested prefix has already been used for another namespace, a new one
-	 * will be auto-generated.
+	 * Hints that a namespace is going to be used in a sub-tree. Use this method to
+	 * avoid namespaces that are used only in leaf-nodes of a tree being re-defined
+	 * every time they are used. The XMLWriter will generally try to use the
+	 * suggested prefix for this namespace, but there is no guarantee of this.
+	 * <p/>
+	 * 
+	 * In particular, if the namespace is already in use, the current prefix will still
+	 * be used. Similarly if the suggested prefix has already been used for another
+	 * namespace, a new one will be auto-generated.
 	 *
-	 * @param nsURI The namespace to declare
+	 * @param nsURI      The namespace to declare
 	 * @param prefixHint A suggested prefix-string for this namespace.
 	 */
 
-	public void declareNamespace(String nsURI, String prefixHint) throws IOException;
+	void declareNamespace(String nsURI, String prefixHint) throws IOException;
 
 	/**
-	 * Close this XMLWriter, and it's underlying stream.
+	 * Close this XMLWriter, and its underlying stream.
 	 *
 	 * @since 1.4
 	 */
 
-	public void close() throws IOException;
+	void close() throws IOException;
 }

From 2ae93e7c9460767b0186f0db3e2bc774bd4a1bd9 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sat, 14 Aug 2021 12:36:52 +0100
Subject: [PATCH 152/599] prettyXML test

---
 .../nbio/core/util/PrettyXMLWriter.java       |  6 ++
 .../nbio/core/util/PrettyXMLWriterTest.java   | 89 +++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/PrettyXMLWriter.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/PrettyXMLWriter.java
index 0027dbc7b4..27485db5f5 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/PrettyXMLWriter.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/PrettyXMLWriter.java
@@ -50,6 +50,11 @@ public PrettyXMLWriter(PrintWriter writer) {
 		this.writer = writer;
 	}
 
+	/**
+	 * Declare a namespace for current and following elements
+	 * 'prefixHint' is ignored entirely in this implementation	
+	 * 
+	 */
 	@Override
 	public void declareNamespace(String nsURI, String prefixHint)
 		throws IOException
@@ -269,6 +274,7 @@ public void print(String data)
 	afterNewline = false;
 	}
 
+	// does not work for adding literal XML elements.
 	@Override
 	public void printRaw(String data)
 		throws IOException
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java
new file mode 100644
index 0000000000..cc94eb80ff
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java
@@ -0,0 +1,89 @@
+package org.biojava.nbio.core.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.time.LocalDate;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class PrettyXMLWriterTest {
+
+    StringWriter sw = null;
+    XMLWriter xw = null;
+
+    @BeforeEach
+    void before() {
+        sw = new StringWriter();
+        xw = new PrettyXMLWriter(new PrintWriter(sw));
+    }
+
+    private static final String HTTP_TEST_NAMESPACE = "http://test-namespace";
+
+    class TestObject {
+        int a = 22;
+        double b = 43.22;
+        String text = "some text";
+        LocalDate dt = LocalDate.of(2021, 8, 15);
+        String timezone = "UTC";
+    }
+
+    @Test
+    void simpleOutput() throws IOException {
+        final String EXPECTED = "<to>\n" + "  <a>22</a>\n" + "  <b>43.22</b>\n" + "  <text>some text</text>\n"
+                + "  <dt tz=\"UTC\">2021-08-15</dt>\n" + "</to>\n";
+        TestObject to = new TestObject();
+
+        xw.openTag("to");
+        xw.openTag("a");
+        xw.print(to.a + "");
+        xw.closeTag("a");
+
+        xw.openTag("b");
+        xw.print(to.b + "");
+        xw.closeTag("b");
+
+        xw.openTag("text");
+        xw.print(to.text);
+        xw.closeTag("text");
+
+        xw.openTag("dt");
+        xw.attribute("tz", to.timezone);
+        xw.print(to.dt.toString());
+        xw.closeTag("dt");
+
+        xw.closeTag("to");
+        System.out.println(sw.toString());
+        assertEquals(EXPECTED, sw.toString());
+
+    }
+
+    @Test
+    void specialCharsAreEscaped() throws IOException {
+        final String EXPECTED = "<dt>&#60;code&#62;some literal xml &#60;/code&#62;</dt>\n";
+        xw.openTag("dt");
+        xw.print("<code>some literal xml </code>");
+        xw.closeTag("dt");
+
+        assertEquals(EXPECTED, sw.toString());
+    }
+
+    @Test
+    void namespacesAreAddedToElements() throws IOException {
+        final String EXPECTED = "<ns1:dt xmlns:ns1=\"http://test-namespace\" ns1:myattr=\"1\">&#60;code&#62;some literal xml &#60;/code&#62;</ns1:dt>\n";
+
+        xw.declareNamespace(HTTP_TEST_NAMESPACE, "test");
+        // prefix
+        xw.openTag(HTTP_TEST_NAMESPACE, "dt");
+        xw.attribute(HTTP_TEST_NAMESPACE, "myattr", "1");
+        xw.print("<code>some literal xml </code>");
+        xw.closeTag(HTTP_TEST_NAMESPACE, "dt");
+
+        assertEquals(EXPECTED, sw.toString());
+    }
+
+
+}

From 92cfa241dd0e9c540f4433423455490858dc8d82 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sat, 14 Aug 2021 13:06:42 +0100
Subject: [PATCH 153/599] pre-PR formatting

---
 .../org/biojava/nbio/core/util/XMLHelper.java    |  6 +++---
 .../nbio/core/util/PrettyXMLWriterTest.java      |  2 --
 .../biojava/nbio/core/util/XMLHelperTest.java    | 16 +++++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
index 30c93fe85b..5f682bdc29 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
@@ -51,7 +51,7 @@
 public class XMLHelper {
 
 	/**
-	 * Creates a new elemend called {@code}elementName{@code} and adds it to {@code}parentElement{@code}
+	 * Creates a new element called {@code}elementName{@code} and adds it to {@code}parentElement{@code}
 	 * @param parentElement
 	 * @param elementName
 	 * @return the new child element
@@ -144,8 +144,8 @@ public static Element selectParentElement(Element element, String parentName) {
 		if (parentNode == null) {
 			return null;
 		}
-		// chek that parent is actually an element, else return null
-		// this is to prevent ClassCastExceptions if 'element's parent is not an Element.
+		// check that parent is actually an element, else return null
+		// this is to prevent ClassCastExceptions if element's parent is not an Element.
 		Element parentElement = null;
 		if (Node.ELEMENT_NODE == parentNode.getNodeType()){
 			parentElement = (Element)parentNode;
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java
index cc94eb80ff..03846bf45b 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java
@@ -84,6 +84,4 @@ void namespacesAreAddedToElements() throws IOException {
 
         assertEquals(EXPECTED, sw.toString());
     }
-
-
 }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
index d3dc65d3a3..46feb31d0b 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
@@ -29,6 +29,7 @@
 
 class XMLHelperTest {
 
+    // simple XML used in most of the tests:
     final String TEST_XML = "<root><list><a id=\"1\"/> <a id=\"2\"/> </list></root>";
 
     @Test
@@ -84,16 +85,18 @@ void documentToOutputStream() throws SAXException, IOException, ParserConfigurat
     @Test
     void selectParentElement() throws SAXException, IOException, ParserConfigurationException {
         Document doc = readTestDoc();
+        
         // get a a grandchild element
         NodeList nodes = doc.getElementsByTagName("a");
+        
         // can get root node
         Element el = (Element) nodes.item(0);
         Element root = XMLHelper.selectParentElement(el, "root");
         assertNotNull(root);
+        
         // non-existing element or if is root node returns null
         assertNull(XMLHelper.selectParentElement(el, "notexisting"));
         assertNull(XMLHelper.selectParentElement(root, "notexisting"));
-
     }
 
     @Nested
@@ -128,7 +131,6 @@ void selectSingleElement()
         void invalidInput() throws XPathExpressionException {
             assertNull(XMLHelper.selectSingleElement(null, "root"));
         }
-
     }
 
     @Nested
@@ -149,6 +151,7 @@ void selectMultipleElementsWithXPath()
             ArrayList<Element> selected = XMLHelper.selectElements(root, "/root/list/a");
             assertEquals(2, selected.size());
         }
+
         @Test
         void selectMultipleElementsWithXPathSearchesWholeTree()
                 throws  XPathExpressionException {
@@ -173,7 +176,6 @@ void selectBySimpleTagName() throws XPathExpressionException {
         void invalidInputtoSelectElements() throws XPathExpressionException {
             assertEquals(0, XMLHelper.selectElements(null, "root").size());
         }
-
     }
 
     void assertParsedDocument(Document doc) {
@@ -183,9 +185,9 @@ void assertParsedDocument(Document doc) {
     }
 
     Document createDocumentWithRootElement() throws ParserConfigurationException {
-        Document d = XMLHelper.getNewDocument();
-        Element root = d.createElement("root");
-        d.appendChild(root);
-        return d;
+        Document doc = XMLHelper.getNewDocument();
+        Element root = doc.createElement("root");
+        doc.appendChild(root);
+        return doc;
     }
 }
\ No newline at end of file

From 0f391205f94787de6daf3fa2758a60b5734236c9 Mon Sep 17 00:00:00 2001
From: Richard2 Adams <richard@researchspace.com>
Date: Wed, 18 Aug 2021 18:54:00 +0100
Subject: [PATCH 154/599] replaced/fixed some tests with Java11 dependencies

---
 .../org/biojava/nbio/core/util/CRC64ChecksumTest.java |  9 ---------
 .../org/biojava/nbio/core/util/FlatFileCacheTest.java | 11 +++++++++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
index d8d34ba99b..ff01701f7a 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
@@ -65,15 +65,6 @@ void allbyteRange (){
         assertEquals(allBytesHex, crc64.toString());
     }
 
-    @Test
-    void allRangeIsSameAsAllArray (){
-        byte [] testBytes = new byte [] {1,2,3,4,5};
-        crc64.update(testBytes, 0, testBytes.length);
-        Long valueFromAllRange = crc64.getValue();
-        crc64.reset();
-        crc64.update(testBytes);
-        assertEquals(valueFromAllRange, crc64.getValue());
-    }
 
     @Test 
     void partialByteRange (){
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
index b041098783..b3b1bc448e 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
@@ -5,8 +5,10 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -25,10 +27,15 @@ void before(){
 
     File createSmallTmpFile() throws IOException{
         File f = File.createTempFile("flatFile","txt");
-        Files.writeString(Path.of(f.getAbsolutePath()), aDNA);
+       writeToFile( aDNA, f);
         return f;
     }
 
+    private void writeToFile(String aDNA, File f) throws IOException {
+        FileOutputStream fos = new FileOutputStream(f);
+        fos.write(aDNA.getBytes(StandardCharsets.UTF_8));
+    }
+
     @Test
     void flatFileRetrieve () throws IOException {
         File aDNAFile = createSmallTmpFile();
@@ -66,7 +73,7 @@ void fileCanBeModifiedButCachedValueIsUnchanged() throws IOException{
         long originalLength = aDNAFile.length();
         
         // write new content to original file
-        Files.writeString(Path.of(aDNAFile.getAbsolutePath()), aProtein);
+        writeToFile( aProtein , aDNAFile);
 
         // retrieve from cache, is unchanged
         InputStream is = FlatFileCache.getInputStream("key");

From f50c64c5df839e193efd7a9ad6444862fc01570b Mon Sep 17 00:00:00 2001
From: Richard2 Adams <richard@researchspace.com>
Date: Fri, 20 Aug 2021 18:05:05 +0100
Subject: [PATCH 155/599] substitution matrix tests

---
 .../SubstitutionMatrixHelperTest.java         | 97 +++++++++++++++++++
 .../nbio/core/util/CRC64ChecksumTest.java     |  4 +-
 2 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelperTest.java

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelperTest.java
new file mode 100644
index 0000000000..d7d40d2e10
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelperTest.java
@@ -0,0 +1,97 @@
+package org.biojava.nbio.core.alignment.matrices;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SubstitutionMatrixHelperTest {
+
+    @Test
+    void getMatrixFromAAINDEX() {
+    }
+
+    @Test
+    void getIdentity() {
+    }
+
+    @Test
+    void getBlosum100() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum100());
+    }
+
+    @Test
+    void getBlosum30() {
+    }
+
+    @Test
+    void getBlosum35() {
+    }
+
+    @Test
+    void getBlosum40() {
+    }
+
+    @Test
+    void getBlosum45() {
+    }
+
+    @Test
+    void getBlosum50() {
+    }
+
+    @Test
+    void getBlosum55() {
+    }
+
+    @Test
+    void getBlosum60() {
+    }
+
+    @Test
+    void getBlosum62() {
+    }
+
+    @Test
+    void getBlosum65() {
+    }
+
+    @Test
+    void getBlosum70() {
+    }
+
+    @Test
+    void getBlosum75() {
+    }
+
+    @Test
+    void getBlosum80() {
+    }
+
+    @Test
+    void getBlosum85() {
+    }
+
+    @Test
+    void getBlosum90() {
+    }
+
+    @Test
+    void getGonnet250() {
+    }
+
+    @Test
+    void getNuc4_2() {
+    }
+
+    @Test
+    void getNuc4_4() {
+    }
+
+    @Test
+    void getPAM250() {
+    }
+
+    @Test
+    void getAminoAcidSubstitutionMatrix() {
+    }
+}
\ No newline at end of file
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
index d8d34ba99b..9bce137566 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
@@ -71,8 +71,8 @@ void allRangeIsSameAsAllArray (){
         crc64.update(testBytes, 0, testBytes.length);
         Long valueFromAllRange = crc64.getValue();
         crc64.reset();
-        crc64.update(testBytes);
-        assertEquals(valueFromAllRange, crc64.getValue());
+//        crc64.update(testBytes);
+//        assertEquals(valueFromAllRange, crc64.getValue());
     }
 
     @Test 

From d3d90c2fc38c4b292e3ea8f3d6d8e4601f6a3e58 Mon Sep 17 00:00:00 2001
From: Richard2 Adams <richard@researchspace.com>
Date: Fri, 20 Aug 2021 19:03:01 +0100
Subject: [PATCH 156/599] add tests for SubstitutionMatrixHelper

---
 .../alignment/matrices/AAIndexFileParser.java | 35 +-----------
 .../matrices/SubstitutionMatrixHelper.java    | 10 ++--
 .../SubstitutionMatrixHelperTest.java         | 54 +++++++++++++++++++
 .../nbio/core/util/CRC64ChecksumTest.java     |  2 +-
 4 files changed, 64 insertions(+), 37 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexFileParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexFileParser.java
index 6e2e5bff56..843014c685 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexFileParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexFileParser.java
@@ -51,12 +51,11 @@ public class AAIndexFileParser {
 	boolean inMatrix;
 	boolean symmetricMatrix ;
 
-
 	public AAIndexFileParser(){
 		matrices  = new HashMap<String, SubstitutionMatrix<AminoAcidCompound>>();
 	}
 
-	/** parse an inputStream that points to an AAINDEX database file
+	/** Parse an inputStream that points to an AAINDEX database file
 	 *
 	 * @param inputStream
 	 * @throws IOException
@@ -75,13 +74,12 @@ public void parse(InputStream inputStream) throws IOException {
 		line = buf.readLine();
 
 		while (  line != null ) {
-
 			if ( line.startsWith("//")) {
 				finalizeMatrix();
 				inMatrix = false;
 
 			} else if ( line.startsWith("H ")){
-				// a new matric!
+				// a new matrix!
 				newMatrix(line);
 			} else if ( line.startsWith("D ")) {
 				currentMatrix.setDescription(line.substring(2));
@@ -92,25 +90,18 @@ public void parse(InputStream inputStream) throws IOException {
 				if ( inMatrix)
 					processScores(line);
 			}
-
 			line = buf.readLine();
 		}
-
 	}
 
-
 	//  process a line such as >    -0.3     1.6     0.7     0.8    -2.6     3.0<
 	private void processScores(String line) {
-
 		String[] values = line.trim().split(" +");
 
 		// increment the current row we are talking about
 		currentRowPos++;
 
-
-
 		for ( int i =0 ; i < values.length ; i++){
-
 			if ( values[i].endsWith(".")) {
 				values[i] = values[i] + "0";
 			}
@@ -119,48 +110,34 @@ private void processScores(String line) {
 			if (values[i].equals("-")) {
 				values[i] = "0";
 			}
-
 			if ( scale == -1 ) {
 				scale = determineScale(values[0]);
 			}
 
-
 			Float score = Float.parseFloat(values[i]);
 			score = scale * score;
 
 			Short s = (short) Math.round(score);
-
 			matrix[currentRowPos][i] = s;
 
 			if ( values.length < cols.size() || ( symmetricMatrix)){
 				//System.out.println(values.length + " " + cols.size() + " " + currentRowPos + " " + i + " " +  line);
-
 				matrix[i][currentRowPos] = s;
-
 				symmetricMatrix = true;
-
 			}
-
 			if ( score > max)
 				max = s;
 			if ( score < min)
 				min = s;
-
-
 		}
 	}
 
 	private int determineScale(String value) {
-
 		String[] spl = value.split("\\.");
-
 		if (spl.length <= 1)
 			return 1;
-
 		String digits = spl[1];
-
 		return (int)Math.round(Math.pow(10, digits.length()));
-
 	}
 
 	// process a line of type >M rows = ARNDCQEGHILKMFPSTWYV, cols = ARNDCQEGHILKMFPSTWYV<
@@ -180,27 +157,19 @@ private void initMatrix(String line) {
 		rows = new ArrayList<AminoAcidCompound>();
 		cols = new ArrayList<AminoAcidCompound>();
 
-
 		//System.out.println(">" + currentRows+"<");
 		AminoAcidCompoundSet compoundSet = AminoAcidCompoundSet.getAminoAcidCompoundSet();
 		for ( int i = 0 ; i < currentRows.length() ; i ++){
 			char c = currentRows.charAt(i);
 			AminoAcidCompound aa = compoundSet.getCompoundForString(String.valueOf(c));
-
 			rows.add(aa);
 		}
 
 		for ( int i = 0 ; i < currentCols.length() ; i ++){
 			char c = currentRows.charAt(i);
 			AminoAcidCompound aa = compoundSet.getCompoundForString(String.valueOf(c));
-
 			cols.add(aa);
 		}
-
-
-
-
-
 		currentMatrix.setScale(scale);
 	}
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java
index 7b629e7352..3c6e307d59 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java
@@ -68,7 +68,10 @@ public static SubstitutionMatrix<AminoAcidCompound> getMatrixFromAAINDEX(String
 
 	}
 
-
+	/**
+	 * Gets identity matrix where matches score 1 and mismatches score -10000
+	 * @return
+	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getIdentity() {
 		return getAminoAcidMatrix("identity");
 	}
@@ -231,8 +234,8 @@ public static SubstitutionMatrix<AminoAcidCompound> getPAM250() {
 
 	/**
 	 * Returns a substitution matrix for {@link AminoAcidCompound amino acids} given by the name {@code name}.
-	 * Searches first in the default AAINDEX file (see @link {@link #getMatrixFromAAINDEX(String)}), then in the classpath.
-	 * If the required matrix does not exist, null is returned.
+	 * Searches first in the default AAINDEX file (see @link {@link #getMatrixFromAAINDEX(String)}), then in the classpath
+	 * in src/main/resources/matrices.
 	 * Example names:
 	 * <ul>
 	 * <li>blosum62</li>
@@ -241,6 +244,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getPAM250() {
 	 * <li>gonnet250</li>
 	 * </ul>
 	 * @param name Either a common name or an AAINDEX name
+	 * @throws  NullPointerException if the matrix does not exist.
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getAminoAcidSubstitutionMatrix(String name) {
 		SubstitutionMatrix<AminoAcidCompound> matrix = getMatrixFromAAINDEX(name);
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelperTest.java
index d7d40d2e10..99a4b14814 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelperTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelperTest.java
@@ -1,17 +1,43 @@
 package org.biojava.nbio.core.alignment.matrices;
 
+import org.biojava.nbio.core.alignment.template.SubstitutionMatrix;
+import org.biojava.nbio.core.sequence.compound.AminoAcidCompound;
+import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 class SubstitutionMatrixHelperTest {
+    AminoAcidCompoundSet aaSet = new AminoAcidCompoundSet();
+
 
     @Test
     void getMatrixFromAAINDEX() {
+        SubstitutionMatrix<AminoAcidCompound> aaIndex = SubstitutionMatrixHelper.getMatrixFromAAINDEX("ALTS910101");
+        assertNotNull(aaIndex);
+        assertEquals(-30, aaIndex.getValue(aaSet.getCompoundForString("R"),
+                aaSet.getCompoundForString("A")));
     }
 
     @Test
     void getIdentity() {
+        SubstitutionMatrix<AminoAcidCompound> identityMatrix = SubstitutionMatrixHelper.getIdentity();
+        final String standard20 = "ARNDCQEGHILKMFPSTWYV";
+        for (AminoAcidCompound from : aaSet.getAllCompounds()) {
+            if (!standard20.contains(from.getShortName())) {
+                continue;
+            }
+            for (AminoAcidCompound to : aaSet.getAllCompounds()) {
+                if (!standard20.contains(to.getShortName())) {
+                    continue;
+                }
+                if (from.equals(to)) {
+                    assertEquals(1, identityMatrix.getValue(from, to));
+                } else {
+                    assertEquals(-10000, identityMatrix.getValue(from, to));
+                }
+            }
+        }
     }
 
     @Test
@@ -21,77 +47,105 @@ void getBlosum100() {
 
     @Test
     void getBlosum30() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum30());
     }
 
     @Test
     void getBlosum35() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum35());
     }
 
     @Test
     void getBlosum40() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum40());
     }
 
     @Test
     void getBlosum45() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum45());
     }
 
     @Test
     void getBlosum50() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum50());
     }
 
     @Test
     void getBlosum55() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum55());
     }
 
     @Test
     void getBlosum60() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum60());
     }
 
     @Test
     void getBlosum62() {
+        SubstitutionMatrix<AminoAcidCompound> blosum62 = SubstitutionMatrixHelper.getBlosum62();
+        assertNotNull(blosum62);
+        AminoAcidCompound trypt = aaSet.getCompoundForString("W");
+        assertEquals(11, blosum62.getValue(trypt, trypt));
     }
 
     @Test
     void getBlosum65() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum65());
     }
 
     @Test
     void getBlosum70() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum70());
     }
 
     @Test
     void getBlosum75() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum75());
     }
 
     @Test
     void getBlosum80() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum80());
     }
 
     @Test
     void getBlosum85() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum85());
     }
 
     @Test
     void getBlosum90() {
+        assertNotNull(SubstitutionMatrixHelper.getBlosum90());
     }
 
     @Test
     void getGonnet250() {
+        assertNotNull(SubstitutionMatrixHelper.getGonnet250());
     }
 
     @Test
     void getNuc4_2() {
+        assertNotNull(SubstitutionMatrixHelper.getNuc4_2());
     }
 
     @Test
     void getNuc4_4() {
+        assertNotNull(SubstitutionMatrixHelper.getNuc4_4());
     }
 
     @Test
     void getPAM250() {
+        assertNotNull(SubstitutionMatrixHelper.getPAM250());
     }
 
     @Test
     void getAminoAcidSubstitutionMatrix() {
+        assertNotNull(SubstitutionMatrixHelper.getAminoAcidSubstitutionMatrix("blosum62"));
+        assertNotNull(SubstitutionMatrixHelper.getAminoAcidSubstitutionMatrix("DAYM780301"));
+    }
+
+    @Test
+    void unknownMatrixReturnsNull() {
+        assertThrows(NullPointerException.class, () -> SubstitutionMatrixHelper.getAminoAcidSubstitutionMatrix("?????"));
     }
 }
\ No newline at end of file
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
index d92dba2f49..a7fca59ecb 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/CRC64ChecksumTest.java
@@ -64,7 +64,7 @@ void allbyteRange (){
         }
         assertEquals(allBytesHex, crc64.toString());
     }
-    
+
     @Test 
     void partialByteRange (){
         byte [] testBytes = new byte [] {1,2,3,4,5};

From 8266f6195cb50f71520755e97936e940207baad3 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sat, 21 Aug 2021 21:37:22 +0100
Subject: [PATCH 157/599] return null if no matrix exists

---
 .../matrices/SubstitutionMatrixHelper.java      | 17 +++++++++++++----
 .../matrices/SubstitutionMatrixHelperTest.java  |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java
index 3c6e307d59..ca93b1818f 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java
@@ -29,6 +29,7 @@
 import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
 import org.biojava.nbio.core.sequence.compound.NucleotideCompound;
 
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Serializable;
 import java.util.HashMap;
@@ -244,7 +245,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getPAM250() {
 	 * <li>gonnet250</li>
 	 * </ul>
 	 * @param name Either a common name or an AAINDEX name
-	 * @throws  NullPointerException if the matrix does not exist.
+	 * @return a {@code} SubstitutionMatrix {@code} or {@code}null{@code} if no matrix is found
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getAminoAcidSubstitutionMatrix(String name) {
 		SubstitutionMatrix<AminoAcidCompound> matrix = getMatrixFromAAINDEX(name);
@@ -255,8 +256,12 @@ public static SubstitutionMatrix<AminoAcidCompound> getAminoAcidSubstitutionMatr
 	// reads in an amino acid substitution matrix, if necessary
 	private static SubstitutionMatrix<AminoAcidCompound> getAminoAcidMatrix(String file) {
 		if (!aminoAcidMatrices.containsKey(file)) {
+			InputStreamReader reader = getReader(file);
+			if (reader == null) {
+				return null;
+			}
 			aminoAcidMatrices.put(file, new SimpleSubstitutionMatrix<AminoAcidCompound>(
-					AminoAcidCompoundSet.getAminoAcidCompoundSet(), getReader(file), file));
+					AminoAcidCompoundSet.getAminoAcidCompoundSet(), reader , file));
 		}
 		return aminoAcidMatrices.get(file);
 	}
@@ -273,8 +278,12 @@ private static SubstitutionMatrix<NucleotideCompound> getNucleotideMatrix(String
 	// reads in a substitution matrix from a resource file
 	private static InputStreamReader getReader(String file) {
 		String resourcePathPrefix = "matrices/";
-		return new InputStreamReader(SubstitutionMatrixHelper.class.getResourceAsStream(String.format("/%s.txt",
-				resourcePathPrefix+file)));
+		InputStream is = SubstitutionMatrixHelper.class.getResourceAsStream(String.format("/%s.txt",
+		resourcePathPrefix+file));
+		if (is == null) {
+			return null;
+		}
+		return new InputStreamReader(is);
 	}
 
 }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelperTest.java
index 99a4b14814..a3a95499b0 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelperTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelperTest.java
@@ -146,6 +146,6 @@ void getAminoAcidSubstitutionMatrix() {
 
     @Test
     void unknownMatrixReturnsNull() {
-        assertThrows(NullPointerException.class, () -> SubstitutionMatrixHelper.getAminoAcidSubstitutionMatrix("?????"));
+        assertNull( SubstitutionMatrixHelper.getAminoAcidSubstitutionMatrix("?????"));
     }
 }
\ No newline at end of file

From d303a16e4ac3c22925f9ecc36c699dfc7ca4d870 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sat, 21 Aug 2021 22:48:07 +0100
Subject: [PATCH 158/599] new test class for SubstitutionMatrix

---
 .../matrices/SubstitutionMatrixTest.java      | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixTest.java

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixTest.java
new file mode 100644
index 0000000000..48455702f1
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixTest.java
@@ -0,0 +1,71 @@
+package org.biojava.nbio.core.alignment.matrices;
+
+import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
+import org.biojava.nbio.core.sequence.compound.DNACompoundSet;
+import org.biojava.nbio.core.sequence.compound.NucleotideCompound;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+
+class SubstitutionMatrixTest {
+    AminoAcidCompoundSet aaSet = new AminoAcidCompoundSet();
+    DNACompoundSet dnaSet = DNACompoundSet.getDNACompoundSet();
+    final short MATCH = 5;
+    final short REPLACE = -10;
+    SimpleSubstitutionMatrix<NucleotideCompound> sm = null;
+    @BeforeEach
+    void before (){
+        sm = new SimpleSubstitutionMatrix<NucleotideCompound>(
+            dnaSet, (short)MATCH, REPLACE);
+    }
+
+    @Test
+    void createIdentityMatrix() {
+        assertEquals(MATCH, sm.getMaxValue());
+        assertEquals(REPLACE, sm.getMinValue());
+        assertEquals(dnaSet, sm.getCompoundSet());
+        short value = sm.getValue(dnaSet.getCompoundForString("T"),dnaSet.getCompoundForString("T"));
+        assertEquals(MATCH, value);
+
+        value = sm.getValue(dnaSet.getCompoundForString("T"),dnaSet.getCompoundForString("A"));
+        assertEquals(REPLACE, value);
+    }
+
+    @Test
+    void matrixDimensions(){
+        int dnaSetSize = dnaSet.getAllCompounds().size();
+        NucleotideCompound thy = dnaSet.getCompoundForString("T");
+        assertEquals(dnaSetSize, sm.getColumn(thy).size());
+        assertEquals(dnaSetSize, sm.getRow(thy).size());
+    }
+
+    @Test
+    void getMatrixReturnsCopy(){
+        
+        short [][] matrix = sm.getMatrix();
+        assertEquals(MATCH, matrix[0][0]);
+        matrix [0][0]= 100; // new value doesn't affect internal matrix
+        assertEquals(MATCH, sm.getMatrix()[0][0]);
+    }
+
+    @Test
+    void matrixToString(){
+        String asString = sm.toString();
+        // description + 5*2 for ATCGNatcgn + 1 header + 1  for '-'
+        assertEquals(13, asString.split("\n").length);
+        String header = asString.split("\n")[1];
+        assertTrue(header.replaceAll(" ","").matches("[ATCGatcgNn-]+"));
+    }
+
+    @Test
+    void matrixAsString(){
+        String asString = sm.getMatrixAsString();
+
+        // 5*2 for ATCGNatcgn + 1 header + 1  for '-'
+        assertEquals(12, asString.split("\n").length);
+        String header = asString.split("\n")[0];
+        assertTrue(header.replaceAll(" ","").matches("[ATCGatcgNn-]+"));
+    }
+}
\ No newline at end of file

From 0913958a54aded90ed072e86da62134cb634176a Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Mon, 23 Aug 2021 11:00:20 +0800
Subject: [PATCH 159/599] Moving KeyWords to PDBHeader

Updated the documentation
Deprecated description
---
 .../cif/CifFileSupplierIntegrationTest.java   |  4 +-
 .../org/biojava/nbio/structure/PDBHeader.java | 37 ++++++++++++++++++-
 .../org/biojava/nbio/structure/Structure.java | 17 ++-------
 .../biojava/nbio/structure/StructureImpl.java | 13 -------
 .../structure/SubstructureIdentifier.java     |  1 -
 .../nbio/structure/io/PDBFileParser.java      |  2 +-
 .../io/cif/AbstractCifFileSupplier.java       |  2 +-
 .../io/cif/CifStructureConsumerImpl.java      |  6 +--
 .../biojava/nbio/structure/TestKeywords.java  | 14 +++----
 9 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
index cf7e493ed1..1a66090ccd 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
@@ -72,8 +72,8 @@ private static void testRoundTrip(String pdbId) throws IOException {
         assertEquals(originalStruct.nrModels(), readStruct.nrModels());
         
         assertArrayEquals("Keywords Are not preserved", 
-        		originalStruct.getKeywords().toArray(), 
-        		readStruct.getKeywords().toArray());
+        		originalStruct.getPDBHeader().getKeywords().toArray(), 
+        		readStruct.getPDBHeader().getKeywords().toArray());
 
         for (int i = 0; i < originalStruct.nrModels(); i++) {
             assertEquals(originalStruct.getModel(i).size(), readStruct.getModel(i).size());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
index d65c61ae95..b83b29d4f9 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
@@ -35,7 +35,12 @@
 
 /**
  * A class that contains PDB Header information.
- *
+ * In contrast to what the name suggests, this class does not represent a
+ * direct mapping of the Header section of the PDB legacy file format.
+ * Instead, it holds the information that is not directly related to the 
+ * structure data. Such information may exist in some cases and may not exist in
+ * other cases.
+ * 
  * @author Andreas Prlic
  * @since 1.6
  *
@@ -47,7 +52,10 @@ public class PDBHeader implements PDBRecord {
 	private static final Logger logger = LoggerFactory.getLogger(PDBHeader.class);
 
 	private String title;
+	/**@deprecated This field should not be used. It will be removed later. 
+	 * Use {@link #getKeywords()} instead. */
 	private String description;
+	private List<String> keywords;
 	private String idCode;
 	private String classification;
 
@@ -92,6 +100,8 @@ public PDBHeader(){
 		bioAssemblies = new LinkedHashMap<Integer, BioAssemblyInfo>();
 		crystallographicInfo = new PDBCrystallographicInfo();
 
+		keywords       = new ArrayList<>();
+
 	}
 
 	/** String representation
@@ -589,9 +599,16 @@ public String getTitle() {
 	public void setTitle(String title) {
 		this.title = title;
 	}
+	
+	/**@deprecated will be removed later. Use {@link #getKeywords()}
+	 * @return
+	 */
 	public String getDescription() {
 		return description;
 	}
+	/**@deprecated will be removed later. Use {@link #setKeywords(List)}
+	 * @param description
+	 */
 	public void setDescription(String description) {
 		this.description = description;
 	}
@@ -683,4 +700,22 @@ public float getRwork() {
 	public void setRwork(float rWork) {
 		this.rWork = rWork;
 	}
+
+	/**
+	 * Gets the keywords (KEYWODS) record of the structure
+	 * @return The keywords in a <code>List&lt;String&gt;</code>
+	 * @since 6.0.0
+	 */
+	public List<String> getKeywords() {
+		return keywords;
+	}
+
+	/**
+	 * Sets the KEYWODS record of the structure.
+	 * @param keywords The keywords in a <code>List&lt;String&gt; to set.</code>
+	 * @since 6.0.0
+	 */
+	public void setKeywords(List<String> keywords) {
+		this.keywords = keywords;
+	}
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
index 6e67f8aa4b..6fa247e73a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
@@ -665,7 +665,9 @@ public interface Structure extends Cloneable, Serializable {
 	EntityInfo getEntityById(int entityId);
 
 	/**
-	 * Return the header information for this PDB file
+	 * Return the header information for this PDB file.
+	 * <b>N.B.</b> Take care when you blindly use the returned object from this method,
+	 * because it might be null in some cases.
 	 *
 	 * @return the PDBHeader object
 	 */
@@ -789,17 +791,4 @@ public interface Structure extends Cloneable, Serializable {
 	 */
 	String getIdentifier();
 	
-	/**
-	 * Gets the keywords (KEYWODS) record of the structure
-	 * @return The keywords in a <code>List&lt;String&gt;</code>
-	 * @since 6.0.0
-	 */
-	List<String> getKeywords();
-	
-	/**
-	 * Sets the KEYWODS record of the structure.
-	 * @param keywords The keywords in a <code>List&lt;String&gt; to set.</code>
-	 * @since 6.0.0
-	 */
-	void setKeywords(List<String> keywords);
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
index 3716a48346..9f07e0338c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
@@ -57,7 +57,6 @@ public class StructureImpl implements Structure {
 	private List<Bond> ssbonds;
 	private List<Site> sites;
 	private String name ;
-	private List<String> keywords;
 	private StructureIdentifier structureIdentifier;
 
 	private PDBHeader pdbHeader;
@@ -77,7 +76,6 @@ public StructureImpl() {
 		pdbHeader      = new PDBHeader();
 		ssbonds        = new ArrayList<>();
 		sites          = new ArrayList<>();
-		keywords       = new ArrayList<>();
 	}
 
 	/**
@@ -124,7 +122,6 @@ public Structure clone() {
 		n.setPDBHeader(pdbHeader);
 		n.setDBRefs(this.getDBRefs());
 		n.setSites(getSites());
-		n.setKeywords(this.getKeywords());
 
 
 		// go through each chain and clone chain
@@ -1023,16 +1020,6 @@ public String getPdbId() {
 		return pdb_id;
 	}
 
-	/** {@inheritDoc} */
-	public List<String> getKeywords() {
-		return keywords;
-	}
-
-	/** {@inheritDoc} */
-	public void setKeywords(List<String> keywords) {
-		this.keywords = keywords;
-	}
-
 	@Override
 	public void resetModels() {
 		models = new ArrayList<>();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
index 2d9f262891..da9c1e1dee 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
@@ -186,7 +186,6 @@ public Structure reduce(Structure s) throws StructureException {
 		newS.setName(this.toString());
 		newS.setDBRefs(s.getDBRefs());
 		newS.setBiologicalAssembly(s.isBiologicalAssembly());
-		newS.setKeywords(s.getKeywords());
 		newS.getPDBHeader().setDescription(
 				"sub-range " + ranges + " of "  + newS.getPDBCode() + " "
 						+ s.getPDBHeader().getDescription());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index d2875139a1..774894df92 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -2808,7 +2808,7 @@ private void handlePDBKeywords(List<String> lines) {
 			}
 			lst.add(keyword);
 		}
-		structure.setKeywords(lst);
+		pdbHeader.setKeywords(lst);
 	}
 	
 	/**
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
index 2599342edd..7b10b4c88f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
@@ -46,7 +46,7 @@ protected CifFile getInternal(Structure structure, List<WrappedAtom> wrappedAtom
                 .enterBlock(structure.getPDBCode());
 
         blockBuilder.enterStructKeywords().enterText()
-        .add(String.join(", ", structure.getKeywords()))
+        .add(String.join(", ", structure.getPDBHeader().getKeywords()))
         .leaveColumn().leaveCategory();
 
         if (atomSite.isDefined() && atomSite.getRowCount() > 0) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index b0643e03dc..d15acdd43f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -905,14 +905,14 @@ public void consumeStructKeywords(StructKeywords structKeywords) {
                 keywordsList.add(string.trim());
             }
         }
-        structure.setKeywords(keywordsList);
+        structure.getPDBHeader().setKeywords(keywordsList);
 
         StrColumn pdbxKeywords = structKeywords.getPdbxKeywords();
         if (pdbxKeywords.isDefined()) {
             String keywords = pdbxKeywords.get(0);
             pdbHeader.setClassification(keywords);
-            //This field should be left empty
-//          pdbHeader.setDescription(keywords);
+            //This field should be left empty. TODO The next line should be removed later
+            pdbHeader.setDescription(keywords);
         }
     }
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestKeywords.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestKeywords.java
index 8adaefb219..28ad865ab6 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestKeywords.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestKeywords.java
@@ -19,9 +19,9 @@ public void testKeywordsOnFiveLines () throws IOException {
 
 		PDBFileParser pdbpars = new PDBFileParser();
 		Structure structure = pdbpars.parsePDBFile(inStream);
-		List<String> keywords = structure.getKeywords();
-		assertEquals(keywords.size(), 12);
-		assertEquals(keywords.get(11), "TRANSCRIPTION REGULATOR");
+		List<String> keywords = structure.getPDBHeader().getKeywords();
+		assertEquals(12, keywords.size());
+		assertEquals("TRANSCRIPTION REGULATOR", keywords.get(11));
 	}
 
 	@Test
@@ -33,9 +33,9 @@ public void testDash() throws IOException {
 		
 		Structure structure =  new PDBFileParser().parsePDBFile(inStream);
 		
-		List<String> keywords = structure.getKeywords();
-		assertEquals(keywords.size(), 6);
-		assertEquals(keywords.get(3), "THIOREDOXIN-FOLD");
-		assertEquals(keywords.get(4), "ANTI-OXIDATVE DEFENSE SYSTEM");
+		List<String> keywords = structure.getPDBHeader().getKeywords();
+		assertEquals(6, keywords.size());
+		assertEquals("THIOREDOXIN-FOLD", keywords.get(3));
+		assertEquals("ANTI-OXIDATVE DEFENSE SYSTEM", keywords.get(4));
 	}
 }

From b648835396e3e4973495fe9981a3bd23d4b130cc Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Wed, 25 Aug 2021 21:30:12 +0100
Subject: [PATCH 160/599] test defaultAAIndexProvider

---
 .../alignment/matrices/AAIndexProvider.java   |  8 +++++-
 .../matrices/DefaultAAIndexProvider.java      |  5 ----
 .../matrices/DefaultAAIndexProviderTest.java  | 27 +++++++++++++++++++
 3 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/DefaultAAIndexProviderTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexProvider.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexProvider.java
index 32b5994c60..ec4ec8d454 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexProvider.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexProvider.java
@@ -26,5 +26,11 @@
 
 public interface AAIndexProvider {
 
-	public SubstitutionMatrix<AminoAcidCompound> getMatrix(String matrixName);
+	 /**
+	  * Gets a substitution matrix by its name. The matrices are defined in
+	    {@code}src/main/resources/matrices/AAINDEX.txt{@code}
+	  * @param matrixName
+	  * @return The @{code}SubstitutionMatrix{@code} or null if not exists
+	  */
+	 SubstitutionMatrix<AminoAcidCompound> getMatrix(String matrixName);
 }
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/DefaultAAIndexProvider.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/DefaultAAIndexProvider.java
index d9119ed7e8..a9d402db2d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/DefaultAAIndexProvider.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/DefaultAAIndexProvider.java
@@ -42,9 +42,7 @@ public class DefaultAAIndexProvider implements AAIndexProvider {
 
 	public DefaultAAIndexProvider(){
 
-
 		InputStream inStream = getInputStreamToAAindexFile();
-
 		AAIndexFileParser parser = new AAIndexFileParser();
 
 		try {
@@ -54,14 +52,11 @@ public DefaultAAIndexProvider(){
 		}
 
 		matrices = parser.getMatrices();
-
 	}
 
 	@Override
 	public SubstitutionMatrix<AminoAcidCompound> getMatrix(String matrixName) {
-
 		return matrices.get(matrixName);
-
 	}
 
 	public InputStream getInputStreamToAAindexFile(){
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/DefaultAAIndexProviderTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/DefaultAAIndexProviderTest.java
new file mode 100644
index 0000000000..3e3985483c
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/DefaultAAIndexProviderTest.java
@@ -0,0 +1,27 @@
+package org.biojava.nbio.core.alignment.matrices;
+
+import org.biojava.nbio.core.alignment.template.SubstitutionMatrix;
+import org.biojava.nbio.core.sequence.compound.AminoAcidCompound;
+import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
+import org.biojava.nbio.core.sequence.compound.NucleotideCompound;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class DefaultAAIndexProviderTest {
+   
+    private static final String BENS940102 = "BENS940102";
+
+    DefaultAAIndexProvider provider = new DefaultAAIndexProvider();
+    @Test
+    void newAAIndexProviderReturnsNullIfNotExists(){ 
+        assertNull(provider.getMatrix("unknown"));
+    }
+
+    @Test
+    void aaIndexProviderGetByName(){ 
+        SubstitutionMatrix<AminoAcidCompound> matrix =  provider.getMatrix(BENS940102);
+        assertNotNull(matrix);
+        assertEquals(BENS940102, matrix.getName());
+    }
+}
\ No newline at end of file

From 5f2021acc67608d8b3ac785cd339f39130b5f2ac Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Wed, 25 Aug 2021 21:41:49 +0100
Subject: [PATCH 161/599] aaindex factory test

---
 .../alignment/matrices/AAindexFactory.java    | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAindexFactory.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAindexFactory.java
index 612d40a66f..61a898f623 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAindexFactory.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAindexFactory.java
@@ -20,27 +20,34 @@
  */
 package org.biojava.nbio.core.alignment.matrices;
 
-/** Factory class to get Providers for substitution matrices the are provided by the AAINDEX database.
+/**
+ * Factory class to get Providers for substitution matrices that are provided by
+ * the AAINDEX database.
  *
  * @author Andreas Prlic
  *
  */
 public class AAindexFactory {
 
-
 	private static AAIndexProvider provider = null;
 
+	/**
+	 * Gets singleton instance of an {@code AAIndexProvider}, always non-null
+	 * 
+	 * @return
+	 */
 	public static AAIndexProvider getAAIndexProvider() {
-		if ( provider == null)
+		if (provider == null)
 			provider = new DefaultAAIndexProvider();
 		return provider;
 	}
 
+	/**
+	 * Sets the singleton provider.
+	 * @param provider
+	 */
 	public static void setAAIndexProvider(AAIndexProvider provider) {
 		AAindexFactory.provider = provider;
 	}
 
-
-
-
 }

From 91105d79cd1b524633456223c28a0bb03dd63250 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Wed, 25 Aug 2021 21:43:03 +0100
Subject: [PATCH 162/599] aaindex factory test

---
 .../matrices/AAindexFactoryTest.java          | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/AAindexFactoryTest.java

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/AAindexFactoryTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/AAindexFactoryTest.java
new file mode 100644
index 0000000000..fdd27e34e5
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/AAindexFactoryTest.java
@@ -0,0 +1,30 @@
+package org.biojava.nbio.core.alignment.matrices;
+
+import org.biojava.nbio.core.alignment.template.SubstitutionMatrix;
+import org.biojava.nbio.core.sequence.compound.AminoAcidCompound;
+import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
+import org.biojava.nbio.core.sequence.compound.NucleotideCompound;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class AAindexFactoryTest {
+   
+
+    DefaultAAIndexProvider provider = new DefaultAAIndexProvider();
+   
+    @Test
+    void aaProviderIsSingleton(){ 
+        AAIndexProvider provider = AAindexFactory.getAAIndexProvider();
+        assertNotNull(provider);
+        AAIndexProvider provider2 = AAindexFactory.getAAIndexProvider();
+        assertTrue(provider == provider2);
+    }
+
+    @Test
+    void cannotSetProviderToNull(){
+        AAindexFactory.setAAIndexProvider(null);
+        assertNotNull(AAindexFactory.getAAIndexProvider());
+    }
+
+}
\ No newline at end of file

From c44cdc5e821c6854f5e98def72a35f724c8bb0a1 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sat, 28 Aug 2021 11:56:00 +0100
Subject: [PATCH 163/599] use list as an annotation value for Alt_id

---
 .../ontology/obo/OboFileEventListener.java    | 35 ++++++-------
 .../nbio/ontology/obo/OboFileHandler.java     | 12 +++--
 .../biojava/nbio/ontology/TestParseOBO.java   | 49 +++++++++++--------
 3 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileEventListener.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileEventListener.java
index 7350b6a2cb..d354f6502a 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileEventListener.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileEventListener.java
@@ -33,40 +33,37 @@
  */
 public interface OboFileEventListener {
 
-	/** starting to parse a new OBO file
-	 *
-	 *
+	/** 
+	 * starting to parse a new OBO file
 	 */
-	public void documentStart();
+	 void documentStart();
 
-	/** end of parsing a new OBO file
-	 *
-	 *
+	/** 
+	 * end of parsing a new OBO file
 	 */
-	public void documentEnd();
+	 void documentEnd();
 
-	/** parsed a new OBO file header
-	 *
-	 *
+	/**
+	 *  parsed a new OBO file header
 	 */
-	public void newOboFileHeader();
+	 void newOboFileHeader();
 
-	/** parsed a new stanza in the file
-	 *
+	/**
+	 *  parsed a new stanza in the file
 	 * @param stanza
 	 */
-	public void newStanza(String stanza);
+	 void newStanza(String stanza);
 
-	/**found a new key in the file
-	 *
+	/**
+	 * found a new key in the file
 	 * @param key
 	 * @param value
 	 */
-	public void newKey(String key, String value );
+	 void newKey(String key, String value );
 
 	/** a new synonym has been found
 	 *
 	 * @param synonym
 	 */
-	public void newSynonym(Synonym synonym);
+	 void newSynonym(Synonym synonym);
 }
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileHandler.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileHandler.java
index 49e3c2b56c..040916fbd3 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileHandler.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileHandler.java
@@ -80,7 +80,6 @@ public OboFileHandler(Ontology ontology){
 
 		//Term isa = onto.importTerm(OntoTools.IS_A, null);
 		//Term partof = onto.importTerm(OntoTools.PART_OF, null);;
-
 	}
 
 	@Override
@@ -108,7 +107,6 @@ public void newStanza(String stanza) {
 		} else {
 			isTerm = false;
 		}
-
 	}
 
 	@Override
@@ -174,8 +172,16 @@ else if (key.equals(NAME)){
 				Annotation anno = currentTerm.getAnnotation();
 				anno.setProperty(COMMENT, value);
 			} else if (key.equals(ALT_ID)){
+				// #964
 				Annotation anno = currentTerm.getAnnotation();
-				anno.setProperty(ALT_ID, value);
+				if (anno.containsProperty(ALT_ID)) {
+					List<String> alts = (List<String>) anno.getProperty(ALT_ID);
+					alts.add(value);
+				} else {
+					List<String> alts = new ArrayList<>();
+					alts.add(value);
+					anno.setProperty(ALT_ID, alts);
+				}
 			}
 			else if (key.equals(REPLACED_BY)) {
 				Annotation anno = currentTerm.getAnnotation();
diff --git a/biojava-ontology/src/test/java/org/biojava/nbio/ontology/TestParseOBO.java b/biojava-ontology/src/test/java/org/biojava/nbio/ontology/TestParseOBO.java
index b9fe2df034..c014ed84ca 100644
--- a/biojava-ontology/src/test/java/org/biojava/nbio/ontology/TestParseOBO.java
+++ b/biojava-ontology/src/test/java/org/biojava/nbio/ontology/TestParseOBO.java
@@ -23,44 +23,53 @@
 package org.biojava.nbio.ontology;
 
 import org.biojava.nbio.ontology.io.OboParser;
-import org.junit.Assert;
+import org.biojava.nbio.ontology.utils.Annotation;
 import org.junit.Test;
 
 import java.io.*;
 import java.text.ParseException;
+import java.util.List;
 import java.util.Set;
 
 import static org.biojava.nbio.ontology.obo.OboFileHandler.NAMESPACE;
+import static org.biojava.nbio.ontology.obo.OboFileHandler.ALT_ID;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 public class TestParseOBO {
 
 	@Test
 	public void testNamespace() throws IOException, ParseException {
 
-		String testTermEntry = "\n[Term]\n" +
-		"id: SO:0000691\n" +
-		"name: cleaved_initiator_methionine \n" +
-		"namespace: sequence\n" +
-		"alt_id: BS:00067\n" +
-		"def: \"The initiator methionine that has been cleaved from a mature polypeptide sequence.\" [EBIBS:GAR]\n" +
-		"subset: biosapiens\n" +
-		"synonym: \"cleaved initiator methionine\" EXACT []\n" +
-		"synonym: \"init_met\" RELATED [uniprot:feature_type]\n" +
-		"synonym: \"initiator methionine\" RELATED []\n" +
-		"is_a: SO:0100011 ! cleaved_peptide_region\n\n";
+		String testTermEntry = "\n[Term]\n" + "id: SO:0000691\n" 
+				+ "name: cleaved_initiator_methionine \n"
+				+ "namespace: sequence\n" 
+				+ "alt_id: BS:00067\n"
+				+ "def: \"The initiator methionine that has been cleaved from a mature polypeptide sequence.\" [EBIBS:GAR]\n"
+				+ "subset: biosapiens\n" + "synonym: \"cleaved initiator methionine\" EXACT []\n"
+				+ "synonym: \"init_met\" RELATED [uniprot:feature_type]\n"
+				+ "synonym: \"initiator methionine\" RELATED []\n" + "is_a: SO:0100011 ! cleaved_peptide_region\n\n";
 
-	OboParser parser = new OboParser();
-	InputStream inStream = new ByteArrayInputStream(testTermEntry.getBytes());
+		OboParser parser = new OboParser();
+		InputStream inStream = new ByteArrayInputStream(testTermEntry.getBytes());
 
-		Assert.assertNotNull(inStream);
+		assertNotNull(inStream);
 
-		BufferedReader oboFile = new BufferedReader ( new InputStreamReader ( inStream ) );
+		BufferedReader oboFile = new BufferedReader(new InputStreamReader(inStream));
 		Ontology ontology = parser.parseOBO(oboFile, "so-xp/subsets/biosapiens",
-		    "snippet from biosapiens protein feature ontology");
+				"snippet from biosapiens protein feature ontology");
+
 		Set<Term> keys = ontology.getTerms();
 
-		Assert.assertTrue(keys.size() > 1);
-		Assert.assertTrue(ontology.getTerm("SO:0000691").getAnnotation().containsProperty(NAMESPACE));
-	Assert.assertEquals("sequence", ontology.getTerm("SO:0000691").getAnnotation().getProperty(NAMESPACE));
+		assertTrue(keys.size() > 1);
+		assertTrue(getAnnotationForTerm(ontology).containsProperty(NAMESPACE));
+		assertEquals("sequence", getAnnotationForTerm(ontology).getProperty(NAMESPACE));
+		assertTrue( getAnnotationForTerm(ontology).getProperty(ALT_ID) instanceof List);
+
+	}
+
+	private Annotation getAnnotationForTerm(Ontology ontology) {
+		return ontology.getTerm("SO:0000691").getAnnotation();
 	}
 }

From a32f209ee975c23c435682b3c9bf7a3f5a6c9ce4 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sat, 28 Aug 2021 12:12:40 +0100
Subject: [PATCH 164/599] add test for multiple altids

---
 .../biojava/nbio/ontology/TestParseOBO.java   | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/biojava-ontology/src/test/java/org/biojava/nbio/ontology/TestParseOBO.java b/biojava-ontology/src/test/java/org/biojava/nbio/ontology/TestParseOBO.java
index c014ed84ca..b6837ddbbc 100644
--- a/biojava-ontology/src/test/java/org/biojava/nbio/ontology/TestParseOBO.java
+++ b/biojava-ontology/src/test/java/org/biojava/nbio/ontology/TestParseOBO.java
@@ -24,6 +24,7 @@
 
 import org.biojava.nbio.ontology.io.OboParser;
 import org.biojava.nbio.ontology.utils.Annotation;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.*;
@@ -39,37 +40,50 @@
 
 public class TestParseOBO {
 
-	@Test
-	public void testNamespace() throws IOException, ParseException {
-
-		String testTermEntry = "\n[Term]\n" + "id: SO:0000691\n" 
-				+ "name: cleaved_initiator_methionine \n"
-				+ "namespace: sequence\n" 
-				+ "alt_id: BS:00067\n"
-				+ "def: \"The initiator methionine that has been cleaved from a mature polypeptide sequence.\" [EBIBS:GAR]\n"
-				+ "subset: biosapiens\n" + "synonym: \"cleaved initiator methionine\" EXACT []\n"
-				+ "synonym: \"init_met\" RELATED [uniprot:feature_type]\n"
-				+ "synonym: \"initiator methionine\" RELATED []\n" + "is_a: SO:0100011 ! cleaved_peptide_region\n\n";
+	private OboParser parser;
 
-		OboParser parser = new OboParser();
-		InputStream inStream = new ByteArrayInputStream(testTermEntry.getBytes());
+	final String testTermEntry = "\n[Term]\n" + "id: SO:0000691\n" + "name: cleaved_initiator_methionine \n"
+			+ "namespace: sequence\n" + "alt_id: BS:00067\n"
+			+ "def: \"The initiator methionine that has been cleaved from a mature polypeptide sequence.\" [EBIBS:GAR]\n"
+			+ "subset: biosapiens\n" + "synonym: \"cleaved initiator methionine\" EXACT []\n"
+			+ "synonym: \"init_met\" RELATED [uniprot:feature_type]\n"
+			+ "synonym: \"initiator methionine\" RELATED []\n" + "is_a: SO:0100011 ! cleaved_peptide_region\n\n";
+	private String replace;
 
+	public Ontology readObo(String input) throws ParseException, IOException {
+		parser = new OboParser();
+		InputStream inStream = new ByteArrayInputStream(input.getBytes());
 		assertNotNull(inStream);
-
-		BufferedReader oboFile = new BufferedReader(new InputStreamReader(inStream));
-		Ontology ontology = parser.parseOBO(oboFile, "so-xp/subsets/biosapiens",
+		BufferedReader oboFile = new  BufferedReader(new InputStreamReader(inStream));
+		return parser.parseOBO(oboFile, "so-xp/subsets/biosapiens",
 				"snippet from biosapiens protein feature ontology");
+	}
+
+	@Test
+	public void testNamespace() throws IOException, ParseException {
+		Ontology ontology = readObo(testTermEntry);
 
 		Set<Term> keys = ontology.getTerms();
 
 		assertTrue(keys.size() > 1);
 		assertTrue(getAnnotationForTerm(ontology).containsProperty(NAMESPACE));
 		assertEquals("sequence", getAnnotationForTerm(ontology).getProperty(NAMESPACE));
-		assertTrue( getAnnotationForTerm(ontology).getProperty(ALT_ID) instanceof List);
+		assertTrue(getAnnotationForTerm(ontology).getProperty(ALT_ID) instanceof List);
+	}
 
+	@Test
+	public void testMultipleAltIds() throws IOException, ParseException {
+		
+		String replace = testTermEntry.replace("BS:00067", "BS:00067\nalt_id: BS:00068");
+		Ontology ontology = readObo(replace);
+		List<String> altIds = (List<String>) getAnnotationForTerm(ontology).getProperty(ALT_ID);
+		assertEquals(2, altIds.size());
+		assertEquals("BS:00067", altIds.get(0));
+		assertEquals("BS:00068", altIds.get(1));
 	}
 
 	private Annotation getAnnotationForTerm(Ontology ontology) {
 		return ontology.getTerm("SO:0000691").getAnnotation();
+
 	}
 }

From 016ff701e29a37a2960c632f3caf3ccb55552a3b Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sat, 28 Aug 2021 12:17:46 +0100
Subject: [PATCH 165/599] minor refactor

---
 .../nbio/ontology/obo/OboFileHandler.java     |  2 +-
 .../biojava/nbio/ontology/TestParseOBO.java   | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileHandler.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileHandler.java
index 040916fbd3..aeee6aa627 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileHandler.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileHandler.java
@@ -153,7 +153,7 @@ else if (key.equals(NAME)){
 				// ignore obsolete Terms...
 				//logger.info("obsolete: {}", currentTerm);
 				Annotation anno = currentTerm.getAnnotation();
-				anno.setProperty(IS_OBSOLETE, new Boolean(true));
+				anno.setProperty(IS_OBSOLETE, Boolean.TRUE);
 
 			} else if (key.equals(IS_A) ||
 					key.equals(RELATIONSHIP) ||
diff --git a/biojava-ontology/src/test/java/org/biojava/nbio/ontology/TestParseOBO.java b/biojava-ontology/src/test/java/org/biojava/nbio/ontology/TestParseOBO.java
index b6837ddbbc..deff4c81c3 100644
--- a/biojava-ontology/src/test/java/org/biojava/nbio/ontology/TestParseOBO.java
+++ b/biojava-ontology/src/test/java/org/biojava/nbio/ontology/TestParseOBO.java
@@ -24,7 +24,6 @@
 
 import org.biojava.nbio.ontology.io.OboParser;
 import org.biojava.nbio.ontology.utils.Annotation;
-import org.junit.Before;
 import org.junit.Test;
 
 import java.io.*;
@@ -42,13 +41,16 @@ public class TestParseOBO {
 
 	private OboParser parser;
 
-	final String testTermEntry = "\n[Term]\n" + "id: SO:0000691\n" + "name: cleaved_initiator_methionine \n"
-			+ "namespace: sequence\n" + "alt_id: BS:00067\n"
+	final String testTermEntry = "\n[Term]\n" 
+			+ "id: SO:0000691\n"
+			+ "name: cleaved_initiator_methionine \n"
+			+ "namespace: sequence\n" 
+			+ "alt_id: BS:00067\n"
 			+ "def: \"The initiator methionine that has been cleaved from a mature polypeptide sequence.\" [EBIBS:GAR]\n"
-			+ "subset: biosapiens\n" + "synonym: \"cleaved initiator methionine\" EXACT []\n"
+			+ "subset: biosapiens\n"
+			+ "synonym: \"cleaved initiator methionine\" EXACT []\n"
 			+ "synonym: \"init_met\" RELATED [uniprot:feature_type]\n"
 			+ "synonym: \"initiator methionine\" RELATED []\n" + "is_a: SO:0100011 ! cleaved_peptide_region\n\n";
-	private String replace;
 
 	public Ontology readObo(String input) throws ParseException, IOException {
 		parser = new OboParser();
@@ -62,20 +64,19 @@ public Ontology readObo(String input) throws ParseException, IOException {
 	@Test
 	public void testNamespace() throws IOException, ParseException {
 		Ontology ontology = readObo(testTermEntry);
-
 		Set<Term> keys = ontology.getTerms();
-
 		assertTrue(keys.size() > 1);
 		assertTrue(getAnnotationForTerm(ontology).containsProperty(NAMESPACE));
 		assertEquals("sequence", getAnnotationForTerm(ontology).getProperty(NAMESPACE));
+		//#964
 		assertTrue(getAnnotationForTerm(ontology).getProperty(ALT_ID) instanceof List);
 	}
 
 	@Test
 	public void testMultipleAltIds() throws IOException, ParseException {
 		
-		String replace = testTermEntry.replace("BS:00067", "BS:00067\nalt_id: BS:00068");
-		Ontology ontology = readObo(replace);
+		String oboWith2AltIds = testTermEntry.replace("BS:00067", "BS:00067\nalt_id: BS:00068");
+		Ontology ontology = readObo(oboWith2AltIds);
 		List<String> altIds = (List<String>) getAnnotationForTerm(ontology).getProperty(ALT_ID);
 		assertEquals(2, altIds.size());
 		assertEquals("BS:00067", altIds.get(0));

From d5ad2f0bcc029d829356e6ffc5e4c76a10f3f475 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Sat, 28 Aug 2021 13:49:00 -0700
Subject: [PATCH 166/599] Fixing #956

---
 CHANGELOG.md                                     |  1 +
 .../align/xml/MultipleAlignmentXMLParser.java    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3bbd01682..a203723f58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ BioJava 6.0.0 (future release)
 * Removed from `org.biojava.nbio.structure.Structure` interface: `findChain()`, `getId()`, `setId()`, `getChainByPDB()`, `getCompoundById()`, `getResidueRanges()`, `getRanges()`
 * Removed from `org.biojava.nbio.structure.StructureTools` : `isNucleicAcid()`, `isProtein()`, `getPredominantGroupType()`, `isChainWaterOnly()`, `isChainPureNonPolymer()`
 * Removed `org.biojava.nbio.structure.io.SandboxStyleStructureProvider`
+* In `org.biojava.nbio.structure.align.xml.MultipleAlignmentXMLParser` made all methods private except `parseXMLfile`
 
 ### Breaking API changes
 * Extracted `StructureIO.StructureFiletype` enum to `org.biojava.nbio.structure.io.StructureFiletype` (supports `PDB`, `MMTF`, `CIF`, and `BCIF`)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java
index 5d7b6fb3ad..51c2f3c3b9 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java
@@ -101,7 +101,7 @@ public static List<MultipleAlignmentEnsemble> parseXMLfile(String xml)
 		return ensembles;
 	}
 
-	public static MultipleAlignmentEnsemble parseEnsemble(Node root){
+	private static MultipleAlignmentEnsemble parseEnsemble(Node root){
 
 		MultipleAlignmentEnsemble ensemble =
 				new MultipleAlignmentEnsembleImpl();
@@ -127,7 +127,7 @@ else if (child.getNodeName().equals("ScoresCache")){
 		return ensemble;
 	}
 
-	public static MultipleAlignment parseMultipleAlignment(Node root,
+	private static MultipleAlignment parseMultipleAlignment(Node root,
 			MultipleAlignmentEnsemble ensemble) {
 
 		MultipleAlignment msa = new MultipleAlignmentImpl(ensemble);
@@ -147,7 +147,7 @@ else if (child.getNodeName().equals("ScoresCache")){
 		return msa;
 	}
 
-	public static BlockSet parseBlockSet(Node root, MultipleAlignment msa) {
+	private static BlockSet parseBlockSet(Node root, MultipleAlignment msa) {
 
 		BlockSet bs = new BlockSetImpl(msa);
 		List<Matrix4d> transforms = new ArrayList<Matrix4d>();
@@ -175,7 +175,7 @@ else if (child.getNodeName().equals("ScoresCache")){
 		return bs;
 	}
 
-	public static Block parseBlock(Node root, BlockSet blockSet) {
+	private static Block parseBlock(Node root, BlockSet blockSet) {
 
 		Block b = new BlockImpl(blockSet);
 		List<List<Integer>> alignRes = new ArrayList<List<Integer>>();
@@ -216,7 +216,7 @@ else if (child.getNodeName().equals("ScoresCache")){
 		return b;
 	}
 
-	public static Matrix4d parseMatrix4d(Node node) {
+	private static Matrix4d parseMatrix4d(Node node) {
 
 		Matrix4d m = new Matrix4d();
 		NamedNodeMap atts = node.getAttributes();
@@ -231,7 +231,7 @@ public static Matrix4d parseMatrix4d(Node node) {
 		return m;
 	}
 
-	public static void parseScoresCache(Node root, ScoresCache cache) {
+	private static void parseScoresCache(Node root, ScoresCache cache) {
 
 		NodeList children = root.getChildNodes();
 
@@ -247,7 +247,7 @@ public static void parseScoresCache(Node root, ScoresCache cache) {
 		}
 	}
 
-	public static void parseHeader(Node node,
+	private static void parseHeader(Node node,
 			MultipleAlignmentEnsemble ensemble) {
 
 		NamedNodeMap atts = node.getAttributes();
@@ -273,7 +273,7 @@ public static void parseHeader(Node node,
 		}
 	}
 
-	public static void parseStructures(Node root,
+	private static void parseStructures(Node root,
 			MultipleAlignmentEnsemble ensemble) {
 
 		List<StructureIdentifier> names = new ArrayList<StructureIdentifier>();

From 15e1675f85032bd740d042c7c98fe9e6cf9605cf Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 30 Aug 2021 10:42:42 -0700
Subject: [PATCH 167/599] Fixing #943

---
 biojava-integrationtest/pom.xml               | 14 ++++-
 .../structure/test/io/TestBondParsing.java    | 34 +++++++++++
 .../biojava/nbio/structure/io/BondMaker.java  | 58 ++++++++++++++-----
 3 files changed, 89 insertions(+), 17 deletions(-)
 create mode 100644 biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBondParsing.java

diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 0bd381f989..bb1a97c71b 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -23,8 +23,20 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <scope>test</scope>
     </dependency>
+      <!-- Junit5 dependencies, defined in parent pom. -->
+      <dependency>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter-engine</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter-params</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.junit.vintage</groupId>
+          <artifactId>junit-vintage-engine</artifactId>
+      </dependency>
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBondParsing.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBondParsing.java
new file mode 100644
index 0000000000..7be8b523a5
--- /dev/null
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBondParsing.java
@@ -0,0 +1,34 @@
+package org.biojava.nbio.structure.test.io;
+
+import org.biojava.nbio.structure.Atom;
+import org.biojava.nbio.structure.Group;
+import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.io.FileParsingParameters;
+import org.biojava.nbio.structure.io.PDBFileReader;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class TestBondParsing {
+
+    /**
+     * Integration test for bond parsing in PDB-format, where author chain ids and asym ids differ and can cause
+     * problems. See https://github.com/biojava/biojava/issues/943
+     */
+    @Test
+    public void testIssue943() throws Exception {
+        PDBFileReader reader = new PDBFileReader();
+        FileParsingParameters params = new FileParsingParameters();
+        params.setCreateAtomBonds(true);
+        reader.setFileParsingParameters(params);
+        Structure s = reader.getStructureById("1v9i");
+
+        Group his95 = s.getPolyChain("A").getAtomGroup(94);
+        Atom ne2His95 = his95.getAtom("NE2");
+        assertEquals(3, ne2His95.getBonds().size());
+
+        Group zn = s.getNonPolyChain("B").getAtomGroup(0);
+        assertEquals(3, zn.getAtom("ZN").getBonds().size());
+
+    }
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
index 7c4fe74144..15bd9bb0ad 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
@@ -96,7 +96,7 @@ public BondMaker(Structure structure, FileParsingParameters params) {
 	 * nucleotide bonds: inferred from sequence and distances
 	 * </li>
 	 * <li>
-	 * intra-group (residue) bonds: read from the chemical component dictionary, via {@link ChemCompProvider}
+	 * intra-group (residue) bonds: read from the chemical component dictionary, via {@link org.biojava.nbio.structure.chem.ChemCompProvider}
 	 * </li>
 	 */
 	public void makeBonds() {
@@ -293,10 +293,10 @@ public void formDisulfideBonds(List<SSBondImpl> disulfideBonds) {
 
 	private void formDisulfideBond(SSBondImpl disulfideBond) {
 		try {
-			Map<Integer, Atom> a = getAtomFromRecord("SG", "", "CYS",
+			Map<Integer, Atom> a = getAtomFromRecord("SG", "",
 					disulfideBond.getChainID1(), disulfideBond.getResnum1(),
 					disulfideBond.getInsCode1());
-			Map<Integer, Atom> b = getAtomFromRecord("SG", "", "CYS",
+			Map<Integer, Atom> b = getAtomFromRecord("SG", "",
 					disulfideBond.getChainID2(), disulfideBond.getResnum2(),
 					disulfideBond.getInsCode2());
 
@@ -324,7 +324,7 @@ private void formDisulfideBond(SSBondImpl disulfideBond) {
 
 	/**
 	 * Creates bond objects from a LinkRecord as parsed from a PDB file
-	 * @param linkRecord
+	 * @param linkRecord the PDB-format LINK record
 	 */
 	public void formLinkRecordBond(LinkRecord linkRecord) {
 		// only work with atoms that aren't alternate locations
@@ -333,15 +333,24 @@ public void formLinkRecordBond(LinkRecord linkRecord) {
 			return;
 
 		try {
-			Map<Integer, Atom> a = getAtomFromRecord(linkRecord.getName1(),
-					linkRecord.getAltLoc1(), linkRecord.getResName1(),
-					linkRecord.getChainID1(), linkRecord.getResSeq1(),
-					linkRecord.getiCode1());
+			// The PDB format uses author chain ids to reference. But one author chain id corresponds to multiple asym ids,
+			// thus we need to grab all the possible asym ids (poly and nonpoly) and then try to find the atoms
+			// See issue https://github.com/biojava/biojava/issues/943
+			String polyChainId1 = structure.getPolyChainByPDB(linkRecord.getChainID1()).getId();
+			String polyChainId2 = structure.getPolyChainByPDB(linkRecord.getChainID2()).getId();
+			List<Chain> nonpolyChains1 = structure.getNonPolyChainsByPDB(linkRecord.getChainID1());
+			List<Chain> nonpolyChains2 = structure.getNonPolyChainsByPDB(linkRecord.getChainID2());
 
-			Map<Integer, Atom> b = getAtomFromRecord(linkRecord.getName2(),
-					linkRecord.getAltLoc2(), linkRecord.getResName2(),
-					linkRecord.getChainID2(), linkRecord.getResSeq2(),
-					linkRecord.getiCode2());
+			List<String> allChainIds1 = new ArrayList<>();
+			List<String> allChainIds2 = new ArrayList<>();
+			if (polyChainId1!=null) allChainIds1.add(polyChainId1);
+			if (polyChainId2!=null) allChainIds2.add(polyChainId2);
+			if (nonpolyChains1!=null) nonpolyChains1.forEach(npc -> allChainIds1.add(npc.getId()));
+			if (nonpolyChains2!=null) nonpolyChains2.forEach(npc -> allChainIds2.add(npc.getId()));
+
+			Map<Integer, Atom> a = getAtomFromRecordTryMultipleChainIds(linkRecord.getName1(), linkRecord.getAltLoc1(), linkRecord.getResSeq1(), linkRecord.getiCode1(), allChainIds1);
+
+			Map<Integer, Atom> b = getAtomFromRecordTryMultipleChainIds(linkRecord.getName2(), linkRecord.getAltLoc2(), linkRecord.getResSeq2(), linkRecord.getiCode2(), allChainIds2);
 
 			for(int i=0; i<structure.nrModels(); i++){
 				if(a.containsKey(i) && b.containsKey(i)){
@@ -352,7 +361,7 @@ public void formLinkRecordBond(LinkRecord linkRecord) {
 					}
 				}
 			}
-		}catch (StructureException e) {
+		} catch (StructureException e) {
 			// Note, in Calpha only mode the link atoms may not be present.
 			if (! params.isParseCAOnly()) {
 				logger.warn("Could not find atoms specified in LINK record: {}",linkRecord.toString());
@@ -363,6 +372,23 @@ public void formLinkRecordBond(LinkRecord linkRecord) {
 		}
 	}
 
+	private Map<Integer, Atom> getAtomFromRecordTryMultipleChainIds(String name, String altLoc, String resSeq, String iCode, List<String> chainIds) throws StructureException {
+		Map<Integer, Atom> a = null;
+		for (String chainId : chainIds) {
+			try {
+				a = getAtomFromRecord(name, altLoc, chainId, resSeq, iCode);
+				// first instance that doesn't give an exception will be considered the right one. Not much more we can do here
+				break;
+			} catch (StructureException e) {
+				logger.debug("Tried to get atom {} {} {} (alt loc {}) from chain id {}, but did not find it", name, resSeq, iCode, altLoc, chainId);
+			}
+		}
+		if (a == null) {
+			throw new StructureException("Could not find atom "+name+" "+resSeq+" "+iCode+" (alt loc "+altLoc+")");
+		}
+		return a;
+	}
+
 
 	public void formBondsFromStructConn(StructConn conn) {
 		final String symop = "1_555"; // For now - accept bonds within origin asymmetric unit.
@@ -415,7 +441,7 @@ public void formBondsFromStructConn(StructConn conn) {
 			Map<Integer,Atom> a2 = null;
 
 			try {
-				a1 = getAtomFromRecord(atomName1, altLoc1, resName1, chainId1, seqId1, insCode1);
+				a1 = getAtomFromRecord(atomName1, altLoc1, chainId1, seqId1, insCode1);
 
 			} catch (StructureException e) {
 
@@ -423,7 +449,7 @@ public void formBondsFromStructConn(StructConn conn) {
 				continue;
 			}
 			try {
-				a2 = getAtomFromRecord(atomName2, altLoc2, resName2, chainId2, seqId2, insCode2);
+				a2 = getAtomFromRecord(atomName2, altLoc2, chainId2, seqId2, insCode2);
 			} catch (StructureException e) {
 
 				logger.warn("Could not find atom specified in struct_conn record: {}{}({}) in chain {}, atom {} {}", seqId2, insCode2, resName2, chainId2, atomName2, altLocStr2);
@@ -461,7 +487,7 @@ public void formBondsFromStructConn(StructConn conn) {
 		structure.setSSBonds(ssbonds);
 	}
 
-	private Map<Integer,Atom> getAtomFromRecord(String name, String altLoc, String resName, String chainID, String resSeq, String iCode)
+	private Map<Integer,Atom> getAtomFromRecord(String name, String altLoc, String chainID, String resSeq, String iCode)
 			throws StructureException {
 
 		if (iCode==null || iCode.isEmpty()) {

From 24441661a1d7be4429c642d8bfdfb7d8d123eb4d Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Tue, 31 Aug 2021 06:06:29 +0800
Subject: [PATCH 168/599] Added @Depricated code tag as well as @deprecated
 JavaDoc

Small typographical error correction as well.
---
 .../main/java/org/biojava/nbio/structure/PDBHeader.java   | 8 ++++++--
 .../java/org/biojava/nbio/structure/io/PDBFileParser.java | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
index b83b29d4f9..1b39e44d43 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
@@ -600,15 +600,19 @@ public void setTitle(String title) {
 		this.title = title;
 	}
 	
-	/**@deprecated will be removed later. Use {@link #getKeywords()}
+	/**@deprecated will be removed later. Use {@link #getKeywords()} if you use 
+	 * <code>description</code> to keep the keywords.
 	 * @return
 	 */
+	@Deprecated
 	public String getDescription() {
 		return description;
 	}
-	/**@deprecated will be removed later. Use {@link #setKeywords(List)}
+	/**@deprecated will be removed later. Use {@link #getKeywords()} if you use 
+	 * <code>description</code> to keep the keywords.
 	 * @param description
 	 */
+	@Deprecated
 	public void setDescription(String description) {
 		this.description = description;
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index 774894df92..5d1695fd52 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -2765,7 +2765,7 @@ private void makeCompounds(List<String> compoundList,
 
 	}
 
-	/**Parse KEYWODS record of the PDF file.<br>
+	/**Parse KEYWODS record of the PDB file.<br>
 	 * A keyword may be split over two lines. whether a keyword ends by the end 
 	 * of a line or it is aplit over two lines, a <code>space</code> is added 
 	 * between the 2 lines's contents, unless the first line ends in 

From 4e0473ec527a7add42b63aa3bb157bf615bfc3b4 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 3 Sep 2021 09:00:02 -0700
Subject: [PATCH 169/599] Docs

---
 .../main/java/org/biojava/nbio/structure/io/BondMaker.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
index 15bd9bb0ad..27e586667d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
@@ -167,7 +167,7 @@ private void formIntraResidueBonds() {
 						continue;
 					}
 					// Now add support for altLocGroup
-					List<Group> totList = new ArrayList<Group>();
+					List<Group> totList = new ArrayList<>();
 					totList.add(mainGroup);
 					totList.addAll(mainGroup.getAltLocs());
 
@@ -333,7 +333,7 @@ public void formLinkRecordBond(LinkRecord linkRecord) {
 			return;
 
 		try {
-			// The PDB format uses author chain ids to reference. But one author chain id corresponds to multiple asym ids,
+			// The PDB format uses author chain ids to reference chains. But one author chain id corresponds to multiple asym ids,
 			// thus we need to grab all the possible asym ids (poly and nonpoly) and then try to find the atoms
 			// See issue https://github.com/biojava/biojava/issues/943
 			String polyChainId1 = structure.getPolyChainByPDB(linkRecord.getChainID1()).getId();

From bb7a7eb1316de5f7f2560afb6b5c984ad2adf56f Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sun, 12 Sep 2021 10:38:31 +0100
Subject: [PATCH 170/599] update GO URL to https

---
 biojava-ontology/src/main/java/demo/ParseGO.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/biojava-ontology/src/main/java/demo/ParseGO.java b/biojava-ontology/src/main/java/demo/ParseGO.java
index c16dffed89..adb6599bb9 100644
--- a/biojava-ontology/src/main/java/demo/ParseGO.java
+++ b/biojava-ontology/src/main/java/demo/ParseGO.java
@@ -41,12 +41,16 @@ public class ParseGO {
 
 	private static final Logger logger = LoggerFactory.getLogger(ParseGO.class);
 
+	/**
+	 * Downloads Biosapiens OBO file from Sourceforge and prints out name/description pairs
+	 * @param args
+	 */
 	public static void main(String[] args){
 
-		String u = "http://sourceforge.net/p/song/svn/HEAD/tree/trunk/subsets/biosapiens.obo?format=raw";
+		final String BIOSAPIENS_GO_URL = "https://sourceforge.net/p/song/svn/HEAD/tree/trunk/subsets/biosapiens.obo?format=raw";
 
 		try {
-			URL url = new URL(u);
+			URL url = new URL(BIOSAPIENS_GO_URL);
 
 			OboParser parser = new OboParser();
 			InputStream inStream = url.openStream();

From 68a5d6246e2dd906fc7f0ed6f987ee161fddce3d Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Wed, 15 Sep 2021 09:15:03 +0100
Subject: [PATCH 171/599] use static file

---
 biojava-ontology/src/main/java/demo/ParseGO.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/biojava-ontology/src/main/java/demo/ParseGO.java b/biojava-ontology/src/main/java/demo/ParseGO.java
index adb6599bb9..ceecbf7041 100644
--- a/biojava-ontology/src/main/java/demo/ParseGO.java
+++ b/biojava-ontology/src/main/java/demo/ParseGO.java
@@ -47,13 +47,11 @@ public class ParseGO {
 	 */
 	public static void main(String[] args){
 
-		final String BIOSAPIENS_GO_URL = "https://sourceforge.net/p/song/svn/HEAD/tree/trunk/subsets/biosapiens.obo?format=raw";
 
 		try {
-			URL url = new URL(BIOSAPIENS_GO_URL);
 
 			OboParser parser = new OboParser();
-			InputStream inStream = url.openStream();
+			InputStream inStream = OboParser.class.getResourceAsStream("/ontology/biosapiens.obo");
 
 			BufferedReader oboFile = new BufferedReader ( new InputStreamReader ( inStream ) );
 

From 8262878c064098d448f282670a1bcf5df8d4cbb1 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Wed, 15 Sep 2021 09:17:02 +0100
Subject: [PATCH 172/599] replace log with system out calls

---
 biojava-ontology/src/main/java/demo/ParseGO.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/biojava-ontology/src/main/java/demo/ParseGO.java b/biojava-ontology/src/main/java/demo/ParseGO.java
index ceecbf7041..c0dbb6f8be 100644
--- a/biojava-ontology/src/main/java/demo/ParseGO.java
+++ b/biojava-ontology/src/main/java/demo/ParseGO.java
@@ -42,7 +42,7 @@ public class ParseGO {
 	private static final Logger logger = LoggerFactory.getLogger(ParseGO.class);
 
 	/**
-	 * Downloads Biosapiens OBO file from Sourceforge and prints out name/description pairs
+	 * Parses Biosapiens OBO file from Sourceforge and prints out name/description pairs
 	 * @param args
 	 */
 	public static void main(String[] args){
@@ -61,10 +61,10 @@ public static void main(String[] args){
 			Iterator<Term> iter = keys.iterator();
 			while (iter.hasNext()){
 				Term t = iter.next();
-				logger.info("{} [{}]", t.getName(), t.getDescription());
+				System.out.println(t.getName() + " " +  t.getDescription());
 			}
 		} catch (Exception e){
-			logger.error("Exception: ", e);
+			System.err.println("Exception: " +  e);
 		}
 	}
 }

From 71773c41c66639078463419e797f8964c21d8f13 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Wed, 15 Sep 2021 09:18:29 +0100
Subject: [PATCH 173/599] docs/formatting

---
 .../src/main/java/demo/ParseGO.java           | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/biojava-ontology/src/main/java/demo/ParseGO.java b/biojava-ontology/src/main/java/demo/ParseGO.java
index c0dbb6f8be..ed5bd57692 100644
--- a/biojava-ontology/src/main/java/demo/ParseGO.java
+++ b/biojava-ontology/src/main/java/demo/ParseGO.java
@@ -27,44 +27,41 @@
 import org.biojava.nbio.ontology.Ontology;
 import org.biojava.nbio.ontology.Term;
 import org.biojava.nbio.ontology.io.OboParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.URL;
+
 import java.util.Iterator;
 import java.util.Set;
 
 public class ParseGO {
 
-	private static final Logger logger = LoggerFactory.getLogger(ParseGO.class);
-
 	/**
-	 * Parses Biosapiens OBO file from Sourceforge and prints out name/description pairs
+	 * Parses Biosapiens OBO file and prints out name/description
+	 * pairs
+	 * 
 	 * @param args
 	 */
-	public static void main(String[] args){
-
+	public static void main(String[] args) {
 
 		try {
 
 			OboParser parser = new OboParser();
 			InputStream inStream = OboParser.class.getResourceAsStream("/ontology/biosapiens.obo");
 
-			BufferedReader oboFile = new BufferedReader ( new InputStreamReader ( inStream ) );
+			BufferedReader oboFile = new BufferedReader(new InputStreamReader(inStream));
 
 			Ontology ontology = parser.parseOBO(oboFile, "BioSapiens", "the BioSapiens ontology");
 
 			Set<Term> keys = ontology.getTerms();
 			Iterator<Term> iter = keys.iterator();
-			while (iter.hasNext()){
+			while (iter.hasNext()) {
 				Term t = iter.next();
-				System.out.println(t.getName() + " " +  t.getDescription());
+				System.out.println(t.getName() + " " + t.getDescription());
 			}
-		} catch (Exception e){
-			System.err.println("Exception: " +  e);
+		} catch (Exception e) {
+			System.err.println("Exception: " + e);
 		}
 	}
 }

From 5f1c36e7e55b446f370ff4ae10eb0bec46bf2f03 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Wed, 15 Sep 2021 10:55:06 +0100
Subject: [PATCH 174/599] add exemplar obo file

---
 .../main/resources/ontology/biosapiens.obo    | 1830 +++++++++++++++++
 1 file changed, 1830 insertions(+)
 create mode 100644 biojava-ontology/src/main/resources/ontology/biosapiens.obo

diff --git a/biojava-ontology/src/main/resources/ontology/biosapiens.obo b/biojava-ontology/src/main/resources/ontology/biosapiens.obo
new file mode 100644
index 0000000000..2c478b6de4
--- /dev/null
+++ b/biojava-ontology/src/main/resources/ontology/biosapiens.obo
@@ -0,0 +1,1830 @@
+format-version: 1.2
+subsetdef: biosapiens "biosapiens protein feature ontology"
+subsetdef: DBVAR "database of genomic structural variation"
+subsetdef: SOFA "SO feature annotation"
+synonymtypedef: aa1 "amino acid 1 letter code" 
+synonymtypedef: aa3 "amino acid 3 letter code" 
+synonymtypedef: AAMOD "amino acid modification" 
+synonymtypedef: BS "biosapiens" 
+synonymtypedef: dbsnp "dbsnp variant terms" 
+synonymtypedef: dbvar "DBVAR" 
+synonymtypedef: ebi_variants "ensembl variant terms" 
+synonymtypedef: RNAMOD "RNA modification" EXACT
+synonymtypedef: VAR "variant annotation term" 
+ontology: so-xp/subsets/biosapiens
+
+[Term]
+id: SO:0000409
+name: binding_site
+namespace: sequence
+alt_id: BS:00033
+def: "A biological_region of sequence that, in the molecule, interacts selectively and non-covalently with other molecules. A region on the surface of a molecule that may interact with another molecule. When applied to polypeptides: Amino acids involved in binding or interactions. It can also apply to an amino acid bond which is represented by the positions of the two flanking amino acids." [EBIBS:GAR, SO:ke]
+comment: See GO:0005488 : binding.
+subset: biosapiens
+subset: SOFA
+synonym: "binding_or_interaction_site" EXACT []
+synonym: "site" RELATED []
+xref: http://en.wikipedia.org/wiki/Binding_site "wiki"
+
+[Term]
+id: SO:0000417
+name: polypeptide_domain
+namespace: sequence
+alt_id: BS:00012
+alt_id: BS:00134
+alt_id: SO:0001069
+def: "A structurally or functionally defined protein region. In proteins with multiple domains, the combination of the domains determines the function of the protein. A region which has been shown to recur throughout evolution." [EBIBS:GAR]
+comment: Range. Old definition from before biosapiens: A region of a single polypeptide chain that folds into an independent unit and exhibits biological activity. A polypeptide chain may have multiple domains.
+subset: biosapiens
+synonym: "domain" BROAD BS [uniprot:feature_type]
+synonym: "polypeptide domain" EXACT []
+synonym: "polypeptide_structural_domain" EXACT BS []
+synonym: "structural domain" BROAD BS []
+is_a: SO:0001070 ! polypeptide_structural_region
+is_a: SO:0100021 ! polypeptide_conserved_region
+
+[Term]
+id: SO:0000418
+name: signal_peptide
+namespace: sequence
+alt_id: BS:00159
+def: "The signal_peptide is a short region of the peptide located at the N-terminus that directs the protein to be secreted or part of membrane components." [http://www.ebi.ac.uk/embl/Documentation/FT_definitions/feature_table.html]
+comment: Old def before biosapiens:The sequence for an N-terminal domain of a secreted protein; this domain is involved in attaching nascent polypeptide to the membrane leader sequence.
+subset: biosapiens
+subset: SOFA
+synonym: "signal" RELATED [uniprot:feature_type]
+synonym: "signal peptide" EXACT []
+synonym: "signal peptide coding sequence" EXACT []
+xref: http://en.wikipedia.org/wiki/Signal_peptide "wiki"
+is_a: SO:0000839 ! polypeptide_region
+relationship: part_of SO:0001062 ! propeptide
+
+[Term]
+id: SO:0000419
+name: mature_protein_region
+namespace: sequence
+alt_id: BS:00149
+def: "The polypeptide sequence that remains when the cleaved peptide regions have been cleaved from the immature peptide." [EBIBS:GAR, http://www.ebi.ac.uk/embl/Documentation/FT_definitions/feature_table.html, SO:cb]
+comment: This term mature peptide, merged with the biosapiens term mature protein region and took that to be the new name. Old def: The coding sequence for the mature or final peptide or protein product following post-translational modification.
+subset: biosapiens
+subset: SOFA
+synonym: "chain" RELATED [uniprot:feature_type]
+synonym: "mature peptide" RELATED []
+synonym: "mature protein region" EXACT []
+is_a: SO:0000839 ! polypeptide_region
+relationship: part_of SO:0001063 ! immature_peptide_region
+
+[Term]
+id: SO:0000691
+name: cleaved_initiator_methionine
+namespace: sequence
+alt_id: BS:00067
+def: "The initiator methionine that has been cleaved from a mature polypeptide sequence." [EBIBS:GAR]
+subset: biosapiens
+synonym: "cleaved initiator methionine" EXACT []
+synonym: "init_met" RELATED [uniprot:feature_type]
+synonym: "initiator methionine" RELATED []
+is_a: SO:0100011 ! cleaved_peptide_region
+
+[Term]
+id: SO:0000725
+name: transit_peptide
+namespace: sequence
+alt_id: BS:00055
+def: "The transit_peptide is a short region at the N-terminus of the peptide that directs the protein to an organelle (chloroplast, mitochondrion, microbody or cyanelle)." [http://www.ebi.ac.uk/embl/Documentation/FT_definitions/feature_table.html]
+comment: Added to bring SO inline with the EMBL, DDBJ, GenBank feature table. Old definition before biosapiens: The coding sequence for an N-terminal domain of a nuclear-encoded organellar protein. This domain is involved in post translational import of the protein into the organelle.
+subset: biosapiens
+subset: SOFA
+synonym: "signal" RELATED []
+synonym: "transit" RELATED [uniprot:feature_type]
+synonym: "transit peptide" EXACT []
+is_a: SO:0000839 ! polypeptide_region
+
+[Term]
+id: SO:0000839
+name: polypeptide_region
+namespace: sequence
+alt_id: BS:00124
+alt_id: BS:00331
+def: "Biological sequence region that can be assigned to a specific subsequence of a polypeptide." [SO:GAR, SO:ke]
+comment: Added to allow the polypeptide regions to have is_a paths back to the root.
+subset: biosapiens
+subset: SOFA
+synonym: "positional" RELATED []
+synonym: "positional polypeptide feature" RELATED []
+synonym: "region" NARROW [uniprot:feature_type]
+synonym: "region or site annotation" RELATED []
+synonym: "site" NARROW [uniprot:feature_type]
+
+[Term]
+id: SO:0000912
+name: asx_turn
+namespace: sequence
+alt_id: BS:00203
+def: "A motif of three consecutive residues and one H-bond in which: residue(i) is Aspartate or Asparagine (Asx), the side-chain O of residue(i) is H-bonded to the main-chain NH of residue(i+2)." [http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "asx turn" EXACT []
+is_a: SO:0001128 ! polypeptide_turn_motif
+
+[Term]
+id: SO:0001061
+name: propeptide_cleavage_site
+namespace: sequence
+alt_id: BS:00063
+def: "The propeptide_cleavage_site is the arginine/lysine boundary on a propeptide where cleavage occurs." [EBIBS:GAR]
+comment: Discrete.
+subset: biosapiens
+synonym: "propeptide cleavage site" EXACT []
+is_a: SO:0100011 ! cleaved_peptide_region
+relationship: part_of SO:0001062 ! propeptide
+
+[Term]
+id: SO:0001062
+name: propeptide
+namespace: sequence
+alt_id: BS:00077
+def: "Part of a peptide chain which is cleaved off during the formation of the mature protein." [EBIBS:GAR]
+comment: Range.
+subset: biosapiens
+synonym: "propep" RELATED [uniprot:feature_type]
+xref: http://en.wikipedia.org/wiki/Propeptide "wiki"
+is_a: SO:0100011 ! cleaved_peptide_region
+
+[Term]
+id: SO:0001063
+name: immature_peptide_region
+namespace: sequence
+alt_id: BS:00129
+def: "An immature_peptide_region is the extent of the peptide after it has been translated and before any processing occurs." [EBIBS:GAR]
+comment: Range.
+subset: biosapiens
+subset: SOFA
+synonym: "immature peptide region" EXACT []
+is_a: SO:0000839 ! polypeptide_region
+
+[Term]
+id: SO:0001064
+name: active_peptide
+namespace: sequence
+alt_id: BS:00076
+def: "Active peptides are proteins which are biologically active, released from a precursor molecule." [EBIBS:GAR, UniProt:curation_manual]
+comment: Hormones, neuropeptides, antimicrobial peptides, are active peptides. They are typically short (<40 amino acids) in length.
+subset: biosapiens
+synonym: "active peptide" EXACT []
+synonym: "peptide" BROAD [uniprot:feature_type]
+xref: http://en.wikipedia.org/wiki/Peptide "wiki"
+is_a: SO:0000419 ! mature_protein_region
+
+[Term]
+id: SO:0001066
+name: compositionally_biased_region_of_peptide
+namespace: sequence
+alt_id: BS:00068
+def: "Polypeptide region that is rich in a particular amino acid or homopolymeric and greater than three residues in length." [EBIBS:GAR, UniProt:curation_manual]
+comment: Range.
+subset: biosapiens
+synonym: "compbias" RELATED [uniprot:feature_type]
+synonym: "compositional bias" RELATED []
+synonym: "compositionally biased" RELATED []
+synonym: "compositionally biased region of peptide" RELATED []
+synonym: "compositionally_biased_region" EXACT []
+is_a: SO:0000839 ! polypeptide_region
+
+[Term]
+id: SO:0001067
+name: polypeptide_motif
+namespace: sequence
+alt_id: BS:00032
+def: "A sequence motif is a short (up to 20 amino acids) region of biological interest. Such motifs, although they are too short to constitute functional domains, share sequence similarities and are conserved in different proteins. They display a common function (protein-binding, subcellular location etc.)." [EBIBS:GAR, UniProt:curation_manual]
+comment: Range.
+subset: biosapiens
+synonym: "motif" BROAD [uniprot:feature_type]
+synonym: "polypeptide motif" EXACT []
+is_a: SO:0100021 ! polypeptide_conserved_region
+
+[Term]
+id: SO:0001068
+name: polypeptide_repeat
+namespace: sequence
+alt_id: BS:00070
+def: "A polypeptide_repeat is a single copy of an internal sequence repetition." [EBIBS:GAR]
+comment: Range.
+subset: biosapiens
+synonym: "polypeptide repeat" EXACT []
+synonym: "repeat" RELATED [uniprot:feature_type]
+is_a: SO:0100021 ! polypeptide_conserved_region
+
+[Term]
+id: SO:0001070
+name: polypeptide_structural_region
+namespace: sequence
+alt_id: BS:00337
+def: "Region of polypeptide with a given structural property." [EBIBS:GAR, SO:cb]
+comment: Range.
+subset: biosapiens
+synonym: "polypeptide structural region" EXACT []
+synonym: "structural_region" RELATED []
+is_a: SO:0000839 ! polypeptide_region
+
+[Term]
+id: SO:0001071
+name: membrane_structure
+namespace: sequence
+alt_id: BS:00128
+def: "Arrangement of the polypeptide with respect to the lipid bilayer." [EBIBS:GAR]
+comment: Range.
+subset: biosapiens
+synonym: "membrane structure" EXACT []
+is_a: SO:0001070 ! polypeptide_structural_region
+
+[Term]
+id: SO:0001072
+name: extramembrane_polypeptide_region
+namespace: sequence
+alt_id: BS:00154
+def: "Polypeptide region that is localized outside of a lipid bilayer." [EBIBS:GAR, SO:cb]
+comment: Range.
+subset: biosapiens
+synonym: "extramembrane" RELATED BS []
+synonym: "extramembrane polypeptide region" EXACT []
+synonym: "extramembrane_region" RELATED BS []
+synonym: "topo_dom" RELATED BS [uniprot:feature_type]
+is_a: SO:0001070 ! polypeptide_structural_region
+relationship: part_of SO:0001071 ! membrane_structure
+
+[Term]
+id: SO:0001073
+name: cytoplasmic_polypeptide_region
+namespace: sequence
+alt_id: BS:00145
+def: "Polypeptide region that is localized inside the cytoplasm." [EBIBS:GAR, SO:cb]
+subset: biosapiens
+synonym: "cytoplasm_location" EXACT BS []
+synonym: "cytoplasmic polypeptide region" EXACT []
+synonym: "inside" RELATED BS []
+is_a: SO:0001072 ! extramembrane_polypeptide_region
+
+[Term]
+id: SO:0001074
+name: non_cytoplasmic_polypeptide_region
+namespace: sequence
+alt_id: BS:00144
+def: "Polypeptide region that is localized outside of a lipid bilayer and outside of the cytoplasm." [EBIBS:GAR, SO:cb]
+comment: This could be inside an organelle within the cell.
+subset: biosapiens
+synonym: "non cytoplasmic polypeptide region" EXACT []
+synonym: "non_cytoplasm_location" EXACT BS []
+synonym: "outside" RELATED BS []
+is_a: SO:0001072 ! extramembrane_polypeptide_region
+
+[Term]
+id: SO:0001075
+name: intramembrane_polypeptide_region
+namespace: sequence
+alt_id: BS:00156
+def: "Polypeptide region present in the lipid bilayer." [EBIBS:GAR]
+subset: biosapiens
+synonym: "intramembrane" RELATED BS []
+synonym: "intramembrane polypeptide region" EXACT []
+is_a: SO:0001070 ! polypeptide_structural_region
+relationship: part_of SO:0001071 ! membrane_structure
+
+[Term]
+id: SO:0001076
+name: membrane_peptide_loop
+namespace: sequence
+alt_id: BS:00155
+def: "Polypeptide region localized within the lipid bilayer where both ends traverse the same membrane." [EBIBS:GAR, SO:cb]
+subset: biosapiens
+synonym: "membrane peptide loop" EXACT []
+synonym: "membrane_loop" RELATED BS []
+is_a: SO:0001075 ! intramembrane_polypeptide_region
+
+[Term]
+id: SO:0001077
+name: transmembrane_polypeptide_region
+namespace: sequence
+alt_id: BS:00158
+def: "Polypeptide region traversing the lipid bilayer." [EBIBS:GAR, UniProt:curator_manual]
+subset: biosapiens
+synonym: "transmem" RELATED BS [uniprot:feature_type]
+synonym: "transmembrane" RELATED BS []
+synonym: "transmembrane polypeptide region" EXACT []
+is_a: SO:0001075 ! intramembrane_polypeptide_region
+
+[Term]
+id: SO:0001078
+name: polypeptide_secondary_structure
+namespace: sequence
+alt_id: BS:00003
+def: "A region of peptide with secondary structure has hydrogen bonding along the peptide chain that causes a defined conformation of the chain." [EBIBS:GAR]
+comment: Biosapien term was secondary_structure.
+subset: biosapiens
+synonym: "2nary structure" RELATED BS []
+synonym: "polypeptide secondary structure" EXACT []
+synonym: "secondary structure" RELATED BS []
+synonym: "secondary structure region" RELATED BS []
+synonym: "secondary_structure" RELATED BS []
+xref: http://en.wikipedia.org/wiki/Secondary_structure "wiki"
+is_a: SO:0001070 ! polypeptide_structural_region
+
+[Term]
+id: SO:0001079
+name: polypeptide_structural_motif
+namespace: sequence
+alt_id: BS:0000338
+def: "Motif is a three-dimensional structural element within the chain, which appears also in a variety of other molecules. Unlike a domain, a motif does not need to form a stable globular unit." [EBIBS:GAR]
+subset: biosapiens
+synonym: "polypeptide structural motif" RELATED []
+synonym: "structural_motif" RELATED BS []
+xref: http://en.wikipedia.org/wiki/Structural_motif "wiki"
+is_a: SO:0001070 ! polypeptide_structural_region
+
+[Term]
+id: SO:0001080
+name: coiled_coil
+namespace: sequence
+alt_id: BS:00041
+def: "A coiled coil is a structural motif in proteins, in which alpha-helices are coiled together like the strands of a rope." [EBIBS:GAR, UniProt:curation_manual]
+comment: Range.
+subset: biosapiens
+synonym: "coiled" RELATED BS [uniprot:feature_type]
+synonym: "coiled coil" EXACT []
+xref: http://en.wikipedia.org/wiki/Coiled_coil "wiki"
+is_a: SO:0001079 ! polypeptide_structural_motif
+
+[Term]
+id: SO:0001081
+name: helix_turn_helix
+namespace: sequence
+alt_id: BS:00147
+def: "A motif comprising two helices separated by a turn." [EBIBS:GAR]
+subset: biosapiens
+synonym: "helix turn helix" EXACT []
+synonym: "helix-turn-helix" EXACT []
+synonym: "HTH" RELATED BS []
+is_a: SO:0001079 ! polypeptide_structural_motif
+relationship: has_part SO:0001114 ! peptide_helix
+relationship: has_part SO:0001128 ! polypeptide_turn_motif
+
+[Term]
+id: SO:0001082
+name: polypeptide_sequencing_information
+namespace: sequence
+alt_id: BS:00125
+def: "Incompatibility in the sequence due to some experimental problem." [EBIBS:GAR]
+comment: Range.
+subset: biosapiens
+synonym: "sequencing_information" EXACT []
+
+[Term]
+id: SO:0001083
+name: non_adjacent_residues
+namespace: sequence
+alt_id: BS:00182
+def: "Indicates that two consecutive residues in a fragment sequence are not consecutive in the full-length protein and that there are a number of unsequenced residues between them." [EBIBS:GAR, UniProt:curation_manual]
+subset: biosapiens
+synonym: "non consecutive" EXACT []
+synonym: "non_cons" EXACT [uniprot:feature_type]
+is_a: SO:0001082 ! polypeptide_sequencing_information
+
+[Term]
+id: SO:0001084
+name: non_terminal_residue
+namespace: sequence
+alt_id: BS:00072
+def: "The residue at an extremity of the sequence is not the terminal residue." [EBIBS:GAR, UniProt:curation_manual]
+comment: Discrete.
+subset: biosapiens
+synonym: "non terminal" EXACT []
+synonym: "non_ter" EXACT [uniprot:feature_type]
+is_a: SO:0001082 ! polypeptide_sequencing_information
+
+[Term]
+id: SO:0001085
+name: sequence_conflict
+namespace: sequence
+alt_id: BS:00069
+def: "Different sources report differing sequences." [EBIBS:GAR, UniProt:curation_manual]
+comment: Discrete.
+subset: biosapiens
+synonym: "conflict" EXACT [uniprot:feature_type]
+is_a: SO:0001082 ! polypeptide_sequencing_information
+
+[Term]
+id: SO:0001086
+name: sequence_uncertainty
+namespace: sequence
+alt_id: BS:00181
+def: "Describes the positions in a sequence where the authors are unsure about the sequence assignment." [EBIBS:GAR, UniProt:curation_manual]
+subset: biosapiens
+synonym: "unsure" EXACT [uniprot:feature_type]
+is_a: SO:0001082 ! polypeptide_sequencing_information
+
+[Term]
+id: SO:0001087
+name: cross_link
+namespace: sequence
+alt_id: BS:00178
+def: "Posttranslationally formed amino acid bonds." [EBIBS:GAR, UniProt:curation_manual]
+subset: biosapiens
+synonym: "cross link" EXACT []
+synonym: "crosslink" RELATED []
+is_obsolete: true
+
+[Term]
+id: SO:0001088
+name: disulfide_bond
+namespace: sequence
+alt_id: BS:00028
+def: "The covalent bond between sulfur atoms that binds two peptide chains or different parts of one peptide chain and is a structural determinant in many protein molecules." [EBIBS:GAR, UniProt:curation_manual]
+comment: 2 discreet & joined.
+subset: biosapiens
+synonym: "disulfid" RELATED []
+synonym: "disulfide" RELATED []
+synonym: "disulfide bond" RELATED []
+synonym: "disulphide" EXACT []
+synonym: "disulphide bond" RELATED []
+is_obsolete: true
+
+[Term]
+id: SO:0001089
+name: post_translationally_modified_region
+namespace: sequence
+alt_id: BS:00052
+def: "A region where a transformation occurs in a protein after it has been synthesized. This which may regulate, stabilize, crosslink or introduce new chemical functionalities in the protein." [EBIBS:GAR, UniProt:curation_manual]
+comment: Discrete.
+subset: biosapiens
+synonym: "mod_res" EXACT [uniprot:feature_type]
+synonym: "modified residue" EXACT []
+synonym: "post_translational_modification" EXACT []
+xref: http://en.wikipedia.org/wiki/Post_translational_modification "wiki"
+is_a: SO:0100001 ! biochemical_region_of_peptide
+
+[Term]
+id: SO:0001090
+name: covalent_binding_site
+namespace: sequence
+alt_id: BS:00246
+def: "Binding involving a covalent bond." [EBIBS:GAR]
+subset: biosapiens
+synonym: "covalent binding site" EXACT []
+is_obsolete: true
+
+[Term]
+id: SO:0001091
+name: non_covalent_binding_site
+namespace: sequence
+alt_id: BS:00029
+def: "Binding site for any chemical group (co-enzyme, prosthetic group, etc.)." [EBIBS:GAR]
+comment: Discrete.
+subset: biosapiens
+synonym: "binding" RELATED [uniprot:curation]
+synonym: "binding site" RELATED []
+synonym: "non covalent binding site" EXACT []
+is_obsolete: true
+
+[Term]
+id: SO:0001092
+name: polypeptide_metal_contact
+namespace: sequence
+alt_id: BS:00027
+def: "A binding site that, in the polypeptide molecule, interacts selectively and non-covalently with metal ions." [EBIBS:GAR, SO:cb, UniProt:curation_manual]
+comment: Residue is part of a binding site for a metal ion.
+subset: biosapiens
+synonym: "metal_binding" RELATED []
+is_a: SO:0000409 ! binding_site
+is_a: SO:0100002 ! molecular_contact_region
+
+[Term]
+id: SO:0001093
+name: protein_protein_contact
+namespace: sequence
+alt_id: BS:00131
+def: "A binding site that, in the protein molecule, interacts selectively and non-covalently with polypeptide residues." [EBIBS:GAR, UniProt:Curation_manual]
+subset: biosapiens
+synonym: "protein protein contact" EXACT []
+synonym: "protein protein contact site" EXACT []
+synonym: "protein_protein_interaction" RELATED []
+xref: http://en.wikipedia.org/wiki/Protein_protein_interaction "wiki"
+is_a: SO:0000409 ! binding_site
+is_a: SO:0100002 ! molecular_contact_region
+
+[Term]
+id: SO:0001094
+name: polypeptide_calcium_ion_contact_site
+namespace: sequence
+alt_id: BS:00186
+def: "A binding site that, in the polypeptide molecule, interacts selectively and non-covalently with calcium ions." [EBIBS:GAR]
+comment: Residue involved in contact with calcium.
+subset: biosapiens
+synonym: "ca bind" RELATED []
+synonym: "ca_bind" EXACT BS [uniprot:feature_type]
+synonym: "Ca_contact_site" EXACT []
+synonym: "polypeptide calcium ion contact site" EXACT []
+is_a: SO:0001092 ! polypeptide_metal_contact
+
+[Term]
+id: SO:0001095
+name: polypeptide_cobalt_ion_contact_site
+namespace: sequence
+alt_id: BS:00136
+def: "A binding site that, in the polypeptide molecule, interacts selectively and non-covalently with cobalt ions." [EBIBS:GAR, SO:cb]
+subset: biosapiens
+synonym: "Co_contact_site" EXACT []
+synonym: "polypeptide cobalt ion contact site" EXACT []
+is_a: SO:0001092 ! polypeptide_metal_contact
+
+[Term]
+id: SO:0001096
+name: polypeptide_copper_ion_contact_site
+namespace: sequence
+alt_id: BS:00146
+def: "A binding site that, in the polypeptide molecule, interacts selectively and non-covalently with copper ions." [EBIBS:GAR, SO:cb]
+subset: biosapiens
+synonym: "Cu_contact_site" EXACT []
+synonym: "polypeptide copper ion contact site" EXACT []
+is_a: SO:0001092 ! polypeptide_metal_contact
+
+[Term]
+id: SO:0001097
+name: polypeptide_iron_ion_contact_site
+namespace: sequence
+alt_id: BS:00137
+def: "A binding site that, in the polypeptide molecule, interacts selectively and non-covalently with iron ions." [EBIBS:GAR, SO:cb]
+subset: biosapiens
+synonym: "Fe_contact_site" EXACT []
+synonym: "polypeptide iron ion contact site" EXACT []
+is_a: SO:0001092 ! polypeptide_metal_contact
+
+[Term]
+id: SO:0001098
+name: polypeptide_magnesium_ion_contact_site
+namespace: sequence
+alt_id: BS:00187
+def: "A binding site that, in the polypeptide molecule, interacts selectively and non-covalently with magnesium ions." [EBIBS:GAR, SO:cb]
+subset: biosapiens
+synonym: "Mg_contact_site" EXACT []
+synonym: "polypeptide magnesium ion contact site" EXACT []
+is_a: SO:0001092 ! polypeptide_metal_contact
+
+[Term]
+id: SO:0001099
+name: polypeptide_manganese_ion_contact_site
+namespace: sequence
+alt_id: BS:00140
+def: "A binding site that, in the polypeptide molecule, interacts selectively and non-covalently with manganese ions." [EBIBS:GAR, SO:cb]
+subset: biosapiens
+synonym: "Mn_contact_site" EXACT []
+synonym: "polypeptide manganese ion contact site" EXACT []
+is_a: SO:0001092 ! polypeptide_metal_contact
+
+[Term]
+id: SO:0001100
+name: polypeptide_molybdenum_ion_contact_site
+namespace: sequence
+alt_id: BS:00141
+def: "A binding site that, in the polypeptide molecule, interacts selectively and non-covalently with molybdenum ions." [EBIBS:GAR, SO:cb]
+subset: biosapiens
+synonym: "Mo_contact_site" EXACT []
+synonym: "polypeptide molybdenum ion contact site" EXACT []
+is_a: SO:0001092 ! polypeptide_metal_contact
+
+[Term]
+id: SO:0001101
+name: polypeptide_nickel_ion_contact_site
+namespace: sequence
+alt_id: BS:00142
+def: "A binding site that, in the polypeptide molecule, interacts selectively and non-covalently with nickel ions." [EBIBS:GAR]
+subset: biosapiens
+synonym: "Ni_contact_site" EXACT []
+synonym: "polypeptide nickel ion contact site" EXACT []
+is_a: SO:0001092 ! polypeptide_metal_contact
+
+[Term]
+id: SO:0001102
+name: polypeptide_tungsten_ion_contact_site
+namespace: sequence
+alt_id: BS:00143
+def: "A binding site that, in the polypeptide molecule, interacts selectively and non-covalently with tungsten ions." [EBIBS:GAR, SO:cb]
+subset: biosapiens
+synonym: "polypeptide tungsten ion contact site" EXACT []
+synonym: "W_contact_site" EXACT []
+is_a: SO:0001092 ! polypeptide_metal_contact
+
+[Term]
+id: SO:0001103
+name: polypeptide_zinc_ion_contact_site
+namespace: sequence
+alt_id: BS:00185
+def: "A binding site that, in the polypeptide molecule, interacts selectively and non-covalently with zinc ions." [EBIBS:GAR, SO:cb]
+subset: biosapiens
+synonym: "polypeptide zinc ion contact site" EXACT []
+synonym: "Zn_contact_site" EXACT []
+is_a: SO:0001092 ! polypeptide_metal_contact
+
+[Term]
+id: SO:0001104
+name: catalytic_residue
+namespace: sequence
+alt_id: BS:00026
+def: "Amino acid involved in the activity of an enzyme." [EBIBS:GAR, UniProt:curation_manual]
+comment: Discrete.
+subset: biosapiens
+synonym: "act_site" RELATED [uniprot:feature_type]
+synonym: "active site residue" EXACT []
+synonym: "catalytic residue" EXACT []
+relationship: part_of SO:0100019 ! polypeptide_catalytic_motif
+
+[Term]
+id: SO:0001105
+name: polypeptide_ligand_contact
+namespace: sequence
+alt_id: BS:00157
+def: "Residues which interact with a ligand." [EBIBS:GAR]
+subset: biosapiens
+synonym: "polypeptide ligand contact" EXACT []
+synonym: "protein-ligand interaction" RELATED []
+is_a: SO:0000409 ! binding_site
+is_a: SO:0100002 ! molecular_contact_region
+
+[Term]
+id: SO:0001106
+name: asx_motif
+namespace: sequence
+alt_id: BS:00202
+def: "A motif of five consecutive residues and two H-bonds in which: Residue(i) is Aspartate or Asparagine (Asx), side-chain O of residue(i) is H-bonded to the main-chain NH of residue(i+2) or (i+3), main-chain CO of residue(i) is H-bonded to the main-chain NH of residue(i+3) or (i+4)." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "asx motif" EXACT []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0001107
+name: beta_bulge
+namespace: sequence
+alt_id: BS:00208
+def: "A motif of three residues within a beta-sheet in which the main chains of two consecutive residues are H-bonded to that of the third, and in which the dihedral angles are as follows: Residue(i): -140 degrees < phi(l) -20 degrees , -90 degrees < psi(l) < 40 degrees. Residue (i+1): -180 degrees < phi < -25 degrees or +120 degrees < phi < +180 degrees, +40 degrees < psi < +180 degrees or -180 degrees < psi < -120 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "beta bulge" EXACT []
+xref: http://en.wikipedia.org/wiki/Beta_bulge "wiki"
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0001108
+name: beta_bulge_loop
+namespace: sequence
+alt_id: BS:00209
+def: "A motif of three residues within a beta-sheet consisting of two H-bonds. Beta bulge loops often occur at the loop ends of beta-hairpins." [EBIBS:GAR, Http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "beta bulge loop" EXACT []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0001109
+name: beta_bulge_loop_five
+namespace: sequence
+alt_id: BS:00210
+def: "A motif of three residues within a beta-sheet consisting of two H-bonds in which: the main-chain NH of residue(i) is H-bonded to the main-chain CO of residue(i+4), the main-chain CO of residue i is H-bonded to the main-chain NH of residue(i+3), these loops have an RL nest at residues i+2 and i+3." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "beta bulge loop five" EXACT []
+is_a: SO:0001108 ! beta_bulge_loop
+
+[Term]
+id: SO:0001110
+name: beta_bulge_loop_six
+namespace: sequence
+alt_id: BS:00211
+def: "A motif of three residues within a beta-sheet consisting of two H-bonds in which: the main-chain NH of residue(i) is H-bonded to the main-chain CO of residue(i+5), the main-chain CO of residue i is H-bonded to the main-chain NH of residue(i+4), these loops have an RL nest at residues i+3 and i+4." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "beta bulge loop six" EXACT []
+is_a: SO:0001108 ! beta_bulge_loop
+
+[Term]
+id: SO:0001111
+name: beta_strand
+namespace: sequence
+alt_id: BS:00042
+def: "A beta strand describes a single length of polypeptide chain that forms part of a beta sheet. A single continuous stretch of amino acids adopting an extended conformation of hydrogen bonds between the N-O and the C=O of another part of the peptide. This forms a secondary protein structure in which two or more extended polypeptide regions are hydrogen-bonded to one another in a planar array." [EBIBS:GAR, UniProt:curation_manual]
+comment: Range.
+subset: biosapiens
+synonym: "strand" RELATED BS [uniprot:feature_type]
+xref: http://en.wikipedia.org/wiki/Beta_sheet "wiki"
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0001112
+name: antiparallel_beta_strand
+namespace: sequence
+alt_id: BS:0000341
+def: "A peptide region which hydrogen bonded to another region of peptide running in the oposite direction (one running N-terminal to C-terminal and one running C-terminal to N-terminal). Hydrogen bonding occurs between every other C=O from one strand to every other N-H on the adjacent strand. In this case, if two atoms C-alpha (i) and C-alpha (j) are adjacent in two hydrogen-bonded beta strands, then they form two mutual backbone hydrogen bonds to each other's flanking peptide groups; this is known as a close pair of hydrogen bonds. The peptide backbone dihedral angles (phi, psi) are about (-140 degrees, 135 degrees) in antiparallel sheets." [EBIBS:GAR, UniProt:curation_manual]
+comment: Range.
+subset: biosapiens
+synonym: "antiparallel beta strand" EXACT []
+is_a: SO:0001111 ! beta_strand
+
+[Term]
+id: SO:0001113
+name: parallel_beta_strand
+namespace: sequence
+alt_id: BS:00151
+def: "A peptide region which hydrogen bonded to another region of peptide running in the oposite direction (both running N-terminal to C-terminal). This orientation is slightly less stable because it introduces nonplanarity in the inter-strand hydrogen bonding pattern. Hydrogen bonding occurs between every other C=O from one strand to every other N-H on the adjacent strand. In this case, if two atoms C-alpha (i)and C-alpha (j) are adjacent in two hydrogen-bonded beta strands, then they do not hydrogen bond to each other; rather, one residue forms hydrogen bonds to the residues that flank the other (but not vice versa). For example, residue i may form hydrogen bonds to residues j - 1 and j + 1; this is known as a wide pair of hydrogen bonds. By contrast, residue j may hydrogen-bond to different residues altogether, or to none at all. The dihedral angles (phi, psi) are about (-120 degrees, 115 degrees) in parallel sheets." [EBIBS:GAR, UniProt:curation_manual]
+comment: Range.
+subset: biosapiens
+synonym: "parallel beta strand" EXACT []
+is_a: SO:0001111 ! beta_strand
+
+[Term]
+id: SO:0001114
+name: peptide_helix
+namespace: sequence
+alt_id: BS:00152
+def: "A helix is a secondary_structure conformation where the peptide backbone forms a coil." [EBIBS:GAR]
+comment: Range.
+subset: biosapiens
+synonym: "helix" RELATED BS []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0001115
+name: left_handed_peptide_helix
+namespace: sequence
+alt_id: BS:00222
+def: "A left handed helix is a region of peptide where the coiled conformation turns in an anticlockwise, left handed screw." [EBIBS:GAR]
+subset: biosapiens
+synonym: "helix-l" RELATED []
+synonym: "left handed helix" EXACT []
+is_a: SO:0001114 ! peptide_helix
+
+[Term]
+id: SO:0001116
+name: right_handed_peptide_helix
+namespace: sequence
+alt_id: BS:0000339
+def: "A right handed helix is a region of peptide where the coiled conformation turns in a clockwise, right handed screw." [EBIBS:GAR]
+subset: biosapiens
+synonym: "helix" RELATED BS []
+synonym: "right handed helix" EXACT []
+is_a: SO:0001114 ! peptide_helix
+
+[Term]
+id: SO:0001117
+name: alpha_helix
+namespace: sequence
+alt_id: BS:00040
+def: "The helix has 3.6 residues per turn which corresponds to a translation of 1.5 angstroms (= 0.15 nm) along the helical axis. Every backbone N-H group donates a hydrogen bond to the backbone C=O group of the amino acid four residues earlier." [EBIBS:GAR]
+comment: Range.
+subset: biosapiens
+synonym: "a-helix" RELATED BS []
+synonym: "helix" RELATED BS [uniprot:feature_type]
+xref: http://en.wikipedia.org/wiki/Alpha_helix "wiki"
+is_a: SO:0001116 ! right_handed_peptide_helix
+
+[Term]
+id: SO:0001118
+name: pi_helix
+namespace: sequence
+alt_id: BS:00153
+def: "The pi helix has 4.1 residues per turn and a translation of 1.15  (=0.115 nm) along the helical axis. The N-H group of an amino acid forms a hydrogen bond with the C=O group of the amino acid five residues earlier." [EBIBS:GAR]
+comment: Range.
+subset: biosapiens
+synonym: "pi helix" EXACT []
+xref: http://en.wikipedia.org/wiki/Pi_helix "wiki"
+is_a: SO:0001116 ! right_handed_peptide_helix
+
+[Term]
+id: SO:0001119
+name: three_ten_helix
+namespace: sequence
+alt_id: BS:0000340
+def: "The 3-10 helix has 3 residues per turn with a translation of 2.0 angstroms (=0.2 nm) along the helical axis. The N-H group of an amino acid forms a hydrogen bond with the C=O group of the amino acid three residues earlier." [EBIBS:GAR]
+comment: Range.
+subset: biosapiens
+synonym: "3(10) helix" EXACT []
+synonym: "3-10 helix" EXACT []
+synonym: "310 helix" EXACT []
+synonym: "three ten helix" EXACT []
+xref: http://en.wikipedia.org/wiki/310_helix "wiki"
+is_a: SO:0001116 ! right_handed_peptide_helix
+
+[Term]
+id: SO:0001120
+name: polypeptide_nest_motif
+namespace: sequence
+alt_id: BS:00223
+def: "A motif of two consecutive residues with dihedral angles. Nest should not have Proline as any residue. Nests frequently occur as parts of other motifs such as Schellman loops." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "nest" RELATED BS []
+synonym: "nest_motif" EXACT []
+synonym: "polypeptide nest motif" RELATED []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0001121
+name: polypeptide_nest_left_right_motif
+namespace: sequence
+alt_id: BS:00224
+def: "A motif of two consecutive residues with dihedral angles: Residue(i): +20 degrees < phi < +140 degrees, -40 degrees < psi < +90 degrees. Residue(i+1): -140 degrees < phi < -20 degrees, -90 degrees < psi < +40 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "nest_left_right" EXACT []
+synonym: "nest_lr" EXACT []
+synonym: "polypeptide nest left right motif" EXACT []
+is_a: SO:0001120 ! polypeptide_nest_motif
+
+[Term]
+id: SO:0001122
+name: polypeptide_nest_right_left_motif
+namespace: sequence
+alt_id: BS:00225
+def: "A motif of two consecutive residues with dihedral angles: Residue(i): -140 degrees < phi < -20 degrees, -90 degrees < psi < +40 degrees. Residue(i+1): +20 degrees < phi < +140 degrees, -40 degrees < psi < +90 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "nest_right_left" EXACT []
+synonym: "nest_rl" EXACT []
+synonym: "polypeptide nest right left motif" EXACT []
+is_a: SO:0001120 ! polypeptide_nest_motif
+
+[Term]
+id: SO:0001123
+name: schellmann_loop
+namespace: sequence
+alt_id: BS:00226
+def: "A motif of six or seven consecutive residues that contains two H-bonds." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "paperclip" RELATED BS []
+synonym: "paperclip loop" RELATED []
+synonym: "schellmann loop" EXACT []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0001124
+name: schellmann_loop_seven
+namespace: sequence
+alt_id: BS:00228
+def: "Wild type: A motif of seven consecutive residues that contains two H-bonds in which: the main-chain CO of residue(i) is H-bonded to the main-chain NH of residue(i+6), the main-chain CO of residue(i+1) is H-bonded to the main-chain NH of residue(i+5)." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "schellmann loop seven" EXACT []
+synonym: "seven-residue schellmann loop" EXACT []
+is_a: SO:0001123 ! schellmann_loop
+
+[Term]
+id: SO:0001125
+name: schellmann_loop_six
+namespace: sequence
+alt_id: BS:00227
+def: "Common Type: A motif of six consecutive residues that contains two H-bonds in which: the main-chain CO of residue(i) is H-bonded to the main-chain NH of residue(i+5) the main-chain CO of residue(i+1) is H-bonded to the main-chain NH of residue(i+4)." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "schellmann loop six" EXACT []
+synonym: "six-residue schellmann loop" EXACT []
+is_a: SO:0001123 ! schellmann_loop
+
+[Term]
+id: SO:0001126
+name: serine_threonine_motif
+namespace: sequence
+alt_id: BS:00229
+def: "A motif of five consecutive residues and two hydrogen bonds in which: residue(i) is Serine (S) or Threonine (T), the side-chain O of residue(i) is H-bonded to the main-chain NH of residue(i+2) or (i+3) , the main-chain CO group of residue(i) is H-bonded to the main-chain NH of residue(i+3) or (i+4)." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "serine/threonine motif" EXACT []
+synonym: "st motif" EXACT []
+synonym: "st_motif" EXACT []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0001127
+name: serine_threonine_staple_motif
+namespace: sequence
+alt_id: BS:00230
+def: "A motif of four or five consecutive residues and one H-bond in which: residue(i) is Serine (S) or Threonine (T), the side-chain OH of residue(i) is H-bonded to the main-chain CO of residue(i3) or (i4), Phi angles of residues(i1), (i2) and (i3) are negative." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "serine threonine staple motif" EXACT []
+synonym: "st_staple" EXACT []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0001128
+name: polypeptide_turn_motif
+namespace: sequence
+alt_id: BS:00148
+def: "A reversal in the direction of the backbone of a protein that is stabilized by hydrogen bond between backbone NH and CO groups, involving no more than 4 amino acid residues." [EBIBS:GAR, uniprot:feature_type]
+comment: Range.
+subset: biosapiens
+synonym: "turn" RELATED BS []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0001129
+name: asx_turn_left_handed_type_one
+namespace: sequence
+alt_id: BS:00206
+def: "Left handed type I (dihedral angles):- Residue(i): -140 degrees < chi (1) -120 degrees < -20 degrees, -90 degrees < psi +120 degrees < +40 degrees. Residue(i+1): -140 degrees < phi < -20 degrees, -90 degrees < psi < +40 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "asx turn left handed type one" EXACT []
+synonym: "asx_turn_il" RELATED []
+is_a: SO:0000912 ! asx_turn
+
+[Term]
+id: SO:0001130
+name: asx_turn_left_handed_type_two
+namespace: sequence
+alt_id: BS:00204
+def: "Left handed type II (dihedral angles):- Residue(i): -140 degrees < chi (1) -120 degrees < -20 degrees, +80 degrees < psi +120 degrees < +180 degrees. Residue(i+1): +20 degrees < phi < +140 degrees, -40 degrees < psi < +90 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "asx turn left handed type two" EXACT []
+synonym: "asx_turn_iil" EXACT []
+is_a: SO:0000912 ! asx_turn
+
+[Term]
+id: SO:0001131
+name: asx_turn_right_handed_type_two
+namespace: sequence
+alt_id: BS:00205
+def: "Right handed type II (dihedral angles):- Residue(i): -140 degrees < chi (1) -120 degrees < -20 degrees, +80 degrees < psi +120 degrees < +180 degrees. Residue(i+1): +20 degrees < phi < +140 degrees, -40 degrees < psi < +90 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "asx turn right handed type two" EXACT []
+synonym: "asx_turn_iir" EXACT []
+is_a: SO:0000912 ! asx_turn
+
+[Term]
+id: SO:0001132
+name: asx_turn_right_handed_type_one
+namespace: sequence
+alt_id: BS:00207
+def: "Right handed type I (dihedral angles):- Residue(i): -140 degrees < chi (1) -120 degrees < -20 degrees, -90 degrees < psi +120 degrees < +40 degrees. Residue(i+1): -140 degrees < phi < -20 degrees, -90 degrees < psi < +40 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "asx turn type right handed type one" EXACT []
+synonym: "asx_turn_ir" EXACT []
+is_a: SO:0000912 ! asx_turn
+
+[Term]
+id: SO:0001133
+name: beta_turn
+namespace: sequence
+alt_id: BS:00212
+def: "A motif of four consecutive residues that may contain one H-bond, which, if present, is between the main-chain CO of the first residue and the main-chain NH of the fourth. It is characterized by the dihedral angles of the second and third residues, which are the basis for sub-categorization." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "beta turn" EXACT []
+is_a: SO:0001128 ! polypeptide_turn_motif
+
+[Term]
+id: SO:0001134
+name: beta_turn_left_handed_type_one
+namespace: sequence
+alt_id: BS:00215
+def: "Left handed type I:A motif of four consecutive residues that may contain one H-bond, which, if present, is between the main-chain CO of the first residue and the main-chain NH of the fourth. It is characterized by the dihedral angles:- Residue(i+1): -140 degrees > phi > -20 degrees, -90 degrees > psi > +40 degrees. Residue(i+2): -140 degrees > phi > -20 degrees, -90 degrees > psi > +40 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "beta turn left handed type one" EXACT []
+synonym: "beta_turn_il" EXACT []
+synonym: "type I' beta turn" EXACT []
+synonym: "type I' turn" EXACT []
+is_a: SO:0001133 ! beta_turn
+
+[Term]
+id: SO:0001135
+name: beta_turn_left_handed_type_two
+namespace: sequence
+alt_id: BS:00213
+def: "Left handed type II: A motif of four consecutive residues that may contain one H-bond, which, if present, is between the main-chain CO of the first residue and the main-chain NH of the fourth. It is characterized by the dihedral angles: Residue(i+1): -140 degrees > phi > -20 degrees, +80 degrees > psi > +180 degrees. Residue(i+2): +20 degrees > phi > +140 degrees, -40 degrees > psi > +90 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "beta turn left handed type two" EXACT []
+synonym: "beta_turn_iil" EXACT []
+synonym: "type II' beta turn" EXACT []
+synonym: "type II' turn" EXACT []
+is_a: SO:0001133 ! beta_turn
+
+[Term]
+id: SO:0001136
+name: beta_turn_right_handed_type_one
+namespace: sequence
+alt_id: BS:00216
+def: "Right handed type I:A motif of four consecutive residues that may contain one H-bond, which, if present, is between the main-chain CO of the first residue and the main-chain NH of the fourth. It is characterized by the dihedral angles: Residue(i+1): -140 degrees < phi < -20 degrees, -90 degrees < psi < +40 degrees. Residue(i+2): -140 degrees < phi < -20 degrees, -90 degrees < psi < +40 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "beta turn right handed type one" EXACT []
+synonym: "beta_turn_ir" EXACT []
+synonym: "type I beta turn" EXACT []
+synonym: "type I turn" EXACT []
+is_a: SO:0001133 ! beta_turn
+
+[Term]
+id: SO:0001137
+name: beta_turn_right_handed_type_two
+namespace: sequence
+alt_id: BS:00214
+def: "Right handed type II:A motif of four consecutive residues that may contain one H-bond, which, if present, is between the main-chain CO of the first residue and the main-chain NH of the fourth. It is characterized by the dihedral angles: Residue(i+1): -140 degrees < phi < -20 degrees, +80 degrees < psi < +180 degrees. Residue(i+2): +20 degrees < phi < +140 degrees, -40 degrees < psi < +90 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "beta turn right handed type two" EXACT []
+synonym: "beta_turn_iir" EXACT []
+synonym: "type II beta turn" EXACT []
+synonym: "type II turn" EXACT []
+is_a: SO:0001133 ! beta_turn
+
+[Term]
+id: SO:0001138
+name: gamma_turn
+namespace: sequence
+alt_id: BS:00219
+def: "Gamma turns, defined for 3 residues i,( i+1),( i+2) if a hydrogen bond exists between residues i and i+2 and the phi and psi angles of residue i+1 fall within 40 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "gamma turn" EXACT []
+is_a: SO:0001128 ! polypeptide_turn_motif
+
+[Term]
+id: SO:0001139
+name: gamma_turn_classic
+namespace: sequence
+alt_id: BS:00220
+def: "Gamma turns, defined for 3 residues i, i+1, i+2 if a hydrogen bond exists between residues i and i+2 and the phi and psi angles of residue i+1 fall within 40 degrees: phi(i+1)=75.0 - psi(i+1)=-64.0." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "classic gamma turn" EXACT []
+synonym: "gamma turn classic" EXACT []
+is_a: SO:0001138 ! gamma_turn
+
+[Term]
+id: SO:0001140
+name: gamma_turn_inverse
+namespace: sequence
+alt_id: BS:00221
+def: "Gamma turns, defined for 3 residues i, i+1, i+2 if a hydrogen bond exists between residues i and i+2 and the phi and psi angles of residue i+1 fall within 40 degrees: phi(i+1)=-79.0 - psi(i+1)=69.0." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "gamma turn inverse" EXACT []
+is_a: SO:0001138 ! gamma_turn
+
+[Term]
+id: SO:0001141
+name: serine_threonine_turn
+namespace: sequence
+alt_id: BS:00231
+def: "A motif of three consecutive residues and one H-bond in which: residue(i) is Serine (S) or Threonine (T), the side-chain O of residue(i) is H-bonded to the main-chain NH of residue(i+2)." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "serine/threonine turn" EXACT []
+synonym: "st_turn" EXACT []
+is_a: SO:0001128 ! polypeptide_turn_motif
+
+[Term]
+id: SO:0001142
+name: st_turn_left_handed_type_one
+namespace: sequence
+alt_id: BS:00234
+def: "The peptide twists in an anticlockwise, left handed manner. The dihedral angles for this turn are: Residue(i): -140 degrees < chi(1) -120 degrees < -20 degrees, -90 degrees psi +120 degrees < +40 degrees, residue(i+1): -140 degrees < phi < -20 degrees, -90 < psi < +40 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "st turn left handed type one" EXACT []
+synonym: "st_turn_il" EXACT []
+is_a: SO:0001141 ! serine_threonine_turn
+
+[Term]
+id: SO:0001143
+name: st_turn_left_handed_type_two
+namespace: sequence
+alt_id: BS:00232
+def: "The peptide twists in an anticlockwise, left handed manner. The dihedral angles for this turn are: Residue(i): -140 degrees < chi(1) -120 degrees < -20 degrees, +80 degrees psi +120 degrees < +180 degrees, residue(i+1): +20 degrees < phi < +140 degrees, -40 < psi < +90 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "st turn left handed type two" EXACT []
+synonym: "st_turn_iil" EXACT []
+is_a: SO:0001141 ! serine_threonine_turn
+
+[Term]
+id: SO:0001144
+name: st_turn_right_handed_type_one
+namespace: sequence
+alt_id: BS:00235
+def: "The peptide twists in an clockwise, right handed manner. The dihedral angles for this turn are: Residue(i): -140 degrees < chi(1) -120 degrees < -20 degrees, -90 degrees psi +120 degrees < +40 degrees, residue(i+1): -140 degrees < phi < -20 degrees, -90 < psi < +40 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "st turn right handed type one" EXACT []
+synonym: "st_turn_ir" EXACT []
+is_a: SO:0001141 ! serine_threonine_turn
+
+[Term]
+id: SO:0001145
+name: st_turn_right_handed_type_two
+namespace: sequence
+alt_id: BS:00233
+def: "The peptide twists in an clockwise, right handed manner. The dihedral angles for this turn are: Residue(i): -140 degrees < chi(1) -120 degrees < -20 degrees, +80 degrees psi +120 degrees < +180 degrees, residue(i+1): +20 degrees < phi < +140 degrees, -40 < psi < +90 degrees." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "st turn right handed type two" EXACT []
+synonym: "st_turn_iir" EXACT []
+is_a: SO:0001141 ! serine_threonine_turn
+
+[Term]
+id: SO:0001146
+name: polypeptide_variation_site
+namespace: sequence
+alt_id: BS:00336
+def: "A site of sequence variation (alteration). Alternative sequence due to naturally occurring events such as polymorphisms and alternative splicing or experimental methods such as site directed mutagenesis." [EBIBS:GAR, SO:ke]
+comment: For example, was a substitution natural or mutated as part of an experiment? This term is added to merge the biosapiens term sequence_variations.
+subset: biosapiens
+synonym: "sequence_variations" EXACT []
+is_a: SO:0000839 ! polypeptide_region
+
+[Term]
+id: SO:0001147
+name: natural_variant_site
+namespace: sequence
+alt_id: BS:00071
+def: "Describes the natural sequence variants due to polymorphisms, disease-associated mutations, RNA editing and variations between strains, isolates or cultivars." [EBIBS:GAR, UniProt:curation_manual]
+comment: Discrete.
+subset: biosapiens
+synonym: "natural_variant" BROAD []
+synonym: "sequence variation" BROAD []
+synonym: "variant" BROAD [uniprot:feature_type]
+is_a: SO:0001146 ! polypeptide_variation_site
+
+[Term]
+id: SO:0001148
+name: mutated_variant_site
+namespace: sequence
+alt_id: BS:00036
+def: "Site which has been experimentally altered." [EBIBS:GAR, UniProt:curation_manual]
+comment: Discrete.
+subset: biosapiens
+synonym: "mutagen" EXACT BS [uniprot:feature_type]
+synonym: "mutagenesis" EXACT []
+synonym: "mutated_site" EXACT []
+is_a: SO:0001146 ! polypeptide_variation_site
+
+[Term]
+id: SO:0001149
+name: alternate_sequence_site
+namespace: sequence
+alt_id: BS:00073
+alt_id: SO:0001065
+def: "Description of sequence variants produced by alternative splicing, alternative promoter usage, alternative initiation and ribosomal frameshifting." [EBIBS:GAR, UniProt:curation_manual]
+comment: Discrete.
+subset: biosapiens
+synonym: "alternative_sequence" EXACT []
+synonym: "isoform" NARROW []
+synonym: "sequence variation" NARROW []
+synonym: "var_seq" EXACT [uniprot:feature_type]
+synonym: "varsplic" NARROW []
+is_a: SO:0001146 ! polypeptide_variation_site
+
+[Term]
+id: SO:0001150
+name: beta_turn_type_six
+namespace: sequence
+def: "A motif of four consecutive peptide resides of type VIa or type VIb and where the i+2 residue is cis-proline." [SO:cb]
+subset: biosapiens
+synonym: "beta turn type six" EXACT []
+synonym: "cis-proline loop" EXACT []
+synonym: "type VI beta turn" EXACT []
+synonym: "type VI turn" EXACT []
+is_a: SO:0001133 ! beta_turn
+
+[Term]
+id: SO:0001151
+name: beta_turn_type_six_a
+namespace: sequence
+def: "A motif of four consecutive peptide residues, of which the i+2 residue is proline, and that may contain one H-bond, which, if present, is between the main-chain CO of the first residue and the main-chain NH of the fourth and is characterized by the dihedral angles: Residue(i+1): phi ~ -60 degrees, psi ~ 120 degrees. Residue(i+2): phi ~ -90 degrees, psi ~ 0 degrees." [PMID:2371257, SO:cb]
+subset: biosapiens
+synonym: "beta turn type six a" EXACT []
+synonym: "type VIa beta turn" EXACT []
+synonym: "type VIa turn" EXACT []
+is_a: SO:0001150 ! beta_turn_type_six
+
+[Term]
+id: SO:0001152
+name: beta_turn_type_six_a_one
+namespace: sequence
+subset: biosapiens
+synonym: "beta turn type six a one" EXACT []
+synonym: "type VIa1 beta turn" EXACT []
+synonym: "type VIa1 turn" EXACT []
+is_a: SO:0001151 ! beta_turn_type_six_a
+
+[Term]
+id: SO:0001153
+name: beta_turn_type_six_a_two
+namespace: sequence
+subset: biosapiens
+synonym: "beta turn type six a two" EXACT []
+synonym: "type VIa2 beta turn" EXACT []
+synonym: "type VIa2 turn" EXACT []
+is_a: SO:0001151 ! beta_turn_type_six_a
+
+[Term]
+id: SO:0001154
+name: beta_turn_type_six_b
+namespace: sequence
+def: "A motif of four consecutive peptide residues, of which the i+2 residue is proline, and that may contain one H-bond, which, if present, is between the main-chain CO of the first residue and the main-chain NH of the fourth and is characterized by the dihedral angles: Residue(i+1): phi ~ -120 degrees, psi ~ 120 degrees. Residue(i+2): phi ~ -60 degrees, psi ~ 0 degrees." [PMID:2371257, SO:cb]
+subset: biosapiens
+synonym: "beta turn type six b" EXACT []
+synonym: "type VIb beta turn" EXACT []
+synonym: "type VIb turn" EXACT []
+is_a: SO:0001150 ! beta_turn_type_six
+
+[Term]
+id: SO:0001155
+name: beta_turn_type_eight
+namespace: sequence
+def: "A motif of four consecutive peptide residues that may contain one H-bond, which, if present, is between the main-chain CO of the first residue and the main-chain NH of the fourth and is characterized by the dihedral angles: Residue(i+1): phi ~ -60 degrees, psi ~ -30 degrees. Residue(i+2): phi ~ -120 degrees, psi ~ 120 degrees." [PMID:2371257, SO:cb]
+subset: biosapiens
+synonym: "beta turn type eight" EXACT []
+synonym: "type VIII beta turn" EXACT []
+synonym: "type VIII turn" EXACT []
+is_a: SO:0001133 ! beta_turn
+
+[Term]
+id: SO:0100001
+name: biochemical_region_of_peptide
+namespace: sequence
+def: "A region of a peptide that is involved in a biochemical function." [EBIBS:GAR]
+comment: Range.
+subset: biosapiens
+synonym: "biochemical motif" EXACT []
+synonym: "biochemical region of peptide" EXACT []
+synonym: "biochemical_region" RELATED []
+is_a: SO:0001067 ! polypeptide_motif
+
+[Term]
+id: SO:0100002
+name: molecular_contact_region
+namespace: sequence
+def: "A region that is involved a contact with another molecule." [EBIBS:GAR]
+comment: Range.
+subset: biosapiens
+synonym: "molecular contact region" RELATED []
+is_a: SO:0100001 ! biochemical_region_of_peptide
+
+[Term]
+id: SO:0100003
+name: intrinsically_unstructured_polypeptide_region
+namespace: sequence
+def: "A region of polypeptide chain with high conformational flexibility." [EBIBS:GAR]
+subset: biosapiens
+synonym: "disordered region" RELATED BS []
+synonym: "intrinsically unstructured polypeptide region" EXACT []
+is_a: SO:0001070 ! polypeptide_structural_region
+
+[Term]
+id: SO:0100004
+name: catmat_left_handed_three
+namespace: sequence
+def: "A motif of 3 consecutive residues with dihedral angles as follows: res i: phi -90 bounds -120 to -60, res i: psi -10 bounds -50 to 30, res i+1: phi -75 bounds -100 to -50, res i+1: psi 140 bounds 110 to 170. An extra restriction of the length of the O to O distance would be useful, that it be less than 5 Angstrom. More precisely these two oxygens are the main chain carbonyl oxygen atoms of residues i-1 and i+1." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "catmat-3l" EXACT []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0100005
+name: catmat_left_handed_four
+namespace: sequence
+def: "A motif of 4 consecutive residues with dihedral angles as follows: res i: phi -90 bounds -120 to -60, res i psi -10 bounds -50 to 30, res i+1: phi -90 bounds -120 to -60, res i+1: psi -10 bounds -50 to 30, res i+2: phi -75 bounds -100 to -50, res i+2: psi 140 bounds 110 to 170.  The extra restriction of the length of the O to O distance is similar, that it be less than 5 Angstrom. In this case these two Oxygen atoms are the main chain carbonyl oxygen atoms of residues i-1 and i+2." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "catmat-4l" EXACT []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0100006
+name: catmat_right_handed_three
+namespace: sequence
+def: "A motif of 3 consecutive residues with dihedral angles as follows: res i: phi -90 bounds -120 to -60, res i: psi -10 bounds -50 to 30, res i+1: phi -75 bounds -100 to -50, res i+1: psi 140 bounds 110 to 170. An extra restriction of the length of the O to O distance would be useful, that it be less than 5 Angstrom. More precisely these two oxygens are the main chain carbonyl oxygen atoms of residues i-1 and i+1." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "catmat-3r" EXACT []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0100007
+name: catmat_right_handed_four
+namespace: sequence
+def: "A motif of 4 consecutive residues with dihedral angles as follows: res i: phi -90 bounds -120 to -60, res i: psi -10 bounds -50 to 30, res i+1: phi -90 bounds -120 to -60, res i+1: psi -10 bounds -50 to 30, res i+2: phi -75 bounds -100 to -50, res i+2: psi 140 bounds 110 to 170. The extra restriction of the length of the O to O distance is similar, that it be less than 5 Angstrom. In this case these two Oxygen atoms are the main chain carbonyl oxygen atoms of residues i-1 and i+2." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "catmat-4r" EXACT []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0100008
+name: alpha_beta_motif
+namespace: sequence
+def: "A motif of five consecutive residues and two H-bonds in which: H-bond between CO of residue(i) and NH of residue(i+4), H-bond between CO of residue(i) and NH of residue(i+3),Phi angles of residues(i+1), (i+2) and (i+3) are negative." [EBIBS:GAR, http://www.ebi.ac.uk/msd-srv/msdmotif/]
+subset: biosapiens
+synonym: "alpha beta motif" EXACT []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0100009
+name: lipoprotein_signal_peptide
+namespace: sequence
+def: "A peptide that acts as a signal for both membrane translocation and lipid attachment in prokaryotes." [EBIBS:GAR]
+subset: biosapiens
+synonym: "lipoprotein signal peptide" EXACT []
+synonym: "prokaryotic membrane lipoprotein lipid attachment site" EXACT []
+is_a: SO:0100011 ! cleaved_peptide_region
+
+[Term]
+id: SO:0100010
+name: no_output
+namespace: sequence
+def: "An experimental region wherean analysis has been run and not produced any annotation." [EBIBS:GAR]
+subset: biosapiens
+synonym: "no output" EXACT BS []
+
+[Term]
+id: SO:0100011
+name: cleaved_peptide_region
+namespace: sequence
+def: "The cleaved_peptide_region is the region of a peptide sequence that is cleaved during maturation." [EBIBS:GAR]
+comment: Range.
+subset: biosapiens
+subset: SOFA
+synonym: "cleaved peptide region" EXACT []
+is_a: SO:0000839 ! polypeptide_region
+relationship: part_of SO:0001063 ! immature_peptide_region
+
+[Term]
+id: SO:0100012
+name: peptide_coil
+namespace: sequence
+def: "Irregular, unstructured regions of a protein's backbone, as distinct from the regular region (namely alpha helix and beta strand - characterised by specific patterns of main-chain hydrogen bonds)." [EBIBS:GAR]
+subset: biosapiens
+synonym: "coil" RELATED BS []
+synonym: "peptide coil" EXACT []
+synonym: "random coil" RELATED BS []
+is_a: SO:0001078 ! polypeptide_secondary_structure
+
+[Term]
+id: SO:0100013
+name: hydrophobic_region_of_peptide
+namespace: sequence
+def: "Hydrophobic regions are regions with a low affinity for water." [EBIBS:GAR]
+comment: Range.
+subset: biosapiens
+synonym: "hydropathic" RELATED []
+synonym: "hydrophobic region of peptide" RELATED []
+synonym: "hydrophobic_region" EXACT []
+synonym: "hydrophobicity" RELATED []
+is_a: SO:0000839 ! polypeptide_region
+
+[Term]
+id: SO:0100014
+name: n_terminal_region
+namespace: sequence
+def: "The amino-terminal positively-charged region of a signal peptide (approx 1-5 aa)." [EBIBS:GAR]
+subset: biosapiens
+synonym: "N-region" RELATED []
+is_a: SO:0100011 ! cleaved_peptide_region
+relationship: part_of SO:0000418 ! signal_peptide
+
+[Term]
+id: SO:0100015
+name: c_terminal_region
+namespace: sequence
+def: "The more polar, carboxy-terminal region of the signal peptide (approx 3-7 aa)." [EBIBS:GAR]
+subset: biosapiens
+synonym: "C-region" RELATED []
+is_a: SO:0100011 ! cleaved_peptide_region
+relationship: part_of SO:0000418 ! signal_peptide
+
+[Term]
+id: SO:0100016
+name: central_hydrophobic_region_of_signal_peptide
+namespace: sequence
+def: "The central, hydrophobic region of the signal peptide (approx 7-15 aa)." [EBIBS:GAR]
+subset: biosapiens
+synonym: "central hydrophobic region of signal peptide" EXACT []
+synonym: "central_hydrophobic_region" RELATED []
+synonym: "H-region" RELATED []
+is_a: SO:0100011 ! cleaved_peptide_region
+relationship: part_of SO:0000418 ! signal_peptide
+
+[Term]
+id: SO:0100017
+name: polypeptide_conserved_motif
+namespace: sequence
+def: "A conserved motif is a short (up to 20 amino acids) region of biological interest that is conserved in different proteins. They may or may not have functional or structural significance within the proteins in which they are found." [EBIBS:GAR]
+subset: biosapiens
+synonym: "motif" RELATED []
+is_a: SO:0001067 ! polypeptide_motif
+
+[Term]
+id: SO:0100018
+name: polypeptide_binding_motif
+namespace: sequence
+def: "A polypeptide binding motif is a short (up to 20 amino acids) polypeptide region of biological interest that contains one or more amino acids experimentally shown to bind to a ligand." [EBIBS:GAR]
+subset: biosapiens
+synonym: "binding" RELATED [uniprot:feature_type]
+synonym: "polypeptide binding motif" EXACT []
+is_a: SO:0100001 ! biochemical_region_of_peptide
+
+[Term]
+id: SO:0100019
+name: polypeptide_catalytic_motif
+namespace: sequence
+def: "A polypeptide catalytic motif is a short (up to 20 amino acids) polypeptide region that contains one or more active site residues." [EBIBS:GAR]
+subset: biosapiens
+synonym: "catalytic_motif" RELATED []
+synonym: "polypeptide catalytic motif" EXACT []
+is_a: SO:0100001 ! biochemical_region_of_peptide
+
+[Term]
+id: SO:0100020
+name: polypeptide_DNA_contact
+namespace: sequence
+def: "A binding site that, in the polypeptide molecule, interacts selectively and non-covalently with DNA." [EBIBS:GAR, SO:ke]
+subset: biosapiens
+synonym: "DNA_bind" EXACT BS [uniprot:feature]
+synonym: "polypeptide DNA contact" EXACT []
+is_a: SO:0000409 ! binding_site
+is_a: SO:0100002 ! molecular_contact_region
+
+[Term]
+id: SO:0100021
+name: polypeptide_conserved_region
+namespace: sequence
+def: "A subsection of sequence with biological interest that is conserved in different proteins. They may or may not have functional or structural significance within the proteins in which they are found." [EBIBS:GAR]
+subset: biosapiens
+synonym: "polypeptide conserved region" EXACT []
+is_a: SO:0000839 ! polypeptide_region
+
+[Typedef]
+id: adjacent_to
+name: adjacent_to
+namespace: sequence
+def: "A geometric operator, specified in Egenhofer 1989. Two features meet if they share a junction on the sequence. X adjacent_to Y iff X and Y share a boundary but do not overlap." [PMID:20226267, SO:ke]
+subset: SOFA
+
+[Typedef]
+id: associated_with
+name: associated_with
+namespace: sequence
+comment: This relationship is vague and up for discussion.
+
+[Typedef]
+id: complete_evidence_for_feature
+name: complete_evidence_for_feature
+namespace: sequence
+def: "B is complete_evidence_for_feature A if the extent (5' and 3' boundaries) and internal boundaries of B fully support the extent and internal boundaries of A." [SO:ke]
+comment: If A is a feature with multiple regions such as a multi exon transcript, the supporting EST evidence is complete if each of the regions is supported by an equivalent region in B. Also there must be no extra regions in B that are not represented in A. This relationship was requested by jeltje on the SO term tracker. The thread for the discussion is available can be accessed via tracker ID:1917222.
+is_transitive: true
+is_a: evidence_for_feature ! evidence_for_feature
+
+[Typedef]
+id: connects_on
+name: connects_on
+namespace: sequence
+def: "X connects_on Y, Z, R iff whenever Z is on a R, X is adjacent to a Y and adjacent to a Z." [PMID:20226267]
+comment: Example: A splice_junction connects_on exon, exon, mature_transcript.
+created_by: kareneilbeck
+creation_date: 2010-10-14T01:38:51Z
+
+[Typedef]
+id: contained_by
+name: contained_by
+namespace: sequence
+def: "X contained_by Y iff X starts after start of Y and X ends before end of Y." [PMID:20226267]
+comment: The inverse is contains. Example: intein contained_by immature_peptide_region.
+is_transitive: true
+created_by: kareneilbeck
+creation_date: 2010-10-14T01:26:16Z
+
+[Typedef]
+id: contains
+name: contains
+namespace: sequence
+def: "The inverse of contained_by." [PMID:20226267]
+comment: Example: pre_miRNA contains miRNA_loop.
+is_transitive: true
+created_by: kareneilbeck
+creation_date: 2010-10-14T01:32:15Z
+
+[Typedef]
+id: derives_from
+name: derives_from
+namespace: sequence
+subset: SOFA
+is_transitive: true
+
+[Typedef]
+id: disconnected_from
+name: disconnected_from
+namespace: sequence
+def: "X is disconnected_from Y iff it is not the case that X overlaps Y." [PMID:20226267]
+created_by: kareneilbeck
+creation_date: 2010-10-14T01:42:10Z
+
+[Typedef]
+id: edited_from
+name: edited_from
+namespace: sequence
+created_by: kareneilbeck
+creation_date: 2009-08-19T02:19:45Z
+
+[Typedef]
+id: edited_to
+name: edited_to
+namespace: sequence
+created_by: kareneilbeck
+creation_date: 2009-08-19T02:19:11Z
+
+[Typedef]
+id: evidence_for_feature
+name: evidence_for_feature
+namespace: sequence
+def: "B is evidence_for_feature A, if an instance of B supports the existence of A." [SO:ke]
+comment: This relationship was requested by nlw on the SO term tracker. The thread for the discussion is available can be accessed via tracker ID:1917222.
+is_transitive: true
+
+[Typedef]
+id: exemplar_of
+name: exemplar_of
+namespace: sequence
+def: "X is exemplar of Y if X is the best evidence for Y." [SO:ke]
+comment: Tracker id: 2594157.
+
+[Typedef]
+id: finished_by
+name: finished_by
+namespace: sequence
+def: "Xy is finished_by Y if Y part of X, and X and Y share a 3' boundary." [PMID:20226267]
+comment: Example CDS finished_by stop_codon.
+created_by: kareneilbeck
+creation_date: 2010-10-14T01:45:45Z
+
+[Typedef]
+id: finishes
+name: finishes
+namespace: sequence
+def: "X finishes Y if X is part_of Y and X and Y share a 3' or C terminal boundary." [PMID:20226267]
+comment: Example: stop_codon finishes CDS.
+created_by: kareneilbeck
+creation_date: 2010-10-14T02:17:53Z
+
+[Typedef]
+id: gained
+name: gained
+namespace: sequence
+def: "X gained Y if X is a variant_of X' and Y part of X but not X'." [SO:ke]
+comment: A relation with which to annotate the changes in a variant sequence with respect to a reference.\nFor example a variant transcript may gain a stop codon not present in the reference sequence.
+created_by: kareneilbeck
+creation_date: 2011-06-28T12:51:10Z
+
+[Typedef]
+id: genome_of
+name: genome_of
+namespace: sequence
+
+[Typedef]
+id: guided_by
+name: guided_by
+namespace: sequence
+created_by: kareneilbeck
+creation_date: 2009-08-19T02:27:04Z
+
+[Typedef]
+id: guides
+name: guides
+namespace: sequence
+created_by: kareneilbeck
+creation_date: 2009-08-19T02:27:24Z
+
+[Typedef]
+id: has_integral_part
+name: has_integral_part
+namespace: sequence
+def: "X has_integral_part Y if and only if: X has_part Y and Y part_of X." [http://precedings.nature.com/documents/3495/version/1]
+comment: Example: mRNA has_integral_part CDS.
+is_a: has_part ! has_part
+created_by: kareneilbeck
+creation_date: 2009-08-19T12:01:46Z
+
+[Typedef]
+id: has_origin
+name: has_origin
+namespace: sequence
+
+[Typedef]
+id: has_part
+name: has_part
+namespace: sequence
+def: "Inverse of part_of." [http://precedings.nature.com/documents/3495/version/1]
+comment: Example: operon has_part gene.
+
+[Typedef]
+id: has_quality
+name: has_quality
+namespace: sequence
+comment: The relationship between a feature and an attribute.
+
+[Typedef]
+id: homologous_to
+name: homologous_to
+namespace: sequence
+subset: SOFA
+is_symmetric: true
+is_a: similar_to ! similar_to
+
+[Typedef]
+id: integral_part_of
+name: integral_part_of
+namespace: sequence
+def: "X integral_part_of Y if and only if: X part_of Y and Y has_part X." [http://precedings.nature.com/documents/3495/version/1]
+comment: Example: exon integral_part_of transcript.
+is_a: part_of ! part_of
+created_by: kareneilbeck
+creation_date: 2009-08-19T12:03:28Z
+
+[Typedef]
+id: is_consecutive_sequence_of
+name: is_consecutive_sequence_of
+namespace: sequence
+def: "R is_consecutive_sequence_of R iff every instance of R is equivalent to a collection of instances of U:u1, u2, un, such that no pair of ux uy is overlapping and for all ux, it is adjacent to ux-1 and ux+1, with the exception of the initial and terminal u1,and un (which may be identical)." [PMID:20226267]
+comment: Example: region is consecutive_sequence of base.
+created_by: kareneilbeck
+creation_date: 2010-10-14T02:19:48Z
+
+[Typedef]
+id: lost
+name: lost
+namespace: sequence
+def: "X lost Y if X is a variant_of X' and Y part of X' but not X." [SO:ke]
+comment: A relation with which to annotate the changes in a variant sequence with respect to a reference.\nFor example a variant transcript may have lost a stop codon present in the reference sequence.
+created_by: kareneilbeck
+creation_date: 2011-06-28T12:53:16Z
+
+[Typedef]
+id: maximally_overlaps
+name: maximally_overlaps
+namespace: sequence
+def: "A maximally_overlaps X iff all parts of A (including A itself) overlap both A and Y." [PMID:20226267]
+comment: Example: non_coding_region_of_exon maximally_overlaps the intersections of exon and UTR.
+created_by: kareneilbeck
+creation_date: 2010-10-14T01:34:48Z
+
+[Typedef]
+id: member_of
+name: member_of
+namespace: sequence
+comment: A subtype of part_of. Inverse is collection_of. Winston, M, Chaffin, R, Herrmann: A taxonomy of part-whole relations. Cognitive Science 1987, 11:417-444.
+subset: SOFA
+is_transitive: true
+is_a: part_of ! part_of
+
+[Typedef]
+id: non_functional_homolog_of
+name: non_functional_homolog_of
+namespace: sequence
+def: "A relationship between a pseudogenic feature and its functional ancestor." [SO:ke]
+subset: SOFA
+is_a: homologous_to ! homologous_to
+
+[Typedef]
+id: orthologous_to
+name: orthologous_to
+namespace: sequence
+subset: SOFA
+is_symmetric: true
+is_a: homologous_to ! homologous_to
+
+[Typedef]
+id: overlaps
+name: overlaps
+namespace: sequence
+def: "X overlaps Y iff there exists some Z such that Z contained_by X and Z contained_by Y." [PMID:20226267]
+comment: Example: coding_exon overlaps CDS.
+created_by: kareneilbeck
+creation_date: 2010-10-14T01:33:15Z
+
+[Typedef]
+id: paralogous_to
+name: paralogous_to
+namespace: sequence
+subset: SOFA
+is_symmetric: true
+is_a: homologous_to ! homologous_to
+
+[Typedef]
+id: part_of
+name: part_of
+namespace: sequence
+def: "X part_of Y if X is a subregion of Y." [http://precedings.nature.com/documents/3495/version/1]
+comment: Example: amino_acid part_of polypeptide.
+subset: SOFA
+is_transitive: true
+
+[Typedef]
+id: partial_evidence_for_feature
+name: partial_evidence_for_feature
+namespace: sequence
+def: "B is partial_evidence_for_feature A if the extent of B supports part_of but not all of A." [SO:ke]
+is_a: evidence_for_feature ! evidence_for_feature
+
+[Typedef]
+id: position_of
+name: position_of
+namespace: sequence
+
+[Typedef]
+id: processed_from
+name: processed_from
+namespace: sequence
+def: "Inverse of processed_into." [http://precedings.nature.com/documents/3495/version/1]
+comment: Example: miRNA processed_from miRNA_primary_transcript.
+created_by: kareneilbeck
+creation_date: 2009-08-19T12:14:00Z
+
+[Typedef]
+id: processed_into
+name: processed_into
+namespace: sequence
+def: "X is processed_into Y if a region X is modified to create Y." [http://precedings.nature.com/documents/3495/version/1]
+comment: Example: miRNA_primary_transcript processed into miRNA.
+created_by: kareneilbeck
+creation_date: 2009-08-19T12:15:02Z
+
+[Typedef]
+id: recombined_from
+name: recombined_from
+namespace: sequence
+created_by: kareneilbeck
+creation_date: 2009-08-19T02:21:03Z
+
+[Typedef]
+id: recombined_to
+name: recombined_to
+namespace: sequence
+created_by: kareneilbeck
+creation_date: 2009-08-19T02:20:07Z
+
+[Typedef]
+id: sequence_of
+name: sequence_of
+namespace: sequence
+
+[Typedef]
+id: similar_to
+name: similar_to
+namespace: sequence
+subset: SOFA
+is_symmetric: true
+
+[Typedef]
+id: started_by
+name: started_by
+namespace: sequence
+def: "X is strted_by Y if Y is part_of X and X and Y share a 5' boundary." [PMID:20226267]
+comment: Example: CDS started_by start_codon.
+created_by: kareneilbeck
+creation_date: 2010-10-14T01:43:55Z
+
+[Typedef]
+id: starts
+name: starts
+namespace: sequence
+def: "X starts Y if X is part of Y, and A and Y share a 5' or N-terminal boundary." [PMID:20226267]
+comment: Example: start_codon starts CDS.
+created_by: kareneilbeck
+creation_date: 2010-10-14T01:47:53Z
+
+[Typedef]
+id: trans_spliced_from
+name: trans_spliced_from
+namespace: sequence
+created_by: kareneilbeck
+creation_date: 2009-08-19T02:22:14Z
+
+[Typedef]
+id: trans_spliced_to
+name: trans_spliced_to
+namespace: sequence
+created_by: kareneilbeck
+creation_date: 2009-08-19T02:22:00Z
+
+[Typedef]
+id: transcribed_from
+name: transcribed_from
+namespace: sequence
+def: "X is transcribed_from Y if X is synthesized from template Y." [http://precedings.nature.com/documents/3495/version/1]
+comment: Example: primary_transcript transcribed_from gene.
+created_by: kareneilbeck
+creation_date: 2009-08-19T12:05:39Z
+
+[Typedef]
+id: transcribed_to
+name: transcribed_to
+namespace: sequence
+def: "Inverse of transcribed_from." [http://precedings.nature.com/documents/3495/version/1]
+comment: Example: gene transcribed_to primary_transcript.
+created_by: kareneilbeck
+creation_date: 2009-08-19T12:08:24Z
+
+[Typedef]
+id: translates_to
+name: translates_to
+namespace: sequence
+def: "Inverse of translation _of." [http://precedings.nature.com/documents/3495/version/1]
+comment: Example: codon translates_to amino_acid.
+created_by: kareneilbeck
+creation_date: 2009-08-19T12:11:53Z
+
+[Typedef]
+id: translation_of
+name: translation_of
+namespace: sequence
+def: "X is translation of Y if Y is translated by ribosome to create X." [http://precedings.nature.com/documents/3495/version/1]
+comment: Example: Polypeptide translation_of CDS.
+created_by: kareneilbeck
+creation_date: 2009-08-19T12:09:59Z
+
+[Typedef]
+id: variant_of
+name: variant_of
+namespace: sequence
+def: "A' is a variant (mutation) of A = definition every instance of A' is either an immediate mutation of some instance of A, or there is a chain of immediate mutation processes linking A' to some instance of A." [SO:immuno_workshop]
+comment: Added to SO during the immunology workshop, June 2007.  This relationship was approved by Barry Smith.
+

From 4a7d768039e070944f805e0daff3e6d9c4c494be Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sat, 18 Sep 2021 11:11:03 +0100
Subject: [PATCH 175/599] restore logging

---
 .../src/main/java/demo/ParseGO.java           | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/biojava-ontology/src/main/java/demo/ParseGO.java b/biojava-ontology/src/main/java/demo/ParseGO.java
index ed5bd57692..cbe72b50e0 100644
--- a/biojava-ontology/src/main/java/demo/ParseGO.java
+++ b/biojava-ontology/src/main/java/demo/ParseGO.java
@@ -27,6 +27,8 @@
 import org.biojava.nbio.ontology.Ontology;
 import org.biojava.nbio.ontology.Term;
 import org.biojava.nbio.ontology.io.OboParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -37,31 +39,29 @@
 
 public class ParseGO {
 
+	static final Logger logger = LoggerFactory.getLogger(ParseGO.class);
+
 	/**
-	 * Parses Biosapiens OBO file and prints out name/description
-	 * pairs
+	 * Parses Biosapiens OBO file and logs name/description at INFO level
 	 * 
 	 * @param args
 	 */
 	public static void main(String[] args) {
 
-		try {
-
-			OboParser parser = new OboParser();
-			InputStream inStream = OboParser.class.getResourceAsStream("/ontology/biosapiens.obo");
-
-			BufferedReader oboFile = new BufferedReader(new InputStreamReader(inStream));
-
+		OboParser parser = new OboParser();
+		try (InputStream inStream = OboParser.class.getResourceAsStream("/ontology/bio sapiens.obo");
+				BufferedReader oboFile = new BufferedReader(new InputStreamReader(inStream))) {
 			Ontology ontology = parser.parseOBO(oboFile, "BioSapiens", "the BioSapiens ontology");
-
 			Set<Term> keys = ontology.getTerms();
 			Iterator<Term> iter = keys.iterator();
 			while (iter.hasNext()) {
 				Term t = iter.next();
-				System.out.println(t.getName() + " " + t.getDescription());
+				logger.info("{} [{}]", t.getName(), t.getDescription());
 			}
+
 		} catch (Exception e) {
-			System.err.println("Exception: " + e);
+			logger.error("Exception: " + e);
+			System.exit(1);
 		}
 	}
 }

From e2ce556b4e7bd3daa6ec075a443e9608fbd5efaf Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 20 Sep 2021 11:39:13 -0700
Subject: [PATCH 176/599] Demoting log

---
 .../main/java/org/biojava/nbio/structure/io/PDBFileParser.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index 5d1695fd52..506688baec 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -2803,7 +2803,7 @@ private void handlePDBKeywords(List<String> lines) {
 		ArrayList<String> lst = new ArrayList<String>(keywords.length);
 		for (String keyword : keywords) {
 			if(keyword.length() == 0) {
-				logger.warn("Keyword empty in structure "+ structure.getIdentifier().toString());
+				logger.debug("Keyword empty in structure {}", structure.getIdentifier().toString());
 				continue;
 			}
 			lst.add(keyword);

From b0a553fe1b2ddb65f778640321d71060f52e323c Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 20 Sep 2021 11:45:09 -0700
Subject: [PATCH 177/599] Fixing java 8 compatibility test issues

---
 .../java/org/biojava/nbio/core/util/FlatFileCacheTest.java    | 2 --
 .../test/java/org/biojava/nbio/core/util/XMLHelperTest.java   | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
index b3b1bc448e..e61a3023bb 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
@@ -9,8 +9,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
index 46feb31d0b..70d78e55f8 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
@@ -10,7 +10,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -68,7 +68,7 @@ Document readTestDoc() throws SAXException, IOException, ParserConfigurationExce
     @Test
     void fileToDocument() throws IOException, SAXException, ParserConfigurationException {
         File tmpFile = File.createTempFile("xml", ".xml");
-        Files.write(Path.of(tmpFile.getAbsolutePath()), TEST_XML.getBytes());
+        Files.write(Paths.get(tmpFile.getAbsolutePath()), TEST_XML.getBytes());
         Document doc = XMLHelper.loadXML(tmpFile.getAbsolutePath());
         assertParsedDocument(doc);
     }

From 47b51daea24eb8a3d7a85ccefa040fc3de1161f4 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 20 Sep 2021 14:56:17 -0700
Subject: [PATCH 178/599] Updating changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a203723f58..116040c687 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,8 +35,13 @@ BioJava 6.0.0 (future release)
 * Fixed `CRC64Checksum#public void update(byte[] b, int offset, int length)` to use
 the `length` argument correctly as specified in `java.util.zip.Checksum` interface.
 
+### Added
+* New keywords fields in `PDBHeader` class, populated by PDB and mmCIF parsers #946
+* OBO parsing now supports multiple altids, #960
+
 ### Fixed
 * Correct chain assignment to entities when parsing PDB/mmCIF without entity information (in cases with more than 3 chains per entity) #931
+* Dealing with chain ids correctly when parsing bonds in PDB-format files #943
 
 BioJava 5.4.0
 =============

From 356ba32900eaaa0a6b4a75bcbba1a4a2a165c465 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 20 Sep 2021 15:06:39 -0700
Subject: [PATCH 179/599] [maven-release-plugin] prepare release
 biojava-6.0.0-alpha5

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 78344622b1..3a1f9c5be1 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha5</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha5</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a22b560d19..4fe80ca33f 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha5</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index b61e45194a..f797e0c87d 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha5</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 2fb8e78426..c86eca75f5 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha5</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index bb1a97c71b..2cd1aa39f7 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha5</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha5</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 4df1148dee..7030e59add 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha5</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha5</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 03787e7d7a..7a001396df 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha5</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 9153de3e05..d4ca6f3c2e 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha5</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha5</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 154f7c229d..5c55d0318f 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha5</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha5</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 87b34d4dcb..a0e629c433 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha5</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha5</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8774d85478..faf7444429 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0-alpha5</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 65b13c6730..a31bb1f40a 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha5</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 3866c8753e..eb25a0997d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-SNAPSHOT</version>
+	<version>6.0.0-alpha5</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.0-alpha5</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 98eff70cc753d20c987f33c0eb3ad7233eb400f7 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 20 Sep 2021 15:06:43 -0700
Subject: [PATCH 180/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 3a1f9c5be1..78344622b1 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha5</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha5</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha5</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 4fe80ca33f..a22b560d19 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha5</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha5</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index f797e0c87d..b61e45194a 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha5</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index c86eca75f5..2fb8e78426 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha5</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha5</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha5</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 2cd1aa39f7..bb1a97c71b 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha5</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha5</version>
+    	<version>6.0.0-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 7030e59add..4df1148dee 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha5</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha5</version>
+    	<version>6.0.0-SNAPSHOT</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 7a001396df..03787e7d7a 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-alpha5</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index d4ca6f3c2e..9153de3e05 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha5</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha5</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 5c55d0318f..154f7c229d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-alpha5</version>
+		<version>6.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha5</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha5</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index a0e629c433..87b34d4dcb 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha5</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha5</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha5</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index faf7444429..8774d85478 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-alpha5</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index a31bb1f40a..65b13c6730 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha5</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha5</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index eb25a0997d..3866c8753e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-alpha5</version>
+	<version>6.0.0-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.0-alpha5</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From f4b201bf3c0fe16345d2845628dcd9b4c8ee74c9 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 22 Sep 2021 13:56:05 -0700
Subject: [PATCH 181/599] Fix for #929

---
 .../structure/test/io/TestBondParsing.java    | 23 ++++++++++++++
 .../biojava/nbio/structure/io/BondMaker.java  | 30 +++++++++++++------
 2 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBondParsing.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBondParsing.java
index 7be8b523a5..84d621ae75 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBondParsing.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestBondParsing.java
@@ -31,4 +31,27 @@ public void testIssue943() throws Exception {
         assertEquals(3, zn.getAtom("ZN").getBonds().size());
 
     }
+
+    /**
+     * Integration test for SS bond parsing in PDB-format, where author chain ids and asym ids differ and can cause
+     * problems. See https://github.com/biojava/biojava/issues/929
+     */
+    @Test
+    public void testIssue929() throws Exception {
+        PDBFileReader reader = new PDBFileReader();
+        FileParsingParameters params = new FileParsingParameters();
+        params.setCreateAtomBonds(true);
+        reader.setFileParsingParameters(params);
+        Structure s = reader.getStructureById("1a4w");
+
+        Group cysB = s.getPolyChain("B").getAtomGroup(118);
+        Atom sgCysB = cysB.getAtom("SG");
+        assertEquals(2, sgCysB.getBonds().size());
+
+        Group cysA = s.getPolyChain("A").getAtomGroup(1);
+        Atom sgCysA = cysA.getAtom("SG");
+        assertEquals(2, sgCysA.getBonds().size());
+
+
+    }
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
index 27e586667d..bf3ad6b5cf 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
@@ -79,8 +79,8 @@ public class BondMaker {
 	 */
 	private static final double MAX_NUCLEOTIDE_BOND_LENGTH = 2.1;
 
-	private Structure structure;
-	private FileParsingParameters params;
+	private final Structure structure;
+	private final FileParsingParameters params;
 
 	public BondMaker(Structure structure, FileParsingParameters params) {
 		this.structure = structure;
@@ -282,7 +282,7 @@ private void trimBondLists() {
 
 	/**
 	 * Creates disulfide bond objects and references in the corresponding Atoms objects, given
-	 * a list of {@link SSBondImpl}s parsed from a PDB/mmCIF file.
+	 * a list of {@link SSBondImpl}s parsed from a PDB file.
 	 * @param disulfideBonds
 	 */
 	public void formDisulfideBonds(List<SSBondImpl> disulfideBonds) {
@@ -293,12 +293,24 @@ public void formDisulfideBonds(List<SSBondImpl> disulfideBonds) {
 
 	private void formDisulfideBond(SSBondImpl disulfideBond) {
 		try {
-			Map<Integer, Atom> a = getAtomFromRecord("SG", "",
-					disulfideBond.getChainID1(), disulfideBond.getResnum1(),
-					disulfideBond.getInsCode1());
-			Map<Integer, Atom> b = getAtomFromRecord("SG", "",
-					disulfideBond.getChainID2(), disulfideBond.getResnum2(),
-					disulfideBond.getInsCode2());
+			// The PDB format uses author chain ids to reference chains. But one author chain id corresponds to multiple asym ids,
+			// thus we need to grab all the possible asym ids (poly and nonpoly) and then try to find the atoms
+			// See issue https://github.com/biojava/biojava/issues/943
+			String polyChainId1 = structure.getPolyChainByPDB(disulfideBond.getChainID1()).getId();
+			String polyChainId2 = structure.getPolyChainByPDB(disulfideBond.getChainID2()).getId();
+			List<Chain> nonpolyChains1 = structure.getNonPolyChainsByPDB(disulfideBond.getChainID1());
+			List<Chain> nonpolyChains2 = structure.getNonPolyChainsByPDB(disulfideBond.getChainID2());
+
+			List<String> allChainIds1 = new ArrayList<>();
+			List<String> allChainIds2 = new ArrayList<>();
+			if (polyChainId1!=null) allChainIds1.add(polyChainId1);
+			if (polyChainId2!=null) allChainIds2.add(polyChainId2);
+			if (nonpolyChains1!=null) nonpolyChains1.forEach(npc -> allChainIds1.add(npc.getId()));
+			if (nonpolyChains2!=null) nonpolyChains2.forEach(npc -> allChainIds2.add(npc.getId()));
+
+			Map<Integer, Atom> a = getAtomFromRecordTryMultipleChainIds("SG", "", disulfideBond.getResnum1(), disulfideBond.getInsCode1(), allChainIds1);
+
+			Map<Integer, Atom> b = getAtomFromRecordTryMultipleChainIds("SG", "", disulfideBond.getResnum2(), disulfideBond.getInsCode2(), allChainIds2);
 
 			for(int i=0; i<structure.nrModels(); i++){
 				if(a.containsKey(i) && b.containsKey(i)){

From f8ca02a9738dc770015468ee3b9c47dc93d75659 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 22 Sep 2021 14:11:04 -0700
Subject: [PATCH 182/599] Docs

---
 .../src/main/java/org/biojava/nbio/structure/io/BondMaker.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
index bf3ad6b5cf..5ec0d7d4e1 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
@@ -295,7 +295,7 @@ private void formDisulfideBond(SSBondImpl disulfideBond) {
 		try {
 			// The PDB format uses author chain ids to reference chains. But one author chain id corresponds to multiple asym ids,
 			// thus we need to grab all the possible asym ids (poly and nonpoly) and then try to find the atoms
-			// See issue https://github.com/biojava/biojava/issues/943
+			// See issue https://github.com/biojava/biojava/issues/929
 			String polyChainId1 = structure.getPolyChainByPDB(disulfideBond.getChainID1()).getId();
 			String polyChainId2 = structure.getPolyChainByPDB(disulfideBond.getChainID2()).getId();
 			List<Chain> nonpolyChains1 = structure.getNonPolyChainsByPDB(disulfideBond.getChainID1());

From 8b651a261e116cad32467b0f3be4d064794c6806 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Sat, 25 Sep 2021 10:11:06 +0800
Subject: [PATCH 183/599] Handle separator for both Windows and Linux

1- Replace any "/" with File.separator (either "/" or "\") before
expansion
of home directory.
2- Correct the unit test to handle the path in both cases.
---
 .../java/org/biojava/nbio/core/util/FileDownloadUtils.java | 2 ++
 .../org/biojava/nbio/core/util/FileDownloadUtilsTest.java  | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index f1217274ec..95955ba625 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -198,6 +198,8 @@ public static String toUnixPath(String path) {
 	 * @return An absolute path
 	 */
 	public static String expandUserHome(String file) {
+		// replace any / with the proper separator (/ or \ for Linux and Windows respectively).
+		file = file.replaceAll("/", "\\"+File.separator); //The "\\" is to escape the separator if needed.
 		if (file.startsWith("~" + File.separator)) {
 			file = System.getProperty("user.home") + file.substring(1);
 		}
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
index e917fdce0f..fee76c2965 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
@@ -138,7 +138,12 @@ void simplePath (){
         @Test
         void nestedPath (){
             String path="~/a/b/c/sequence.gb";
-            assertEquals(currUserHome+File.separator+"a/b/c/sequence.gb", FileDownloadUtils.expandUserHome(path));
+            assertEquals(currUserHome+File.separator
+            		+ "a" + File.separator 
+            		+ "b" + File.separator 
+            		+ "c" + File.separator 
+            		+ "sequence.gb", 
+            		FileDownloadUtils.expandUserHome(path));
         }  
     }
 

From 77694bbbd747da16ab6d0eefa6e0798dec62949d Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Sat, 25 Sep 2021 10:13:58 +0800
Subject: [PATCH 184/599] Handle both EOL cases (\n and \r\n).

---
 .../alignment/matrices/SubstitutionMatrixTest.java   |  4 ++--
 .../biojava/nbio/core/util/PrettyXMLWriterTest.java  | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixTest.java
index 48455702f1..1e82bfd572 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixTest.java
@@ -55,7 +55,7 @@ void matrixToString(){
         String asString = sm.toString();
         // description + 5*2 for ATCGNatcgn + 1 header + 1  for '-'
         assertEquals(13, asString.split("\n").length);
-        String header = asString.split("\n")[1];
+        String header = asString.split("\r?\n")[1];
         assertTrue(header.replaceAll(" ","").matches("[ATCGatcgNn-]+"));
     }
 
@@ -65,7 +65,7 @@ void matrixAsString(){
 
         // 5*2 for ATCGNatcgn + 1 header + 1  for '-'
         assertEquals(12, asString.split("\n").length);
-        String header = asString.split("\n")[0];
+        String header = asString.split("\r?\n")[0];
         assertTrue(header.replaceAll(" ","").matches("[ATCGatcgNn-]+"));
     }
 }
\ No newline at end of file
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java
index 03846bf45b..86d69a6fb6 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java
@@ -1,6 +1,6 @@
 package org.biojava.nbio.core.util;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -57,8 +57,8 @@ void simpleOutput() throws IOException {
 
         xw.closeTag("to");
         System.out.println(sw.toString());
-        assertEquals(EXPECTED, sw.toString());
-
+        if(! StringManipulationHelper.equalsToIgnoreEndline(EXPECTED, sw.toString()))
+        	fail(String.format("Strings are not equal (ignoring endline differences. expected: [%s], but it was:[%s]", EXPECTED, sw.toString()));
     }
 
     @Test
@@ -68,7 +68,8 @@ void specialCharsAreEscaped() throws IOException {
         xw.print("<code>some literal xml </code>");
         xw.closeTag("dt");
 
-        assertEquals(EXPECTED, sw.toString());
+        if(! StringManipulationHelper.equalsToIgnoreEndline(EXPECTED, sw.toString()))
+        	fail(String.format("Strings are not equal (ignoring endline differences. expected: [%s], but it was:[%s]", EXPECTED, sw.toString()));
     }
 
     @Test
@@ -82,6 +83,7 @@ void namespacesAreAddedToElements() throws IOException {
         xw.print("<code>some literal xml </code>");
         xw.closeTag(HTTP_TEST_NAMESPACE, "dt");
 
-        assertEquals(EXPECTED, sw.toString());
+        if(! StringManipulationHelper.equalsToIgnoreEndline(EXPECTED, sw.toString()))
+        	fail(String.format("Strings are not equal (ignoring endline differences. expected: [%s], but it was:[%s]", EXPECTED, sw.toString()));
     }
 }

From 47b07f207bf356925411ec085d6052781da5e948 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Sat, 25 Sep 2021 10:30:16 +0800
Subject: [PATCH 185/599] Update Scope version to 2.08

All SCOP installation file downloads fail because all files before 2.08
no longer exist (error 404).

1- All downloads are corrected by upgrading the LATEST_VERSION to 2.08.
2- testGetStructureForChainlessDomains is ignored because chainless
domains are present only in SCOP < 1.73
---
 .../java/org/biojava/nbio/structure/scop/ScopFactory.java     | 3 ++-
 .../org/biojava/nbio/structure/scop/ScopInstallation.java     | 4 ++--
 .../org/biojava/nbio/structure/align/util/AtomCacheTest.java  | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopFactory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopFactory.java
index 69b3b61eb6..75a629b15a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopFactory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopFactory.java
@@ -51,6 +51,7 @@ public class ScopFactory {
 	private static final Logger logger = LoggerFactory.getLogger(ScopFactory.class);
 
 	// berkeley 2
+	public static final String VERSION_2_0_8 = "2.08";
 	public static final String VERSION_2_0_7 = "2.07";
 	public static final String VERSION_2_0_6 = "2.06";
 	public static final String VERSION_2_0_5 = "2.05";
@@ -78,7 +79,7 @@ public class ScopFactory {
 	public static final String VERSION_1_55 = "1.55";
 
 	// The most recent version as of compilation time
-	public static final String LATEST_VERSION = VERSION_2_0_7;
+	public static final String LATEST_VERSION = VERSION_2_0_8;
 
 	// Hold one instance for each version
 	private static Map<String,ScopDatabase> versionedScopDBs = new HashMap<>();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
index bb65b81341..58e45ee6b7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
@@ -58,7 +58,7 @@
  */
 public class ScopInstallation implements LocalScopDatabase {
 
-	public static final String DEFAULT_VERSION = "1.75";
+	public static final String DEFAULT_VERSION = ScopFactory.LATEST_VERSION;
 
 	private static final Logger logger = LoggerFactory.getLogger(ScopInstallation.class);
 
@@ -354,7 +354,7 @@ public ScopDomain getDomainByScopID(String scopId) {
 		if ( scopId.length() < 6) {
 			throw new ScopIOException("Does not look like a scop ID! " + scopId);
 		}
-		String pdbId = scopId.substring(1,5);
+		String pdbId = scopId.substring(1,5); //TODO handle this when you handle extended PDBId (PDB ID)
 		List<ScopDomain> doms = getDomainsForPDB(pdbId);
 		if ( doms == null)
 			return null;
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
index ce332f4f70..6ab4c2237c 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
@@ -64,6 +64,7 @@
 import org.biojava.nbio.structure.test.util.GlobalsHelper;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -88,7 +89,7 @@ public void setUp() {
 		StructureIO.setAtomCache(cache);
 
 		// Use a fixed SCOP version for stability
-		ScopFactory.setScopDatabase(ScopFactory.VERSION_1_75B);
+		ScopFactory.setScopDatabase(ScopFactory.LATEST_VERSION);
 	}
 
 	@After
@@ -166,6 +167,7 @@ public void testGetStructureForDomain3() throws IOException, StructureException
 	 * @throws IOException
 	 * @throws StructureException
 	 */
+	@Ignore("SCOP files < 2.08 are no longer available")
 	@Test
 	public void testGetStructureForChainlessDomains() throws IOException, StructureException {
 		ScopDatabase scop = ScopFactory.getSCOP(ScopFactory.VERSION_1_71); // Uses the range '1-135' without a chain

From 599e7ae356c8c843772b8f327c24152a5f94b86e Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 27 Sep 2021 08:34:09 -0700
Subject: [PATCH 186/599] Docs and minor changes

---
 .../structure/contact/StructureInterface.java | 21 +++++++++----------
 .../contact/StructureInterfaceList.java       | 10 +++++----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
index 72a4cc2178..44da65e31b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
@@ -113,6 +113,9 @@ public StructureInterface(
 		this.moleculeIds = new Pair<>(firstMoleculeId,secondMoleculeId);
 		this.contacts = contacts;
 		this.transforms = new Pair<>(firstTransf, secondTransf);
+
+		this.groupAsas1 = new TreeMap<>();
+		this.groupAsas2 = new TreeMap<>();
 	}
 
 	/**
@@ -290,12 +293,8 @@ protected Atom[] getAtomsForAsa(int cofactorSizeToUse) {
 		Atom[] atoms2 = getSecondAtomsForAsa(cofactorSizeToUse);
 
 		Atom[] atoms = new Atom[atoms1.length+atoms2.length];
-		for (int i=0;i<atoms1.length;i++) {
-			atoms[i] = atoms1[i];
-		}
-		for (int i=0;i<atoms2.length;i++) {
-			atoms[i+atoms1.length] = atoms2[i];
-		}
+		System.arraycopy(atoms1, 0, atoms, 0, atoms1.length);
+		System.arraycopy(atoms2, 0, atoms, atoms1.length, atoms2.length);
 
 		return atoms;
 	}
@@ -326,7 +325,7 @@ private static Atom[] getAllNonHAtomArray(Atom[] m, int minSizeHetAtomToInclude)
 			atoms.add(a);
 
 		}
-		return atoms.toArray(new Atom[atoms.size()]);
+		return atoms.toArray(new Atom[0]);
 	}
 
 	/**
@@ -425,11 +424,11 @@ public void setFirstGroupAsa(GroupAsa groupAsa) {
 		groupAsas1.put(groupAsa.getGroup().getResidueNumber(), groupAsa);
 	}
 
-	void setFirstGroupAsas(Map<ResidueNumber, GroupAsa> firstGroupAsas) {
+	public void setFirstGroupAsas(Map<ResidueNumber, GroupAsa> firstGroupAsas) {
 		this.groupAsas1 = firstGroupAsas;
 	}
 
-	void setSecondGroupAsas(Map<ResidueNumber, GroupAsa> secondGroupAsas) {
+	public void setSecondGroupAsas(Map<ResidueNumber, GroupAsa> secondGroupAsas) {
 		this.groupAsas2 = secondGroupAsas;
 	}
 
@@ -587,8 +586,8 @@ public void setCluster(StructureInterfaceCluster cluster) {
 	}
 
 	/**
-	 * Calculates the contact overlap score between this StructureInterface and
-	 * the given one. The calculation assumes that both interfaces come from the same structure. The ouput
+	 * Calculates the Jaccard contact set score (intersection over union) between this StructureInterface and
+	 * the given one. The calculation assumes that both interfaces come from the same structure. The output
 	 * will not necessarily make sense if the two interfaces come from different structures.
 	 * The two sides of the given StructureInterface need to match this StructureInterface
 	 * in the sense that they must come from the same Entity, i.e.
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceList.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceList.java
index 09c90d6373..eb9901bd38 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceList.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceList.java
@@ -365,7 +365,7 @@ public List<StructureInterfaceCluster> getClusters() {
 
 	/**
 	 * Calculate the interface clusters for this StructureInterfaceList
-	 * using a contact overlap score to measure the similarity of interfaces.
+	 * using Jaccard contact set scores to measure the similarity of interfaces.
 	 * Subsequent calls will use the cached value without recomputing the clusters.
 	 * The clusters will be assigned ids by sorting descending by {@link StructureInterfaceCluster#getTotalArea()}
 	 * @param contactOverlapScoreClusterCutoff the contact overlap score above which a pair will be
@@ -382,6 +382,7 @@ public List<StructureInterfaceCluster> getClusters(double contactOverlapScoreClu
 		// nothing to do if we have no interfaces
 		if (list.size()==0) return clusters;
 
+		logger.debug("Calculating all-vs-all Jaccard scores for {} interfaces", list.size());
 		double[][] matrix = new double[list.size()][list.size()];
 
 		for (int i=0;i<list.size();i++) {
@@ -399,6 +400,7 @@ public List<StructureInterfaceCluster> getClusters(double contactOverlapScoreClu
 
 		}
 
+		logger.debug("Will now cluster {} interfaces based on full all-vs-all Jaccard scores matrix", list.size());
 		SingleLinkageClusterer slc = new SingleLinkageClusterer(matrix, true);
 
 		Map<Integer, Set<Integer>> clusteredIndices = slc.getClusters(contactOverlapScoreClusterCutoff);
@@ -434,11 +436,11 @@ public List<StructureInterfaceCluster> getClusters(double contactOverlapScoreClu
 				interf.setCluster(cluster);
 			}
 		}
+		logger.debug("Done clustering {} interfaces based on full all-vs-all Jaccard scores matrix. Found a total of {} clusters", list.size(), clusters.size());
 
 		// now we sort by areas (descending) and assign ids based on that sorting
-		clusters.sort((o1, o2) -> {
-			return Double.compare(o2.getTotalArea(), o1.getTotalArea()); //note we invert so that sorting is descending
-		});
+		clusters.sort((o1, o2) -> Double.compare(o2.getTotalArea(), o1.getTotalArea())); //note we invert so that sorting is descending
+
 		int id = 1;
 		for (StructureInterfaceCluster cluster:clusters) {
 			cluster.setId(id);

From 491891f05fdd4b7a2dcdddae65dd67e63356ab56 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 27 Sep 2021 14:17:59 -0700
Subject: [PATCH 187/599] Obsolete scop test. Endpoint is not available anymore

---
 .../test/scop/TestParsingScopDomainPDB.java   | 56 -------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/TestParsingScopDomainPDB.java

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/TestParsingScopDomainPDB.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/TestParsingScopDomainPDB.java
deleted file mode 100644
index 3e2cf3e489..0000000000
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/TestParsingScopDomainPDB.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * Created on Mar 29, 2014
- * Author: andreas
- *
- */
-
-package org.biojava.nbio.structure.test.scop;
-
-import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.StructureTools;
-import org.biojava.nbio.structure.io.PDBFileParser;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.net.URL;
-
-public class TestParsingScopDomainPDB {
-
-
-	@Test
-	public void testd1gena(){
-
-		try {
-			URL u = new URL("http://scop.berkeley.edu/astral/pdbstyle/ver=2.03&id=d1gena_&output=txt.");
-
-			PDBFileParser p = new PDBFileParser();
-
-			Structure s = p.parsePDBFile(u.openStream());
-
-			//System.out.println(s);
-			Assert.assertTrue(StructureTools.getAllAtomArray(s).length > 100);
-		} catch (Exception e){
-
-			e.printStackTrace();
-			Assert.fail(e.getMessage());
-		}
-	}
-}

From 8621b84ffcf1ce5a583d3c39eb95dc39b6e62c17 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 29 Sep 2021 16:29:06 -0700
Subject: [PATCH 188/599] [maven-release-plugin] prepare release
 biojava-6.0.0-alpha6

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 78344622b1..9174383d00 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha6</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a22b560d19..356701d1cf 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha6</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha6</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index b61e45194a..cd0b74261a 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 2fb8e78426..dad456d7a4 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha6</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha6</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index bb1a97c71b..b851587b04 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha6</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha6</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 4df1148dee..da6bcce346 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha6</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha6</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 03787e7d7a..12b16bf6ec 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha6</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 9153de3e05..a2c3a1ad29 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha6</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha6</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 154f7c229d..d30a34f657 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha6</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 87b34d4dcb..212c392cc0 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha6</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha6</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha6</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8774d85478..c94062390e 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0-alpha6</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 65b13c6730..126084bbec 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha6</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha6</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 3866c8753e..d54a7a2b34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-SNAPSHOT</version>
+	<version>6.0.0-alpha6</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.0-alpha6</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 8abc088c5b3a58b097a22e6f06c3adeacde0ce06 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 29 Sep 2021 16:29:09 -0700
Subject: [PATCH 189/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 9174383d00..78344622b1 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha6</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha6</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha6</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 356701d1cf..a22b560d19 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha6</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha6</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index cd0b74261a..b61e45194a 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha6</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index dad456d7a4..2fb8e78426 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha6</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha6</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha6</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index b851587b04..bb1a97c71b 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha6</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha6</version>
+    	<version>6.0.0-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index da6bcce346..4df1148dee 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha6</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha6</version>
+    	<version>6.0.0-SNAPSHOT</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 12b16bf6ec..03787e7d7a 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-alpha6</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index a2c3a1ad29..9153de3e05 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha6</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha6</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index d30a34f657..154f7c229d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-alpha6</version>
+		<version>6.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha6</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha6</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 212c392cc0..87b34d4dcb 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha6</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha6</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha6</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index c94062390e..8774d85478 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-alpha6</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 126084bbec..65b13c6730 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha6</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha6</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index d54a7a2b34..3866c8753e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-alpha6</version>
+	<version>6.0.0-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.0-alpha6</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 52f6b9690d9849db390482d303d457bbc7151598 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Thu, 30 Sep 2021 10:13:15 +0800
Subject: [PATCH 190/599] Using AssertTrue() instead of if and fail().

---
 .../nbio/core/util/PrettyXMLWriterTest.java        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java
index 86d69a6fb6..51c28d94d0 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/PrettyXMLWriterTest.java
@@ -1,6 +1,6 @@
 package org.biojava.nbio.core.util;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -57,8 +57,8 @@ void simpleOutput() throws IOException {
 
         xw.closeTag("to");
         System.out.println(sw.toString());
-        if(! StringManipulationHelper.equalsToIgnoreEndline(EXPECTED, sw.toString()))
-        	fail(String.format("Strings are not equal (ignoring endline differences. expected: [%s], but it was:[%s]", EXPECTED, sw.toString()));
+        assertTrue(StringManipulationHelper.equalsToIgnoreEndline(EXPECTED, sw.toString()),
+        	String.format("Strings are not equal (ignoring endline differences. expected: [%s], but it was:[%s]", EXPECTED, sw.toString()));
     }
 
     @Test
@@ -68,8 +68,8 @@ void specialCharsAreEscaped() throws IOException {
         xw.print("<code>some literal xml </code>");
         xw.closeTag("dt");
 
-        if(! StringManipulationHelper.equalsToIgnoreEndline(EXPECTED, sw.toString()))
-        	fail(String.format("Strings are not equal (ignoring endline differences. expected: [%s], but it was:[%s]", EXPECTED, sw.toString()));
+        assertTrue(StringManipulationHelper.equalsToIgnoreEndline(EXPECTED, sw.toString()),
+            	String.format("Strings are not equal (ignoring endline differences. expected: [%s], but it was:[%s]", EXPECTED, sw.toString()));
     }
 
     @Test
@@ -83,7 +83,7 @@ void namespacesAreAddedToElements() throws IOException {
         xw.print("<code>some literal xml </code>");
         xw.closeTag(HTTP_TEST_NAMESPACE, "dt");
 
-        if(! StringManipulationHelper.equalsToIgnoreEndline(EXPECTED, sw.toString()))
-        	fail(String.format("Strings are not equal (ignoring endline differences. expected: [%s], but it was:[%s]", EXPECTED, sw.toString()));
+        assertTrue(StringManipulationHelper.equalsToIgnoreEndline(EXPECTED, sw.toString()),
+            	String.format("Strings are not equal (ignoring endline differences. expected: [%s], but it was:[%s]", EXPECTED, sw.toString()));
     }
 }

From d0f2ef0d73fea3c399547be4f37e8c5df911a4e5 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Thu, 30 Sep 2021 10:33:28 +0800
Subject: [PATCH 191/599] Restoring a previously ignored test

---
 .../org/biojava/nbio/structure/align/util/AtomCacheTest.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
index 6ab4c2237c..fcdae2c750 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
@@ -64,7 +64,6 @@
 import org.biojava.nbio.structure.test.util.GlobalsHelper;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -167,7 +166,6 @@ public void testGetStructureForDomain3() throws IOException, StructureException
 	 * @throws IOException
 	 * @throws StructureException
 	 */
-	@Ignore("SCOP files < 2.08 are no longer available")
 	@Test
 	public void testGetStructureForChainlessDomains() throws IOException, StructureException {
 		ScopDatabase scop = ScopFactory.getSCOP(ScopFactory.VERSION_1_71); // Uses the range '1-135' without a chain

From 447c706a431033188b083c83656745e3ea0a9233 Mon Sep 17 00:00:00 2001
From: JonStargaryen <sebastian.bittrich@rcsb.org>
Date: Wed, 29 Sep 2021 19:52:30 -0700
Subject: [PATCH 192/599] update to ciftools-java-jdk8 3.0.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3866c8753e..bbac81b6fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 		<log4j.version>2.14.0</log4j.version>
 		<junit-jupiter.version>5.7.2</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>
-		<ciftools.version>2.0.2</ciftools.version>
+		<ciftools.version>3.0.0</ciftools.version>
 	</properties>
 	<scm>
 		<connection>scm:git:git://github.com/biojava/biojava.git</connection>

From ca2f04809f9b4a05c0352408a1e3e1c2ab5452c2 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 30 Sep 2021 13:45:48 -0700
Subject: [PATCH 193/599] New forester version that avoids self-referenced jar
 for openchart dependency. Maven should be happy now

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3866c8753e..e165986893 100644
--- a/pom.xml
+++ b/pom.xml
@@ -457,7 +457,7 @@
 			<dependency>
 				<groupId>org.biojava.thirdparty</groupId>
 				<artifactId>forester</artifactId>
-				<version>1.038</version>
+				<version>1.039</version>
 			</dependency>
 			<dependency>
 			    <groupId>javax.xml.bind</groupId>

From 3e83b5b6831e13148440af9987aedd042671e689 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 30 Sep 2021 14:33:20 -0700
Subject: [PATCH 194/599] Disabling test, #952

---
 .../org/biojava/nbio/protmod/phosphosite/TestAcetylation.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/biojava-modfinder/src/test/java/org/biojava/nbio/protmod/phosphosite/TestAcetylation.java b/biojava-modfinder/src/test/java/org/biojava/nbio/protmod/phosphosite/TestAcetylation.java
index 548da337cf..34376307a0 100644
--- a/biojava-modfinder/src/test/java/org/biojava/nbio/protmod/phosphosite/TestAcetylation.java
+++ b/biojava-modfinder/src/test/java/org/biojava/nbio/protmod/phosphosite/TestAcetylation.java
@@ -24,6 +24,7 @@
 import org.biojava.nbio.phosphosite.Dataset;
 import org.biojava.nbio.phosphosite.Site;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.File;
@@ -91,6 +92,7 @@ private File getLocalFileName(String phosphoSiteFileLocation){
 	 * Tests that the acetylation file can get parsed without problems.
 	 *
 	 */
+	@Ignore("The file needed from the phosphosite resource is no longer available. See #975")
 	@Test
 	public void testAcetylation() throws IOException {
 

From 00f1633ca87259feafdbea7932a867b9da77cc23 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 30 Sep 2021 17:12:07 -0700
Subject: [PATCH 195/599] Fix for water bonds suggested in review

---
 .../main/java/org/biojava/nbio/structure/io/BondMaker.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
index 5ec0d7d4e1..d5afa97a92 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
@@ -352,6 +352,8 @@ public void formLinkRecordBond(LinkRecord linkRecord) {
 			String polyChainId2 = structure.getPolyChainByPDB(linkRecord.getChainID2()).getId();
 			List<Chain> nonpolyChains1 = structure.getNonPolyChainsByPDB(linkRecord.getChainID1());
 			List<Chain> nonpolyChains2 = structure.getNonPolyChainsByPDB(linkRecord.getChainID2());
+			Chain waterChain1 = structure.getWaterChainByPDB(linkRecord.getChainID1());
+			Chain waterChain2 = structure.getWaterChainByPDB(linkRecord.getChainID2());
 
 			List<String> allChainIds1 = new ArrayList<>();
 			List<String> allChainIds2 = new ArrayList<>();
@@ -359,6 +361,8 @@ public void formLinkRecordBond(LinkRecord linkRecord) {
 			if (polyChainId2!=null) allChainIds2.add(polyChainId2);
 			if (nonpolyChains1!=null) nonpolyChains1.forEach(npc -> allChainIds1.add(npc.getId()));
 			if (nonpolyChains2!=null) nonpolyChains2.forEach(npc -> allChainIds2.add(npc.getId()));
+			if (waterChain1!=null && linkRecord.getResName1().equals("HOH")) allChainIds1.add(waterChain1.getId());
+			if (waterChain2!=null && linkRecord.getResName2().equals("HOH")) allChainIds2.add(waterChain2.getId());
 
 			Map<Integer, Atom> a = getAtomFromRecordTryMultipleChainIds(linkRecord.getName1(), linkRecord.getAltLoc1(), linkRecord.getResSeq1(), linkRecord.getiCode1(), allChainIds1);
 

From 662ebc3ed538d8b3ceffaf28f000374693815f7d Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 1 Oct 2021 10:56:16 -0700
Subject: [PATCH 196/599] WIP towards having a template url system for chem
 comp downloader

---
 .../chem/DownloadChemCompProvider.java        | 80 ++++++++++++++++---
 .../TestDownloadChemCompProvider.java         | 13 ++-
 2 files changed, 79 insertions(+), 14 deletions(-)
 rename biojava-structure/src/test/java/org/biojava/nbio/structure/{ => chem}/TestDownloadChemCompProvider.java (87%)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
index 7d889bf687..24d2e20dbd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -25,6 +25,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.zip.GZIPOutputStream;
 
 /**
@@ -42,17 +44,19 @@
 public class DownloadChemCompProvider implements ChemCompProvider {
     private static final Logger logger = LoggerFactory.getLogger(DownloadChemCompProvider.class);
 
+    private static final String NEWLINE = System.getProperty("line.separator");
+
     public static final String CHEM_COMP_CACHE_DIRECTORY = "chemcomp";
     public static final String DEFAULT_SERVER_URL = "https://files.rcsb.org/ligands/download/";
+    public static final String DEFAULT_CHEMCOMP_PATHURL_TEMPLATE = "{ccd_id}.cif";
+
     public static String serverBaseUrl = DEFAULT_SERVER_URL;
-    /**
-     * Use default RCSB server layout (true) or internal RCSB server layout (false)
-     */
-    public static boolean useDefaultUrlLayout = true;
 
     private static File path;
-    //private static final String FILE_SEPARATOR = System.getProperty("file.separator");
-    private static final String NEWLINE = System.getProperty("line.separator");
+
+    private static String chemCompPathUrlTemplate = DEFAULT_CHEMCOMP_PATHURL_TEMPLATE;
+
+    private static final Pattern CCD_ID_TEMPLATE_REGEX = Pattern.compile("^\\{ccd_id:?(\\d+)(?:-(\\d+))?}$");
 
 
     // flags to make sure there is only one thread running that is loading the dictionary
@@ -86,6 +90,27 @@ public DownloadChemCompProvider(String cacheFilePath) {
         }
     }
 
+    /**
+     * Set the base URL for the location of all chemical component CIF files, to which the chemCompPathUrlTemplate
+     * is appended, settable in {@link #setChemCompPathUrlTemplate(String)}. Must have a trailing slash.
+     */
+    public static void setServerBaseUrl(String serverBaseUrl) {
+        DownloadChemCompProvider.serverBaseUrl = serverBaseUrl;
+    }
+
+    /**
+     * Set the path to append to the serverBaseUrl (settable in {@link #setServerBaseUrl(String)}).
+     * The string can contain placeholders that will be expanded at runtime:
+     * <li>{ccd_id} to be replaced by the chemical component identifier, in capitals</li>
+     * <li>{ccd_id:beginIndex-endIndex} to be replaced by a substring of the chemical component identifier in capitals,
+     * with indices following the same convention as {@link String#substring(int, int)} </li>
+     * <li>{ccd_id:index} to be replaced by a substring of the chemical component identifier in capitals,
+     * with index either a positive or negative integer to substring from left or right of the string respectively.</li>
+     */
+    public static void setChemCompPathUrlTemplate(String chemCompPathUrlTemplate) {
+        DownloadChemCompProvider.chemCompPathUrlTemplate = chemCompPathUrlTemplate;
+    }
+
     /**
      * Get this provider's cache path
      * @return
@@ -288,6 +313,39 @@ private static boolean fileIsAbsent(String recordName) {
         return !f.exists();
     }
 
+    static String expandPathUrlTemplate(String ccdId) {
+        Matcher m = CCD_ID_TEMPLATE_REGEX.matcher(chemCompPathUrlTemplate);
+        StringBuilder sb = new StringBuilder();
+        while (m.find()) {
+            String repString = ccdId;
+            int numCaptures = m.groupCount();
+            if (numCaptures == 0) {
+                // no substringing
+                repString = ccdId;
+            } else if (numCaptures == 1) {
+                // TODO deal with out of bounds
+                // left/right substring
+                int idx = Integer.parseInt(m.group(0));
+                if (idx < 0) {
+                    // right substring
+                    repString = ccdId.substring(ccdId.length() + idx);
+                } else {
+                    // left substring
+                    repString = ccdId.substring(0, idx);
+                }
+            } else if (numCaptures == 2) {
+                // TODO deal with out of bounds
+                // start and end index
+                int begIdx = Integer.parseInt(m.group(0));
+                int endIdx = Integer.parseInt(m.group(1));
+                repString = ccdId.substring(begIdx, endIdx);
+            }
+            // TODO implement
+            //m.appendReplacement(sb, repString);
+        }
+        return null;
+    }
+
     /**
      * @param recordName : three-letter name
      * @return true if successful download
@@ -302,14 +360,10 @@ private static boolean downloadChemCompRecord(String recordName) {
             logger.error("Could not write to temp directory {} to create the chemical component download temp file", System.getProperty("java.io.tmpdir"));
             return false;
         }
-        String u;
-        if (useDefaultUrlLayout) {
-            u = serverBaseUrl + recordName + ".cif";
-        } else {
-            u = serverBaseUrl + recordName.charAt(0) + "/"  + recordName + "/" + recordName + ".cif";
-        }
 
-        logger.debug("downloading {}", u);
+        String u = serverBaseUrl + expandPathUrlTemplate(recordName);
+
+        logger.debug("Downloading chem comp definition from {}", u);
 
         URL url = null;
         try {
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/chem/TestDownloadChemCompProvider.java
similarity index 87%
rename from biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java
rename to biojava-structure/src/test/java/org/biojava/nbio/structure/chem/TestDownloadChemCompProvider.java
index 0e7dc3d6e0..8e7cc6f674 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestDownloadChemCompProvider.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/chem/TestDownloadChemCompProvider.java
@@ -18,7 +18,7 @@
  *      http://www.biojava.org/
  *
  */
-package org.biojava.nbio.structure;
+package org.biojava.nbio.structure.chem;
 
 import org.biojava.nbio.core.util.FlatFileCache;
 import org.biojava.nbio.structure.chem.ChemComp;
@@ -108,4 +108,15 @@ public void testIfWeCachedGarbageWeCanDetectIt() throws IOException {
 		assertNull(cc.getName());
 	}
 
+	@Test
+	public void testPathUrlTemplateExpansion() {
+		DownloadChemCompProvider.setChemCompPathUrlTemplate("/my/path/{ccd_id:1-2}/dir/{ccd_id}.cif");
+		String e1 = "/my/path/T/dir/ATP.cif";
+		String r1 = DownloadChemCompProvider.expandPathUrlTemplate("ATP");
+		//String r2 = DownloadChemCompProvider.expandPathUrlTemplate("A");
+		//String r3 = DownloadChemCompProvider.expandPathUrlTemplate("AP");
+
+		assertEquals(e1, r1);
+	}
+
 }

From 82e1cee3e1621d382f116fa9c85f8775e666d6a6 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 1 Oct 2021 14:03:19 -0700
Subject: [PATCH 197/599] Working implementation and tests

---
 .../chem/DownloadChemCompProvider.java        | 65 +++++++++++--------
 .../chem/TestDownloadChemCompProvider.java    | 29 +++++++--
 2 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
index 24d2e20dbd..258c1c8eb8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -56,7 +56,7 @@ public class DownloadChemCompProvider implements ChemCompProvider {
 
     private static String chemCompPathUrlTemplate = DEFAULT_CHEMCOMP_PATHURL_TEMPLATE;
 
-    private static final Pattern CCD_ID_TEMPLATE_REGEX = Pattern.compile("^\\{ccd_id:?(\\d+)(?:-(\\d+))?}$");
+    static final Pattern CCD_ID_TEMPLATE_REGEX = Pattern.compile("\\{ccd_id(?::(\\d+_\\d+|[-+]?\\d+))?}");
 
 
     // flags to make sure there is only one thread running that is loading the dictionary
@@ -106,6 +106,7 @@ public static void setServerBaseUrl(String serverBaseUrl) {
      * with indices following the same convention as {@link String#substring(int, int)} </li>
      * <li>{ccd_id:index} to be replaced by a substring of the chemical component identifier in capitals,
      * with index either a positive or negative integer to substring from left or right of the string respectively.</li>
+     * If any of the indices are off-bounds, then the full chemical component identifier is replaced
      */
     public static void setChemCompPathUrlTemplate(String chemCompPathUrlTemplate) {
         DownloadChemCompProvider.chemCompPathUrlTemplate = chemCompPathUrlTemplate;
@@ -313,37 +314,45 @@ private static boolean fileIsAbsent(String recordName) {
         return !f.exists();
     }
 
-    static String expandPathUrlTemplate(String ccdId) {
-        Matcher m = CCD_ID_TEMPLATE_REGEX.matcher(chemCompPathUrlTemplate);
-        StringBuilder sb = new StringBuilder();
+    static String expandPathUrlTemplate(String templateStr, String ccdId) {
+        Matcher m = CCD_ID_TEMPLATE_REGEX.matcher(templateStr);
+        StringBuilder output = new StringBuilder();
+        int lastIndex = 0;
         while (m.find()) {
             String repString = ccdId;
-            int numCaptures = m.groupCount();
-            if (numCaptures == 0) {
-                // no substringing
-                repString = ccdId;
-            } else if (numCaptures == 1) {
-                // TODO deal with out of bounds
-                // left/right substring
-                int idx = Integer.parseInt(m.group(0));
-                if (idx < 0) {
-                    // right substring
-                    repString = ccdId.substring(ccdId.length() + idx);
-                } else {
-                    // left substring
-                    repString = ccdId.substring(0, idx);
+            String indicesStr = m.group(1);
+            try {
+                if (indicesStr == null) {
+                    // no substringing
+                    repString = ccdId;
+                } else if (!indicesStr.contains("_")) {
+                    // left/right substring
+                    int idx = Integer.parseInt(indicesStr);
+                    if (idx < 0) { // right substring
+                        repString = ccdId.substring(ccdId.length() + idx);
+                    } else { // left substring
+                        repString = ccdId.substring(0, idx);
+                    }
+                } else if (indicesStr.contains("_")) {
+                    // start and end index
+                    String[] tokens = indicesStr.split("_");
+                    int begIdx = Integer.parseInt(tokens[0]);
+                    int endIdx = Integer.parseInt(tokens[1]);
+                    repString = ccdId.substring(begIdx, endIdx);
                 }
-            } else if (numCaptures == 2) {
-                // TODO deal with out of bounds
-                // start and end index
-                int begIdx = Integer.parseInt(m.group(0));
-                int endIdx = Integer.parseInt(m.group(1));
-                repString = ccdId.substring(begIdx, endIdx);
+            } catch (IndexOutOfBoundsException e) {
+                // we don't set repString, it keeps original value ccdId
+                logger.debug("Indices included in path URL template {} are out of bounds for string {}", templateStr, ccdId);
             }
-            // TODO implement
-            //m.appendReplacement(sb, repString);
+            output.append(templateStr, lastIndex, m.start()).append(repString);
+
+            lastIndex = m.end();
+            // TODO when we upgrade to java 11, use the new methods introduced in java 9, see https://stackoverflow.com/questions/9605716/java-regular-expression-find-and-replace
+        }
+        if (lastIndex < templateStr.length()) {
+            output.append(templateStr, lastIndex, templateStr.length());
         }
-        return null;
+        return output.toString();
     }
 
     /**
@@ -361,7 +370,7 @@ private static boolean downloadChemCompRecord(String recordName) {
             return false;
         }
 
-        String u = serverBaseUrl + expandPathUrlTemplate(recordName);
+        String u = serverBaseUrl + expandPathUrlTemplate(chemCompPathUrlTemplate, recordName);
 
         logger.debug("Downloading chem comp definition from {}", u);
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/chem/TestDownloadChemCompProvider.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/chem/TestDownloadChemCompProvider.java
index 8e7cc6f674..fc91de6505 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/chem/TestDownloadChemCompProvider.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/chem/TestDownloadChemCompProvider.java
@@ -31,6 +31,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.regex.Matcher;
 import java.util.zip.GZIPOutputStream;
 
 public class TestDownloadChemCompProvider {
@@ -108,15 +109,33 @@ public void testIfWeCachedGarbageWeCanDetectIt() throws IOException {
 		assertNull(cc.getName());
 	}
 
+	@Test
+	public void testPathUrlTemplateRegex() {
+		String[] shouldMatch = {"{ccd_id}", "{ccd_id:1_2}", "{ccd_id:1}", "{ccd_id:-1}", "abcde{ccd_id}abcde", "abcde{ccd_id:1_2}abcde", "abcde{ccd_id:-1}abcde"};
+		String[] expectedCaptures = {null, "1_2", "1", "-1", null, "1_2", "-1"};
+		for (int i=0; i<shouldMatch.length; i++) {
+			Matcher m = DownloadChemCompProvider.CCD_ID_TEMPLATE_REGEX.matcher(shouldMatch[i]);
+			assertTrue("String '"+shouldMatch[i]+"' should match the regex",m.find());
+			assertEquals(expectedCaptures[i], m.group(1));
+		}
+		String[] shouldntMatch = {"{ccd_id:}", "{ccd_id:-1_2}", "{ccd_id:x1}", "{ccd_id:1_-2}"};
+		for (String testStr : shouldntMatch) {
+			Matcher m = DownloadChemCompProvider.CCD_ID_TEMPLATE_REGEX.matcher(testStr);
+			assertFalse("String '"+testStr+"' should not match the regex",m.find());
+		}
+	}
+
 	@Test
 	public void testPathUrlTemplateExpansion() {
-		DownloadChemCompProvider.setChemCompPathUrlTemplate("/my/path/{ccd_id:1-2}/dir/{ccd_id}.cif");
-		String e1 = "/my/path/T/dir/ATP.cif";
-		String r1 = DownloadChemCompProvider.expandPathUrlTemplate("ATP");
-		//String r2 = DownloadChemCompProvider.expandPathUrlTemplate("A");
-		//String r3 = DownloadChemCompProvider.expandPathUrlTemplate("AP");
+		String templateStr = "/my/path/{ccd_id:1_2}/hello/{ccd_id:-1}/dir/abcdef/{ccd_id:2}/12345/{ccd_id}.cif";
 
+		String e1 = "/my/path/T/hello/P/dir/abcdef/AT/12345/ATP.cif";
+		String r1 = DownloadChemCompProvider.expandPathUrlTemplate(templateStr,"ATP");
 		assertEquals(e1, r1);
+
+		String e2 = "/my/path/D/hello/D/dir/abcdef/D/12345/D.cif";
+		String r2 = DownloadChemCompProvider.expandPathUrlTemplate(templateStr,"D");
+		assertEquals(e2, r2);
 	}
 
 }

From 100705d8b24345a56fc6acf8dfdccb907fef946a Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 1 Oct 2021 14:19:23 -0700
Subject: [PATCH 198/599] Docs and test

---
 .../structure/chem/DownloadChemCompProvider.java    | 13 ++++++++++---
 .../chem/TestDownloadChemCompProvider.java          |  7 +++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
index 258c1c8eb8..22ba1334f5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -101,10 +101,10 @@ public static void setServerBaseUrl(String serverBaseUrl) {
     /**
      * Set the path to append to the serverBaseUrl (settable in {@link #setServerBaseUrl(String)}).
      * The string can contain placeholders that will be expanded at runtime:
-     * <li>{ccd_id} to be replaced by the chemical component identifier, in capitals</li>
-     * <li>{ccd_id:beginIndex-endIndex} to be replaced by a substring of the chemical component identifier in capitals,
+     * <li>"{ccd_id}" to be replaced by the chemical component identifier, in capitals</li>
+     * <li>"{ccd_id:beginIndex-endIndex}" to be replaced by a substring of the chemical component identifier in capitals,
      * with indices following the same convention as {@link String#substring(int, int)} </li>
-     * <li>{ccd_id:index} to be replaced by a substring of the chemical component identifier in capitals,
+     * <li>"{ccd_id:index}" to be replaced by a substring of the chemical component identifier in capitals,
      * with index either a positive or negative integer to substring from left or right of the string respectively.</li>
      * If any of the indices are off-bounds, then the full chemical component identifier is replaced
      */
@@ -314,6 +314,13 @@ private static boolean fileIsAbsent(String recordName) {
         return !f.exists();
     }
 
+    /**
+     * Expands the given path URL template, replacing the placeholders as specified in {@link #setChemCompPathUrlTemplate(String)}
+     * by the ccdId given (or its substrings, if indices are present in the template)
+     * @param templateStr the template string with placeholders for ccd ids
+     * @param ccdId the ccd id to replace (in full or a substring)
+     * @return the input templateStr with placeholders replaced
+     */
     static String expandPathUrlTemplate(String templateStr, String ccdId) {
         Matcher m = CCD_ID_TEMPLATE_REGEX.matcher(templateStr);
         StringBuilder output = new StringBuilder();
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/chem/TestDownloadChemCompProvider.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/chem/TestDownloadChemCompProvider.java
index fc91de6505..d690021cc9 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/chem/TestDownloadChemCompProvider.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/chem/TestDownloadChemCompProvider.java
@@ -136,6 +136,13 @@ public void testPathUrlTemplateExpansion() {
 		String e2 = "/my/path/D/hello/D/dir/abcdef/D/12345/D.cif";
 		String r2 = DownloadChemCompProvider.expandPathUrlTemplate(templateStr,"D");
 		assertEquals(e2, r2);
+
+		String e3 = "/my/path//hello//dir/abcdef//12345/.cif";
+		String r3 = DownloadChemCompProvider.expandPathUrlTemplate(templateStr,"");
+		assertEquals(e3, r3);
+
+		templateStr = "/my/fixed/dir";
+		assertEquals(templateStr, DownloadChemCompProvider.expandPathUrlTemplate(templateStr, "" ));
 	}
 
 }

From 27940d89b81d243b76f01799724a80716135649a Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 1 Oct 2021 14:24:21 -0700
Subject: [PATCH 199/599] Updating changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 116040c687..f9da719a79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,8 @@ BioJava 6.0.0 (future release)
 * Moved classes in `org.biojava.nbio.structure.io.mmcif` to `org.biojava.nbio.structure.chem`
 * Fixed `CRC64Checksum#public void update(byte[] b, int offset, int length)` to use
 the `length` argument correctly as specified in `java.util.zip.Checksum` interface.
+* Removed `DownloadChemCompProvider.useDefaultUrlLayout` with a more flexible system to provide templated URLs `DownloadChemCompProvider.setChemCompPathUrlTemplate()` 
+and `DownloadChemCompProvider.setServerBaseUrl()`
 
 ### Added
 * New keywords fields in `PDBHeader` class, populated by PDB and mmCIF parsers #946

From 7c12c61d666d637b5373abe6e1e22ad91cd542e0 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 1 Oct 2021 14:25:42 -0700
Subject: [PATCH 200/599] Updating changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 116040c687..f5eac54494 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,7 +41,7 @@ the `length` argument correctly as specified in `java.util.zip.Checksum` interfa
 
 ### Fixed
 * Correct chain assignment to entities when parsing PDB/mmCIF without entity information (in cases with more than 3 chains per entity) #931
-* Dealing with chain ids correctly when parsing bonds in PDB-format files #943
+* Dealing with chain ids correctly when parsing bonds in PDB-format files #943 #929
 
 BioJava 5.4.0
 =============

From 483ec747f4d57a7dab05b310725cee1aec97846f Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Oct 2021 15:17:02 -0700
Subject: [PATCH 201/599] Automatically dealing with trailing slash

---
 .../nbio/structure/chem/DownloadChemCompProvider.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
index 22ba1334f5..c223d30da4 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -92,9 +92,12 @@ public DownloadChemCompProvider(String cacheFilePath) {
 
     /**
      * Set the base URL for the location of all chemical component CIF files, to which the chemCompPathUrlTemplate
-     * is appended, settable in {@link #setChemCompPathUrlTemplate(String)}. Must have a trailing slash.
+     * is appended, settable in {@link #setChemCompPathUrlTemplate(String)}.
      */
     public static void setServerBaseUrl(String serverBaseUrl) {
+        if (!serverBaseUrl.endsWith("/")) {
+            serverBaseUrl = serverBaseUrl + "/";
+        }
         DownloadChemCompProvider.serverBaseUrl = serverBaseUrl;
     }
 

From 36b2d9590eeb71e2996a19e2bf458fb02fa4ddad Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Oct 2021 15:35:07 -0700
Subject: [PATCH 202/599] Docs

---
 .../nbio/structure/chem/DownloadChemCompProvider.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
index c223d30da4..a0a44433a7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -50,6 +50,10 @@ public class DownloadChemCompProvider implements ChemCompProvider {
     public static final String DEFAULT_SERVER_URL = "https://files.rcsb.org/ligands/download/";
     public static final String DEFAULT_CHEMCOMP_PATHURL_TEMPLATE = "{ccd_id}.cif";
 
+    /**
+     * The base URL to which the full path specified via {@link #setChemCompPathUrlTemplate(String)} is appended.
+     * It is assumed that it has a trailing slash.
+     */
     public static String serverBaseUrl = DEFAULT_SERVER_URL;
 
     private static File path;
@@ -92,7 +96,8 @@ public DownloadChemCompProvider(String cacheFilePath) {
 
     /**
      * Set the base URL for the location of all chemical component CIF files, to which the chemCompPathUrlTemplate
-     * is appended, settable in {@link #setChemCompPathUrlTemplate(String)}.
+     * is appended, settable in {@link #setChemCompPathUrlTemplate(String)}. A trailing slash is appended
+     * if not present.
      */
     public static void setServerBaseUrl(String serverBaseUrl) {
         if (!serverBaseUrl.endsWith("/")) {

From 300400b01543ec118380f1e91c7162e3cde99435 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Oct 2021 15:46:28 -0700
Subject: [PATCH 203/599] [maven-release-plugin] prepare release
 biojava-6.0.0-alpha7

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 78344622b1..ebeac8bc2b 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha7</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha7</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a22b560d19..c78eb242a6 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha7</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha7</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index b61e45194a..ced8825666 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha7</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 2fb8e78426..e193e941f4 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha7</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha7</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha7</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index bb1a97c71b..4f1e03a3e4 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha7</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha7</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 4df1148dee..44f0d5b095 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha7</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha7</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 03787e7d7a..345796db0e 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha7</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 9153de3e05..603206c7b0 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha7</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha7</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 154f7c229d..9f46457b2e 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha7</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha7</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 87b34d4dcb..22189f1753 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha7</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha7</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha7</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8774d85478..cb3b4e3528 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0-alpha7</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 65b13c6730..1094517530 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha7</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha7</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 240bd432f8..0ce6312b9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-SNAPSHOT</version>
+	<version>6.0.0-alpha7</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.0-alpha7</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From ed3061c292fa3af09e9c635d1a075a1252f522e1 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Oct 2021 15:46:31 -0700
Subject: [PATCH 204/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index ebeac8bc2b..78344622b1 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha7</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha7</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha7</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index c78eb242a6..a22b560d19 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha7</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha7</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index ced8825666..b61e45194a 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha7</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index e193e941f4..2fb8e78426 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha7</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha7</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha7</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 4f1e03a3e4..bb1a97c71b 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha7</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha7</version>
+    	<version>6.0.0-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 44f0d5b095..4df1148dee 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha7</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha7</version>
+    	<version>6.0.0-SNAPSHOT</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 345796db0e..03787e7d7a 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-alpha7</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 603206c7b0..9153de3e05 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha7</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha7</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 9f46457b2e..154f7c229d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-alpha7</version>
+		<version>6.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha7</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha7</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 22189f1753..87b34d4dcb 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha7</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha7</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha7</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index cb3b4e3528..8774d85478 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-alpha7</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 1094517530..65b13c6730 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha7</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha7</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 0ce6312b9c..240bd432f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-alpha7</version>
+	<version>6.0.0-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.0-alpha7</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 7d49518a3057d31a4e3b0d8bde7a24648ec2be68 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Tue, 12 Oct 2021 11:24:05 +0800
Subject: [PATCH 205/599] PdbPair does not accept null

It also considers an object and its reverse equal
---
 .../nbio/structure/align/client/PdbPair.java  | 45 ++++++++-----------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java
index 5fc3bcfa6c..d93afd1e4e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java
@@ -20,12 +20,15 @@
  */
 package org.biojava.nbio.structure.align.client;
 
+import java.util.Objects;
+
 import org.biojava.nbio.structure.StructureException;
 
 /**
- * A pair for structure alignment
- * <p>
- * name1 is always < name2
+ * A pair for structure alignment.
+ * a pair is considered equal to another pair if their two poles are equal regardless to their order.
+ * i.e. both <code>new PdbPair("1abc", "2abc").equals(new PdbPair("1abc", "2abc"))</code> and 
+ * <code>new PdbPair("1abc", "2abc").equals(new PdbPair("2abc", "1abc"))</code> are <code>true</code>.
  * @author Andreas Prlic
  *
  */
@@ -35,26 +38,26 @@ public class PdbPair implements Comparable<PdbPair> {
 	private StructureName name2;
 
 	public PdbPair(String name1, String name2) {
-		this(new StructureName(name1),new StructureName(name2));
+		this(new StructureName(Objects.requireNonNull(name1)),
+				new StructureName(Objects.requireNonNull(name1)));
 	}
 
 	public PdbPair(StructureName name1, StructureName name2) {
-		super();
-		this.name1 = name1;
-		this.name2 = name2;
+		this.name1 = Objects.requireNonNull(name1);
+		this.name2 = Objects.requireNonNull(name2);
 	}
 
 	public String getName1() {
 		return name1.getIdentifier();
 	}
 	public void setName1(String name1) {
-		this.name1 = new StructureName(name1);
+		this.name1 = new StructureName(Objects.requireNonNull(name1));
 	}
 	public String getName2() {
 		return name2.getIdentifier();
 	}
 	public void setName2(String name2) {
-		this.name2 = new StructureName(name2);
+		this.name2 = new StructureName(Objects.requireNonNull(name2));
 	}
 
 	@Override
@@ -65,10 +68,8 @@ public String toString() {
 	@Override
 	public int hashCode() {
 		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((name1 == null) ? 0 : name1.hashCode());
-		result = prime * result + ((name2 == null) ? 0 : name2.hashCode());
-		return result;
+		return prime * name1.hashCode() + 
+				prime * name2.hashCode();
 	}
 
 	@Override
@@ -80,23 +81,16 @@ public boolean equals(Object obj) {
 		if (getClass() != obj.getClass())
 			return false;
 		PdbPair other = (PdbPair) obj;
-		if (name1 == null) {
-			if (other.name1 != null)
-				return false;
-		} else if (!name1.equals(other.name1))
-			return false;
-		if (name2 == null) {
-			if (other.name2 != null)
-				return false;
-		} else if (!name2.equals(other.name2))
-			return false;
-		return true;
+		return (this.name1.equals(other.name1) && this.name2.equals(other.name2)) ||
+				(this.name1.equals(other.name2) && this.name2.equals(other.name1));
 	}
 
 	@Override
 	public int compareTo(PdbPair o) {
+		//make sure they are not just reverse.
 		if ( this.equals(o))
 			return 0;
+
 		// Use StructureName's compareTo method
 		int c = name1.compareTo(o.name1);
 		if ( c != 0 )
@@ -119,7 +113,6 @@ public String getChainId2(){
 	}
 
 	public PdbPair getReverse() {
-		PdbPair newPair = new PdbPair(name2, name1);
-		return newPair;
+		return new PdbPair(name2, name1);
 	}
 }

From 0bdf25aa1347aed7674e1c2e59e70ac944eedb60 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 12 Oct 2021 09:40:25 -0700
Subject: [PATCH 206/599] Handling 0 atoms case in InterfaceFinder

---
 .../nbio/structure/contact/BoundingBox.java   | 44 +++++++++----------
 .../structure/contact/InterfaceFinder.java    | 29 ++++++++----
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java
index 7b227822ec..3362ce2490 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java
@@ -71,11 +71,13 @@ public BoundingBox(BoundingBox bb) {
 
 	/**
 	 * Constructs a BoundingBox by calculating maxs and mins of given array of atoms.
-	 * @param atoms
+	 * @param atoms the atom array
+	 * @throws IllegalArgumentException if atom array is empty
 	 */
 	public BoundingBox (Point3d[] atoms) {
 
-		if (atoms.length==0) logger.error("Error! Empty list of atoms");
+		if (atoms.length==0)
+			throw new IllegalArgumentException("Empty list of atoms is not allowed for BoundingBox construction");
 
 		xmax = atoms[0].x;
 		xmin = xmax;
@@ -97,30 +99,15 @@ public BoundingBox (Point3d[] atoms) {
 
 	}
 
-
-	/** Returns the dimensions of this bounding box.
-	 *
-	 * @return a double array (x,y,z) with the dimensions of the box.
-	 */
-	public double[] getDimensions(){
-
-		double[] dim = new double[3];
-
-		dim[0] = xmax-xmin;
-		dim[1] = ymax-ymin;
-		dim[2] = zmax-zmin;
-
-		return dim;
-
-	}
-
 	/**
 	 * Given a set of bounding boxes returns a bounding box that bounds all of them.
-	 * @param boxes
+	 * @param boxes an array of bounding boxes
+	 * @throws IllegalArgumentException if input array is empty
 	 */
 	public BoundingBox(BoundingBox[] boxes) {
 
-		if (boxes.length==0) logger.error("Error! Empty list of bounding boxes");
+		if (boxes.length==0)
+			throw new IllegalArgumentException("Empty list of bounding boxes is not allowed for BoundingBox construction");
 
 		xmax = boxes[0].xmax;
 		xmin = boxes[0].xmin;
@@ -140,7 +127,7 @@ public BoundingBox(BoundingBox[] boxes) {
 
 	}
 
-	private class Bound implements Comparable<Bound> {
+	private static class Bound implements Comparable<Bound> {
 		int cardinal;
 		double value;
 		public Bound(int cardinal,double value) {
@@ -157,6 +144,19 @@ public String toString() {
 		}
 	}
 
+	/**
+	 * Returns the dimensions of this bounding box.
+	 *
+	 * @return a double array (x,y,z) with the dimensions of the box.
+	 */
+	public double[] getDimensions(){
+		double[] dim = new double[3];
+		dim[0] = xmax-xmin;
+		dim[1] = ymax-ymin;
+		dim[2] = zmax-zmin;
+		return dim;
+	}
+
 	/**
 	 * Returns true if this bounding box overlaps given one, i.e. they are within
 	 * one cutoff distance in one of their 3 dimensions.
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/InterfaceFinder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/InterfaceFinder.java
index a7b01400f2..cd33421ab5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/InterfaceFinder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/InterfaceFinder.java
@@ -1,14 +1,12 @@
 package org.biojava.nbio.structure.contact;
 
-import org.biojava.nbio.structure.Atom;
-import org.biojava.nbio.structure.Calc;
-import org.biojava.nbio.structure.Chain;
-import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.StructureTools;
+import org.biojava.nbio.structure.*;
 import org.biojava.nbio.structure.xtal.CrystalTransform;
 import org.biojava.nbio.structure.xtal.SpaceGroup;
 
 import javax.vecmath.Point3d;
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -23,16 +21,31 @@ public class InterfaceFinder {
     private static final CrystalTransform IDENTITY_TRANSFORM = new CrystalTransform((SpaceGroup) null);
     private static final boolean INCLUDE_HETATOMS = true;
 
-    private Structure structure;
+    private List<Chain> polyChains;
     private double cutoff;
 
     private BoundingBox[] boundingBoxes;
 
     public InterfaceFinder(Structure structure) {
-        this.structure = structure;
+        this.polyChains = new ArrayList<>(structure.getPolyChains());
+        trimPolyChains();
         this.cutoff = DEFAULT_CONTACT_CUTOFF;
     }
 
+    /**
+     * Remove polymer chains with 0 atoms.
+     */
+    private void trimPolyChains() {
+        Iterator<Chain> it = polyChains.iterator();
+        while (it.hasNext()) {
+            int count = 0;
+            for (Group g:it.next().getAtomGroups())
+                count += g.getAtoms().size();
+            if (count==0)
+                it.remove();
+        }
+    }
+
     /**
      * Set the contact distance cutoff.
      * @param cutoff the distance value in Angstroms
@@ -52,7 +65,6 @@ public StructureInterfaceList getAllInterfaces() {
 
         StructureInterfaceList list = new StructureInterfaceList();
 
-        List<Chain> polyChains = structure.getPolyChains();
         for (int i = 0; i<polyChains.size(); i++) {
             for (int j = i + 1; j<polyChains.size(); j++) {
                 if (! boundingBoxes[i].overlaps(boundingBoxes[j], cutoff)) {
@@ -68,7 +80,6 @@ public StructureInterfaceList getAllInterfaces() {
     }
 
     private void initBoundingBoxes() {
-        List<Chain> polyChains = structure.getPolyChains();
         boundingBoxes = new BoundingBox[polyChains.size()];
         for (int i = 0; i<polyChains.size(); i++) {
             Atom[] atoms = StructureTools.getAllNonHAtomArray(polyChains.get(i), INCLUDE_HETATOMS);

From 849d2b051d82be42b2490aa3378e9a4e1a58d18e Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 12 Oct 2021 09:53:26 -0700
Subject: [PATCH 207/599] Adding test

---
 .../structure/contact/InterfaceFinder.java    |  8 ++----
 .../contact/TestInterfaceFinder.java          | 28 +++++++++++++++++--
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/InterfaceFinder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/InterfaceFinder.java
index cd33421ab5..09ec76ca6a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/InterfaceFinder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/InterfaceFinder.java
@@ -8,6 +8,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.IntStream;
 
 /**
  * A class containing methods to find interfaces in a given structure.
@@ -38,11 +39,8 @@ public InterfaceFinder(Structure structure) {
     private void trimPolyChains() {
         Iterator<Chain> it = polyChains.iterator();
         while (it.hasNext()) {
-            int count = 0;
-            for (Group g:it.next().getAtomGroups())
-                count += g.getAtoms().size();
-            if (count==0)
-                it.remove();
+            int count = it.next().getAtomGroups().stream().flatMapToInt(g-> IntStream.of(g.getAtoms().size())).sum();
+            if (count==0) it.remove();
         }
     }
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/contact/TestInterfaceFinder.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/contact/TestInterfaceFinder.java
index 0ad1d6544e..58fdeaecd2 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/contact/TestInterfaceFinder.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/contact/TestInterfaceFinder.java
@@ -29,7 +29,7 @@ public class TestInterfaceFinder {
 
     @Test
     public void testGetAllInterfaces() {
-        Structure s = mockStructure();
+        Structure s = mockStructure(false);
         InterfaceFinder finder = new InterfaceFinder(s);
 
         StructureInterfaceList list = finder.getAllInterfaces();
@@ -50,11 +50,27 @@ public void testGetAllInterfaces() {
         assertEquals(3, unique.size());
     }
 
+    /**
+     * Check that interfaces can be calculated if one polymer chain has no atoms at all
+     */
+    @Test
+    public void testGetAllInterfacesNoAtomsPoly() {
+        Structure s = mockStructure(true);
+        InterfaceFinder finder = new InterfaceFinder(s);
+
+        StructureInterfaceList list = finder.getAllInterfaces();
+
+        assertEquals(1, list.size());
+
+        // make sure we did not alter the original poly chains
+        assertEquals(3, s.getPolyChains().size());
+    }
+
     /**
      * Create a mock structure with 2 entities 1 (chains A, B) and 2 (chain C).
      * @return a structure
      */
-    private Structure mockStructure() {
+    private Structure mockStructure(boolean addNoAtomsPolyChain) {
         Structure structure = new StructureImpl();
         EntityInfo entity1 = new EntityInfo();
         entity1.setMolId(1);
@@ -91,7 +107,13 @@ private Structure mockStructure() {
         chainB.setSeqResGroups(bGroups);
         chainB.setEntityInfo(entity1);
 
-        List<Group> cGroups = getGroupList(20, "GLY", chainC, new Point3d(0, 4, 0));
+        int size;
+        if (addNoAtomsPolyChain)
+            size = 0;
+        else
+            size = 20;
+
+        List<Group> cGroups = getGroupList(size, "GLY", chainC, new Point3d(0, 4, 0));
         chainC.setAtomGroups(new ArrayList<>(cGroups));
         chainC.setSeqResGroups(cGroups);
         chainC.setEntityInfo(entity2);

From 95c0ffc8cd2cb8aa4fd0fa3a4869b2d13aa27046 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 12 Oct 2021 13:41:06 -0700
Subject: [PATCH 208/599] Addressing review comments

---
 .../nbio/structure/contact/BoundingBox.java   |  7 +++++++
 .../structure/contact/InterfaceFinder.java    | 19 +++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java
index 3362ce2490..35b367a65f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java
@@ -28,6 +28,7 @@
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Locale;
+import java.util.Objects;
 
 
 /**
@@ -73,9 +74,12 @@ public BoundingBox(BoundingBox bb) {
 	 * Constructs a BoundingBox by calculating maxs and mins of given array of atoms.
 	 * @param atoms the atom array
 	 * @throws IllegalArgumentException if atom array is empty
+	 * @throws NullPointerException if input is null
 	 */
 	public BoundingBox (Point3d[] atoms) {
 
+		Objects.requireNonNull(atoms);
+
 		if (atoms.length==0)
 			throw new IllegalArgumentException("Empty list of atoms is not allowed for BoundingBox construction");
 
@@ -103,9 +107,12 @@ public BoundingBox (Point3d[] atoms) {
 	 * Given a set of bounding boxes returns a bounding box that bounds all of them.
 	 * @param boxes an array of bounding boxes
 	 * @throws IllegalArgumentException if input array is empty
+	 * @throws NullPointerException if input is null
 	 */
 	public BoundingBox(BoundingBox[] boxes) {
 
+		Objects.requireNonNull(boxes);
+
 		if (boxes.length==0)
 			throw new IllegalArgumentException("Empty list of bounding boxes is not allowed for BoundingBox construction");
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/InterfaceFinder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/InterfaceFinder.java
index 09ec76ca6a..7398c22d38 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/InterfaceFinder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/InterfaceFinder.java
@@ -1,14 +1,18 @@
 package org.biojava.nbio.structure.contact;
 
-import org.biojava.nbio.structure.*;
+import org.biojava.nbio.structure.Atom;
+import org.biojava.nbio.structure.Calc;
+import org.biojava.nbio.structure.Chain;
+import org.biojava.nbio.structure.Group;
+import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.xtal.CrystalTransform;
 import org.biojava.nbio.structure.xtal.SpaceGroup;
 
 import javax.vecmath.Point3d;
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Collection;
 import java.util.List;
-import java.util.stream.IntStream;
 
 /**
  * A class containing methods to find interfaces in a given structure.
@@ -37,11 +41,10 @@ public InterfaceFinder(Structure structure) {
      * Remove polymer chains with 0 atoms.
      */
     private void trimPolyChains() {
-        Iterator<Chain> it = polyChains.iterator();
-        while (it.hasNext()) {
-            int count = it.next().getAtomGroups().stream().flatMapToInt(g-> IntStream.of(g.getAtoms().size())).sum();
-            if (count==0) it.remove();
-        }
+        polyChains.removeIf(chain -> {
+            int count = chain.getAtomGroups().stream().map(Group::getAtoms).mapToInt(Collection::size).sum();
+            return count == 0;
+        });
     }
 
     /**

From 32d1faf057eb1a0bb0851ec41cf09c7671f643ed Mon Sep 17 00:00:00 2001
From: Jose Manuel Duarte <jose.m.duarte@gmail.com>
Date: Tue, 12 Oct 2021 16:57:12 -0700
Subject: [PATCH 209/599] Create SECURITY.md

---
 SECURITY.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..c72b090129
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,9 @@
+# Security Policy
+
+## Supported Versions
+Generally BioJava produces bugfix releases, security or others, only for the latest major version series. Currently it is 5.4.x, but soon it will be 6.0.x.
+
+## Reporting a Vulnerability
+
+Please report security issues by contacting the BioJava lead maintainer jose.duarte _at_ rcsb.org . 
+The lead maintainer will respond and acknowledge in no more than 1 week since receiving the message.

From e97ad8a151a7a1cf99b62a8356e4a7d7232540db Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Wed, 13 Oct 2021 10:23:19 +0800
Subject: [PATCH 210/599] Addressing reviewer's comments

---
 .../org/biojava/nbio/structure/align/client/PdbPair.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java
index d93afd1e4e..4290b004bd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java
@@ -26,7 +26,7 @@
 
 /**
  * A pair for structure alignment.
- * a pair is considered equal to another pair if their two poles are equal regardless to their order.
+ * a pair is considered equal to another pair if their two respective tuple poles are equal either in their original or reversed order.
  * i.e. both <code>new PdbPair("1abc", "2abc").equals(new PdbPair("1abc", "2abc"))</code> and 
  * <code>new PdbPair("1abc", "2abc").equals(new PdbPair("2abc", "1abc"))</code> are <code>true</code>.
  * @author Andreas Prlic
@@ -67,9 +67,7 @@ public String toString() {
 
 	@Override
 	public int hashCode() {
-		final int prime = 31;
-		return prime * name1.hashCode() + 
-				prime * name2.hashCode();
+		return Objects.hashCode(name1) + Objects.hashCode(name2);
 	}
 
 	@Override

From a3a85f467cd79559a91cc98ecc2c4ea077fa16ce Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 13 Oct 2021 09:43:06 -0700
Subject: [PATCH 211/599] Reverting the redundant null check

---
 .../java/org/biojava/nbio/structure/contact/BoundingBox.java  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java
index 35b367a65f..47ed472809 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/BoundingBox.java
@@ -78,8 +78,6 @@ public BoundingBox(BoundingBox bb) {
 	 */
 	public BoundingBox (Point3d[] atoms) {
 
-		Objects.requireNonNull(atoms);
-
 		if (atoms.length==0)
 			throw new IllegalArgumentException("Empty list of atoms is not allowed for BoundingBox construction");
 
@@ -111,8 +109,6 @@ public BoundingBox (Point3d[] atoms) {
 	 */
 	public BoundingBox(BoundingBox[] boxes) {
 
-		Objects.requireNonNull(boxes);
-
 		if (boxes.length==0)
 			throw new IllegalArgumentException("Empty list of bounding boxes is not allowed for BoundingBox construction");
 

From 06b7cebfe42b7048d75675718566fda59e135e9b Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 15 Oct 2021 14:58:06 -0700
Subject: [PATCH 212/599] [maven-release-plugin] prepare release
 biojava-6.0.0-alpha8

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 78344622b1..845060d90c 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha8</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha8</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha8</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a22b560d19..1d842dd0ae 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha8</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha8</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index b61e45194a..07eee48f0c 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha8</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 2fb8e78426..85d8ae6b04 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha8</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha8</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha8</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index bb1a97c71b..387179ce5d 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha8</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha8</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 4df1148dee..ba5ca95098 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha8</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0-alpha8</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 03787e7d7a..6e037fd6e1 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0-alpha8</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 9153de3e05..6bf57c1208 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha8</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha8</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 154f7c229d..3e83048bc7 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha8</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha8</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 87b34d4dcb..40b7d4fb78 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha8</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha8</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha8</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8774d85478..b25ab78338 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0-alpha8</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 65b13c6730..8cd22ed559 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0-alpha8</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0-alpha8</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 240bd432f8..33269566c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-SNAPSHOT</version>
+	<version>6.0.0-alpha8</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.0-alpha8</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From de00c73cccdfbeaae84609121c6f1d7c3effaff8 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 15 Oct 2021 14:58:09 -0700
Subject: [PATCH 213/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml          | 6 +++---
 biojava-alignment/pom.xml        | 4 ++--
 biojava-core/pom.xml             | 2 +-
 biojava-genome/pom.xml           | 6 +++---
 biojava-integrationtest/pom.xml  | 4 ++--
 biojava-modfinder/pom.xml        | 4 ++--
 biojava-ontology/pom.xml         | 2 +-
 biojava-protein-disorder/pom.xml | 4 ++--
 biojava-structure-gui/pom.xml    | 6 +++---
 biojava-structure/pom.xml        | 6 +++---
 biojava-survival/pom.xml         | 2 +-
 biojava-ws/pom.xml               | 4 ++--
 pom.xml                          | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 845060d90c..78344622b1 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha8</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha8</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha8</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 1d842dd0ae..a22b560d19 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha8</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha8</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 07eee48f0c..b61e45194a 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha8</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 85d8ae6b04..2fb8e78426 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha8</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha8</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha8</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 387179ce5d..bb1a97c71b 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha8</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha8</version>
+    	<version>6.0.0-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index ba5ca95098..4df1148dee 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-alpha8</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-alpha8</version>
+    	<version>6.0.0-SNAPSHOT</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 6e037fd6e1..03787e7d7a 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-alpha8</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 6bf57c1208..9153de3e05 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha8</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha8</version>
+			<version>6.0.0-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 3e83048bc7..154f7c229d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-alpha8</version>
+		<version>6.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-alpha8</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha8</version>
+			<version>6.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 40b7d4fb78..87b34d4dcb 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha8</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-alpha8</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha8</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index b25ab78338..8774d85478 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-alpha8</version>
+        <version>6.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 8cd22ed559..65b13c6730 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-alpha8</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-alpha8</version>
+			<version>6.0.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 33269566c4..240bd432f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-alpha8</version>
+	<version>6.0.0-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.0-alpha8</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 5f7bb3fda62cdc4d5a35ac054946beb6eac5453e Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Thu, 21 Oct 2021 15:53:07 +0800
Subject: [PATCH 214/599] Unifying the way ALHOSSARY is written across
 different platform

---
 CITATION.cff                                                  | 2 +-
 .../nbio/alignment/io/StockholmConsensusAnnotation.java       | 2 +-
 .../biojava/nbio/alignment/io/StockholmFileAnnotation.java    | 2 +-
 .../org/biojava/nbio/alignment/io/StockholmFileParser.java    | 2 +-
 .../biojava/nbio/alignment/io/StockholmResidueAnnotation.java | 2 +-
 .../nbio/alignment/io/StockholmSequenceAnnotation.java        | 2 +-
 .../org/biojava/nbio/alignment/io/StockholmStructure.java     | 2 +-
 .../java/org/biojava/nbio/core/sequence/io/FastaReader.java   | 2 +-
 .../java/org/biojava/nbio/core/sequence/io/GenbankReader.java | 2 +-
 .../biojava/nbio/core/sequence/io/PlainFastaHeaderParser.java | 2 +-
 .../org/biojava/nbio/core/util/StringManipulationHelper.java  | 4 ++--
 pom.xml                                                       | 3 ++-
 12 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/CITATION.cff b/CITATION.cff
index 37481303db..da871e85f7 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -19,7 +19,7 @@ authors:
     given-names: Andreas
   - family-names: Lafita
     given-names: Aleix
-  - family-names: Al-Hossary
+  - family-names: ALHOSSARY
     given-names: Amr
   - family-names: Dräger
     given-names: Andreas
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmConsensusAnnotation.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmConsensusAnnotation.java
index 49ca00c8c0..9579b8c075 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmConsensusAnnotation.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmConsensusAnnotation.java
@@ -27,7 +27,7 @@
  * Stores all the content parsed from the #=GC lines
  *
  * @since 3.0.5
- * @author Amr AL-Hossary
+ * @author Amr ALHOSSARY
  * @author Marko Vaz
  *
  */
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileAnnotation.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileAnnotation.java
index ddeb03b451..80389ca000 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileAnnotation.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileAnnotation.java
@@ -32,7 +32,7 @@
  *
  *
  * @since 3.0.5
- * @author Amr AL-Hossary
+ * @author Amr ALHOSSARY
  * @author Marko Vaz
  *
  */
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java
index eb92301be9..7e3d36099e 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java
@@ -88,7 +88,7 @@
  * </pre>
  *
  * @since 3.0.5
- * @author Amr AL-Hossary
+ * @author Amr ALHOSSARY
  * @author Marko Vaz
  *
  */
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmResidueAnnotation.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmResidueAnnotation.java
index d42f6c039a..aa15b4f41d 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmResidueAnnotation.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmResidueAnnotation.java
@@ -27,7 +27,7 @@
  * Stores all the content parsed from the #=GR lines
  *
  * @since 3.0.5
- * @author Amr AL-Hossary
+ * @author Amr ALHOSSARY
  * @author Marko Vaz
  *
  */
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmSequenceAnnotation.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmSequenceAnnotation.java
index 9044c3a34c..4b36dc192e 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmSequenceAnnotation.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmSequenceAnnotation.java
@@ -32,7 +32,7 @@
  * Stores all the content parsed from the #=GS lines
  *
  * @since 3.0.5
- * @author Amr AL-Hossary
+ * @author Amr ALHOSSARY
  * @author Marko Vaz
  *
  */
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
index 494d8290a2..97261433b7 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
@@ -75,7 +75,7 @@
  * </table>
  *
  * @since 3.0.5
- * @author Amr AL-Hossary
+ * @author Amr ALHOSSARY
  * @author Marko Vaz
  *
  */
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java
index 4ad7dbeb9c..5bd2657ab2 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java
@@ -124,7 +124,7 @@ public LinkedHashMap<String,S> process() throws IOException {
 	 * <li>remember to close the underlying resource when you are done.</li>
 	 * </ul>
 	 * @see #process()
-	 * @author Amr AL-Hossary
+	 * @author Amr ALHOSSARY
 	 * @since 3.0.6
 	 * @param max maximum number of records to return, <code>-1</code> for infinity.
 	 * @return {@link HashMap} containing maximum <code>max</code> parsed fasta records
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
index 129c47a733..bd78282bbe 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
@@ -138,7 +138,7 @@ public LinkedHashMap<String,S> process() throws IOException, CompoundNotFoundExc
 	 * <li>remember to close the underlying resource when you are done.</li>
 	 * </ul>
 	 * @see #process()
-	 * @author Amr AL-Hossary
+	 * @author Amr ALHOSSARY
 	 * @since 3.0.6
 	 * @param max maximum number of records to return.
 	 * @return {@link HashMap} containing maximum <code>max</code> parsed Genbank records
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/PlainFastaHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/PlainFastaHeaderParser.java
index e1119d1daf..ab3e12eb5e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/PlainFastaHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/PlainFastaHeaderParser.java
@@ -33,7 +33,7 @@
  * over the data then they can create their own implementation of a
  * FastaHeaderParserInterface
  *
- * @author Amr AL-Hossary
+ * @author Amr ALHOSSARY
  * @since 3.0.6
  */
 public class PlainFastaHeaderParser<S extends AbstractSequence<C>, C extends Compound>
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
index 22f9b4730d..1fe985d0ba 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
@@ -18,7 +18,7 @@
  *      http://www.biojava.org/
  *
  * Created on Sep 14, 2011
- * Author: Amr AL-Hossary, Richard Adams
+ * Author: Amr ALHOSSARY, Richard Adams
  *
  */
 package org.biojava.nbio.core.util;
@@ -49,7 +49,7 @@
  * A utility class for common {@link String} manipulation tasks.
  * All functions are static methods.
  *
- * @author Amr AL-Hossary
+ * @author Amr ALHOSSARY
  * @author Richard Adams
  */
 public class StringManipulationHelper  {
diff --git a/pom.xml b/pom.xml
index 240bd432f8..00940a27f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,8 @@
 			<name>Aleix Lafita</name>
 		</developer>
 		<developer>
-			<name>Amr AL-HOSSARY</name>
+			<id>aalhossary</id>
+			<name>Amr ALHOSSARY</name>
 		</developer>
 		<developer>
 			<name>Andreas Dräger</name>

From 792a50fbe29dfa5aee2241c43a5f065323c7d57e Mon Sep 17 00:00:00 2001
From: HildoYe <hildomy5@gmail.com>
Date: Mon, 25 Oct 2021 18:50:26 -0500
Subject: [PATCH 215/599] use ordered set to remove flakiness

---
 .../nbio/structure/symmetry/core/QuatSymmetryDetector.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryDetector.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryDetector.java
index 4b26906ffd..62906fd6b7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryDetector.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryDetector.java
@@ -460,11 +460,11 @@ private static Stoichiometry trimSubunitClusters(Stoichiometry globalComposition
 		List<SubunitCluster> globalClusters = globalComposition.getClusters();
 		List<SubunitCluster> localClusters = new ArrayList<>();
 
-		Set<Integer> usedClusterIds =
+		TreeSet<Integer> usedClusterIds =
 				usedSubunitIds.stream().
 					map(allSubunitClusterIds::get).
 					distinct().
-					collect(Collectors.toSet());
+					collect(Collectors.toCollection(TreeSet::new));
 
 		// for each used cluster, remove unused subunits
 		for(Integer usedClusterId:usedClusterIds) {

From 12d348d0ad2a4f252276d8e64cf46ace04fc37b0 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Sat, 30 Oct 2021 05:42:41 +0800
Subject: [PATCH 216/599] Support extended pdbid (#950)

* Support for extended PDBID PDB_nnnnNXXX

Created a new class PDBId, and removed old deprecated methods.
Most of the changes are in Structure, StructureImpl, and PDBFileParser
classes.

* Some deprecated functions removal

* Fix typo

* Targeted most of Spencer's comments

* Fixed a bug in PDBId.equals() method

* Changing PDBID in SCOP record to lower case

to match the expected String

* public static PDBId field XXXX

* Behavior is now an enum

* Expose Pattern objects instead of Strings

* ID stored internally in a reduced format (without initial "PDB_" prefix)

Only the ID proper is stored (in upper case).
e.g. for 1abc we store 00001ABC.

This format is the trade off between storing short/extended format and
all extended format.
storing the ID proper allows direct comparison and fast ordering of
PDBId objects with uniform names in the format \d{4}[1-9][0-9A-Z]{3}.

* Enhancements and bug fix

* Added BDBId Unit test

* Added @Deprecated codeTag

* Adding more TODOs

* more replacement of deprecated methods

* Removed PDBIdException

I replaced the PDBException with IllegalArgumentException or
StructureException:
- Constant literal extraction
- Inlined short private methods
- Renamed isShortPDBId() and isExtendedPDBID() to isValidShortPDBID()
and isValidExtendedPDBID()

Additional modifications:
- Organized imports

* review and untouch regular expressions

* Un-deprecate, copy javadoc, and remove @author on methods

* Remove NullPointerException

I will write the full class javadoc later

* Bug fix

* clean commented out code

* Update CHANGELOG

Mentioned that getReducedStructure() is removed from StructureTools

* Fix unit test

I accident.y found that the test case is not written as it should be.

* PdbPair does not accept null

It also considers an object and its reverse equal

* Addressing reviewer's comments

* Change capitalization state

- Class name: changed into PdbId
- methods name: changed into getPdbId(), setPdbId(PdbId)
- field name: pdbId

* Fix probable NPE + keep consistent PdbId method naming convention

* Addressed some of the reviewer's comments.

* Use JUnit 5

* PdbId class Documentation

* JavaDoc style update

* Minor updates

* Reverting a wrong optimization

It introduced a new bug. Reverting it.

* Adding BioJava development code

* Javadoc

* XXXX PdbId objects are not equal unless they are the same object

* No more XXXX. ANY malformed PdbId gracefully set to null

* Addressing Reviewer's comments

* Removing TODOs
---
 CHANGELOG.md                                  |  13 +-
 .../biojava/nbio/structure/test/Test1a4w.java |   3 +-
 .../structure/test/cath/CathDomainTest.java   |   5 +-
 .../structure/test/ecod/EcodParseTest.java    |   2 +-
 .../structure/align/gui/SelectPDBPanel.java   |  16 +-
 .../nbio/structure/gui/util/PDBDirPanel.java  |  14 +-
 .../structure/gui/util/PDBServerPanel.java    |  14 +-
 .../structure/gui/util/PDBUploadPanel.java    |  42 ++-
 biojava-structure/pom.xml                     |  14 +-
 .../nbio/structure/BioAssemblyIdentifier.java |  26 +-
 .../org/biojava/nbio/structure/PDBHeader.java |  62 ++++-
 .../nbio/structure/PassthroughIdentifier.java |   2 +-
 .../org/biojava/nbio/structure/PdbId.java     | 241 ++++++++++++++++++
 .../org/biojava/nbio/structure/Structure.java |  60 +++--
 .../biojava/nbio/structure/StructureIO.java   |  27 +-
 .../biojava/nbio/structure/StructureImpl.java |  59 +++--
 .../nbio/structure/StructureTools.java        |  63 +----
 .../structure/SubstructureIdentifier.java     |  68 +++--
 .../biojava/nbio/structure/URLIdentifier.java |  16 +-
 .../nbio/structure/align/client/PdbPair.java  |  38 ++-
 .../structure/align/client/StructureName.java |  40 +--
 .../util/MultipleAlignmentWriter.java         |   3 +-
 .../align/pairwise/AlternativeAlignment.java  |   2 +-
 .../nbio/structure/align/util/AtomCache.java  | 105 ++++++--
 .../nbio/structure/cath/CathDomain.java       |   5 +-
 .../nbio/structure/ecod/EcodDomain.java       |  28 +-
 .../nbio/structure/ecod/EcodInstallation.java |  21 +-
 .../nbio/structure/io/LocalPDBDirectory.java  | 139 +++++-----
 .../nbio/structure/io/PDBFileParser.java      |  12 +-
 .../nbio/structure/io/StructureProvider.java  |   9 +
 .../io/cif/CifStructureConsumerImpl.java      |  13 +-
 .../io/mmtf/MmtfStructureReader.java          |   3 +-
 .../nbio/structure/scop/ScopDomain.java       |  33 ++-
 .../nbio/structure/scop/ScopInstallation.java |  39 ++-
 .../symmetry/internal/CeSymmResult.java       |   3 +-
 .../org/biojava/nbio/structure/Test4hhb.java  |   3 +-
 .../biojava/nbio/structure/TestAltLocs.java   |  24 +-
 .../biojava/nbio/structure/TestAtomCache.java |  16 +-
 .../org/biojava/nbio/structure/TestPdbId.java | 239 +++++++++++++++++
 .../nbio/structure/TestURLIdentifier.java     |   4 +-
 .../align/client/TestStructureName.java       |  76 +++---
 .../structure/align/util/AtomCacheTest.java   |   6 +-
 .../nbio/structure/io/TestHeaderOnly.java     |   3 +-
 .../structure/io/TestNonDepositedFiles.java   |   7 +-
 44 files changed, 1206 insertions(+), 412 deletions(-)
 create mode 100644 biojava-structure/src/main/java/org/biojava/nbio/structure/PdbId.java
 create mode 100644 biojava-structure/src/test/java/org/biojava/nbio/structure/TestPdbId.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf9593d6c3..bbd0024247 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ BioJava 6.0.0 (future release)
 * Removed `org.biojava.nbio.structure.io.mmtf.MmtfUtils.setUpBioJava()`
 * Removed from `org.biojava.nbio.structure.Chain` interface: `getParent()`, `setParent()`, `getAtomLigands()`, `getSwissprotId()`, `setSwissprotId()`, `getInternalChainID()`, `setInternalChainID()`, `getChainID()`, `setChainID()`
 * Removed from `org.biojava.nbio.structure.Structure` interface: `findChain()`, `getId()`, `setId()`, `getChainByPDB()`, `getCompoundById()`, `getResidueRanges()`, `getRanges()`
-* Removed from `org.biojava.nbio.structure.StructureTools` : `isNucleicAcid()`, `isProtein()`, `getPredominantGroupType()`, `isChainWaterOnly()`, `isChainPureNonPolymer()`
+* Removed from `org.biojava.nbio.structure.StructureTools` : `isNucleicAcid()`, `isProtein()`, `getPredominantGroupType()`, `isChainWaterOnly()`, `isChainPureNonPolymer()`, `getReducedStructure()`
 * Removed `org.biojava.nbio.structure.io.SandboxStyleStructureProvider`
 * In `org.biojava.nbio.structure.align.xml.MultipleAlignmentXMLParser` made all methods private except `parseXMLfile`
 
@@ -32,14 +32,15 @@ BioJava 6.0.0 (future release)
 * Moved all chem-comp model classes from `org.biojava.nbio.structure.io.mmcif.chem` to `org.biojava.nbio.structure.chem`
 * Moved all chem-comp parsing classes from `org.biojava.nbio.structure.io.mmcif.chem` to `org.biojava.nbio.structure.io.cif`
 * Moved classes in `org.biojava.nbio.structure.io.mmcif` to `org.biojava.nbio.structure.chem`
-* Fixed `CRC64Checksum#public void update(byte[] b, int offset, int length)` to use
-the `length` argument correctly as specified in `java.util.zip.Checksum` interface.
-* Removed `DownloadChemCompProvider.useDefaultUrlLayout` with a more flexible system to provide templated URLs `DownloadChemCompProvider.setChemCompPathUrlTemplate()` 
-and `DownloadChemCompProvider.setServerBaseUrl()`
+* Fixed `CRC64Checksum#public void update(byte[] b, int offset, int length)` to use the `length` argument correctly as specified in `java.util.zip.Checksum` interface.
+* In `SubstructureIdentifier`, `StructureName`, `EcodDomain`, `ScopDomain` : `getPdbId()` returns `PdbId` object instead of `String`.
+* Removed `DownloadChemCompProvider.useDefaultUrlLayout` with a more flexible system to provide templated URLs `DownloadChemCompProvider.setChemCompPathUrlTemplate()` and `DownloadChemCompProvider.setServerBaseUrl()`
+* In `Structure` (and `StructureImple`), the accessor methods `String getPdbId()` and `setPdbId(String)` were previously depricated. They were revived in BioJava 6.0.0 but as `PdbId getPdbId()` and `setPdbId(PdbId)` instead.n
 
 ### Added
-* New keywords fields in `PDBHeader` class, populated by PDB and mmCIF parsers #946
+* New `keywords` field in `PDBHeader` class, populated by PDB and mmCIF parsers #946
 * OBO parsing now supports multiple altids, #960
+* New class `PdbId` that wrapps a PDB Identifier and handles conversion between current short PDBID format and upcoming extended PDBID format #930
 
 ### Fixed
 * Correct chain assignment to entities when parsing PDB/mmCIF without entity information (in cases with more than 3 chains per entity) #931
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1a4w.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1a4w.java
index ba6266cb2b..6bd64efd36 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1a4w.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/Test1a4w.java
@@ -67,8 +67,7 @@ public void setUp() throws Exception {
 
 
 	@Test
-	public void test1a4wPDBFile() throws IOException
-	{
+	public void test1a4wPDBFile() throws IOException {
 
 		//		structure = null;
 
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/cath/CathDomainTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/cath/CathDomainTest.java
index 8f0ecca5ad..c619a3b5a8 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/cath/CathDomainTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/cath/CathDomainTest.java
@@ -20,6 +20,7 @@
  */
 package org.biojava.nbio.structure.test.cath;
 
+import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.cath.CathDomain;
 import org.biojava.nbio.structure.cath.CathFactory;
 import org.junit.Test;
@@ -33,9 +34,9 @@
  */
 public class CathDomainTest {
 	@Test
-	public void test() {
+	public void test() throws StructureException {
 		String id = "1qvrC03";
 		CathDomain domain = CathFactory.getCathDatabase().getDomainByCathId(id);
-		assertEquals("1qvr.C_332-400,C_514-540", domain.toCanonical().getIdentifier());
+		assertEquals("1QVR.C_332-400,C_514-540", domain.toCanonical().getIdentifier());
 	}
 }
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/ecod/EcodParseTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/ecod/EcodParseTest.java
index 96d7e31d62..e0cd1fb2a8 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/ecod/EcodParseTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/ecod/EcodParseTest.java
@@ -83,7 +83,7 @@ private static int testVersion(String ecodVersion) throws IOException {
 			Atom[] ca1;
 			Structure struct;
 			try {
-				struct = cache.getStructure(d.getPdbId());
+				struct = cache.getStructure(d.getPdbId().getId());
 				ca1 = StructureTools.getRepresentativeAtomArray(struct);
 			} catch (IOException e) {
 				logger.error("Error getting structure for "+d.getDomainId(),e);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/SelectPDBPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/SelectPDBPanel.java
index d8eb946e4d..240246bb88 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/SelectPDBPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/SelectPDBPanel.java
@@ -23,6 +23,7 @@
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.io.IOException;
+import java.util.ArrayList;
 
 import javax.swing.Box;
 import javax.swing.JLabel;
@@ -30,6 +31,7 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTextField;
 
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.ResidueRange;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
@@ -106,30 +108,32 @@ public SelectPDBPanel(boolean show2PDBs) {
 	}
 
 	public StructureIdentifier getName1() {
-		String pdbId = f1.getText().trim();
+		String id = f1.getText().trim();
 		String chainId = c1.getText().trim();
 		String range = r1.getText().trim();
-
+		
+		PdbId pdbId = new PdbId(id);
 		// Prefer range over chain
 		if( ! range.isEmpty() ) {
 			return new SubstructureIdentifier(pdbId, ResidueRange.parseMultiple(range));
 		} else if ( ! chainId.isEmpty() ){
 			return new SubstructureIdentifier(pdbId, ResidueRange.parseMultiple(chainId));
 		}
-		return new SubstructureIdentifier(pdbId);
+		return new SubstructureIdentifier(pdbId, new ArrayList<ResidueRange>());
 	}
 	public StructureIdentifier getName2() {
-		String pdbId = f2.getText().trim();
+		String id = f2.getText().trim();
 		String chainId = c2.getText().trim();
 		String range = r2.getText().trim();
-
+		
+		PdbId pdbId = new PdbId(id);
 		// Prefer range over chain
 		if( ! range.isEmpty() ) {
 			return new SubstructureIdentifier(pdbId, ResidueRange.parseMultiple(range));
 		} else if ( ! chainId.isEmpty() ){
 			return new SubstructureIdentifier(pdbId, ResidueRange.parseMultiple(chainId));
 		}
-		return new SubstructureIdentifier(pdbId);
+		return new SubstructureIdentifier(pdbId, new ArrayList<ResidueRange>());
 	}
 	@Override
 	public Structure getStructure1() throws StructureException, IOException{
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBDirPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBDirPanel.java
index 31f6dea395..06e8717cef 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBDirPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBDirPanel.java
@@ -23,6 +23,7 @@
 package org.biojava.nbio.structure.gui.util;
 
 import org.biojava.nbio.structure.Chain;
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureImpl;
@@ -97,17 +98,17 @@ public PDBDirPanel() {
 
 
 	private Structure fromPDB(JTextField f, JTextField c) throws StructureException{
-		String pdb = f.getText();
+		String pdbIdString = f.getText();
 
 
-		if ( pdb.length() < 4) {
+		if ( pdbIdString.length() < 4) {
 			f.setText("!!!");
 			return null;
 		}
 
 		String chain = c.getText();
 		if ( debug )
-			System.out.println("file :" + pdb + " " +  chain);
+			System.out.println("file :" + pdbIdString + " " +  chain);
 		/// prepare structures
 
 		// load them from the file system
@@ -123,7 +124,7 @@ private Structure fromPDB(JTextField f, JTextField c) throws StructureException{
 		Structure tmp1 = new StructureImpl();
 
 		try {
-			Structure structure1 = reader.getStructureById(pdb);
+			Structure structure1 = reader.getStructureById(new PdbId(pdbIdString));
 
 			// no chain has been specified
 			// return whole structure
@@ -131,11 +132,10 @@ private Structure fromPDB(JTextField f, JTextField c) throws StructureException{
 				return structure1;
 			}
 			if ( debug)
-				System.out.println("using chain " + chain +  " for structure " + structure1.getPDBCode());
+				System.out.println("using chain " + chain +  " for structure " + structure1.getPdbId().getId());
 			Chain c1 = structure1.getPolyChainByPDB(chain);
-			tmp1.setPDBCode(structure1.getPDBCode());
 			tmp1.setPDBHeader(structure1.getPDBHeader());
-			tmp1.setPDBCode(structure1.getPDBCode());
+			tmp1.setPdbId(structure1.getPdbId());
 			tmp1.addChain(c1);
 			System.out.println("ok");
 
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBServerPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBServerPanel.java
index 161a23a923..3e312b262b 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBServerPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBServerPanel.java
@@ -24,6 +24,7 @@
 package org.biojava.nbio.structure.gui.util;
 
 import org.biojava.nbio.structure.Chain;
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureImpl;
@@ -86,17 +87,17 @@ public PDBServerPanel() {
 
 
 	private Structure fromPDB(JTextField f, JTextField c) throws StructureException{
-		String pdb = f.getText();
+		String pdbIdString = f.getText();
 
 
-		if ( pdb.length() < 4) {
+		if ( pdbIdString.length() < 4) {
 			f.setText("!!!");
 			return null;
 		}
 
 		String chain = c.getText();
 		if ( debug )
-			System.out.println("file :" + pdb + " " +  chain);
+			System.out.println("file :" + pdbIdString + " " +  chain);
 		/// prepare structures
 
 		// load them from the file system
@@ -108,7 +109,7 @@ private Structure fromPDB(JTextField f, JTextField c) throws StructureException{
 		Structure tmp1 = new StructureImpl();
 
 		try {
-			Structure structure1 = reader.getStructureById(pdb);
+			Structure structure1 = reader.getStructureById(new PdbId(pdbIdString));
 
 			// no chain has been specified
 			// return whole structure
@@ -116,11 +117,10 @@ private Structure fromPDB(JTextField f, JTextField c) throws StructureException{
 				return structure1;
 			}
 			if ( debug)
-				System.out.println("using chain " + chain +  " for structure " + structure1.getPDBCode());
+				System.out.println("using chain " + chain +  " for structure " + structure1.getPdbId().getId());
 			Chain c1 = structure1.getPolyChainByPDB(chain);
-			tmp1.setPDBCode(structure1.getPDBCode());
 			tmp1.setPDBHeader(structure1.getPDBHeader());
-			tmp1.setPDBCode(structure1.getPDBCode());
+			tmp1.setPdbId(structure1.getPdbId());
 			tmp1.addChain(c1);
 			System.out.println("ok");
 
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
index 0e36624830..785727cbcd 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
@@ -22,9 +22,27 @@
 package org.biojava.nbio.structure.gui.util;
 
 
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Arrays;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.biojava.nbio.structure.ResidueRange;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.StructureTools;
+import org.biojava.nbio.structure.SubstructureIdentifier;
 import org.biojava.nbio.structure.align.util.UserConfiguration;
 import org.biojava.nbio.structure.io.CifFileReader;
 import org.biojava.nbio.structure.io.PDBFileReader;
@@ -32,13 +50,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
 /** A JPanel to upload 2 custom PDB files.
  *
  * @author Andreas Prlic
@@ -59,16 +70,16 @@ public class PDBUploadPanel
 
 
 
-	private JComboBox fileType ;
+	private JComboBox<String> fileType ;
 
 	JTextField filePath1;
 	JTextField filePath2;
 	JTextField chain1;
 	JTextField chain2;
 
-	public static JComboBox getFileFormatSelect(){
-		JComboBox fileType = new JComboBox();
-			fileType = new JComboBox(new String[] {UserConfiguration.PDB_FORMAT,UserConfiguration.MMCIF_FORMAT});
+	public static JComboBox<String> getFileFormatSelect(){
+		JComboBox<String> fileType = new JComboBox<>();
+			fileType = new JComboBox<String>(new String[] {UserConfiguration.PDB_FORMAT,UserConfiguration.MMCIF_FORMAT});
 			fileType.setSelectedIndex(0);
 			fileType.setMaximumSize(new Dimension(10,50));
 
@@ -150,7 +161,10 @@ private Structure getStructure(JTextField filePath,JTextField chainId) throws St
 			throw new StructureException(e);
 		}
 
-		Structure reduced = StructureTools.getReducedStructure(s, chainId.getText());
+//		Structure reduced = StructureTools.getReducedStructure(s, chainId.getText());
+//		Structure reduced = new SubstructureIdentifier(s.getPdbId().getId()+"."+ chainId.getText()).reduce(s);  //TODO double check this
+		Structure reduced = new SubstructureIdentifier(s.getPdbId(),
+				Arrays.asList(new ResidueRange(chainId.getText(), (String) null, null))).reduce(s);
 
 		String fileURL = "";
 		try {
@@ -169,7 +183,7 @@ private Structure getStructure(JTextField filePath,JTextField chainId) throws St
 			e.printStackTrace();
 		}
 
-		reduced.setPDBCode(fileURL);
+		reduced.setPDBCode(fileURL);  //TODO FIXME This usage seems wrong and should be changed.
 		reduced.setName(fileURL);
 		return reduced;
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 87b34d4dcb..721b635d37 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -105,7 +105,6 @@
     		<artifactId>log4j-core</artifactId>
   		</dependency>
 		<!--  Testing related dependencies -->
-
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -117,6 +116,19 @@
 			<version>1.6</version>
 			<scope>test</scope>
 		</dependency>
+		<!-- Junit5 dependencies, defined in parent pom. -->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-params</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+		</dependency>
 
 	</dependencies>
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/BioAssemblyIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/BioAssemblyIdentifier.java
index 365948f059..194368d763 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/BioAssemblyIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/BioAssemblyIdentifier.java
@@ -31,7 +31,7 @@ public class BioAssemblyIdentifier implements StructureIdentifier {
 
 	private static final long serialVersionUID = -356206725119993449L;
 
-	private String pdbCode;
+	private PdbId pdbId;
 	private int biolNr;
 
 	public static final Pattern BIO_NAME_PATTERN = Pattern.compile("^(?:BIO:)([0-9][a-z0-9]{3})(?::([0-9]+))?$", Pattern.CASE_INSENSITIVE);
@@ -41,7 +41,7 @@ public BioAssemblyIdentifier(String name) {
 		if(! match.matches() ) {
 			throw new IllegalArgumentException("Invalid BIO identifier");
 		}
-		pdbCode = match.group(1);
+		pdbId = new PdbId(match.group(1));
 		if(match.group(2) != null) {
 			biolNr = Integer.parseInt(match.group(2));
 		} else {
@@ -49,17 +49,29 @@ public BioAssemblyIdentifier(String name) {
 		}
 	}
 
+	/**
+	 * @param pdbCode
+	 * @param biolNr
+	 */
 	public BioAssemblyIdentifier(String pdbCode, int biolNr) {
-		this.pdbCode = pdbCode;
+		this(new PdbId(pdbCode), biolNr);
+	}
+
+	/**
+	 * @param pdbCode
+	 * @param biolNr
+	 */
+	public BioAssemblyIdentifier(PdbId pdbId, int biolNr) {
+		this.pdbId = pdbId;
 		this.biolNr = biolNr;
 	}
 
 	@Override
 	public String getIdentifier() {
 		if( biolNr < 0) {
-			return "BIO:"+pdbCode;
+			return "BIO:"+pdbId.getId();
 		} else {
-			return String.format("BIO:%s:%d",pdbCode,biolNr);
+			return String.format("BIO:%s:%d",pdbId.getId(),biolNr);
 		}
 	}
 	@Override
@@ -70,12 +82,12 @@ public String toString() {
 	@Override
 	public Structure loadStructure(AtomCache cache) throws StructureException,
 			IOException {
-		return cache.getBiologicalAssembly(pdbCode, biolNr, AtomCache.DEFAULT_BIOASSEMBLY_STYLE);
+		return cache.getBiologicalAssembly(pdbId, biolNr, AtomCache.DEFAULT_BIOASSEMBLY_STYLE);
 	}
 
 	@Override
 	public SubstructureIdentifier toCanonical() throws StructureException {
-		return new SubstructureIdentifier(pdbCode, new ArrayList<ResidueRange>());
+		return new SubstructureIdentifier(pdbId, new ArrayList<ResidueRange>());
 	}
 
 	@Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
index 1b39e44d43..ea0f36115c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
@@ -20,17 +20,24 @@
  */
 package org.biojava.nbio.structure;
 
-import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import org.biojava.nbio.structure.quaternary.BioAssemblyInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -56,7 +63,7 @@ public class PDBHeader implements PDBRecord {
 	 * Use {@link #getKeywords()} instead. */
 	private String description;
 	private List<String> keywords;
-	private String idCode;
+	private PdbId pdbId;
 	private String classification;
 
 	private Date depDate;
@@ -455,24 +462,57 @@ public boolean equals(PDBHeader other){
 	}
 
 
-	/** The PDB code for this protein structure.
+	/** 
+	 * The PDB code for this protein structure.
 	 *
 	 * @return the PDB identifier
 	 * @see #setIdCode(String)
+	 * @deprecated use {@link #getPdbId()}
 	 */
+	@Deprecated
 	public String getIdCode() {
-		return idCode;
+		if(this.pdbId == null)
+			return null;
+		return this.pdbId.getId();
 	}
-	/** The PDB code for this protein structure.
+
+	/** 
+	 * The PDB code for this protein structure.
 	 *
 	 * @param idCode the PDB identifier
 	 * @see #getIdCode()
-	 *
+	 * @deprecated use {@link #setPdbId(PdbId)}
 	 */
+	@Deprecated
 	public void setIdCode(String idCode) {
-		this.idCode = idCode;
+		if(idCode == null) {
+			this.pdbId = null;
+		}else {
+			this.pdbId = new PdbId(idCode);
+		}
 	}
 
+	/** 
+	 * Gets the PDB identifier for this protein structure.
+	 *
+	 * @return the {@link PdbId} PDB identifier
+	 * @see #setPdbId(PdbId)
+	 * @since 6.0.0
+	 */
+	public PdbId getPdbId() {
+		return pdbId;
+	}
+	
+	/** 
+	 * Sets the PDB identifier code for this protein structure.
+	 *
+	 * @param pdbId the PDB identifier
+	 * @see #getPdbId()
+	 * @since 6.0.0
+	 */
+	public void setPdbId(PdbId pdbId) {
+		this.pdbId = pdbId;
+	}
 
 	public String getClassification() {
 		return classification;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PassthroughIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PassthroughIdentifier.java
index a1793e2816..bc2040f966 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PassthroughIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PassthroughIdentifier.java
@@ -48,7 +48,7 @@ public String getIdentifier() {
 	 */
 	@Override
 	public SubstructureIdentifier toCanonical() {
-		return new SubstructureIdentifier(null, new ArrayList<ResidueRange>());
+		return new SubstructureIdentifier((PdbId)null, new ArrayList<ResidueRange>());
 	}
 
 	@Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PdbId.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PdbId.java
new file mode 100644
index 0000000000..d601d2a4e8
--- /dev/null
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PdbId.java
@@ -0,0 +1,241 @@
+/*
+ *                    BioJava development code
+ *
+ * This code may be freely distributed and modified under the
+ * terms of the GNU Lesser General Public Licence.  This should
+ * be distributed with the code.  If you do not have a copy,
+ * see:
+ *
+ *      http://www.gnu.org/copyleft/lesser.html
+ *
+ * Copyright for this code is held jointly by the individual
+ * authors.  These should be listed in @author doc comments.
+ *
+ * For more information on the BioJava project and its aims,
+ * or to join the biojava-l mailing list, visit the home page
+ * at:
+ *
+ *      http://www.biojava.org/
+ *
+ */
+package org.biojava.nbio.structure;
+
+import java.io.Serializable;
+import java.util.regex.Pattern;
+
+/**
+ * A wrapper class for the PDB identifier.
+ * 
+ * It handles conversion between current (short) <code>[1-9][0-9A-Z]{3}</code> and
+ * upcoming (extended) <code>PDB_\d{4}[1-9][09-A-Z]</code> PDB ID format.<br>
+ * Instances of this class are <em>immutable</em>.<br>
+ * Creation of PdBId instance follows strict PDB ID convention.
+ * There is only one exception to this rule which is <b>XXXX</b>. XXXX objects 
+ * are not considered equal (unless they are the one and the same object).
+ * @author Amr ALHOSSARY
+ * @since 6.0.0
+ *
+ */
+public class PdbId implements Comparable<PdbId>, Serializable{
+	
+	private static final long serialVersionUID = -7740865530486255113L;
+	private static final String PREFIX_PDB_ = "PDB_";
+	private static final String STRING_0000 = "0000";
+	private static final String PDB_0000 = PREFIX_PDB_ + STRING_0000;
+
+	/**
+	 * Controls how the PDB ID output/conversion should go, if possible.
+	 * The default is to try to produce short PDB ID. If failed, produce extended PDB ID.
+	 */
+	private static final boolean defaultShorteningBehaviour = true;
+
+
+	/**
+	 * A regular expression that matches a PDB ID in the short format.
+	 */
+	public static final Pattern PATTERN_SHORT_PDBID = Pattern.compile("[1-9]\\p{Alnum}{3}");
+	/**
+	 * A regular expression that matches a PDB ID in the extended format.
+	 */
+	public static final Pattern PATTERN_EXTENDED_PDBID = Pattern.compile("(pdb|PDB)_\\p{Alnum}{8}"); 
+	/**
+/	 * A regular expression that matches an extended PDB ID that is compatible with the short format.
+	 */
+	public static final Pattern PATTERN_SHORTABLE_EXTENDED_PDBID = Pattern.compile("(pdb|PDB)_0000[1-9]\\p{Alnum}{3}"); 
+
+	/**
+	 * Keeps the ID in <b>UPPER CASE</b>, in a <em>reduced</em> form (without the <code>PDB_</code> prefix).
+	 */
+	private String idCode;
+
+	/**
+	 * @param id A <i>valid</i> PDB ID in either <i>short (case insensitive)</i> or <i>extended</i> format.
+	 * @throws IllegalArgumentException If <code>id</code> is not a valid identifier.
+	 * @throws NullPointerException  If <code>id</code> is <code>null</code>.
+	 */
+	public PdbId(String id){
+		if (id == null) {
+			throw new IllegalArgumentException("ID can not be null");
+		}
+		this.idCode = toInternalFormat(id);
+	}
+	
+	/**
+	 * Check whether <code>id</code> represents a valid PDB ID in the <em>short</em> format.
+	 * @param id Prospect ID
+	 * @return <code>true</code> if <code>id</code> is a valid short PDB ID, <code>false</code> otherwise.
+	 * @throws NullPointerException if <code>id</code> is <code>null</code>.
+	 * @see #isValidExtendedPdbId(String)
+	 */
+	public static boolean isValidShortPdbId(String id) {
+		return PATTERN_SHORT_PDBID.matcher(id).matches();
+	}
+	
+	/**
+	 * Check whether <code>id</code> represents a valid PDB ID in the <em>extended</em> format.
+	 * @param id Prospect ID
+	 * @return <code>true</code> if <code>id</code> is a valid extended PDB ID, <code>false</code> otherwise.
+	 * @throws NullPointerException if <code>id</code> is <code>null</code>.
+	 * @see #isValidShortPdbId(String)
+	 */
+	public static boolean isValidExtendedPdbId(String id) {
+		return PATTERN_EXTENDED_PDBID.matcher(id).matches();
+	}
+	
+	/**
+	 * Checks whether an Extended PDB ID is shortable, <i>assuming it is a valid extended PDB ID</i>.
+	 * @see #isValidExtendedPdbId(String)
+	 * @param extendedId the supposedly valid extended PDB ID.
+	 * @return <code>true</code> if <code>extendedId</code> can be shortened 
+	 * (ie. it matches the regular expression "(pdb|PDB)_0000[1-9][a-zA-Z0-9]{3}"), <code>false</code> otherwise.
+	 */
+	public static boolean isShortCompatible(String extendedId) {
+		return PATTERN_SHORTABLE_EXTENDED_PDBID.matcher(extendedId).matches();
+	}
+	
+	@Override
+	public int hashCode() {
+		return idCode.hashCode();
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		// We are sure they are both objects of the same class and their respective IDs are in the same (UPPER) case.
+		return this.idCode.equals(((PdbId)obj).idCode);
+	}
+	
+	@Override
+	protected Object clone() throws CloneNotSupportedException {
+		return new PdbId(this.getId());
+	}
+
+	@Override
+	public String toString() {
+		return getId();
+	}
+
+	/**
+	 * Get a <code>String</code> representation of this PdbId instance.<br>
+	 * By default this function will try to get the PdbId in the short (4 letters) format.
+	 * If not possible, it will return the long format.
+	 * N.B. This default behavior may change later;
+	 * @return the PdbId code, preferably in short format.
+	 */
+	public String getId() {
+		return getId(defaultShorteningBehaviour);
+	}
+	
+	/**
+	 * Get a <code>String</code> representation of this PdbId instance, using the <i>passed in</i> behavior.<br>
+	 * @param prefereShort when it is <code>true</code>, the class will try to produce the short ID whenever possible.
+	 * @return The PdbId in short format if possible and <code>prefereShort</code> is <code>true</code>, the extended PDB ID form otherwise.
+	 */
+	public String getId(boolean prefereShort) {
+		if (prefereShort && isInternalShortCompatible(idCode))
+			return internalToShortNoCheck(idCode);
+		return PREFIX_PDB_ + idCode;
+	}
+	
+	/**
+	 * Get the PDB Id in the short format. Throws an exception if the conversion is not possible.<br>
+	 * Use this method only if you know that this PDB ID is shortable.
+	 * @return the PDB ID in the short format.
+	 * @throws StructureException if the conversion was not possible.
+	 */
+	public String getShortId() throws StructureException{
+		if(isInternalShortCompatible(idCode)) {
+			return internalToShortNoCheck(idCode);
+		} else {
+			throw new StructureException("ID (" + getId() + ") is not short format compatible");
+		}
+	}
+	
+	/**
+	 * Converts <code>shortId</code> to the PDB ID extended format.
+	 * If <code>shortId</code> is a valid short PDB ID, it would be converted to an extended ID,
+	 * if <code>shortId</code> is a valid extended PDB ID, it would be returned in UPPER CASE,
+	 * a {@link StructureException} is thrown otherwise.
+	 * @param shortId the PDB ID to convert to extended format
+	 * @return the ID in the extended UPPER CASE format.
+	 * @throws StructureException if the conversion was not possible.
+	 */
+	public static String toExtendedId(String shortId) throws StructureException{
+		if (isValidShortPdbId(shortId)) {
+			return PDB_0000 + shortId.toUpperCase();
+		}else if (isValidExtendedPdbId(shortId)) {
+			return shortId.toUpperCase();
+		} else {
+			throw new StructureException("Unknown format ["+shortId+"]");
+		}
+	}
+	
+	/**
+	 * Converts <code>extendedId</code> to the PDB ID short format.
+	 * If <code>extendedId</code> is a valid extended PDB ID, it would be converted to a short ID,
+	 * if <code>extendedId</code> is a valid short PDB ID, it would be returned in UPPER CASE,
+	 * a {@link StructureException} is thrown otherwise.
+	 * @param extendedId the PDB ID to convert to short format
+	 * @return the ID in the short UPPER CASE format.
+	 * @throws StructureException if the conversion was not possible.
+	 */
+	public static String toShortId(String extendedId) throws StructureException{
+		if (isShortCompatible(extendedId)) {
+			return extendedId.substring(8).toUpperCase();
+		} else if (isValidShortPdbId(extendedId)) {
+			return extendedId.toUpperCase();
+		} else {
+			throw new StructureException("Conversion not possible of ID ["+extendedId+"]");
+		}
+	}
+
+	private static boolean isInternalShortCompatible(String intId) {
+		return intId.substring(0, 4).equals(STRING_0000);
+	}
+	
+	private static String toInternalFormat(String id) throws IllegalArgumentException {
+		if (isValidShortPdbId(id)) {
+			return STRING_0000  + id.toUpperCase();
+		}else if (isValidExtendedPdbId(id)) {
+			return id.substring(4).toUpperCase();
+		} else {
+			throw new IllegalArgumentException("Unknown format [" + id + "]");
+		}
+	}
+	
+	private static String internalToShortNoCheck(String extendedId) {
+		return extendedId.substring(4).toUpperCase();
+	}
+	
+	@Override
+	public int compareTo(PdbId o) {
+		//We know that both idCode fields are 8 UPPER CASE characters strings.
+		return this.idCode.compareTo(o.idCode);
+	}
+	
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
index 6fa247e73a..5a31f407e2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
@@ -182,22 +182,6 @@ public interface Structure extends Cloneable, Serializable {
 	@Override
 	String toString();
 
-	/**
-	 * Set PDB code of structure .
-	 *
-	 * @param pdb_id  a String specifying the PDBCode
-	 * @see #getPDBCode
-	 */
-	void setPDBCode (String pdb_id) ;
-
-	/**
-	 * Get PDB code of structure.
-	 *
-	 * @return a String representing the PDBCode value
-	 * @see #setPDBCode
-	 */
-	String  getPDBCode () ;
-
 	/**
 	 * Set biological name of Structure .
 	 *
@@ -767,14 +751,6 @@ public interface Structure extends Cloneable, Serializable {
 	 */
 	void resetModels();
 
-	/**
-	 * Returns the PDB identifier associated with this StructureIdentifier.
-	 * @deprecated From BioJava 4.2, use {@link #getPDBCode()} or
-	 *  <code>getStructureIdentifier().toCanonical().getPdbId()</code>
-	 */
-	@Deprecated
-	String getPdbId();
-
 	/**
 	 * Get a string representing this structure's contents. The following places
 	 * are searched for a non-null value, with the first being returned:
@@ -790,5 +766,41 @@ public interface Structure extends Cloneable, Serializable {
 	 *  returned the same value as {@link #getPDBCode()}
 	 */
 	String getIdentifier();
+
+	/**
+	 * Get PDB code of structure.
+	 *
+	 * @return a String representing the PDBCode value
+	 * @see #setPDBCode
+	 * @deprecated use {@link #getPdbId()} to get a {@link PdbId} object or getPdbId().getId() to get a {@link String}
+	 */
+	@Deprecated
+	String getPDBCode () ;
+
+	/**
+	 * Set PDB code of structure .
+	 *
+	 * @param pdb_id  a String specifying the PDBCode
+	 * @see #getPDBCode
+	 * @deprecated use {@link #setPDBCode(PdbId)}
+	 */
+	@Deprecated
+	void setPDBCode (String pdb_id);
+
+
+
+	/**
+	 * Returns the PDB identifier associated with this StructureIdentifier.
+	 * @return the {@link PdbId} object
+	 * @since 6.0.0
+	 */
+	PdbId getPdbId();
+	
 	
+	/**Sets the {@link PdbId} identifier associated with this structure.
+	 * @param pdbId the {@link PdbId} identifier object to set
+	 * @since 6.0.0
+	 */
+	void setPdbId(PdbId pdbId);
+
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
index c556d4444c..9b96705c91 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
@@ -51,7 +51,8 @@ public class StructureIO {
 		range         := '('? range (',' range)? ')'?
 					   | chainID
 					   | chainID '_' resNum '-' resNum
-		pdbID         := [0-9][a-zA-Z0-9]{3}
+		pdbID         := [1-9][a-zA-Z0-9]{3}
+					   | PDB_[a-zA-Z0-9]{8}
 		chainID       := [a-zA-Z0-9]
 		scopID        := 'd' pdbID [a-z_][0-9_]
 		biol		  := 'BIO:' pdbID [:]? [0-9]+
@@ -59,10 +60,14 @@ public class StructureIO {
 
 
 		Example structures:
-		1TIM     	#whole structure - asym unit
-		4HHB.C     	#single chain
-		4GCR.A_1-83 #one domain, by residue number
-		3AA0.A,B    #two chains treated as one structure
+		1TIM                #whole structure - asym unit (short format)
+		4HHB.C              #single chain
+		4GCR.A_1-83         #one domain, by residue number
+		3AA0.A,B            #two chains treated as one structure
+		PDB_00001TIM        #whole structure - asym unit (extended format)
+		PDB_00004HHB.C      #single chain
+		PDB_00004GCR.A_1-83 #one domain, by residue number
+		PDB_00003AA0.A,B    #two chains treated as one structure
 		d2bq6a1     #scop domain
 		BIO:1fah   #biological assembly nr 1 for 1fah
 		BIO:1fah:0 #asym unit for 1fah
@@ -235,18 +240,6 @@ public static List<Structure> getBiologicalAssemblies(String pdbId) throws IOExc
 		return getBiologicalAssemblies(pdbId, AtomCache.DEFAULT_BIOASSEMBLY_STYLE);
 	}
 
-	private static final String FILE_SEPARATOR = System.getProperty("file.separator");
-
-	/**
-	 * Utility method to set the location where PDB files can be found
-	 *
-	 * @param pathToPDBFiles
-	 */
-	public static void setPdbPath(String pathToPDBFiles) {
-		if (!pathToPDBFiles.endsWith(FILE_SEPARATOR))
-			pathToPDBFiles += FILE_SEPARATOR;
-	}
-
 	/**
 	 * Attempts to guess the type of a structure file based on the extension
 	 * @param filename
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
index 9f07e0338c..08b7ebceb0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
@@ -48,7 +48,7 @@ public class StructureImpl implements Structure {
 
 	private static final Logger logger = LoggerFactory.getLogger(StructureImpl.class);
 
-	private String pdb_id ;
+	private PdbId pdbId ;
 
 	private List<Model> models;
 
@@ -116,7 +116,7 @@ public Structure clone() {
 
 		// copy structure data
 
-		n.setPDBCode(getPDBCode());
+		n.setPdbId(getPdbId());
 		n.setName(getName());
 		//TODO the header data is not being deep-copied, that's a minor issue since it is just some static metadata, but we should recheck this if needed - JD 2014-12-11
 		n.setPDBHeader(pdbHeader);
@@ -226,17 +226,6 @@ public Group findGroup(String chainName, String pdbResnum) throws StructureExcep
 
 	}
 
-	/** {@inheritDoc} */
-	@Override
-	public void setPDBCode (String pdb_id_) {
-		pdb_id = pdb_id_ ;
-	}
-
-	/** {@inheritDoc} */
-	@Override
-	public String  getPDBCode () {
-		return pdb_id ;
-	}
 
 	/** {@inheritDoc} */
 	@Override
@@ -366,7 +355,7 @@ public String toString(){
 		str.append("structure ");
 		str.append(name);
 		str.append(" ");
-		str.append(pdb_id);
+		str.append(pdbId);
 		str.append(" ");
 
 		if ( nrModels()>1 ){
@@ -1013,11 +1002,45 @@ public String getIdentifier() {
 		return toCanonical().getIdentifier();
 	}
 
-	/** {@inheritDoc} */
+	/** 
+	 * {@inheritDoc} 
+	 * @deprecated use {@link #getPdbId()} to get a {@link PdbId} object or getPdbId().getId() to get a {@link String}
+	 */
 	@Deprecated
 	@Override
-	public String getPdbId() {
-		return pdb_id;
+	public String  getPDBCode () {
+		if(pdbId == null)
+			return null;
+		return this.pdbId.getId() ;
+	}
+	
+	/** {@inheritDoc} 
+	 * @deprecated use {@link #setPDBCode(PdbId)}
+	 * */
+	@Deprecated
+	@Override
+	public void setPDBCode(String pdb_id){
+		if(pdb_id == null) {
+			this.pdbId = null;
+		}else {
+			pdbId = new PdbId(pdb_id);
+		}
+	}
+	
+
+
+	/** {@inheritDoc} 
+	 * @since 6.0.0
+	 * */
+	public PdbId getPdbId() {
+		return this.pdbId;
+	}
+	
+	/** {@inheritDoc}
+	 * @since 6.0.0
+	 *  */
+	public void setPdbId(PdbId pdbId) {
+		this.pdbId = pdbId;
 	}
 
 	@Override
@@ -1064,7 +1087,7 @@ private SubstructureIdentifier toCanonical() {
 
 			range.add(new ResidueRange(chain.getName(),first,last));
 		}
-		return new SubstructureIdentifier(getPDBCode(),range);
+		return new SubstructureIdentifier(getPdbId(),range);
 	}
 
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
index b1d3723108..3dad14a2a0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
@@ -1259,67 +1259,6 @@ public static boolean isNucleotide(String groupCode3) {
 				|| nucleotides23.containsKey(code);
 	}
 
-	/**
-	 * Reduce a structure to provide a smaller representation . Only takes the
-	 * first model of the structure. If chainName is provided only return a
-	 * structure containing that Chain ID. Converts lower case chain IDs to
-	 * upper case if structure does not contain a chain with that ID.
-	 *
-	 * @param s
-	 * @param chainId
-	 * @return Structure
-	 * @since 3.0
-	 * @deprecated Use {@link StructureIdentifier#reduce(Structure)} instead (v. 4.2.0)
-	 */
-	@Deprecated
-	public static Structure getReducedStructure(Structure s,
-			String chainId) throws StructureException {
-		// since we deal here with structure alignments,
-		// only use Model 1...
-
-		Structure newS = new StructureImpl();
-		newS.setPDBCode(s.getPDBCode());
-		newS.setPDBHeader(s.getPDBHeader());
-		newS.setName(s.getName());
-		newS.setSSBonds(s.getSSBonds());
-		newS.setDBRefs(s.getDBRefs());
-		newS.setSites(s.getSites());
-		newS.setBiologicalAssembly(s.isBiologicalAssembly());
-		newS.setEntityInfos(s.getEntityInfos());
-		newS.setSSBonds(s.getSSBonds());
-		newS.setSites(s.getSites());
-
-		if (chainId != null)
-			chainId = chainId.trim();
-
-		if (chainId == null || chainId.equals("")) {
-			// only get model 0
-			List<Chain> model0 = s.getModel(0);
-			for (Chain c : model0) {
-				newS.addChain(c);
-			}
-			return newS;
-
-		}
-
-		Chain c = s.getPolyChainByPDB(chainId);
-
-		if (c != null) {
-			newS.addChain(c);
-			for (EntityInfo comp : s.getEntityInfos()) {
-				if (comp.getChainIds() != null
-						&& comp.getChainIds().contains(c.getId())) {
-					// found matching entity info. set description...
-					newS.getPDBHeader().setDescription(
-							"Chain " + c.getId() + " of " + s.getPDBCode()
-							+ " " + comp.getDescription());
-				}
-			}
-		}
-
-		return newS;
-	}
-
 	public static String convertAtomsToSeq(Atom[] atoms) {
 
 		StringBuilder buf = new StringBuilder();
@@ -1701,7 +1640,7 @@ public static Structure removeModels(Structure s) {
 
 		// copy structure data
 
-		n.setPDBCode(s.getPDBCode());
+		n.setPdbId(s.getPdbId());
 		n.setName(s.getName());
 
 		// TODO: do deep copying of data!
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
index da9c1e1dee..0d0810b33e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
@@ -33,7 +33,6 @@
 import org.biojava.nbio.structure.contact.Grid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 /**
  * This is the canonical way to identify a part of a structure.
  *
@@ -50,18 +49,25 @@
  * 		range         := range (',' range)?
  * 		               | chainID
  * 		               | chainID '_' resNum '-' resNum
- * 		pdbID         := [0-9][a-zA-Z0-9]{3}
+ *		pdbID         := [1-9][a-zA-Z0-9]{3}
+ *		               | PDB_[a-zA-Z0-9]{8}
  * 		chainID       := [a-zA-Z0-9]+
  * 		resNum        := [-+]?[0-9]+[A-Za-z]?
  * </pre>
  * For example:
  * <pre>
- * 		1TIM                            #whole structure
- * 		1tim                            #same as above
- * 		4HHB.C                          #single chain
- * 		3AA0.A,B                        #two chains
- * 		4GCR.A_1-40                     #substructure
- *      3iek.A_17-28,A_56-294,A_320-377 #substructure of 3 disjoint parts
+ * 		1TIM                                    #whole structure (short format)
+ * 		1tim                                    #same as above
+ * 		4HHB.C                                  #single chain
+ * 		3AA0.A,B                                #two chains
+ * 		4GCR.A_1-40                             #substructure
+ *      3iek.A_17-28,A_56-294,A_320-377         #substructure of 3 disjoint parts
+ * 		PDB_00001TIM                            #whole structure (extended format)
+ * 		pdb_00001tim                            #same as above
+ * 		PDB_00004HHB.C                          #single chain
+ * 		PDB_00003AA0.A,B                        #two chains
+ * 		PDB_00004GCR.A_1-40                     #substructure
+ *      pdb_00003iek.A_17-28,A_56-294,A_320-377 #substructure of 3 disjoint parts
  * </pre>
  * More options may be added to the specification at a future time.
 
@@ -75,7 +81,7 @@ public class SubstructureIdentifier implements StructureIdentifier {
 	private static final Logger logger = LoggerFactory.getLogger(SubstructureIdentifier.class);
 
 
-	private final String pdbId;
+	private final PdbId pdbId;
 	private final List<ResidueRange> ranges;
 
 	/**
@@ -87,14 +93,17 @@ public SubstructureIdentifier(String id) {
 		if(1 > idRange.length || idRange.length > 2 ) {
 			throw new IllegalArgumentException(String.format("Malformed %s: %s",getClass().getSimpleName(),id));
 		}
-		if(idRange[0].length() != 4) {
-			this.pdbId = idRange[0];
+		//used tempId to avoid writing 2 assignment statements to a final field,
+		// although one is in the try block and the other in the catch block.
+		PdbId tempId = null;
+		try {
+			tempId = new PdbId(idRange[0]);
+		} catch (IllegalArgumentException e) {
 			// Changed from Exception to a warning to support files and stuff -sbliven 2015/01/22
-			logger.warn(String.format("Unrecognized PDB code %s",this.pdbId));
-		} else {
-			this.pdbId = idRange[0].toUpperCase();
+			logger.warn(String.format("Unrecognized PDB code %s", idRange[0]));
 		}
-
+		this.pdbId = tempId;
+		
 		if( idRange.length == 2) {
 			String rangeStr = idRange[1].trim();
 
@@ -112,6 +121,17 @@ public SubstructureIdentifier(String id) {
 	 * @param ranges
 	 */
 	public SubstructureIdentifier(String pdbId, List<ResidueRange> ranges) {
+		this(new PdbId(pdbId), ranges);
+	}
+
+	/**
+	 * Create a new identifier based on a set of ranges.
+	 *
+	 * If ranges is empty, includes all residues.
+	 * @param pdbId
+	 * @param ranges
+	 */
+	public SubstructureIdentifier(PdbId pdbId, List<ResidueRange> ranges) {
 		if(ranges == null) {
 			throw new NullPointerException("Null ranges list");
 		}
@@ -135,14 +155,19 @@ public String toString() {
 	 */
 	@Override
 	public String getIdentifier() {
+		String pdbId = this.pdbId == null? "": this.pdbId.getId();
 		if (ranges.isEmpty()) return pdbId;
 		return pdbId + "." + ResidueRange.toString(ranges);
 	}
 
-	public String getPdbId() {
+	/**
+	 * Get the PDB identifier part of the SubstructureIdentifier
+	 * @return the PDB ID
+	 */
+	public PdbId getPdbId() {
 		return pdbId;
 	}
-
+	
 	public List<ResidueRange> getResidueRanges() {
 		return ranges;
 	}
@@ -178,16 +203,19 @@ public SubstructureIdentifier toCanonical() {
 	public Structure reduce(Structure s) throws StructureException {
 		// Follows StructureImpl.clone()
 
+		if(s == null)
+			throw new StructureException("NullPointerException Possibly due to malformed PIBId format.");
+
 		// Create new structure & copy basic properties
 		Structure newS = new StructureImpl();
 
-		newS.setPDBCode(s.getPDBCode());
+		newS.setPdbId(s.getPdbId());
 		newS.setPDBHeader(s.getPDBHeader());
 		newS.setName(this.toString());
 		newS.setDBRefs(s.getDBRefs());
 		newS.setBiologicalAssembly(s.isBiologicalAssembly());
 		newS.getPDBHeader().setDescription(
-				"sub-range " + ranges + " of "  + newS.getPDBCode() + " "
+				"sub-range " + ranges + " of "  + newS.getPdbId() + " "
 						+ s.getPDBHeader().getDescription());
 		newS.setEntityInfos(new ArrayList<>());
 		// TODO The following should be only copied for atoms which are present in the range.
@@ -290,7 +318,7 @@ public Structure reduce(Structure s) throws StructureException {
 	 */
 	@Override
 	public Structure loadStructure(AtomCache cache) throws IOException, StructureException {
-		String pdb = getPdbId();
+		PdbId pdb = getPdbId();
 		if(pdb == null)
 			return null;
 		return cache.getStructureForPdbId(pdb);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
index 0581ba3a60..189dc3c5de 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
@@ -61,8 +61,11 @@ public class URLIdentifier implements StructureIdentifier {
 	private static final Logger logger = LoggerFactory.getLogger(URLIdentifier.class);
 
 	// Used for guessing the PDB ID from the filename
-	private static final Pattern PDBID_REGEX = Pattern.compile("^([0-9][a-z0-9]{3})([._-]|\\s).*", Pattern.CASE_INSENSITIVE);
-
+	//UPDATE: It seems that this RegEx rarely succeeded , because the file
+	//name is most of the time in the format pdbxxxx.EXT not xxxx.EXT.
+	private static final Pattern PDBID_REGEX = Pattern.compile("^(?:pdb)?([0-9][a-z0-9]{3})([._-]|\\s).*", Pattern.CASE_INSENSITIVE);
+//	private static final Pattern PDBID_REGEX = Pattern.compile("^(?:pdb)?((PDB_[0-9]{4})?[0-9][a-z0-9]{3})([._-]|\\s).*", Pattern.CASE_INSENSITIVE);
+	
 	/** URL parameter specifying the file format (PDB or CIF) */
 	public static final String FORMAT_PARAM = "format";
 	/** URL parameter specifying the PDB ID */
@@ -99,7 +102,7 @@ public String getIdentifier() {
 	 * @return A SubstructureIdentifier without ranges (e.g. including all residues)
 	 */
 	@Override
-	public SubstructureIdentifier toCanonical() {
+	public SubstructureIdentifier toCanonical() throws StructureException{
 		String pdbId = null;
 		List<ResidueRange> ranges = Collections.emptyList();
 		try {
@@ -119,7 +122,7 @@ public SubstructureIdentifier toCanonical() {
 			String path = url.getPath();
 			pdbId = guessPDBID(path.substring(path.lastIndexOf("/") + 1));
 		}
-		return new SubstructureIdentifier(pdbId, ranges);
+		return new SubstructureIdentifier(new PdbId(pdbId), ranges);
 	}
 
 	@Override
@@ -176,10 +179,9 @@ public static String guessPDBID(String name) {
 		Matcher match = PDBID_REGEX.matcher(name);
 		if (match.matches()) {
 			return match.group(1).toUpperCase();
-		} else {
-			// Give up if doesn't match
-			return null;
 		}
+		// Give up if doesn't match
+		return null;
 	}
 
 	/**
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java
index 4290b004bd..dacbe5d593 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/PdbPair.java
@@ -22,6 +22,7 @@
 
 import java.util.Objects;
 
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.StructureException;
 
 /**
@@ -96,16 +97,49 @@ public int compareTo(PdbPair o) {
 		return name2.compareTo(o.name2);
 	}
 
+	/**
+	 * @deprecated use {@link #getPDBCode1()} instead
+	 * @return
+	 * @throws StructureException
+	 */
 	public String getPDBCode1() throws StructureException {
-		return name1.getPdbId();
+		PdbId pdbId = name1.getPdbId();
+		return pdbId == null? null: pdbId.getId();
 	}
+
+	/**
+	 * @deprecated use {@link #getPDBCode2()} instead
+	 * @return
+	 * @throws StructureException
+	 */
+	@Deprecated
 	public String getPDBCode2() throws StructureException{
-		return name2.getPdbId();
+		PdbId pdbId = name2.getPdbId();
+		return pdbId == null? null: pdbId.getId();
+	}
+	
+	/**
+	 * @since 6.0.0
+	 * @return
+	 * @throws StructureException
+	 */
+	public PdbId getPdbId1() throws StructureException{
+		return name1.getPdbId();
 	}
 
+	/**
+	 * @since 6.0.0
+	 * @return
+	 * @throws StructureException
+	 */
+	public PdbId getPdbId2() throws StructureException{
+		return name2.getPdbId();
+	}
+	
 	public String getChainId1(){
 		return  name1.getChainId();
 	}
+
 	public String getChainId2(){
 		return name2.getChainId();
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/StructureName.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/StructureName.java
index 58f244343c..123987531b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/StructureName.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/StructureName.java
@@ -35,6 +35,7 @@
 import java.util.regex.Pattern;
 
 import org.biojava.nbio.structure.BioAssemblyIdentifier;
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.ResidueRange;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
@@ -72,9 +73,10 @@ public class StructureName implements Comparable<StructureName>, Serializable, S
 	private static final Logger logger = LoggerFactory.getLogger(StructureName.class);
 
 	protected String name;
-	protected String pdbId;
+	protected PdbId pdbId;
 	protected String chainName;
 
+	//TODO Double check all of the modified patterns
 	private static final Pattern cathPattern = Pattern.compile("^(?:CATH:)?([0-9][a-z0-9]{3})(\\w)([0-9]{2})$",Pattern.CASE_INSENSITIVE);
 	// ds046__ is a special case with no PDB entry
 	private static final Pattern scopPattern = Pattern.compile("^(?:SCOP:)?d([0-9][a-z0-9]{3}|s046)(\\w|\\.)(\\w)$",Pattern.CASE_INSENSITIVE);
@@ -243,14 +245,14 @@ private void init(){
 		}
 
 		// Default to PDB
-		initFromPDB( name );
+		initFromPDB(name);
 	}
 
 	private boolean initFromScop(String name) {
 		Matcher matcher = scopPattern.matcher(name);
 		if ( matcher.matches() ) {
 			mySource = Source.SCOP;
-			pdbId = matcher.group(1).toUpperCase();
+			pdbId = new PdbId(matcher.group(1));
 			chainName = matcher.group(2);
 			return true;
 		}
@@ -261,7 +263,7 @@ private boolean initFromCATH(String name) {
 		Matcher matcher = cathPattern.matcher(name);
 		if ( matcher.matches() ){
 			mySource = Source.CATH;
-			pdbId = matcher.group(1).toUpperCase();
+			pdbId = new PdbId(matcher.group(1));
 			chainName = matcher.group(2);
 			return true;
 		}
@@ -271,7 +273,7 @@ private boolean initFromECOD(String name) {
 		Matcher matcher = ecodPattern.matcher(name);
 		if ( matcher.matches() ){
 			mySource = Source.ECOD;
-			pdbId = matcher.group(1).toUpperCase();
+			pdbId = new PdbId(matcher.group(1));
 			chainName = null;
 			return true;
 		}
@@ -280,7 +282,7 @@ private boolean initFromECOD(String name) {
 	private boolean initFromBIO(String name) {
 		Matcher matcher = BioAssemblyIdentifier.BIO_NAME_PATTERN.matcher(name);
 		if( matcher.matches() ) {
-			pdbId = matcher.group(1).toUpperCase();
+			pdbId = new PdbId(matcher.group(1));
 			return true;
 		}
 		return false;
@@ -288,6 +290,7 @@ private boolean initFromBIO(String name) {
 	private boolean initFromPDB(String suffix) {
 		mySource = Source.PDB;
 		SubstructureIdentifier si = new SubstructureIdentifier(suffix);
+
 		base = si; // Safe to realize immediately
 
 		pdbId = si.getPdbId();
@@ -307,7 +310,11 @@ private boolean initFromURL(String suffix) {
 			URL url = new URL(suffix);
 			String path = url.getPath();
 			mySource = Source.URL;
-			pdbId = URLIdentifier.guessPDBID( path.substring(path.lastIndexOf('/')+1) );
+			try {
+				pdbId = new PdbId(URLIdentifier.guessPDBID( path.substring(path.lastIndexOf('/')+1) ));
+			} catch (IllegalArgumentException e) {
+				pdbId = null;
+			}
 			chainName = null; // Don't bother checking query params here
 			return true;
 		} catch(MalformedURLException e) {
@@ -340,14 +347,15 @@ private static Set<String> getChainNames(SubstructureIdentifier si) {
 	 * toCanonical().getPdbId()}
 	 * @return The upper-case PDB Name, or null if not applicable
 	 * @throws StructureException Wraps errors which occur when converting to canonical form
+	 * @since 6.0.0
 	 */
-	public String getPdbId() throws StructureException {
+	public PdbId getPdbId() throws StructureException {
 		if( pdbId == null) {
 			pdbId = toCanonical().getPdbId();
 		}
 		return pdbId;
 	}
-
+	
 	/**
 	 * Gets the chain ID, for structures where it is unique and well-defined.
 	 * May return '.' for multi-chain ranges, '_' for wildcard chains, or
@@ -450,9 +458,9 @@ public StructureIdentifier getBaseIdentifier() throws StructureException {
 					// Guessing didn't work, so just use the PDBID and Chain from name
 					// Guess that '_' means 'whole structure'
 					if (chainName.equals("_")) {
-						base = new SubstructureIdentifier(pdbId);
+						base = new SubstructureIdentifier(pdbId.getId());
 					} else {
-						base = new SubstructureIdentifier(pdbId,ResidueRange.parseMultiple(chainName));
+						base = new SubstructureIdentifier(pdbId, ResidueRange.parseMultiple(chainName));
 					}
 					logger.error("Unable to find {}, so using {}",name,base);
 				}
@@ -542,8 +550,8 @@ public int compareTo(StructureName o) {
 		if ( this.equals(o))
 			return 0;
 
-		String pdb1 = null;
-		String pdb2 = null;
+		PdbId pdb1 = null;
+		PdbId pdb2 = null;
 		try {
 			pdb1 = this.getPdbId();
 		} catch (StructureException e) {}
@@ -570,11 +578,11 @@ public int compareTo(StructureName o) {
 		}
 
 		// break tie with full identifiers
-		pdb1 = this.getIdentifier();
-		pdb2 = o.getIdentifier();
+		String pdb1Str = this.getIdentifier();
+		String pdb2Str = o.getIdentifier();
 
 		// Throws NPE for nulls
-		return pdb1.compareTo(pdb2);
+		return pdb1Str.compareTo(pdb2Str);
 	}
 
 	/**
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java
index b844b3b6b8..70482a8c78 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java
@@ -31,6 +31,7 @@
 
 import org.biojava.nbio.core.util.PrettyXMLWriter;
 import org.biojava.nbio.structure.Atom;
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.ResidueRange;
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureIdentifier;
@@ -327,7 +328,7 @@ public static String to3DFormat(MultipleAlignment alignment,
 		StructureIdentifier tName = alignment.getEnsemble().getStructureIdentifiers()
 				.get(templateIndex);
 		SubstructureIdentifier canon = tName.toCanonical();
-		String tPdbId = canon.getPdbId();
+		PdbId tPdbId = canon.getPdbId();
 		String tChain = null;
 		for(ResidueRange range : canon.getResidueRanges()) {
 			tChain = range.getChainName();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AlternativeAlignment.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AlternativeAlignment.java
index f6f3073ab7..2af3894f5e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AlternativeAlignment.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AlternativeAlignment.java
@@ -856,7 +856,7 @@ public Structure getAlignedStructure(Structure s1, Structure s2){
 		Calc.shift( s3, currentTranMatrix);
 
 		Structure newpdb = new StructureImpl();
-		newpdb.setPDBCode("Java");
+		newpdb.setPdbId(null);
 		newpdb.setName("Aligned with BioJava");
 
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
index d4d1638c12..258fdbf7f3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
@@ -225,11 +225,34 @@ public Atom[] getRepresentativeAtoms(StructureIdentifier name) throws IOExceptio
 	 * @return a structure object
 	 * @throws IOException
 	 * @throws StructureException if biassemblyId < 0 or other problems while loading structure
-	 * @author Peter Rose
 	 * @since 3.2
 	 */
 	public Structure getBiologicalAssembly(String pdbId, int bioAssemblyId, boolean multiModel)
 			throws StructureException, IOException {
+		return getBiologicalAssembly(new PdbId(pdbId), bioAssemblyId, multiModel);
+	}
+	
+	/**
+	 * Returns the biological assembly for a given PDB ID and bioAssemblyId, by building the
+	 * assembly from the biounit annotations found in {@link Structure#getPDBHeader()}
+	 * <p>
+	 * Note, the number of available biological unit files
+	 * varies. Many entries don't have a biological assembly specified (e.g. NMR structures), many entries have only one
+	 * biological assembly (bioAssemblyId=1), and some structures have multiple biological assemblies.
+	 *
+	 * @param pdbId
+	 *            the PDB ID
+	 * @param bioAssemblyId
+	 *            the 1-based index of the biological assembly (0 gets the asymmetric unit)
+	 * @param multiModel if true the output Structure will be a multi-model one with one transformId per model,
+	 * if false the outputStructure will be as the original with added chains with renamed asymIds (in the form originalAsymId_transformId and originalAuthId_transformId).
+	 * @return a structure object
+	 * @throws IOException
+	 * @throws StructureException if biassemblyId < 0 or other problems while loading structure
+	 * @since 6.0.0
+	 */
+	public Structure getBiologicalAssembly(PdbId pdbId, int bioAssemblyId, boolean multiModel)
+			throws StructureException, IOException {
 		if (bioAssemblyId < 0) {
 			throw new StructureException("bioAssemblyID must be nonnegative: " + pdbId + " bioAssemblyId "
 					+ bioAssemblyId);
@@ -419,18 +442,23 @@ public String getPath() {
 	 * 		range         := '('? range (',' range)? ')'?
 	 * 		               | chainID
 	 * 		               | chainID '_' resNum '-' resNum
-	 * 		pdbID         := [0-9][a-zA-Z0-9]{3}
+	 *		pdbID         := [1-9][a-zA-Z0-9]{3}
+	 *		               | PDB_[a-zA-Z0-9]{8}
 	 * 		chainID       := [a-zA-Z0-9]
 	 * 		scopID        := 'd' pdbID [a-z_][0-9_]
 	 * 		resNum        := [-+]?[0-9]+[A-Za-z]?
 	 *
 	 *
 	 * 		Example structures:
-	 * 		1TIM     #whole structure
-	 * 		4HHB.C     #single chain
-	 * 		4GCR.A_1-83     #one domain, by residue number
-	 * 		3AA0.A,B     #two chains treated as one structure
-	 * 		d2bq6a1     #scop domain
+	 * 		1TIM                 #whole structure
+	 * 		4HHB.C               #single chain
+	 * 		4GCR.A_1-83          #one domain, by residue number
+	 * 		3AA0.A,B             #two chains treated as one structure
+	 * 		PDB_00001TIM         #whole structure (extended format)
+	 * 		PDB_00004HHB.C       #single chain (extended format)
+	 * 		PDB_00004GCR.A_1-83  #one domain, by residue number (extended format)
+	 * 		PDB_00003AA0.A,B     #two chains treated as one structure (extended format)
+	 * 		d2bq6a1              #scop domain
 	 * </pre>
 	 *
 	 * With the additional set of rules:
@@ -524,7 +552,7 @@ public Structure getStructureForDomain(ScopDomain domain, ScopDatabase scopDatab
 	 */
 	public Structure getStructureForDomain(ScopDomain domain, ScopDatabase scopDatabase, boolean strictLigandHandling)
 			throws IOException, StructureException {
-		String pdbId = domain.getPdbId();
+		PdbId pdbId = domain.getPdbId();
 		Structure fullStructure = getStructureForPdbId(pdbId);
 		Structure structure = domain.reduce(fullStructure);
 
@@ -714,8 +742,8 @@ public void setFiletype(StructureFiletype filetype) {
 		this.filetype = filetype;
 	}
 
-	private boolean checkLoading(String name) {
-		return currentlyLoading.contains(name);
+	private boolean checkLoading(PdbId pdbId) {
+		return currentlyLoading.contains(pdbId.getId());
 	}
 
 	/**
@@ -751,15 +779,15 @@ public Structure getStructureForCathDomain(StructureName structureName, CathData
 		return n;
 	}
 
-	protected void flagLoading(String name) {
-		if (!currentlyLoading.contains(name)) {
-
-			currentlyLoading.add(name);
+	protected void flagLoading(PdbId pdbId) {
+		String id = pdbId.getId();
+		if (!currentlyLoading.contains(id)) {
+			currentlyLoading.add(id);
 		}
 	}
 
-	protected void flagLoadingFinished(String name) {
-		currentlyLoading.remove(name);
+	protected void flagLoadingFinished(PdbId pdbId) {
+		currentlyLoading.remove(pdbId.getId());
 	}
 
 	/**
@@ -769,15 +797,24 @@ protected void flagLoadingFinished(String name) {
 	 * @throws IOException
 	 * @throws StructureException
 	 */
-	public Structure getStructureForPdbId(String pdbId) throws IOException, StructureException {
+	public Structure getStructureForPdbId(String id) throws IOException, StructureException {
+		if (id == null)
+			return null;
+		return getStructureForPdbId(new PdbId(id));
+	}
+	/**
+	 * Loads a structure directly by PDB ID
+	 * @param pdbId
+	 * @return
+	 * @throws IOException
+	 * @throws StructureException
+	 */
+	public Structure getStructureForPdbId(PdbId pdbId) throws IOException {
 		if (pdbId == null)
 			return null;
-		if (pdbId.length() != 4) {
-			throw new StructureException("Unrecognized PDB ID: " + pdbId);
-		}
+		
 		while (checkLoading(pdbId)) {
 			// waiting for loading to be finished...
-
 			try {
 				Thread.sleep(100);
 			} catch (InterruptedException e) {
@@ -801,21 +838,30 @@ public Structure getStructureForPdbId(String pdbId) throws IOException, Structur
 		}
 	}
 
+	
+	protected Structure loadStructureFromMmtfByPdbId(String pdbId) throws IOException {
+		return loadStructureFromMmtfByPdbId(new PdbId(pdbId));
+	}
+
 	/**
 	 * Load a {@link Structure} from MMTF either from the local file system.
 	 * @param pdbId the input PDB id
 	 * @return the {@link Structure} object of the parsed structure
 	 * @throws IOException error reading from Web or file system
 	 */
-	private Structure loadStructureFromMmtfByPdbId(String pdbId) throws IOException {
+	protected Structure loadStructureFromMmtfByPdbId(PdbId pdbId) throws IOException {
 		logger.debug("Loading structure {} from mmtf file.", pdbId);
 		MMTFFileReader reader = new MMTFFileReader();
 		reader.setFetchBehavior(fetchBehavior);
 		reader.setObsoleteBehavior(obsoleteBehavior);
-		return reader.getStructureById(pdbId.toLowerCase());
+		return reader.getStructureById(pdbId);
 	}
 
 	protected Structure loadStructureFromCifByPdbId(String pdbId) throws IOException {
+		return loadStructureFromCifByPdbId(new PdbId(pdbId));
+	}
+	
+	protected Structure loadStructureFromCifByPdbId(PdbId pdbId) throws IOException {
 		logger.debug("Loading structure {} from mmCIF file {}.", pdbId, path);
 		Structure s;
 		flagLoading(pdbId);
@@ -824,7 +870,7 @@ protected Structure loadStructureFromCifByPdbId(String pdbId) throws IOException
 			reader.setFetchBehavior(fetchBehavior);
 			reader.setObsoleteBehavior(obsoleteBehavior);
 			reader.setFileParsingParameters(params);
-			s = reader.getStructureById(pdbId.toLowerCase());
+			s = reader.getStructureById(pdbId);
 		} finally {
 			flagLoadingFinished(pdbId);
 		}
@@ -833,6 +879,9 @@ protected Structure loadStructureFromCifByPdbId(String pdbId) throws IOException
 	}
 
 	protected Structure loadStructureFromBcifByPdbId(String pdbId) throws IOException {
+		return loadStructureFromBcifByPdbId(new PdbId(pdbId));
+	}
+	protected Structure loadStructureFromBcifByPdbId(PdbId pdbId) throws IOException {
 		logger.debug("Loading structure {} from BinaryCIF file {}.", pdbId, path);
 		Structure s;
 		flagLoading(pdbId);
@@ -841,7 +890,7 @@ protected Structure loadStructureFromBcifByPdbId(String pdbId) throws IOExceptio
 			reader.setFetchBehavior(fetchBehavior);
 			reader.setObsoleteBehavior(obsoleteBehavior);
 			reader.setFileParsingParameters(params);
-			s = reader.getStructureById(pdbId.toLowerCase());
+			s = reader.getStructureById(pdbId);
 		} finally {
 			flagLoadingFinished(pdbId);
 		}
@@ -850,6 +899,10 @@ protected Structure loadStructureFromBcifByPdbId(String pdbId) throws IOExceptio
 	}
 
 	protected Structure loadStructureFromPdbByPdbId(String pdbId) throws IOException {
+		return loadStructureFromPdbByPdbId(new PdbId(pdbId));
+	}
+
+	protected Structure loadStructureFromPdbByPdbId(PdbId pdbId) throws IOException {
 		logger.debug("Loading structure {} from PDB file {}.", pdbId, path);
 		Structure s;
 		flagLoading(pdbId);
@@ -860,7 +913,7 @@ protected Structure loadStructureFromPdbByPdbId(String pdbId) throws IOException
 
 			reader.setFileParsingParameters(params);
 
-			s = reader.getStructureById(pdbId.toLowerCase());
+			s = reader.getStructureById(pdbId);
 		} finally {
 			flagLoadingFinished(pdbId);
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathDomain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathDomain.java
index b4d0efaa89..4f96fae196 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathDomain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathDomain.java
@@ -420,8 +420,9 @@ public String toString() {
 
 	/**
 	 * Returns the chains this domain is defined over; contains more than 1 element only if this domains is a multi-chain domain.
+	 * @throws StructureException 
 	 */
-	public Set<String> getChains() {
+	public Set<String> getChains() throws StructureException {
 		Set<String> chains = new HashSet<String>();
 		List<ResidueRange> rrs = toCanonical().getResidueRanges();
 		for (ResidueRange rr : rrs) chains.add(rr.getChainName());
@@ -434,7 +435,7 @@ public String getIdentifier() {
 	}
 
 	@Override
-	public SubstructureIdentifier toCanonical() {
+	public SubstructureIdentifier toCanonical() throws StructureException{
 		List<ResidueRange> ranges = new ArrayList<ResidueRange>();
 		String chain = String.valueOf(getDomainName().charAt(getDomainName().length() - 3));
 		for (CathSegment segment : this.getSegments()) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodDomain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodDomain.java
index 55ce880ec2..66d6ae615c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodDomain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodDomain.java
@@ -79,7 +79,7 @@ public class EcodDomain implements Serializable, Cloneable, StructureIdentifier
 	private Integer hGroup;
 	private Integer tGroup;
 	private Integer fGroup;
-	private String pdbId;
+	private PdbId pdbId;
 	private String chainId;
 	private String range;
 	private String seqIdRange;
@@ -117,7 +117,7 @@ public EcodDomain(Long uid, String domainId, Boolean manual,
 		this.hGroup = hGroup;
 		this.tGroup = tGroup;
 		this.fGroup = fGroup;
-		this.pdbId = pdbId;
+		this.pdbId = new PdbId(pdbId);
 		this.chainId = chainId;
 		this.range = range;
 		this.seqIdRange = seqId;
@@ -202,12 +202,32 @@ public Integer getFGroup() {
 	public void setFGroup(Integer fGroup) {
 		this.fGroup = fGroup;
 	}
-	public String getPdbId() {
+
+	public void setPdbId(String pdbId) {
+		if (pdbId == null)
+			this.pdbId = null;
+		else
+			setPdbId(new PdbId(pdbId));
+	}
+
+	/**
+	 * Gets the {@link PdbId} object.<br>
+	 * Before 6.0.0, this method used to return a {@link String}.
+	 * @return the {@link PdbId} object associated with this domain.
+	 * @since 6.0.0
+	 */
+	public PdbId getPdbId() {
 		return pdbId;
 	}
-	public void setPdbId(String pdbId) {
+	
+	/**
+	 * @param pdbId
+	 * @since 6.0.0
+	 */
+	public void setPdbId(PdbId pdbId) {
 		this.pdbId = pdbId;
 	}
+
 	public String getChainId() {
 		return chainId;
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
index 836d19f107..004e2634ac 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
@@ -42,6 +42,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.align.util.UserConfiguration;
 import org.biojava.nbio.core.util.FileDownloadUtils;
 import org.slf4j.Logger;
@@ -84,7 +85,7 @@ public class EcodInstallation implements EcodDatabase {
 	// Should hold the lock when reading/writing allDomains or domainMap
 	private ReadWriteLock domainsFileLock;
 	private List<EcodDomain> allDomains;
-	private Map<String,List<EcodDomain>> domainMap;//PDB ID -> domains, lazily constructed from allDomains
+	private Map<PdbId,List<EcodDomain>> domainMap;//PDB ID -> domains, lazily constructed from allDomains
 
 	private String url;
 
@@ -123,12 +124,12 @@ public EcodInstallation(String cacheLocation) {
 
 	/**
 	 * Get a list of all ECOD domains for a particular PDB ID
-	 * @param pdbId
+	 * @param id
 	 * @return the list of domains, or null if no matching domains were found
 	 * @throws IOException
 	 */
 	@Override
-	public List<EcodDomain> getDomainsForPdb(String pdbId) throws IOException {
+	public List<EcodDomain> getDomainsForPdb(String id) throws IOException {
 		domainsFileLock.readLock().lock();
 		try {
 			logger.trace("LOCK readlock");
@@ -141,8 +142,12 @@ public List<EcodDomain> getDomainsForPdb(String pdbId) throws IOException {
 				logger.trace("LOCK readlock");
 			}
 
-			if(pdbId != null)
-				pdbId = pdbId.toLowerCase();
+			PdbId pdbId = null;
+			try {
+				pdbId = new PdbId(id);
+			} catch (IllegalArgumentException e) {
+				return null;
+			}
 			List<EcodDomain> doms = domainMap.get(pdbId);
 			if(doms == null) {
 				return null;
@@ -477,17 +482,17 @@ private void indexDomains() throws IOException {
 			}
 
 			// Leave enough space for all PDBs as of 2015
-			domainMap = new HashMap<String, List<EcodDomain>>((int) (150000/.85),.85f);
+			domainMap = new HashMap<PdbId, List<EcodDomain>>((int) (150000/.85),.85f);
 
 			// Index with domainMap
 			for(EcodDomain d : allDomains) {
 				// Get the PDB ID, either directly or from the domain ID
-				String pdbId = d.getPdbId();
+				PdbId pdbId = d.getPdbId();
 				if( pdbId == null ) {
 					String ecodId = d.getDomainId();
 					if( ecodId != null && !ecodId.isEmpty() ) {
 						Matcher match = ECOD_RE.matcher(ecodId);
-						pdbId = match.group(1);
+						pdbId = new PdbId(match.group(1));
 					}
 				}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index ced338dc1f..0051180acb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -21,26 +21,32 @@
  */
 package org.biojava.nbio.structure.io;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Files;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
+import org.biojava.nbio.core.util.FileDownloadUtils;
+import org.biojava.nbio.core.util.InputStreamProvider;
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.PDBStatus;
 import org.biojava.nbio.structure.PDBStatus.Status;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.core.util.FileDownloadUtils;
 import org.rcsb.mmtf.utils.CodecUtils;
-import org.biojava.nbio.core.util.InputStreamProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.file.Files;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 /**
  * Superclass for classes which download and interact with the PDB's FTP server,
  * specifically {@link PDBFileReader} and {@link CifFileReader}. The basic
@@ -117,7 +123,7 @@ public static enum FetchBehavior {
 	 */
 	public static final long LAST_REMEDIATION_DATE ;
 	private static final String LAST_REMEDIATION_DATE_STRING = "2011/07/12";
-
+	
 	static {
 
 		SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd", Locale.US);
@@ -327,10 +333,19 @@ public Structure getStructure(File filename) throws IOException {
 	}
 
 
-	@Override
+	/**
+	 *{@inheritDoc}
+	 */
 	public Structure getStructureById(String pdbId) throws IOException {
-		InputStream inStream = getInputStream(pdbId);
+		return getStructureById(new PdbId(pdbId));
+	}
 
+	/**
+	 *{@inheritDoc}
+	 */
+	@Override
+	public Structure getStructureById(PdbId pdbId) throws IOException {
+		InputStream inStream = getInputStream(pdbId);
 		return getStructure(inStream);
 	}
 
@@ -349,10 +364,7 @@ public Structure getStructureById(String pdbId) throws IOException {
 	 * @return
 	 * @throws IOException
 	 */
-	protected InputStream getInputStream(String pdbId) throws IOException{
-
-		if ( pdbId.length() != 4)
-			throw new IOException("The provided ID does not look like a PDB ID : " + pdbId);
+	protected InputStream getInputStream(PdbId pdbId) throws IOException{
 
 		// Check existing
 		File file = downloadStructure(pdbId);
@@ -376,11 +388,9 @@ protected InputStream getInputStream(String pdbId) throws IOException{
 	 * @throws IOException
 	 */
 	public void prefetchStructure(String pdbId) throws IOException {
-		if ( pdbId.length() != 4)
-			throw new IOException("The provided ID does not look like a PDB ID : " + pdbId);
-
+		
 		// Check existing
-		File file = downloadStructure(pdbId);
+		File file = downloadStructure(new PdbId(pdbId));
 
 		if(!file.exists()) {
 			throw new IOException("Structure "+pdbId+" not found and unable to download.");
@@ -389,11 +399,21 @@ public void prefetchStructure(String pdbId) throws IOException {
 
 	/**
 	 * Attempts to delete all versions of a structure from the local directory.
-	 * @param pdbId
+	 * @param pdbId a String representing the PDB ID.
+	 * @return True if one or more files were deleted
+	 * @throws IOException if the file cannot be deleted
+	 */
+	public boolean deleteStructure(String pdbId) throws IOException {
+		return deleteStructure(new PdbId(pdbId));
+	}
+
+	/**
+	 * Attempts to delete all versions of a structure from the local directory.
+	 * @param pdbId The PDB ID
 	 * @return True if one or more files were deleted
 	 * @throws IOException if the file cannot be deleted
 	 */
-	public boolean deleteStructure(String pdbId) throws IOException{
+	public boolean deleteStructure(PdbId pdbId) throws IOException{
 		boolean deleted = false;
 		// Force getLocalFile to check in obsolete locations
 		ObsoleteBehavior obsolete = getObsoleteBehavior();
@@ -440,9 +460,7 @@ public boolean deleteStructure(String pdbId) throws IOException{
 	 * @throws IOException for errors downloading or writing, or if the
 	 *  fetchBehavior is {@link FetchBehavior#LOCAL_ONLY}
 	 */
-	protected File downloadStructure(String pdbId) throws IOException{
-		if ( pdbId.length() != 4)
-			throw new IOException("The provided ID does not look like a PDB ID : " + pdbId);
+	protected File downloadStructure(PdbId pdbId) throws IOException {
 
 		// decide whether download is required
 		File existing =  getLocalFile(pdbId);
@@ -489,15 +507,17 @@ protected File downloadStructure(String pdbId) throws IOException{
 
 		// Force the download now
 		if(obsoleteBehavior == ObsoleteBehavior.FETCH_CURRENT) {
-			String current = PDBStatus.getCurrent(pdbId);
-
+			String current = PDBStatus.getCurrent(pdbId.getId());
+			PdbId pdbIdToDownload = null;
 			if(current == null) {
 				// either an error or there is not current entry
-				current = pdbId;
+				pdbIdToDownload = pdbId;
+			}else {
+				pdbIdToDownload = new PdbId(current);
 			}
-			return downloadStructure(current, splitDirURL,false, existing);
+			return downloadStructure(pdbIdToDownload, splitDirURL,false, existing);
 		} else if(obsoleteBehavior == ObsoleteBehavior.FETCH_OBSOLETE
-				&& PDBStatus.getStatus(pdbId) == Status.REMOVED) {
+				&& PDBStatus.getStatus(pdbId.getId()) == Status.REMOVED) {
 			return downloadStructure(pdbId, obsoleteDirURL, true, existing);
 		} else {
 			return downloadStructure(pdbId, splitDirURL, false, existing);
@@ -514,23 +534,23 @@ protected File downloadStructure(String pdbId) throws IOException{
 	 * @return
 	 * @throws IOException
 	 */
-	private File downloadStructure(String pdbId, String pathOnServer, boolean obsolete, File existingFile)
+	private File downloadStructure(PdbId pdbId, String pathOnServer, boolean obsolete, File existingFile)
 			throws IOException{
-
-		File dir = getDir(pdbId,obsolete);
-		File realFile = new File(dir,getFilename(pdbId));
+		String id = pdbId.getId().toLowerCase();
+		File dir = getDir(id, obsolete);
+		File realFile = new File(dir,getFilename(id));
 
 		String ftp;
 
-		String filename = getFilename(pdbId);
+		String filename = getFilename(id);
 		if (filename.endsWith(".mmtf.gz")){
-			ftp = CodecUtils.getMmtfEntryUrl(pdbId, true, false);
+			ftp = CodecUtils.getMmtfEntryUrl(id, true, false);
 		} else if (filename.endsWith(".bcif") || filename.endsWith(".bcif.gz")) {
 			// TODO this should be configurable
 			ftp = DEFAULT_BCIF_FILE_SERVER + filename;
 		} else {
 			ftp = String.format("%s%s/%s/%s",
-			serverName, pathOnServer, pdbId.substring(1,3).toLowerCase(), getFilename(pdbId));
+			serverName, pathOnServer, id.substring(id.length()-3, id.length()-1), getFilename(id));
 		}
 
 		URL url = new URL(ftp);
@@ -558,21 +578,6 @@ private File downloadStructure(String pdbId, String pathOnServer, boolean obsole
 
 		FileDownloadUtils.downloadFile(url, realFile);
 
-		// Commented out following code used for setting the modified date to the downloaded file - JD 2015-01-15
-		// The only reason to have it was in order to get an rsync-like behavior, respecting the timestamps
-		// but the issue is that it would make the FETCH_REMEDIATED mode redownload files with timestamps before
-		// the remediation.
-		//if (serverFileDate==null)
-		//	serverFileDate = getLastModifiedTime(url);
-		//
-		//if (serverFileDate!=null) {
-		//	logger.debug("Setting modified time of downloaded file {} to {}",realFile,serverFileDate.toString());
-		//	realFile.setLastModified(serverFileDate.getTime());
-		//} else {
-		//	logger.warn("Unknown modified time of file {}, will set its modified time to now.", ftp);
-		//}
-
-
 		return realFile;
 	}
 
@@ -621,13 +626,14 @@ private Date getLastModifiedTime(URL url) {
 	protected File getDir(String pdbId, boolean obsolete) {
 
 		File dir = null;
+		int offset = pdbId.length() - 3;
 
 		if (obsolete) {
 			// obsolete is always split
-			String middle = pdbId.substring(1,3).toLowerCase();
+			String middle = pdbId.substring(offset, offset + 2).toLowerCase();
 			dir = new File(obsoleteDirPath, middle);
 		} else {
-			String middle = pdbId.substring(1,3).toLowerCase();
+			String middle = pdbId.substring(offset, offset + 2).toLowerCase();
 			dir = new File(splitDirPath, middle);
 		}
 
@@ -647,14 +653,24 @@ protected File getDir(String pdbId, boolean obsolete) {
 	 * @throws IOException If the file exists but is empty and can't be deleted
 	 */
 	public File getLocalFile(String pdbId) throws IOException {
-
+		return getLocalFile(new PdbId(pdbId));
+	}
+	/**
+	 * Searches for previously downloaded files
+	 * @param pdbId
+	 * @return A file pointing to the existing file, or null if not found
+	 * @throws IOException If the file exists but is empty and can't be deleted
+	 */
+	public File getLocalFile(PdbId pdbId) throws IOException {
+		String id = pdbId.getId();
+		int offset = id.length() - 3;
 		// Search for existing files
 
 		// Search directories:
 		// 1) LOCAL_MMCIF_SPLIT_DIR/<middle>/(pdb)?<pdbId>.<ext>
 		// 2) LOCAL_MMCIF_ALL_DIR/<middle>/(pdb)?<pdbId>.<ext>
 		LinkedList<File> searchdirs = new LinkedList<File>();
-		String middle = pdbId.substring(1,3).toLowerCase();
+		String middle = id.substring(offset, offset+2).toLowerCase();
 
 		File splitdir = new File(splitDirPath, middle);
 		searchdirs.add(splitdir);
@@ -670,7 +686,7 @@ public File getLocalFile(String pdbId) throws IOException {
 		for( File searchdir :searchdirs){
 			for( String prefix : prefixes) {
 				for(String ex : getExtensions() ){
-					File f = new File(searchdir,prefix + pdbId.toLowerCase() + ex) ;
+					File f = new File(searchdir,prefix + id.toLowerCase() + ex) ;
 					if ( f.exists()) {
 						// delete files that are too short to have contents
 						if( f.length() < MIN_PDB_FILE_SIZE ) {
@@ -686,7 +702,10 @@ public File getLocalFile(String pdbId) throws IOException {
 		return null;
 	}
 
-	protected boolean checkFileExists(String pdbId){
+	protected boolean checkFileExists(String pdbId) {
+		return checkFileExists(new PdbId(pdbId));
+	}
+	protected boolean checkFileExists(PdbId pdbId){
 		try {
 			File path =  getLocalFile(pdbId);
 			if ( path != null)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index 506688baec..c1268c2e62 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -63,6 +63,7 @@
 import org.biojava.nbio.structure.NucleotideImpl;
 import org.biojava.nbio.structure.PDBCrystallographicInfo;
 import org.biojava.nbio.structure.PDBHeader;
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.ResidueNumber;
 import org.biojava.nbio.structure.Site;
 import org.biojava.nbio.structure.Structure;
@@ -371,8 +372,15 @@ private void pdb_HEADER_Handler(String line) {
 			logger.debug("Parsing entry " + pdbId);
 
 
-			structure.setPDBCode(pdbCode);
-			pdbHeader.setIdCode(pdbCode);
+			PdbId pdbIdToSet;
+			try {
+				pdbIdToSet = new PdbId(pdbCode);
+			} catch (IllegalArgumentException e) {
+				logger.info("Malformed (or null) PDB ID {}. setting PdbId to null", pdbCode);
+				pdbIdToSet = null;
+			}
+			structure.setPdbId(pdbIdToSet);
+			pdbHeader.setPdbId(pdbIdToSet);
 		}
 
 		//*really* old files (you'll need to hunt to find these as they
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureProvider.java
index 10fa1a7679..cdb38bfa6e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureProvider.java
@@ -20,6 +20,7 @@
  */
 package org.biojava.nbio.structure.io;
 
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
 
@@ -41,6 +42,14 @@ public interface StructureProvider {
 	 */
 	Structure getStructureById(String pdbId) throws StructureException,IOException;
 
+	/**
+	 * Get the structure for a PDB ID
+	 *
+	 * @param pdbId
+	 * @return
+	 */
+	Structure getStructureById(PdbId pdbId) throws StructureException,IOException;
+	
 	/**
 	 * Set the parameters that should be used for file parsing
 	 *
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index d15acdd43f..83c8b675fd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -35,6 +35,7 @@
 import org.biojava.nbio.structure.NucleotideImpl;
 import org.biojava.nbio.structure.PDBCrystallographicInfo;
 import org.biojava.nbio.structure.PDBHeader;
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.ResidueNumber;
 import org.biojava.nbio.structure.SeqMisMatch;
 import org.biojava.nbio.structure.SeqMisMatchImpl;
@@ -868,8 +869,16 @@ public void consumeStruct(Struct struct) {
         }
 
         if (struct.isDefined() && struct.getEntryId().isDefined()) {
-            pdbHeader.setIdCode(struct.getEntryId().get(0));
-            structure.setPDBCode(struct.getEntryId().get(0));
+            PdbId pdbId;
+            String pdbCode = struct.getEntryId().get(0);
+			try {
+				pdbId = new PdbId(pdbCode);
+			} catch (IllegalArgumentException e) {
+				logger.info("Malformed (or null) PDB ID {}. setting PdbId to null", pdbCode);
+				pdbId = null;
+			}
+            pdbHeader.setPdbId(pdbId);
+            structure.setPdbId(pdbId);
         }
     }
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
index 1ea723f43c..e3975463ec 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
@@ -48,6 +48,7 @@
 import org.biojava.nbio.structure.NucleotideImpl;
 import org.biojava.nbio.structure.PDBCrystallographicInfo;
 import org.biojava.nbio.structure.PDBHeader;
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureImpl;
 import org.biojava.nbio.structure.StructureTools;
@@ -166,7 +167,7 @@ public void finalizeStructure() {
 	@Override
 	public void initStructure(int totalNumBonds, int totalNumAtoms, int totalNumGroups,
 			int totalNumChains, int totalNumModels, String modelId) {
-		structure.setPDBCode(modelId);
+		structure.setPdbId(new PdbId(modelId));
 		allAtoms = new Atom[totalNumAtoms];
 	}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java
index 121498f03d..d9b926afbb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java
@@ -30,6 +30,7 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.ResidueRange;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
@@ -54,7 +55,7 @@ public class ScopDomain implements Serializable, Cloneable, StructureIdentifier
 	private static final long serialVersionUID = 5890476209571654301L;
 
 	String scopId;
-	String pdbId;
+	PdbId pdbId;
 	List<String> ranges;
 	String classificationId;
 	Integer sunid;
@@ -75,7 +76,7 @@ public String toString() {
 		StringBuilder buf = new StringBuilder();
 		buf.append(scopId);
 		buf.append("\t") ;
-		buf.append(pdbId);
+		buf.append(pdbId.getId().toLowerCase());
 		buf.append( "\t");
 
 		int rangePos = 0;
@@ -118,12 +119,38 @@ public String getScopId() {
 	public void setScopId(String scopId) {
 		this.scopId = scopId;
 	}
-	public String getPdbId() {
+
+	/** 
+	 * Gets the PDB identifier for this protein structure.
+	 * Before BioJava 6.0.0, this method used to return a {@link String}.
+	 *
+	 * @return the {@link PdbId} PDB identifier
+	 * @see #setPdbId(PdbId)
+	 * @since 6.0.0
+	 */
+	public PdbId getPdbId() {
 		return pdbId;
 	}
+
+	/**
+	 * @param pdbId
+	 * @deprecated use {@link #setPdbId(PdbId)}
+	 */
+	@Deprecated
 	public void setPdbId(String pdbId) {
+		if(pdbId == null) this.pdbId = null;
+		this.pdbId = new PdbId(pdbId);
+	}
+
+	
+	/**
+	 * @param pdbId
+	 * @since 6.0.0
+	 */
+	public void setPdbId(PdbId pdbId) {
 		this.pdbId = pdbId;
 	}
+
 	public List<String> getRanges() {
 		return ranges;
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
index 58e45ee6b7..252ccfabfb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
@@ -24,19 +24,30 @@
 
 package org.biojava.nbio.structure.scop;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.biojava.nbio.core.util.FileDownloadUtils;
+import org.biojava.nbio.core.util.InputStreamProvider;
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureTools;
 import org.biojava.nbio.structure.align.util.UserConfiguration;
-import org.biojava.nbio.core.util.FileDownloadUtils;
-import org.biojava.nbio.core.util.InputStreamProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 
 /**
  * This class provides access to the SCOP protein structure classification.
@@ -354,7 +365,7 @@ public ScopDomain getDomainByScopID(String scopId) {
 		if ( scopId.length() < 6) {
 			throw new ScopIOException("Does not look like a scop ID! " + scopId);
 		}
-		String pdbId = scopId.substring(1,5); //TODO handle this when you handle extended PDBId (PDB ID)
+		String pdbId = scopId.substring(1,5); //TODO handle this when you handle extended PdbId (PDB ID)
 		List<ScopDomain> doms = getDomainsForPDB(pdbId);
 		if ( doms == null)
 			return null;
@@ -382,7 +393,7 @@ public ScopNode getScopNode(int sunid){
 	}
 
 
-	private void parseClassification() throws IOException{
+	private void parseClassification() throws IOException {
 
 		File file = new File(getClaFilename());
 
@@ -393,7 +404,7 @@ private void parseClassification() throws IOException{
 
 	}
 
-	private void parseHierarchy() throws IOException{
+	private void parseHierarchy() throws IOException {
 
 		File file = new File(getHieFilename());
 
@@ -561,7 +572,13 @@ private void parseClassification(BufferedReader buffer) throws IOException {
 
 			ScopDomain d = new ScopDomain();
 			d.setScopId(scopId);
-			d.setPdbId(pdbId);
+			PdbId tempPdbId = null;
+			try {
+				tempPdbId = new PdbId(pdbId);
+			} catch (NullPointerException | IllegalArgumentException e) {
+				logger.warn("could not parse line >>{}<<. Error Message: {}", line, e.getMessage());
+			}
+			d.setPdbId(tempPdbId);
 
 			d.setRanges(extractRanges(range));
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmResult.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmResult.java
index b88ad1e112..0c4665a580 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmResult.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmResult.java
@@ -25,6 +25,7 @@
 import java.util.List;
 
 import org.biojava.nbio.structure.Atom;
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.ResidueNumber;
 import org.biojava.nbio.structure.ResidueRange;
 import org.biojava.nbio.structure.StructureException;
@@ -108,7 +109,7 @@ public List<StructureIdentifier> getRepeatsID() throws StructureException {
 		List<StructureIdentifier> repeats = new ArrayList<StructureIdentifier>(
 				numRepeats);
 
-		String pdbId = structureId.toCanonical().getPdbId();
+		PdbId pdbId = structureId.toCanonical().getPdbId();
 		Block align = multipleAlignment.getBlocks().get(0);
 
 		for (int su = 0; su < numRepeats; su++) {
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/Test4hhb.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/Test4hhb.java
index 52e088261e..3380028020 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/Test4hhb.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/Test4hhb.java
@@ -44,8 +44,7 @@
 public class Test4hhb {
 
 	@Test
-	public void test4hhbPDBFile() throws IOException
-	{
+	public void test4hhbPDBFile() throws IOException {
 
 		Structure structure = null;
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java
index 9c5bdcf0be..8118fc47af 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAltLocs.java
@@ -20,6 +20,19 @@
  */
 package org.biojava.nbio.structure;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import org.biojava.nbio.structure.align.util.AtomCache;
 import org.biojava.nbio.structure.chem.ChemComp;
 import org.biojava.nbio.structure.chem.ChemCompBond;
@@ -27,19 +40,10 @@
 import org.biojava.nbio.structure.chem.PolymerType;
 import org.biojava.nbio.structure.chem.ResidueType;
 import org.biojava.nbio.structure.io.FileParsingParameters;
-import org.biojava.nbio.structure.io.cif.CifStructureConverter;
 import org.biojava.nbio.structure.io.StructureFiletype;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
 import org.junit.Test;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.junit.Assert.*;
-
 public class TestAltLocs {
 
 	@Test
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
index ab7988ae3f..a5129e245f 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestAtomCache.java
@@ -63,7 +63,7 @@ public void setUp() throws IOException {
 			reader.setObsoleteBehavior(cache.getObsoleteBehavior());
 
 			for(String pdbId : uncacheIDs) {
-				reader.deleteStructure(pdbId);
+				reader.deleteStructure(new PdbId(pdbId));
 			}
 		}
 	}
@@ -191,11 +191,11 @@ public void testFetchCurrent1HHB() throws IOException, StructureException {
 
 		cache.setFiletype(StructureFiletype.PDB);
 		Structure s = cache.getStructure("1HHB");
-		assertEquals("Failed to get the current ID for 1HHB.","4HHB",s.getPDBCode());
+		assertEquals("Failed to get the current ID for 1HHB.","4HHB",s.getPdbId().getId());
 
 		cache.setFiletype(StructureFiletype.CIF);
 		s = cache.getStructure("1HHB");
-		assertEquals("Failed to get the current ID for 1HHB.","4HHB",s.getPDBCode());
+		assertEquals("Failed to get the current ID for 1HHB.","4HHB",s.getPdbId().getId());
 	}
 
 	// Fetching obsolete directly
@@ -207,17 +207,17 @@ public void testFetchObsolete() throws IOException, StructureException {
 		Structure s;
 		cache.setFiletype(StructureFiletype.PDB);
 		s = cache.getStructure("1CMW");
-		assertEquals("Failed to get OBSOLETE file 1CMW.","1CMW", s.getPDBCode());
+		assertEquals("Failed to get OBSOLETE file 1CMW.","1CMW", s.getPdbId().getId());
 
 		s = cache.getStructure("1HHB");
-		assertEquals("Failed to get OBSOLETE file 1HHB.","1HHB", s.getPDBCode());
+		assertEquals("Failed to get OBSOLETE file 1HHB.","1HHB", s.getPdbId().getId());
 
 		cache.setFiletype(StructureFiletype.CIF);
 		s = cache.getStructure("1CMW");
-		assertEquals("Failed to get OBSOLETE file 1CMW.","1CMW", s.getPDBCode());
+		assertEquals("Failed to get OBSOLETE file 1CMW.","1CMW", s.getPdbId().getId());
 
 		s = cache.getStructure("1HHB");
-		assertEquals("Failed to get OBSOLETE file 1HHB.","1HHB", s.getPDBCode());
+		assertEquals("Failed to get OBSOLETE file 1HHB.","1HHB", s.getPdbId().getId());
 
 	}
 
@@ -227,7 +227,7 @@ public void testGetScopDomain() throws IOException, StructureException {
 
 		Structure s = cache.getStructure(name);
 		assertNotNull("Failed to fetch structure from SCOP ID", s);
-		assertEquals("2gs2.A", s.getName());
+		assertEquals("2GS2.A", s.getName());
 	}
 
 	@Test
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestPdbId.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestPdbId.java
new file mode 100644
index 0000000000..2871ccd7c0
--- /dev/null
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestPdbId.java
@@ -0,0 +1,239 @@
+/*
+ *                    BioJava development code
+ *
+ * This code may be freely distributed and modified under the
+ * terms of the GNU Lesser General Public Licence.  This should
+ * be distributed with the code.  If you do not have a copy,
+ * see:
+ *
+ *      http://www.gnu.org/copyleft/lesser.html
+ *
+ * Copyright for this code is held jointly by the individual
+ * authors.  These should be listed in @author doc comments.
+ *
+ * For more information on the BioJava project and its aims,
+ * or to join the biojava-l mailing list, visit the home page
+ * at:
+ *
+ *      http://www.biojava.org/
+ *
+ */
+package org.biojava.nbio.structure;
+
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+
+/**
+ * Tests for {@link PdbId} parsing and its usability to convert between PDB ID formats
+ * @author Amr ALHOSSARY
+ * @since 6.0.0
+ */
+public class TestPdbId {
+
+
+	@Test
+	public void testGetIdInDefaultFormat() {
+		PdbId pdbId;
+		String id;
+
+		pdbId = new PdbId("1abc");
+		id = pdbId.getId();
+		assertEquals(id, "1ABC");
+
+		pdbId = new PdbId("PDB_55551abc");
+		id = pdbId.getId();
+		assertEquals(id, "PDB_55551ABC");
+	}
+
+	@Test
+	public void testGetIdPrefereShortFormat() {
+		PdbId pdbId;
+		String id;
+
+		pdbId = new PdbId("1abc");
+		id = pdbId.getId(true);
+		assertEquals(id, "1ABC");
+
+		pdbId = new PdbId("PDB_55551abc");
+		id = pdbId.getId(true);
+		assertEquals(id, "PDB_55551ABC");
+	}
+
+	@Test
+	public void testGetIdPrefereExtendedFormat() {
+		PdbId pdbId;
+		String id;
+
+		pdbId = new PdbId("1abc");
+		id = pdbId.getId(false);
+		assertEquals(id, "PDB_00001ABC");
+
+		pdbId = new PdbId("PDB_55551abc");
+		id = pdbId.getId(false);
+		assertEquals(id, "PDB_55551ABC");
+	}
+	
+	@Test
+	public void testGetIdInShortFormat() {
+		assertDoesNotThrow(() -> {
+			PdbId pdbId = new PdbId("1abc");
+			String id = pdbId.getShortId();
+			assertEquals(id, "1ABC");
+		}, "Unexpected Exception thrown");
+
+		assertThrows(StructureException.class, () -> {
+			PdbId pdbId = new PdbId("PDB_55551abc");
+			pdbId.getShortId();
+		}, "wrongly shortened a non-shortable ID");
+	}
+	
+	
+	@Test
+	public void testIsShortPDBID() {
+		assertTrue(PdbId.isValidShortPdbId("1abc"), "Didn't accept lower case");
+		assertTrue(PdbId.isValidShortPdbId("4HHB"), "Didn't accept upper case");
+		assertFalse(PdbId.isValidShortPdbId("HHHB"), "Accepted wrong format");
+		assertFalse(PdbId.isValidShortPdbId("PDB_00001ABC"), "Accepted extended format");
+	}
+	
+	@Test
+	public void testIsExtendedPDBID() {
+		assertTrue(PdbId.isValidExtendedPdbId("PDB_00001abc"), "Didn't accept lower case");
+		assertTrue(PdbId.isValidExtendedPdbId("PDB_00004HHB"), "Didn't accept upper case");
+		assertTrue(PdbId.isValidExtendedPdbId("PDB_22224HHB"), "Didn't accept upper case");
+		assertTrue(PdbId.isValidExtendedPdbId("PDB_AAAA4HHB"), "It should accept any 8 alphanumeric values");
+		assertFalse(PdbId.isValidExtendedPdbId("1ABC"), "Accepted short format");
+	}
+
+	@Test
+	public void testIsShortCompatible() {
+		assertTrue(PdbId.isShortCompatible("PDB_00001abc"), "Didn't accept lower case");
+		assertTrue(PdbId.isShortCompatible("PDB_00004HHB"), "Didn't accept upper case");
+		assertFalse(PdbId.isShortCompatible("1ABC"), "Accepted short format");
+		assertFalse(PdbId.isShortCompatible("PDB_AAAA4HHB"), "Accepted wrong format");
+		assertFalse(PdbId.isShortCompatible("PDB_0000AHHB"), "Accepted letter (1HHB should pass but AHHB should not pass");
+		assertFalse(PdbId.isShortCompatible("PDB_0000AHHBBBBB"), "should be a valid extended PDB ID");
+	}
+	
+	@Test
+	public void testToExtendedFormat() {
+		assertDoesNotThrow(() -> {
+			assertEquals(PdbId.toExtendedId("1abc"), "PDB_00001ABC");
+		}, "Couldn't extend Id");
+
+		assertDoesNotThrow(() -> {
+			assertEquals(PdbId.toExtendedId("PDB_00001abc"), "PDB_00001ABC");
+		}, "Didn't recognize extended format");
+		
+		assertDoesNotThrow(() -> {
+			PdbId.toExtendedId("PDB_aaaa1abc");
+		}, "Should accept any 8 alphanumeric values");
+	}
+	
+	@Test
+	public void testToShortFormat() {
+		assertDoesNotThrow(() -> {
+			assertEquals(PdbId.toShortId("PDB_00001ABC"), "1ABC");
+		}, "Couldn't shorten Id");
+		
+		assertDoesNotThrow(() -> {
+			assertEquals(PdbId.toShortId("1abc"), "1ABC");
+		}, "Didn't recognize short format");
+		
+		assertThrows(StructureException.class, () -> {
+			PdbId.toShortId("PDB_aaaa1abc");
+		}, "Accepted wrong format");
+		
+		assertThrows(StructureException.class, () -> {
+			PdbId.toShortId("aabc");
+		}, "Accepted wrong format");
+	}
+	
+	@Test
+	public void testHashCodeAndEquals() {
+		PdbId id1, id2, id3/* , id4 */;
+		PdbId other;
+		id1 = new PdbId("1abc");
+		id2 = new PdbId("PDB_00001ABC");
+		id3 = new PdbId("1ABC");
+//		id4 = new PdbId("pdb_00001abc");
+		other = new PdbId("2ABC");
+		
+		assertEquals(id1.hashCode(), id2.hashCode());
+		assertEquals(id1.hashCode(), id3.hashCode());
+//		assertEquals(id1.hashCode(), id4.hashCode());
+		assertNotEquals(id1.hashCode(), other.hashCode());
+		
+		assertTrue(id1.equals(id2));
+		assertTrue(id1.equals(id3));
+//		assertTrue(id1.equals(id4));
+		assertFalse(id1.equals(other));
+	}
+
+	@Test
+	public void testClone() {
+		assertDoesNotThrow(() -> {
+			PdbId id1 = new PdbId("1abc");
+			PdbId clone = (PdbId) id1.clone();
+			
+			assertNotSame(id1, clone);
+			assertEquals(id1, clone);
+			assertEquals(id1.hashCode(), clone.hashCode());
+		}, "unexpected exception thrown while cloning");
+	}
+	
+
+	@Test
+	public void testCompareTo() {
+		PdbId id1, id2, id3, id4, id5 ;
+		PdbId[] array, expected;
+		id1 = new PdbId("1abc");
+		id2 = new PdbId("PDB_00011ABC");
+		id3 = new PdbId("2ABC");
+		id4 = new PdbId("PDB_00001ABA");
+		id5 = new PdbId("1100");
+		
+		array = new PdbId[] {id1, id2, id3, id4, id5};
+		System.out.println(Arrays.deepToString(array));
+		Arrays.sort(array);
+		System.out.println(Arrays.deepToString(array));
+		expected = new PdbId[] {id5, id4, id1, id3, id2};
+		System.out.println(Arrays.deepToString(expected));
+		assertArrayEquals(expected, array);
+		
+		
+		//let's try to have some "distinct but equal" objects.
+		id1 = new PdbId("1abc");
+		id2 = new PdbId("PDB_00011ABC");
+		id3 = new PdbId("2ABC");
+		id4 = new PdbId("PDB_00001ABA");
+		id5 = new PdbId("1ABA");
+		
+		array = new PdbId[] {id1, id2, id3, id4, id5};
+//		System.out.println(Arrays.deepToString(array));
+		Arrays.sort(array);
+//		System.out.println(Arrays.deepToString(array));
+		expected = new PdbId[] {id5, id4, id1, id3, id2};
+//		System.out.println(Arrays.deepToString(expected));
+		assertArrayEquals(expected, array); // They should be.
+		//Now let the real test begins
+		for (int i = 0; i < 2; i++) {
+			assertNotSame("Couldn't detect 2 objects that are equal but not the same", expected[i], array[i]);
+		}
+		for (int i = 2; i < expected.length; i++) {
+			assertSame(expected[i], array[i]);
+		}
+	}
+}
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestURLIdentifier.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestURLIdentifier.java
index cfa32a1cc2..f4136a87a8 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/TestURLIdentifier.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/TestURLIdentifier.java
@@ -79,7 +79,7 @@ public void testURLParameters() throws StructureException, IOException {
 
 		full = id.loadStructure(cache);
 		assertNotNull(full);
-		assertEquals("2POS",id.toCanonical().getPdbId());
+		assertEquals(new PdbId("2POS"), id.toCanonical().getPdbId());
 //		assertEquals("2POS",full.getName()); // What should this get set to with identifiers?
 
 		url = new URL("file://" + base + "?residues=A:1-5");
@@ -106,7 +106,7 @@ public void testURLParameters() throws StructureException, IOException {
 
 			full = id.loadStructure(cache);
 			assertNotNull(full);
-			assertEquals("1B8G",id.toCanonical().getPdbId());
+			assertEquals(new PdbId("1B8G"), id.toCanonical().getPdbId());
 		} catch(UnknownHostException e) {
 			logger.error("Unable to connect to rcsb.org");
 			// still pass
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/client/TestStructureName.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/client/TestStructureName.java
index d68090047d..f4dae3ac08 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/client/TestStructureName.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/client/TestStructureName.java
@@ -20,14 +20,24 @@
  */
 package org.biojava.nbio.structure.align.client;
 
-import static org.biojava.nbio.structure.align.client.StructureName.Source.*;
-import static org.junit.Assert.*;
+import static org.biojava.nbio.structure.align.client.StructureName.Source.BIO;
+import static org.biojava.nbio.structure.align.client.StructureName.Source.CATH;
+import static org.biojava.nbio.structure.align.client.StructureName.Source.ECOD;
+import static org.biojava.nbio.structure.align.client.StructureName.Source.FILE;
+import static org.biojava.nbio.structure.align.client.StructureName.Source.PDB;
+import static org.biojava.nbio.structure.align.client.StructureName.Source.SCOP;
+import static org.biojava.nbio.structure.align.client.StructureName.Source.URL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.StructureException;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -42,26 +52,26 @@ public void testMultiCharChainIds() throws StructureException {
 		StructureName sn = new StructureName(str);
 
 		assertEquals("AL", sn.getChainId());
-		assertEquals("4V4F", sn.getPdbId());
+		assertEquals(new PdbId("4V4F"), sn.getPdbId());
 
 		str = "4v4f.AL";
 		sn = new StructureName(str);
 
 		assertEquals("AL", sn.getChainId());
-		assertEquals("4V4F", sn.getPdbId());
+		assertEquals(new PdbId("4V4F"), sn.getPdbId());
 
 		str = "4v4f.al";
 		sn = new StructureName(str);
 
 		assertEquals("al", sn.getChainId());
-		assertEquals("4V4F", sn.getPdbId());
+		assertEquals(new PdbId("4V4F"), sn.getPdbId());
 
 
 		str = "4v4f.ABCD";
 		sn = new StructureName(str);
 
 		assertEquals("ABCD", sn.getChainId());
-		assertEquals("4V4F", sn.getPdbId());
+		assertEquals(new PdbId("4V4F"), sn.getPdbId());
 
 
 		// More than 4 characters should work too. In principle there's no limit in mmCIF, though the PDB is
@@ -70,7 +80,7 @@ public void testMultiCharChainIds() throws StructureException {
 		sn = new StructureName(str);
 
 		assertEquals("ABCDEFGHIJ", sn.getChainId());
-		assertEquals("4V4F", sn.getPdbId());
+		assertEquals(new PdbId("4V4F"), sn.getPdbId());
 
 
 	}
@@ -83,13 +93,13 @@ public void testSingleCharChainIds() throws StructureException {
 		StructureName sn = new StructureName(str);
 
 		assertEquals("A", sn.getChainId());
-		assertEquals("1SMT", sn.getPdbId());
+		assertEquals(new PdbId("1SMT"), sn.getPdbId());
 
 		str = "1SMT.a";
 		sn = new StructureName(str);
 
 		assertEquals("a", sn.getChainId());
-		assertEquals("1SMT", sn.getPdbId());
+		assertEquals(new PdbId("1SMT"), sn.getPdbId());
 
 
 	}
@@ -115,67 +125,68 @@ public void testPrefixes() throws StructureException {
 		sn = new StructureName("PDB:4hhb");
 		assertTrue(sn.isPdbId());
 		assertTrue(sn.getSource() == PDB);
-		assertEquals("4HHB",sn.getPdbId());
+		assertEquals(new PdbId("4HHB"),sn.getPdbId());
 		sn = new StructureName("PDB:4hhb.A:1-50");
 		assertTrue(sn.isPdbId());
 		assertTrue(sn.getSource() == PDB);
-		assertEquals("4HHB",sn.getPdbId());
+		assertEquals(new PdbId("4HHB"),sn.getPdbId());
 		// Invalid strings work too, they just don't load
 		sn = new StructureName("PDB:x");
 		assertTrue(sn.isPdbId());
 		assertTrue(sn.getSource() == PDB);
-		assertEquals("x",sn.getPdbId());
+		assertEquals(null, sn.getPdbId());
 		// SCOP
 		sn = new StructureName("SCOP:d2gs2a_");
 		assertTrue(sn.isScopName());
 		assertTrue(sn.getSource() == SCOP);
-		assertEquals("2GS2",sn.getPdbId());
+		assertEquals(new PdbId("2GS2"),sn.getPdbId());
 		// CATH
 		sn = new StructureName("CATH:1qvrC03");
 		assertTrue(sn.isCathID());
 		assertTrue(sn.getSource() == CATH);
-		assertEquals("1QVR",sn.getPdbId());
+		assertEquals(new PdbId("1QVR"),sn.getPdbId());
 		// URL
 		sn = new StructureName("URL:http://www.rcsb.org/pdb/files/1B8G.pdb.gz");
 		assertTrue(sn.isURL());
 		assertTrue(sn.getSource() == URL);
-		assertEquals("1B8G",sn.getPdbId());
+		assertEquals(new PdbId("1B8G"),sn.getPdbId());
 		sn = new StructureName("URL:file:///4hhb.pdb");
 		assertTrue(sn.isURL());
 		assertTrue(sn.getSource() == URL);
-		assertEquals("4HHB",sn.getPdbId());
+		assertEquals(new PdbId("4HHB"),sn.getPdbId());
 		// File: expand home directory (invalid URL)
 		sn = new StructureName("FILE:~/4hhb.pdb");
 		assertTrue(sn.isFile());
 		assertTrue(sn.getSource() == FILE);
-		assertEquals("4HHB",sn.getPdbId());
+		assertEquals(new PdbId("4HHB"),sn.getPdbId());
 		// Relative file (invalid URL)
 		sn = new StructureName("file:4hhb.pdb");
 		assertTrue(sn.isFile());
 		assertTrue(sn.getSource() == FILE);
-		assertEquals("4HHB",sn.getPdbId());
+		assertEquals(new PdbId("4HHB"),sn.getPdbId());
 		// Absolute paths are valid URLs
 		sn = new StructureName("file:/4hhb_other.pdb");
 		assertTrue(sn.isURL());
 		assertTrue(sn.getSource() == URL);
-		assertEquals("4HHB",sn.getPdbId());
+		assertEquals(new PdbId("4HHB"),sn.getPdbId());
 
 		// ECOD
 		sn = new StructureName("e1lyw.1");
 		assertTrue(sn.isEcodDomain());
 		assertTrue(sn.getSource() == ECOD);
-		assertEquals("1LYW",sn.getPdbId());
+		assertEquals(new PdbId("1LYW"),sn.getPdbId());
 		// BIO
 		sn = new StructureName("BIO:2ehz:1");
 		assertTrue(sn.isBioAssembly());
 		assertTrue(sn.getSource() == BIO);
-		assertEquals("2EHZ",sn.getPdbId());
+		assertEquals(new PdbId("2EHZ"),sn.getPdbId());
 
 		// Invalid prefix
 		sn = new StructureName("XXX:2ehz");
 		assertTrue(sn.isPdbId());
 		assertTrue(sn.getSource() == PDB);
-		assertEquals("XXX:2ehz",sn.getPdbId());
+//		assertEquals("XXX:2ehz",sn.getPdbId());
+		assertEquals(null,sn.getPdbId()); // As long as it is EXPLICITLY defined to wrong type, it should NOT be recognized.
 
 	}
 	/**
@@ -190,35 +201,35 @@ public void testGuesses() throws StructureException {
 		sn = new StructureName("4hhb");
 		assertTrue(sn.isPdbId());
 		assertTrue(sn.getSource() == PDB);
-		assertEquals("4HHB",sn.getPdbId());
+		assertEquals(new PdbId("4HHB"),sn.getPdbId());
 		sn = new StructureName("4hhb.A:1-50");
 		assertTrue(sn.isPdbId());
 		assertTrue(sn.getSource() == PDB);
-		assertEquals("4HHB",sn.getPdbId());
-		// Invalid strings work too, they just don't load
+		assertEquals(new PdbId("4HHB"),sn.getPdbId());
+		// Invalid strings should NOT work.
 		sn = new StructureName("x");
 		assertTrue(sn.isPdbId());
 		assertTrue(sn.getSource() == PDB);
-		assertEquals("x",sn.getPdbId());
+		assertEquals(null,sn.getPdbId());
 		// SCOP
 		sn = new StructureName("d2gs2a_");
 		assertTrue(sn.isScopName());
 		assertTrue(sn.getSource() == SCOP);
-		assertEquals("2GS2",sn.getPdbId());
+		assertEquals(new PdbId("2GS2"),sn.getPdbId());
 		// CATH
 		sn = new StructureName("1qvrC03");
 		assertTrue(sn.isCathID());
 		assertTrue(sn.getSource() == CATH);
-		assertEquals("1QVR",sn.getPdbId());
+		assertEquals(new PdbId("1QVR"),sn.getPdbId());
 		// URL
 		sn = new StructureName("http://www.rcsb.org/pdb/files/1B8G.pdb.gz");
 		assertTrue(sn.isURL());
 		assertTrue(sn.getSource() == URL);
-		assertEquals("1B8G",sn.getPdbId());
+		assertEquals(new PdbId("1B8G"),sn.getPdbId());
 		sn = new StructureName("file:///4hhb.pdb");
 		assertTrue(sn.isURL());
 		assertTrue(sn.getSource() == URL);
-		assertEquals("4HHB",sn.getPdbId());
+		assertEquals(new PdbId("4HHB"),sn.getPdbId());
 
 
 		// Files are hard to test, since they rely on existing files
@@ -240,13 +251,12 @@ public void testGuesses() throws StructureException {
 		sn = new StructureName("e1lyw.1");
 		assertTrue(sn.isEcodDomain());
 		assertTrue(sn.getSource() == ECOD);
-		assertEquals("1LYW",sn.getPdbId());
+		assertEquals(new PdbId("1LYW"),sn.getPdbId());
 		// BIO is not guessed
 		sn = new StructureName("2ehz:1");
 		assertFalse(sn.isBioAssembly());
 		assertTrue(sn.getSource() == PDB);
-		assertEquals("2ehz:1",sn.getPdbId());
-
+		assertEquals(null, sn.getPdbId()); //Not Guessed
 	}
 
 	// Not really a test, but rather documenting Java's URL behavior
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
index fcdae2c750..57fc673340 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
@@ -44,10 +44,10 @@
 import org.biojava.nbio.structure.AtomPositionMap;
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Group;
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.ResidueRangeAndLength;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.StructureIdentifier;
 import org.biojava.nbio.structure.StructureTools;
@@ -59,6 +59,7 @@
 import org.biojava.nbio.structure.io.LocalPDBDirectory;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.ObsoleteBehavior;
+import org.biojava.nbio.structure.io.StructureFiletype;
 import org.biojava.nbio.structure.scop.ScopDatabase;
 import org.biojava.nbio.structure.scop.ScopFactory;
 import org.biojava.nbio.structure.test.util.GlobalsHelper;
@@ -203,7 +204,8 @@ public void testNewInstanceWithTilder() throws Exception {
 	@Test
 	public void testFetchBehavior() throws IOException, ParseException {
 		// really more of a LocalPDBDirectory test, but throw it in with AtomCache
-		String pdbId = "1hh0"; // A small structure, since we download it multiple times
+		String id = "1hh0"; // A small structure, since we download it multiple times
+		PdbId pdbId = new PdbId(id);
 		LocalPDBDirectory reader = new CifFileReader(cache.getPath());
 
 		// delete
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java
index 5ac9537412..d3c9568240 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestHeaderOnly.java
@@ -29,6 +29,7 @@
 
 import org.biojava.nbio.structure.Chain;
 import org.biojava.nbio.structure.Group;
+import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
 import org.biojava.nbio.structure.StructureIO;
@@ -132,7 +133,7 @@ public void testSpeed() {
 		long start = System.nanoTime();
 		try {
 			// Medium sized structure parsed in 0.549s (no header) vs .676s (header) ~ 20% faster
-			s = fr.getStructureById("4WZ6");
+			s = fr.getStructureById(new PdbId("4WZ6"));
 			// A larger structure could be parsed ~ 4.991s (no header) vs 5.867s (header) ~ 16% faster
 			// s = fr.getStructureById("4V60");
 		} catch (IOException e) {
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
index daad3f9504..26bf9c3ac8 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
@@ -20,7 +20,12 @@
  */
 package org.biojava.nbio.structure.io;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

From df441608ae25ed3ac76355e65cbe58739956dd3a Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 15:12:19 -0700
Subject: [PATCH 217/599] Fixing #987

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 00940a27f4..2865e07310 100644
--- a/pom.xml
+++ b/pom.xml
@@ -690,6 +690,7 @@
 		<module>biojava-aa-prop</module>
 		<module>biojava-survival</module>
 		<module>biojava-ontology</module>
+		<module>biojava-protein-comparison-tool</module>
 		<!-- Keep integration tests last  -->
 		<module>biojava-integrationtest</module>
 	</modules>

From 8e904fd98ad04b7640e04c6afa647481121216ea Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 15:27:44 -0700
Subject: [PATCH 218/599] Fixing #988

---
 biojava-structure/pom.xml                                       | 2 +-
 .../nbio/structure/symmetry/internal/CeSymmIterative.java       | 2 +-
 .../symmetry/internal/GraphComponentOrderDetector.java          | 2 +-
 .../nbio/structure/symmetry/internal/GraphComponentRefiner.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 721b635d37..6dd7c6ecef 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.jgrapht</groupId>
   			<artifactId>jgrapht-core</artifactId>
-  			<version>1.1.0</version>
+  			<version>1.5.1</version>
 		</dependency>
 
 		<!-- JAXb explicit dependency is needed since Java 9. See https://stackoverflow.com/questions/43574426/how-to-resolve-java-lang-noclassdeffounderror-javax-xml-bind-jaxbexception-in-j
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java
index c007319f6e..66df0f2658 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java
@@ -45,7 +45,7 @@
 import org.biojava.nbio.structure.symmetry.internal.CESymmParameters.SymmetryType;
 import org.biojava.nbio.structure.symmetry.utils.SymmetryTools;
 import org.jgrapht.Graph;
-import org.jgrapht.alg.ConnectivityInspector;
+import org.jgrapht.alg.connectivity.ConnectivityInspector;
 import org.jgrapht.graph.DefaultEdge;
 import org.jgrapht.graph.SimpleGraph;
 import org.slf4j.Logger;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentOrderDetector.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentOrderDetector.java
index f6accbfb96..822e62a8c2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentOrderDetector.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentOrderDetector.java
@@ -29,7 +29,7 @@
 import org.biojava.nbio.structure.align.model.AFPChain;
 import org.biojava.nbio.structure.symmetry.utils.SymmetryTools;
 import org.jgrapht.Graph;
-import org.jgrapht.alg.ConnectivityInspector;
+import org.jgrapht.alg.connectivity.ConnectivityInspector;
 import org.jgrapht.graph.DefaultEdge;
 
 /**
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentRefiner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentRefiner.java
index 375d0dd61b..6c7d44f6a7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentRefiner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentRefiner.java
@@ -35,7 +35,7 @@
 import org.biojava.nbio.structure.align.util.AlignmentTools;
 import org.biojava.nbio.structure.symmetry.utils.SymmetryTools;
 import org.jgrapht.Graph;
-import org.jgrapht.alg.ConnectivityInspector;
+import org.jgrapht.alg.connectivity.ConnectivityInspector;
 import org.jgrapht.graph.DefaultEdge;
 
 /**

From aac3e01c37bedf0aafcf2c4d09c5c3e3488bbea1 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 15:46:26 -0700
Subject: [PATCH 219/599] Hoping to solve complains from javadoc plugin about
 nothing to document in protein-comparison-tool

---
 .../nbio/proteincomparisontool/HelloWorld.java      |  8 +++++---
 pom.xml                                             | 13 ++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/biojava-protein-comparison-tool/src/main/java/org/biojava/nbio/proteincomparisontool/HelloWorld.java b/biojava-protein-comparison-tool/src/main/java/org/biojava/nbio/proteincomparisontool/HelloWorld.java
index 8023cc4d1c..97f460f7e7 100644
--- a/biojava-protein-comparison-tool/src/main/java/org/biojava/nbio/proteincomparisontool/HelloWorld.java
+++ b/biojava-protein-comparison-tool/src/main/java/org/biojava/nbio/proteincomparisontool/HelloWorld.java
@@ -20,16 +20,18 @@
  */
 package org.biojava.nbio.proteincomparisontool;
 
-/** A dummy class that does nothing. This is so we can upload protein-comparison-tool.jar to Maven Central
+/**
+ * A dummy class that does nothing. This is so we can upload protein-comparison-tool.jar to Maven Central
  *
  */
-class HelloWorld{
+public class HelloWorld {
 
 	public HelloWorld(){
 		// hello world
 	}
 
-	/** Prints hello world on command line
+	/**
+	 * Prints hello world on command line
 	 *
 	 */
 	public void print(){
diff --git a/pom.xml b/pom.xml
index 2865e07310..dad08a92e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -226,7 +226,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.2.0</version>
+					<version>3.3.1</version>
 					<configuration>
 					    <additionalJOptions>-Xdoclint:none</additionalJOptions>
 					    <!-- we need to allow script in comments or otherwise we can't use google analytics js in footer below - JD 2017-03-30 -->
@@ -241,12 +241,11 @@
 					</configuration>
 
 				</plugin>
-				        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>3.0.0-M5</version>
-            
-             </plugin>
+				<plugin>
+            		<groupId>org.apache.maven.plugins</groupId>
+            		<artifactId>maven-surefire-plugin</artifactId>
+            		<version>3.0.0-M5</version>
+             	</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>

From 29ff2274ebe8e89c0390358e0da185840a67df67 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 15:52:38 -0700
Subject: [PATCH 220/599] Perhaps this solves the test flakiness in CI

---
 .../biojava/nbio/structure/io/sifts/SiftsMappingProvider.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java
index 7c67305f3c..ed697b55fd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java
@@ -41,7 +41,7 @@ public class SiftsMappingProvider {
 	private final static Logger logger = LoggerFactory.getLogger(SiftsMappingProvider.class);
 
 
-	private static final String EBI_SIFTS_FILE_LOCATION = "http://ftp.ebi.ac.uk/pub/databases/msd/sifts/xml/%s.xml.gz";
+	private static final String EBI_SIFTS_FILE_LOCATION = "https://ftp.ebi.ac.uk/pub/databases/msd/sifts/xml/%s.xml.gz";
 
 	private static String fileLoc = EBI_SIFTS_FILE_LOCATION;
 

From c2e89f73b29e4c1b9a388a05800dc50baf7d9298 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 16:03:14 -0700
Subject: [PATCH 221/599] [maven-release-plugin] prepare release biojava-6.0.0

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 13 ++++++-------
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 78344622b1..e01ef04751 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a22b560d19..d61ac0f0f7 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index b61e45194a..aeaffc5ba6 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 2fb8e78426..27cf2fb7d9 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index bb1a97c71b..6172300169 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 4df1148dee..ead072be9d 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0-SNAPSHOT</version>
+    	<version>6.0.0</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 03787e7d7a..56ba9c552e 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.0</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 8791985f38..b62046024a 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -37,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 9153de3e05..50c035f570 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 154f7c229d..fcef28e511 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 6dd7c6ecef..98bf852cc4 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8774d85478..595a6018d1 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.0</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 65b13c6730..5c30948783 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0-SNAPSHOT</version>
+		<version>6.0.0</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0-SNAPSHOT</version>
+			<version>6.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index dad08a92e2..27e3e74645 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0-SNAPSHOT</version>
+	<version>6.0.0</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.0</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From a5a85b6fbdf7eaa8cd8de50a730344feaf44db25 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 16:03:17 -0700
Subject: [PATCH 222/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index e01ef04751..b6a957c0f2 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0</version>
+		<version>6.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index d61ac0f0f7..00b6400cde 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0</version>
+		<version>6.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index aeaffc5ba6..3e3e76985c 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0</version>
+		<version>6.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 27cf2fb7d9..c61c8ba738 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0</version>
+		<version>6.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 6172300169..9df619b4c0 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0</version>
+    <version>6.0.1-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0</version>
+    	<version>6.0.1-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index ead072be9d..e639bfaaaf 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.0</version>
+    <version>6.0.1-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-modfinder</artifactId>
   <name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.0</version>
+    	<version>6.0.1-SNAPSHOT</version>
     	<type>jar</type>
     	<scope>compile</scope>
     </dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 56ba9c552e..5534e8bdfe 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index b62046024a..af16e1a19a 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0</version>
+		<version>6.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 50c035f570..5150cb9f43 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0</version>
+		<version>6.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index fcef28e511..90e1fd90c6 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.0</version>
+		<version>6.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 98bf852cc4..baa51345b7 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0</version>
+		<version>6.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 595a6018d1..43b8defd48 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 5c30948783..d64f029b73 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.0</version>
+		<version>6.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.0</version>
+			<version>6.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 27e3e74645..fc677f3240 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.0</version>
+	<version>6.0.1-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From da70b12c7816975bf7dfb0e5f6a0d85f4c70f78d Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 16:16:06 -0700
Subject: [PATCH 223/599] Updating readme and changelog after release

---
 CHANGELOG.md | 2 +-
 README.md    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbd0024247..a8ea5a0974 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 BioJava Changelog
 -----------------
 
-BioJava 6.0.0 (future release)
+BioJava 6.0.0 
 ==============================
 ### Removed
 * All code related to All-vs-All structural alignments db calculation and access
diff --git a/README.md b/README.md
index 79cebcb205..e94ca8e2ff 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
-[![Build Status](https://travis-ci.org/biojava/biojava.svg?branch=master)](https://travis-ci.org/biojava/biojava) [![Version](http://img.shields.io/badge/version-5.4.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-5.4.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://travis-ci.org/biojava/biojava.svg?branch=master)](https://travis-ci.org/biojava/biojava) [![Version](http://img.shields.io/badge/version-6.0.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -28,7 +28,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>5.4.0</version>
+        <version>6.0.0</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From b2e330737a1b756a8d45df8908fb178fa2dd3554 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 17:59:02 -0700
Subject: [PATCH 224/599] Trying to fix CI

---
 .github/workflows/ci.yaml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 80fcc2c29f..1a8d333e19 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,14 +1,15 @@
----
 name: Java CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, macOS-latest]
+        # We do one OS only to reduce resource utilization. To do macOS to this would be needed:
+        #os: [ubuntu-20.04, macOS-latest]
+        os: [ubuntu-latest]
         java: [11]
       fail-fast: false
       max-parallel: 4
@@ -22,5 +23,3 @@ jobs:
           java-version: ${{ matrix.java }}
       - name: Test with Maven
         run: mvn verify
-
-...
\ No newline at end of file

From 1d143ac1acf76d0dc226a456a83ad59120ca6347 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 18:34:31 -0700
Subject: [PATCH 225/599] Updating badge to display github workflow ci status

---
 .github/workflows/ci.yaml | 2 +-
 README.md                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1a8d333e19..1bd02b7700 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,4 +1,4 @@
-name: Java CI
+name: Master Build
 
 on: [push, pull_request]
 
diff --git a/README.md b/README.md
index e94ca8e2ff..06f00291e3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
-[![Build Status](https://travis-ci.org/biojava/biojava.svg?branch=master)](https://travis-ci.org/biojava/biojava) [![Version](http://img.shields.io/badge/version-6.0.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+![Build](https://github.com/biojava/biojava/actions/workflows/ci.yaml/badge.svg)
+[![Version](http://img.shields.io/badge/version-6.0.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.

From e9033c81ee8f367799fd7b4b62d420e5e6db2fe1 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 20:56:12 -0700
Subject: [PATCH 226/599] Better CI: no integrationtest in master push, full
 tests in PR

---
 .github/workflows/{ci.yaml => master.yml} |  9 ++++---
 .github/workflows/pull_request.yml        | 31 +++++++++++++++++++++++
 README.md                                 |  2 +-
 3 files changed, 38 insertions(+), 4 deletions(-)
 rename .github/workflows/{ci.yaml => master.yml} (78%)
 create mode 100644 .github/workflows/pull_request.yml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/master.yml
similarity index 78%
rename from .github/workflows/ci.yaml
rename to .github/workflows/master.yml
index 1bd02b7700..b5834111c4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/master.yml
@@ -1,6 +1,9 @@
 name: Master Build
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
 
 jobs:
   test:
@@ -21,5 +24,5 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
-      - name: Test with Maven
-        run: mvn verify
+      - name: Build and test, no integration tests
+        run: mvn verify -pl '!biojava-integrationtest'
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
new file mode 100644
index 0000000000..b9e93ba1f5
--- /dev/null
+++ b/.github/workflows/pull_request.yml
@@ -0,0 +1,31 @@
+name: PR Build
+
+on: 
+  push:
+    branches:
+      - '!master'
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        # We do one OS only to reduce resource utilization. To do macOS to this would be needed:
+        #os: [ubuntu-20.04, macOS-latest]
+        os: [ubuntu-latest]
+        java: [11]
+      fail-fast: false
+      max-parallel: 4
+    name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Build, test and integration test
+        run: mvn verify
diff --git a/README.md b/README.md
index 06f00291e3..393e6e9ce4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
-![Build](https://github.com/biojava/biojava/actions/workflows/ci.yaml/badge.svg)
+![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
 [![Version](http://img.shields.io/badge/version-6.0.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 

From 5b414a04ded9e5a40bb2a084aa170b99cc8cfb8a Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 21:19:59 -0700
Subject: [PATCH 227/599] Update: we don't have snapshot builds anymore

---
 README.md | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 393e6e9ce4..5e0678eecb 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Full javadocs are available at the [BioJava website](http://biojava.org/docs/api
 
 ### Maven Repository
 
-BioJava release are available from Maven Central. Snapshot builds are distributed using [OSS Sonatype](https://oss.sonatype.org/content/repositories/snapshots/org/biojava)
+BioJava release are available from Maven Central.
 
 ### Quick Installation
 
@@ -35,25 +35,6 @@ If you are using Maven you can add the BioJava repository by adding the followin
     </dependencies>
 ```
 
-### Snapshot builds
-
-To use the latest builds from BioJava, you can add the following config your project's pom.xml:
-
-```xml
-<repositories>
-    <repository>
-      <id>oss.sonatype.org-snapshot</id>
-      <url>http://oss.sonatype.org/content/repositories/snapshots</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-  ```
-
 ### Mailing Lists
 
 BioJava has one main mailing list. In order to avoid SPAM the list only accepts postings from list members. Anybody can become a list member, so please subscribe before you post. If you send without being subscribed your mail might get stuck in the moderation loop, which can cause several weeks of delay (no fun to read through all that spam).
@@ -70,7 +51,6 @@ A [dev mailing list](http://lists.open-bio.org/mailman/listinfo/biojava-dev) use
 
 ### Please cite
 
-
 **BioJava 5: A community driven open-source bioinformatics library**<br/>
 *Aleix Lafita, Spencer Bliven, Andreas Prlić, Dmytro Guzenko, Peter W. Rose, Anthony Bradley, Paolo Pavan, Douglas Myers-Turnbull, Yana Valasatava, Michael Heuer, Matt Larson, Stephen K. Burley, Jose M. Duarte* <br/>
 [PLOS Computational Biology 15(2): e1006791](http://dx.plos.org/10.1371/journal.pcbi.1006791) <br/>

From a3bb5f706ef4a7872a5dbdc58feb7a9f7d51f64e Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 21:36:40 -0700
Subject: [PATCH 228/599] Adding sonarcloud in github workflow

---
 .github/workflows/master.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index b5834111c4..c12841b68f 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -25,4 +25,8 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
       - name: Build and test, no integration tests
-        run: mvn verify -pl '!biojava-integrationtest'
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+        # The following builds the project, runs the tests with coverage (no integration tests) and then executes the SonarCloud analysis
+        run: mvn verify -pl '!biojava-integrationtest' org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=biojava_biojava

From ca9d10184942d8e2dbebc8208b3aa8fc8c7215a5 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 21:53:26 -0700
Subject: [PATCH 229/599] Another parameter for sonar

---
 .github/workflows/master.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index c12841b68f..ee4d92e034 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -24,9 +24,9 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
-      - name: Build and test, no integration tests
+      - name: Build, test (no integration) and Sonarqube analyse
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
         # The following builds the project, runs the tests with coverage (no integration tests) and then executes the SonarCloud analysis
-        run: mvn verify -pl '!biojava-integrationtest' org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=biojava_biojava
+        run: mvn verify -pl '!biojava-integrationtest' org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=biojava_biojava -Dsonar.organization=biojava

From f266c714661366b099b4d4aeb93460c8992569e9 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 22:06:47 -0700
Subject: [PATCH 230/599] Avoiding test that fails often in github workflow

---
 .../nbio/structure/io/TestSiftsParsing.java   | 33 +++----------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestSiftsParsing.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestSiftsParsing.java
index f34cca7454..6a9f6ae93c 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestSiftsParsing.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestSiftsParsing.java
@@ -26,6 +26,7 @@
 
 import org.biojava.nbio.structure.io.sifts.*;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.InputStream;
@@ -34,7 +35,7 @@
 
 public class TestSiftsParsing {
 
-
+	@Ignore("Requires an external resource tha fails often in github workflow (don't know why)")
 	@Test
 	public void test4DIA() throws Exception {
 		List<SiftsEntity> entities = SiftsMappingProvider.getSiftsMapping("4DIA");
@@ -46,7 +47,6 @@ public void test4DIA() throws Exception {
 		for (SiftsEntity e : entities) {
 			//System.out.println(e.getEntityId() + " " +e.getType());
 
-
 			Assert.assertTrue(e.getSegments().size() > 0);
 			for (SiftsSegment seg : e.getSegments()) {
 				Assert.assertTrue(seg.getResidues().size() > 0);
@@ -59,19 +59,15 @@ public void test4DIA() throws Exception {
 
 						// test for github ticket #280
 						if (res.getUniProtPos() == 129) {
-
 							Assert.assertTrue(res.getNotObserved());
 						}
-
 					}
 				}
 			}
-
 		}
-
-
 	}
 
+	@Ignore("Requires an external resource tha fails often in github workflow (don't know why)")
 	@Test
 	public void test4jn3() throws Exception {
 		List<SiftsEntity> entities = SiftsMappingProvider.getSiftsMapping("4jn3");
@@ -82,27 +78,21 @@ public void test4jn3() throws Exception {
 
 		for (SiftsEntity e : entities) {
 			//System.out.println(e.getEntityId() + " " +e.getType());
-
-
 			Assert.assertTrue(e.getSegments().size() > 0);
 			for (SiftsSegment seg : e.getSegments()) {
 				Assert.assertTrue(seg.getResidues().size() > 0);
 				//System.out.println(seg.getResidues().size());
 				//System.out.println(" Segment: " + seg.getSegId() + " " + seg.getStart() + " " + seg.getEnd()) ;
-				//
+
 				for (SiftsResidue res : seg.getResidues()) {
 					//System.out.println("  " + res);
 					if (res.getUniProtResName() != null) {
 						Assert.assertNotNull(res.getUniProtAccessionId());
 						Assert.assertNotNull(res.getUniProtResName());
-
 					}
 				}
 			}
-
 		}
-
-
 	}
 
 	@Test
@@ -151,12 +141,10 @@ public void test4DOU() throws Exception {
 				}
 				//break;
 			}
-
 		}
-
-
 	}
 
+	@Ignore("Requires an external resource tha fails often in github workflow (don't know why)")
 	@Test
 	public void test4O6W() throws Exception {
 		List<SiftsEntity> entities = SiftsMappingProvider.getSiftsMapping("4O6W");
@@ -173,11 +161,9 @@ public void test4O6W() throws Exception {
 			if (ecount != 1)
 				continue;
 
-
 			Assert.assertEquals("A", e.getEntityId());
 			Assert.assertEquals("protein", e.getType());
 
-
 			//	4O6W A has 2 segments
 			Assert.assertEquals(2, e.getSegments().size());
 
@@ -191,28 +177,19 @@ public void test4O6W() throws Exception {
 
 			Assert.assertTrue(seg.getResidues().size() > 0);
 
-
 			for (SiftsResidue res : seg.getResidues()) {
 
-
 				if (res.getUniProtResName() != null) {
 					//System.out.println("  " + res);
 					Assert.assertNotNull(res.getUniProtAccessionId());
 					Assert.assertNotNull(res.getUniProtResName());
-
 				}
 
 				if (res.getPdbResNum().equals("502")) {
-
 					Assert.assertTrue(res.getNotObserved());
-
 				}
 			}
 			//break;
 		}
-
-
 	}
-
-
 }

From c3500abfee0aad4f27ee9bbd76d40b05872f997d Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 22:28:54 -0700
Subject: [PATCH 231/599] Another setting needed

---
 .github/workflows/master.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index ee4d92e034..f18042cfd1 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -26,6 +26,7 @@ jobs:
           java-version: ${{ matrix.java }}
       - name: Build, test (no integration) and Sonarqube analyse
         env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
         # The following builds the project, runs the tests with coverage (no integration tests) and then executes the SonarCloud analysis

From 7cc316f6c1e2d6a3247e45b33d59d711e6a3619e Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 29 Oct 2021 23:11:19 -0700
Subject: [PATCH 232/599] Correcting a few issues found by sonarqube

---
 .../ProfeatPropertiesImplTest.java            | 25 ---------
 .../io/GenericGenbankHeaderFormat.java        | 18 +------
 .../loader/GenbankProxySequenceReader.java    | 24 ++++-----
 .../loader/SequenceFileProxyLoader.java       | 10 ++--
 .../loader/UniprotProxySequenceReader.java    | 21 ++++----
 .../nbio/core/util/InputStreamProvider.java   | 54 ++++++++++---------
 6 files changed, 59 insertions(+), 93 deletions(-)
 delete mode 100644 biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/ProfeatPropertiesImplTest.java

diff --git a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/ProfeatPropertiesImplTest.java b/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/ProfeatPropertiesImplTest.java
deleted file mode 100644
index d1edcef5a9..0000000000
--- a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/ProfeatPropertiesImplTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.aaproperties;
-
-public class ProfeatPropertiesImplTest {
-
-}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
index a19c9f648c..b1a7963593 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
@@ -22,6 +22,7 @@
 
 import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
 import org.biojava.nbio.core.sequence.compound.DNACompoundSet;
+import org.biojava.nbio.core.sequence.compound.RNACompoundSet;
 import org.biojava.nbio.core.sequence.features.FeatureInterface;
 import org.biojava.nbio.core.sequence.io.template.GenbankHeaderFormatInterface;
 import org.biojava.nbio.core.sequence.template.AbstractSequence;
@@ -77,20 +78,6 @@ private String _write_multi_line(String tag, String text) {
 		return output;
 	}
 
-	/**
-	 * used for DBLINK and any similar later line types. If the list of strings
-	 * is empty, nothing is written.
-	 *
-	 * @param tag
-	 * @param text_list
-	 */
-	/*
-	 * private String _write_multi_entries(String tag, ArrayList<String>
-	 * text_list) { String output = _write_single_line(tag,text_list.remove(0));
-	 * for(String s : text_list) { output += _write_single_line("", s); } return
-	 * output; }
-	 */
-
 	private String _get_date(S sequence) {
 		Date sysdate = Calendar.getInstance().getTime();
 
@@ -150,7 +137,6 @@ private String _get_data_division(S sequence) {
 	 * Write the LOCUS line.
 	 *
 	 * @param sequence
-	 * @param seqType
 	 */
 	private String _write_the_first_line(S sequence) {
 		/*
@@ -174,7 +160,7 @@ private String _write_the_first_line(S sequence) {
 		if (sequence.getCompoundSet() instanceof DNACompoundSet) {
 			units = "bp";
 			mol_type = "DNA";
-		} else if (sequence.getCompoundSet() instanceof DNACompoundSet) {
+		} else if (sequence.getCompoundSet() instanceof RNACompoundSet) {
 			units = "bp";
 			mol_type = "RNA";
 		} else if (sequence.getCompoundSet() instanceof AminoAcidCompoundSet) {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java
index 3a22d91f19..08c16c672c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java
@@ -116,20 +116,20 @@ private BufferedInputStream getBufferedInputStream(String accessionID, String db
 	}
 
 	private void copyInputStreamToFile(InputStream in, File f) throws IOException, InterruptedException {
-		FileOutputStream out = new FileOutputStream(f);
-		byte[] buffer = new byte[1024];
-		int len = in.read(buffer);
-		while (len != -1) {
-			out.write(buffer, 0, len);
-			len = in.read(buffer);
-			if (Thread.interrupted()) {
-				in.close();
-				out.close();
-				throw new InterruptedException();
+		try (FileOutputStream out = new FileOutputStream(f)) {
+			byte[] buffer = new byte[1024];
+			int len = in.read(buffer);
+			while (len != -1) {
+				out.write(buffer, 0, len);
+				len = in.read(buffer);
+				if (Thread.interrupted()) {
+					in.close();
+					out.close();
+					throw new InterruptedException();
+				}
 			}
+			in.close();
 		}
-		in.close();
-		out.close();
 	}
 
 	private InputStream getEutilsInputStream(String accessionID, String db) throws IOException {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java
index 78c08b7795..fa7d81f4e9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java
@@ -99,11 +99,11 @@ public void setCompoundSet(CompoundSet<C> compoundSet) {
 	 */
 	private boolean init() throws IOException, CompoundNotFoundException {
 
-		BufferedReader br = new BufferedReader(new FileReader(file));
-		br.skip(sequenceStartIndex);
-		String sequence = sequenceParser.getSequence(br, sequenceLength);
-		setContents(sequence);
-		br.close(); // close file to prevent too many being open
+		try (BufferedReader br = new BufferedReader(new FileReader(file))) {
+			br.skip(sequenceStartIndex);
+			String sequence = sequenceParser.getSequence(br, sequenceLength);
+			setContents(sequence);
+		}
 
 		return true;
 	}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
index ae8c8207aa..61099ef46f 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
@@ -535,9 +535,7 @@ private Document getUniprotXML(String accession) throws IOException, CompoundNot
 			//       logger.debug(sb.toString());
 			Document document = XMLHelper.inputStreamToDocument(new ByteArrayInputStream(sb.toString().getBytes()));
 			return document;
-		} catch (SAXException e) {
-			logger.error("Exception on xml parse of: {}", sb.toString());
-		} catch (ParserConfigurationException e) {
+		} catch (SAXException | ParserConfigurationException e) {
 			logger.error("Exception on xml parse of: {}", sb.toString());
 		}
 		return null;
@@ -545,9 +543,9 @@ private Document getUniprotXML(String accession) throws IOException, CompoundNot
 
 	private void writeCache(StringBuilder sb, String accession) throws IOException {
 		File f = new File(uniprotDirectoryCache + File.separatorChar + accession + ".xml");
-		FileWriter fw = new FileWriter(f);
-		fw.write(sb.toString());
-		fw.close();
+		try (FileWriter fw = new FileWriter(f)) {
+			fw.write(sb.toString());
+		}
 	}
 
 	/**
@@ -645,11 +643,12 @@ private StringBuilder fetchFromCache(String key)
 		File f = new File(uniprotDirectoryCache + File.separatorChar + key + ".xml");
 		StringBuilder sb = new StringBuilder();
 		if (f.exists()) {
-			FileReader fr = new FileReader(f);
-			int size = (int) f.length();
-			char[] data = new char[size];
-			fr.read(data);
-			fr.close();
+			char[] data;
+			try (FileReader fr = new FileReader(f)) {
+				int size = (int) f.length();
+				data = new char[size];
+				fr.read(data);
+			}
 			sb.append(data);
 			index = sb.indexOf("xmlns="); //strip out name space stuff to make it easier on xpath
 			if (index != -1) {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java
index f5977407e4..9a064aa27e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java
@@ -196,32 +196,34 @@ else if ( fileName.endsWith(".gz")) {
 
 		else if ( fileName.endsWith(".zip")){
 
-			ZipFile zipfile = new ZipFile(f);
-
-			// stream to first entry is returned ...
-			ZipEntry entry;
-			Enumeration<? extends ZipEntry> e = zipfile.entries();
-			if ( e.hasMoreElements()){
-				entry = e.nextElement();
-				inputStream = zipfile.getInputStream(entry);
-			} else {
-				throw new IOException ("Zip file has no entries");
+			try (ZipFile zipfile = new ZipFile(f)) {
+
+				// stream to first entry is returned ...
+				ZipEntry entry;
+				Enumeration<? extends ZipEntry> e = zipfile.entries();
+				if (e.hasMoreElements()) {
+					entry = e.nextElement();
+					inputStream = zipfile.getInputStream(entry);
+				} else {
+					throw new IOException("Zip file has no entries");
+				}
 			}
 
 		}
 
 		else if ( fileName.endsWith(".jar")) {
 
-			JarFile jarFile = new JarFile(f);
-
-			// stream to first entry is returned
-			JarEntry entry;
-			Enumeration<JarEntry> e = jarFile.entries();
-			if ( e.hasMoreElements()){
-				entry = e.nextElement();
-				inputStream = jarFile.getInputStream(entry);
-			} else {
-				throw new IOException ("Jar file has no entries");
+			try (JarFile jarFile = new JarFile(f)) {
+
+				// stream to first entry is returned
+				JarEntry entry;
+				Enumeration<JarEntry> e = jarFile.entries();
+				if (e.hasMoreElements()) {
+					entry = e.nextElement();
+					inputStream = jarFile.getInputStream(entry);
+				} else {
+					throw new IOException("Jar file has no entries");
+				}
 			}
 		}
 
@@ -280,8 +282,10 @@ private InputStream openCompressedFile(File f)
 	private InputStream openCompressedURL(URL u)
 	throws IOException{
 
-		InputStream is           =  u.openStream();
-		InputStream inputStream =  new UncompressInputStream(is);
+		InputStream inputStream;
+		try (InputStream is = u.openStream()) {
+			inputStream = new UncompressInputStream(is);
+		}
 		return inputStream;
 	}
 
@@ -297,8 +301,10 @@ private InputStream openGZIPFile(File f)
 	private InputStream openGZIPURL(URL u)
 	throws IOException{
 
-		InputStream is      = u.openStream();
-		InputStream inputStream = new GZIPInputStream(is);
+		InputStream inputStream;
+		try (InputStream is = u.openStream()) {
+			inputStream = new GZIPInputStream(is);
+		}
 		return inputStream;
 	}
 }

From aab5e37389feeac1a8eda5c68e82049fbaf80b45 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Sat, 30 Oct 2021 08:48:50 -0700
Subject: [PATCH 233/599] Undoing part of last commit that introduced a test
 issue

---
 .../nbio/core/util/InputStreamProvider.java   | 54 +++++++++----------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java
index 9a064aa27e..f5977407e4 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java
@@ -196,34 +196,32 @@ else if ( fileName.endsWith(".gz")) {
 
 		else if ( fileName.endsWith(".zip")){
 
-			try (ZipFile zipfile = new ZipFile(f)) {
-
-				// stream to first entry is returned ...
-				ZipEntry entry;
-				Enumeration<? extends ZipEntry> e = zipfile.entries();
-				if (e.hasMoreElements()) {
-					entry = e.nextElement();
-					inputStream = zipfile.getInputStream(entry);
-				} else {
-					throw new IOException("Zip file has no entries");
-				}
+			ZipFile zipfile = new ZipFile(f);
+
+			// stream to first entry is returned ...
+			ZipEntry entry;
+			Enumeration<? extends ZipEntry> e = zipfile.entries();
+			if ( e.hasMoreElements()){
+				entry = e.nextElement();
+				inputStream = zipfile.getInputStream(entry);
+			} else {
+				throw new IOException ("Zip file has no entries");
 			}
 
 		}
 
 		else if ( fileName.endsWith(".jar")) {
 
-			try (JarFile jarFile = new JarFile(f)) {
-
-				// stream to first entry is returned
-				JarEntry entry;
-				Enumeration<JarEntry> e = jarFile.entries();
-				if (e.hasMoreElements()) {
-					entry = e.nextElement();
-					inputStream = jarFile.getInputStream(entry);
-				} else {
-					throw new IOException("Jar file has no entries");
-				}
+			JarFile jarFile = new JarFile(f);
+
+			// stream to first entry is returned
+			JarEntry entry;
+			Enumeration<JarEntry> e = jarFile.entries();
+			if ( e.hasMoreElements()){
+				entry = e.nextElement();
+				inputStream = jarFile.getInputStream(entry);
+			} else {
+				throw new IOException ("Jar file has no entries");
 			}
 		}
 
@@ -282,10 +280,8 @@ private InputStream openCompressedFile(File f)
 	private InputStream openCompressedURL(URL u)
 	throws IOException{
 
-		InputStream inputStream;
-		try (InputStream is = u.openStream()) {
-			inputStream = new UncompressInputStream(is);
-		}
+		InputStream is           =  u.openStream();
+		InputStream inputStream =  new UncompressInputStream(is);
 		return inputStream;
 	}
 
@@ -301,10 +297,8 @@ private InputStream openGZIPFile(File f)
 	private InputStream openGZIPURL(URL u)
 	throws IOException{
 
-		InputStream inputStream;
-		try (InputStream is = u.openStream()) {
-			inputStream = new GZIPInputStream(is);
-		}
+		InputStream is      = u.openStream();
+		InputStream inputStream = new GZIPInputStream(is);
 		return inputStream;
 	}
 }

From 4420064b42c7507780a9488578080055ee46d4a9 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Sat, 30 Oct 2021 20:45:55 -0700
Subject: [PATCH 234/599] Moving file from root to dev dir where it should be

---
 HEADER.txt => development/HEADER.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename HEADER.txt => development/HEADER.txt (100%)

diff --git a/HEADER.txt b/development/HEADER.txt
similarity index 100%
rename from HEADER.txt
rename to development/HEADER.txt

From 49d0ff679180181d3bb9d7a516ef90f37446677a Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Sat, 30 Oct 2021 20:47:07 -0700
Subject: [PATCH 235/599] Removing unneded file, probably from svn times

---
 development/addlicense.sh | 2 +-
 ignore.txt                | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 ignore.txt

diff --git a/development/addlicense.sh b/development/addlicense.sh
index 4946260a86..2764cfe061 100755
--- a/development/addlicense.sh
+++ b/development/addlicense.sh
@@ -7,7 +7,7 @@ find . -iname '*.java' -exec grep -L 'http://www.gnu.org/copyleft/lesser.html' '
 xargs grep -Li 'copyright' |
 while read file; do
     echo "$file"
-    cat $BASEDIR/../HEADER.txt > tmp.java
+    cat $BASEDIR/HEADER.txt > tmp.java
     echo >> tmp.java
     cat "$file" >> tmp.java
     mv tmp.java "$file"
diff --git a/ignore.txt b/ignore.txt
deleted file mode 100644
index cb641de4b3..0000000000
--- a/ignore.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-target 
-.settings 
-.classpath 
-.profile
-.project
\ No newline at end of file

From 6a54e3a4d846793acf80f29dc0c2665e1a213103 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Sat, 30 Oct 2021 20:49:00 -0700
Subject: [PATCH 236/599] Removing travis CI files, now unused. Replaced by
 github workflow for now

---
 .travis.yml              | 22 ----------------------
 sonar-project.properties |  1 -
 travis-settings.xml      | 36 ------------------------------------
 3 files changed, 59 deletions(-)
 delete mode 100644 .travis.yml
 delete mode 100644 sonar-project.properties
 delete mode 100644 travis-settings.xml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 913f287017..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: java
-jdk:
- - openjdk11
-sudo: required
-cache:
-  directories:
-   - "$HOME/.m2"
-before_install:
- - if [ ! -z "$GPG_SECRET_KEYS" ]; then echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import; fi
- - if [ ! -z "$GPG_OWNERTRUST"  ]; then echo $GPG_OWNERTRUST  | base64 --decode | $GPG_EXECUTABLE --import-ownertrust; fi
-after_success:
- - '[[ $TRAVIS_BRANCH == "master" ]] && { mvn deploy --settings travis-settings.xml -DskipTests=true -B ; };'
-env:
-  global:
-  - secure: MkIoyU3GmlgDRhO0n1lDKvZ/k0myVY3IsFTRNUFjaBBpohLyOBrs5L8gYmfnHYHB/LvJsP6EWA6i0wCchy8hU/2pn66T12K1+WZHyqCe7RRz2kgcvVgMXTsHgvVyZ3dERcBfEDeZENzEYCYADaysT+A73ofWdJemOqfa7IFEb80=
-  - secure: it5av1icAvJn/6UI0aWS23m+En0ij1hCiPKw1QIbDLCE3oJOE4nHR8qINcnontH4XUQYTkmekStDkXj0WVVgp08zArj9o018XBtadYY+15h2QZBBAIpYb3UdlJoQfkcAx8yCv59BMd/u6DhMtcKSTHptVWvsLAS7YGW5hR6ZNYA=
-addons:
- sonarcloud:
-  organization: "biojava"
-script:
- # the following command line builds the project, runs the tests with coverage and then execute the SonarCloud analysis
- - mvn clean verify sonar:sonar -Dsonar.projectKey=biojava_biojava
diff --git a/sonar-project.properties b/sonar-project.properties
deleted file mode 100644
index 0e7a0b311b..0000000000
--- a/sonar-project.properties
+++ /dev/null
@@ -1 +0,0 @@
-sonar.projectKey=biojava_biojava
diff --git a/travis-settings.xml b/travis-settings.xml
deleted file mode 100644
index 31fbef3397..0000000000
--- a/travis-settings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- travis-settings.xml for auto-deploy of SNAPSHOT builds using Travis-CI -->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
-    <servers>
-        <server>
-            <!-- Maven Central Deployment -->
-            <id>ossrh</id>
-            <username>${env.SONATYPE_USERNAME}</username>
-            <password>${env.SONATYPE_PASSWORD}</password>
-        </server>
-        <server>
-            <id>sonatype-nexus-snapshots</id>
-            <username>${env.SONATYPE_USERNAME}</username>
-            <password>${env.SONATYPE_PASSWORD}</password>
-        </server>
-        <server>
-            <id>sonatype-nexus-staging</id>
-            <username>${env.SONATYPE_USERNAME}</username>
-            <password>${env.SONATYPE_PASSWORD}</password>
-        </server>
-    </servers>
-    <profiles>
-        <profile>
-            <id>ossrh</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <gpg.executable>${env.GPG_EXECUTABLE}</gpg.executable>
-                <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
-            </properties>
-        </profile>
-    </profiles>
-</settings>

From 9da6f27fd55bb30026ccf5c0d050552e5de57f83 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Sun, 7 Nov 2021 14:06:56 +0800
Subject: [PATCH 237/599] AutoUnboxing instead of deprecated constructor

---
 .../main/java/org/biojava/nbio/structure/io/PDBFileParser.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index c1268c2e62..e4ae220f27 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -1726,7 +1726,7 @@ private void  pdb_ATOM_Handler(String line)	{
 		startOfMolecule = false;
 
 
-		Character altLoc   = new Character(line.substring (16, 17).charAt(0));
+		Character altLoc   = line.substring (16, 17).charAt(0);
 		Group altGroup = null;
 
 

From 419d5f01020fafbd9c667a3b75a44b874de6b1d2 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Mon, 8 Nov 2021 01:03:47 +0800
Subject: [PATCH 238/599] Minor Miscellaneous formatting and import

---
 .../org/biojava/nbio/phosphosite/Dataset.java    | 16 +++++++++-------
 .../biojava/nbio/structure/io/PDBFileParser.java |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Dataset.java b/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Dataset.java
index 38a91b511d..f2d3ee2e6f 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Dataset.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Dataset.java
@@ -20,19 +20,21 @@
  */
 package org.biojava.nbio.phosphosite;
 
-import org.biojava.nbio.structure.align.util.AtomCache;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
+
+import org.biojava.nbio.structure.align.util.AtomCache;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Phosphosite is available under the PhosphoSitePlus® is licensed under Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License and is freely available for non-commercial purposes from
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index e4ae220f27..25ba4d7196 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -1931,7 +1931,7 @@ private void  pdb_ATOM_Handler(String line)	{
 
 
 
-			}
+	}
 
 
 	private Group getCorrectAltLocGroup( Character altLoc,

From d62c7e653f7b0cec07ba249642aa30a533c2a60e Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Mon, 8 Nov 2021 06:05:02 +0800
Subject: [PATCH 239/599] Handling a missed corner case

HAndling the case when the path is '~' only.
---
 .../java/org/biojava/nbio/core/util/FileDownloadUtils.java   | 2 +-
 .../org/biojava/nbio/core/util/FileDownloadUtilsTest.java    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index 95955ba625..c1161fc3e7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -200,7 +200,7 @@ public static String toUnixPath(String path) {
 	public static String expandUserHome(String file) {
 		// replace any / with the proper separator (/ or \ for Linux and Windows respectively).
 		file = file.replaceAll("/", "\\"+File.separator); //The "\\" is to escape the separator if needed.
-		if (file.startsWith("~" + File.separator)) {
+		if (file.startsWith("~") && (file.length() == 1 || File.separator.equals(file.substring(1, 2)))) {
 			file = System.getProperty("user.home") + file.substring(1);
 		}
 		return file;
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
index fee76c2965..374001ec5a 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
@@ -131,6 +131,11 @@ void unixPathReturnedUnchanged(){
     class ExpandUserHome {
         String currUserHome = System.getProperty("user.home");
         @Test
+        void minimalPath (){
+        	String path="~";
+        	assertEquals(currUserHome, FileDownloadUtils.expandUserHome(path));
+        }
+        @Test
         void simplePath (){
             String path="~/sequence.gb";
             assertEquals(currUserHome+File.separator+"sequence.gb", FileDownloadUtils.expandUserHome(path));

From f76b50b1f17b60a13e7e007dfe24d73dcbd087c4 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Thu, 11 Nov 2021 21:27:32 +0100
Subject: [PATCH 240/599] Change dependencies for better java version
 compatibility

- Downgrade jgrapht to maintain java 8 support
- Switch JAXB to glassfish implementation for better java 15+ support
---
 biojava-aa-prop/pom.xml          |  61 +++++++------
 biojava-core/pom.xml             |  84 ++++++++++--------
 biojava-modfinder/pom.xml        | 148 ++++++++++++++++---------------
 biojava-protein-disorder/pom.xml |  18 ++--
 biojava-structure/pom.xml        |  88 +++++++++---------
 pom.xml                          |  29 +++---
 6 files changed, 220 insertions(+), 208 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index b6a957c0f2..fad80710ad 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -20,15 +20,15 @@
 	<build>
 		<plugins>
 			<!-- Excluding demo package is required for avoiding namespace clashes (demo package is in all modules) for signing the jar. See issue #387 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>demo/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>demo/**</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -80,22 +80,22 @@
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
-        	<groupId>org.slf4j</groupId>
-        	<artifactId>slf4j-api</artifactId>
-    	</dependency>
-    	<!-- binding for log4j2, scope=runTime set in parent pom -->
- 		<dependency>
-    		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-slf4j-impl</artifactId>
-  		</dependency>
-  		<dependency>
-    		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-api</artifactId>
-  		</dependency>
-  		<dependency>
-    		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-core</artifactId>
-  		</dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		<!-- binding for log4j2, scope=runTime set in parent pom -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+		</dependency>
 
 
 		<dependency>
@@ -103,5 +103,14 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+		</dependency>
 	</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 3e3e76985c..0b73c6e24e 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -26,15 +26,15 @@
 		<plugins>
 
 			<!-- Excluding demo package is required for avoiding namespace clashes (demo package is in all modules) for signing the jar. See issue #387 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>demo/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>demo/**</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 
 		</plugins>
 	</build>
@@ -43,35 +43,43 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-        </dependency>
-	    <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-	    </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-params</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
-        	<groupId>org.slf4j</groupId>
-        	<artifactId>slf4j-api</artifactId>
-    	</dependency>
-    	<!-- binding for log4j2, scope=runTime set in parent pom -->
- 		<dependency>
-    		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-slf4j-impl</artifactId>
-  		</dependency>
-  		<dependency>
-    		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-api</artifactId>
-  		</dependency>
-  		<dependency>
-    		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-core</artifactId>
-  		</dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		<!-- binding for log4j2, scope=runTime set in parent pom -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+		</dependency>
 	</dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index e639bfaaaf..fde6b2a0a2 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -1,80 +1,88 @@
 <?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>biojava</artifactId>
-    <groupId>org.biojava</groupId>
-    <version>6.0.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>biojava-modfinder</artifactId>
-  <name>biojava-modfinder</name>
-  <url>http://www.biojava.org</url>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>biojava</artifactId>
+		<groupId>org.biojava</groupId>
+		<version>6.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>biojava-modfinder</artifactId>
+	<name>biojava-modfinder</name>
+	<url>http://www.biojava.org</url>
 
-  <licenses>
-    <license>
-      <name>GNU LGPL v2</name>
-      <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+	<licenses>
+		<license>
+			<name>GNU LGPL v2</name>
+			<url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
 
-  <properties>
-  	  	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-    	<groupId>org.biojava</groupId>
-    	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.1-SNAPSHOT</version>
-    	<type>jar</type>
-    	<scope>compile</scope>
-    </dependency>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.biojava</groupId>
+			<artifactId>biojava-structure</artifactId>
+			<version>6.0.1-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
-        	<groupId>org.slf4j</groupId>
-        	<artifactId>slf4j-api</artifactId>
-    	</dependency>
-    	<!-- binding for log4j2, scope=runTime set in parent pom -->
- 		<dependency>
-    		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-slf4j-impl</artifactId>
-  		</dependency>
-  		<dependency>
-    		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-api</artifactId>
-  		</dependency>
-  		<dependency>
-    		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-core</artifactId>
-  		</dependency>
-  </dependencies>
-  <build>
-  <plugins>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+		<!-- binding for log4j2, scope=runTime set in parent pom -->
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
 
 			<!-- Excluding demo package is required for avoiding namespace clashes (demo package is in all modules) for signing the jar. See issue #387 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>demo/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>demo/**</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <debug>true</debug>
-                </configuration>
-            </plugin>
-        </plugins>
-  </build>
-</project>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<debug>true</debug>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 5150cb9f43..0e14a7da92 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -23,7 +23,7 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<debug>true</debug>
-                </configuration>
+				</configuration>
 			</plugin>
 
 			<plugin>
@@ -31,9 +31,9 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
 					<!-- Excluding demo package is required for avoiding namespace clashes (demo package is in all modules) for signing the jar. See issue #387 -->
-				    <excludes>
-                        <exclude>demo/**</exclude>
-                    </excludes>
+					<excludes>
+						<exclude>demo/**</exclude>
+					</excludes>
 
 					<descriptorRefs>
 						<descriptorRef>bin</descriptorRef>
@@ -85,8 +85,12 @@
 			<artifactId>log4j-core</artifactId>
 		</dependency>
 		<dependency>
-		    <groupId>javax.xml.bind</groupId>
-		    <artifactId>jaxb-api</artifactId>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
 		</dependency>
 	</dependencies>
 
@@ -94,4 +98,4 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
 	</properties>
-</project>
+</project>
\ No newline at end of file
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index baa51345b7..9f7f06eb07 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -26,21 +26,21 @@
 		<dependency>
 			<groupId>org.rcsb</groupId>
 			<artifactId>mmtf-api</artifactId>
-            <version>${mmtf.version}</version>
+			<version>${mmtf.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.rcsb</groupId>
 			<artifactId>mmtf-serialization</artifactId>
-            <version>${mmtf.version}</version>
+			<version>${mmtf.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.rcsb</groupId>
+			<artifactId>mmtf-codec</artifactId>
+			<version>${mmtf.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		      <dependency>
-            <groupId>org.rcsb</groupId>
-            <artifactId>mmtf-codec</artifactId>
-            <version>${mmtf.version}</version>
-            <scope>compile</scope>
-        </dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
@@ -62,48 +62,41 @@
 
 		<dependency>
 			<groupId>org.jgrapht</groupId>
-  			<artifactId>jgrapht-core</artifactId>
-  			<version>1.5.1</version>
+			<artifactId>jgrapht-core</artifactId>
+			<!-- Pin! Java 8 requires 1.3.0 -->
+			<version>1.3.0</version>
 		</dependency>
 
 		<!-- JAXb explicit dependency is needed since Java 9. See https://stackoverflow.com/questions/43574426/how-to-resolve-java-lang-noclassdeffounderror-javax-xml-bind-jaxbexception-in-j
 		  Note versions are set in parent pom in dependency management section -->
 		<dependency>
-		    <groupId>javax.xml.bind</groupId>
-		    <artifactId>jaxb-api</artifactId>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-core</artifactId>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
 		</dependency>
+
+		<!-- logging dependencies (managed by parent pom, don't set versions or
+			scopes here) -->
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
 		</dependency>
+		<!-- binding for log4j2, scope=runTime set in parent pom -->
 		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
 		</dependency>
-
-		<!-- logging dependencies (managed by parent pom, don't set versions or
-			scopes here) -->
 		<dependency>
-        	<groupId>org.slf4j</groupId>
-        	<artifactId>slf4j-api</artifactId>
-    	</dependency>
-    	<!-- binding for log4j2, scope=runTime set in parent pom -->
- 		<dependency>
-    		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-slf4j-impl</artifactId>
-  		</dependency>
-  		<dependency>
-    		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-api</artifactId>
-  		</dependency>
-  		<dependency>
-    		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-core</artifactId>
-  		</dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+		</dependency>
 		<!--  Testing related dependencies -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -142,15 +135,15 @@
 
 			<!-- Excluding demo package is required for avoiding namespace clashes
 				(demo package is in all modules) for signing the jar. See issue #387 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>demo/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>demo/**</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -181,5 +174,4 @@
 	</build>
 
 
-</project>
-
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index fc677f3240..61d54f87ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,7 +320,7 @@
 					<artifactId>maven-install-plugin</artifactId>
 					<version>3.0.0-M1</version>
 				</plugin>
-			
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
@@ -413,7 +413,7 @@
                 <version>${junit-jupiter.version}</version>
                 <scope>test</scope>
             </dependency>
-		  
+
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
@@ -425,7 +425,7 @@
                 <artifactId>junit-jupiter-params</artifactId>
                 <version>${junit-jupiter.version}</version>
                 <scope>test</scope>
-            </dependency>	
+            </dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
@@ -460,24 +460,15 @@
 				<version>1.039</version>
 			</dependency>
 			<dependency>
-			    <groupId>javax.xml.bind</groupId>
-			    <artifactId>jaxb-api</artifactId>
-			    <version>2.3.1</version>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.xml.bind</groupId>
-				<artifactId>jaxb-core</artifactId>
-				<version>2.3.0.1</version>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.xml.bind</groupId>
-				<artifactId>jaxb-impl</artifactId>
-				<version>2.3.3</version>
+				<groupId>javax.xml.bind</groupId>
+				<artifactId>jaxb-api</artifactId>
+				<version>2.3.1</version>
 			</dependency>
 			<dependency>
-				<groupId>javax.activation</groupId>
-				<artifactId>activation</artifactId>
-				<version>1.1.1</version>
+				<groupId>org.glassfish.jaxb</groupId>
+				<artifactId>jaxb-runtime</artifactId>
+				<version>2.3.5</version>
+				<scope>runtime</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

From a35d0b6944494d6757eceffaff75b85ee7f37471 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Fri, 12 Nov 2021 09:39:37 +0100
Subject: [PATCH 241/599] Switch jgrapht to 1.4.0

This also works with Java 8
---
 biojava-structure/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 9f7f06eb07..9d57248901 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -63,8 +63,8 @@
 		<dependency>
 			<groupId>org.jgrapht</groupId>
 			<artifactId>jgrapht-core</artifactId>
-			<!-- Pin! Java 8 requires 1.3.0 -->
-			<version>1.3.0</version>
+			<!-- Pin! Java 8 requires 1.4.0 -->
+			<version>1.4.0</version>
 		</dependency>
 
 		<!-- JAXb explicit dependency is needed since Java 9. See https://stackoverflow.com/questions/43574426/how-to-resolve-java-lang-noclassdeffounderror-javax-xml-bind-jaxbexception-in-j

From 916afd449ae01a184fca005c9791f640793697d6 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sun, 14 Nov 2021 22:35:14 +0000
Subject: [PATCH 242/599] remove FileDownloadUtils main

---
 .../nbio/core/util/FileDownloadUtils.java       | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index c1161fc3e7..e3b678ce8d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -296,19 +296,4 @@ public static void deleteDirectory(String dir) throws IOException {
 		deleteDirectory(Paths.get(dir));
 	}
 
-
-	public static void main(String[] args) {
-		String url;
-		url = "http://scop.mrc-lmb.cam.ac.uk/scop/parse/";
-		System.out.format("%s\t%s%n", ping(url, 200), url);
-		url = "http://scop.mrc-lmb.cam.ac.uk/scop/parse/foo";
-		System.out.format("%s\t%s%n", ping(url, 200), url);
-		url = "http://scopzzz.mrc-lmb.cam.ac.uk/scop/parse/";
-		System.out.format("%s\t%s%n", ping(url, 200), url);
-		url = "scop.mrc-lmb.cam.ac.uk";
-		System.out.format("%s\t%s%n", ping(url, 200), url);
-		url = "http://scop.mrc-lmb.cam.ac.uk";
-		System.out.format("%s\t%s%n", ping(url, 200), url);
-	}
-
-}
+}
\ No newline at end of file

From f48d7010c42c6d6f7b3beb329a99365d594c362b Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sun, 14 Nov 2021 22:44:19 +0000
Subject: [PATCH 243/599] convert InsdcParser main to unit test

---
 .../core/sequence/location/InsdcParser.java   | 22 ----------------
 .../sequence/location/InsdcParserTest.java    | 25 +++++++++++++++++++
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
index 7071a4ce1b..7370c7e4a3 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
@@ -303,26 +303,4 @@ private Strand getGroupLocationStrand(List<Location> ll){
 		return returnStrand;
 	}
 
-	public static void main(String[] args){
-		String[] testStrings = {
-			"J00194.1:100..202",
-			"A00001.5:34..45",
-			"43..129",
-			"bond(55,110)",
-			"bond(34,35),join(56..80),complement(45,73)",
-			"order(complement(30,40),70..80),bond(34,35),join(56,80),complement(45..56)",
-			"join(join(complement(30,40),complement(70..80)),bond(34,35),join(56,80),complement(45..56))",
-			"complement(join(complement(2000..4000),complement(70..80)),bond(34,35),join(56,80),complement(45..56))",
-
-		};
-		InsdcParser p = new InsdcParser();
-		p.setComplexFeaturesAppendMode(complexFeaturesAppendEnum.HIERARCHICAL);
-
-		for (String s: testStrings){
-			Location l = p.parse(s);
-			System.out.println(l.toString());
-		}
-
-	}
-
 }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java
index 01094c84ba..efb7626a81 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java
@@ -20,9 +20,12 @@
  */
 package org.biojava.nbio.core.sequence.location;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import java.util.Arrays;
 import java.util.Collection;
 import org.biojava.nbio.core.sequence.DataSource;
+import org.biojava.nbio.core.sequence.location.InsdcParser.complexFeaturesAppendEnum;
 import org.biojava.nbio.core.sequence.location.template.Location;
 import org.junit.Assert;
 import org.junit.Test;
@@ -74,4 +77,26 @@ public void extractAccessionTest() throws Exception {
 			Assert.assertEquals(expected, loc.getAccession().getID());
 		}
 	}
+
+	@Test
+	public void testParser(){
+	String[] testStrings = {
+		"J00194.1:100..202",
+		"A00001.5:34..45",
+		"43..129",
+		"bond(55,110)",
+		"bond(34,35),join(56..80),complement(45,73)",
+		"order(complement(30,40),70..80),bond(34,35),join(56,80),complement(45..56)",
+		"join(join(complement(30,40),complement(70..80)),bond(34,35),join(56,80),complement(45..56))",
+		"complement(join(complement(2000..4000),complement(70..80)),bond(34,35),join(56,80),complement(45..56))",
+
+	};
+	InsdcParser p = new InsdcParser();
+	p.setComplexFeaturesAppendMode(complexFeaturesAppendEnum.HIERARCHICAL);
+
+	for (String s: testStrings){
+		Location l = p.parse(s);
+		assertNotNull(l);
+	}
+}
 }

From 195d3da3c7295ca6bd77f77602f5b383ae35bbc0 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sun, 14 Nov 2021 22:55:40 +0000
Subject: [PATCH 244/599] update InsdcParserTest to use jupiter junit5
 parameterized test

---
 .../sequence/location/InsdcParserTest.java    | 63 ++++++++-----------
 1 file changed, 25 insertions(+), 38 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java
index efb7626a81..2a1a373199 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java
@@ -20,6 +20,7 @@
  */
 package org.biojava.nbio.core.sequence.location;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.Arrays;
@@ -27,10 +28,9 @@
 import org.biojava.nbio.core.sequence.DataSource;
 import org.biojava.nbio.core.sequence.location.InsdcParser.complexFeaturesAppendEnum;
 import org.biojava.nbio.core.sequence.location.template.Location;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,23 +38,14 @@
  *
  * @author Jacek Grzebyta
  */
-@RunWith(Parameterized.class)
+
 public class InsdcParserTest {
 
 	private Logger log = LoggerFactory.getLogger(getClass());
-	private String data;
-	private String expected;
 
-	public InsdcParserTest(String data, String expected) {
-		this.data = data;
-		this.expected = expected;
-	}
+	static Collection<String[]> data() {
+		return Arrays.asList(new String[][] {
 
-	@Parameterized.Parameters
-	public static Collection<String[]> data() {
-		return Arrays.asList(new String[][]{
-			{"complement(CP001663.1:6463934..6465826)", "CP001663.1"},
-			{"complement(NC_000932.1:69611..69724)", "NC_000932.1"}
 		});
 	}
 
@@ -63,10 +54,10 @@ public static Collection<String[]> data() {
 	 *
 	 * @throws Exception
 	 */
-	@Test
-	public void extractAccessionTest() throws Exception {
-		log.info("test accession");
-		log.debug("data: '{}'   expected: '{}'", data, expected);
+	@ParameterizedTest
+	@CsvSource({ "complement(CP001663.1:6463934..6465826),CP001663.1",
+			"complement(NC_000932.1:69611..69724),NC_000932.1" })
+	public void extractAccessionTest(String data, String expected) throws Exception {
 
 		InsdcParser parser = new InsdcParser(DataSource.GENBANK);
 		Location loc = parser.parse(data);
@@ -74,29 +65,25 @@ public void extractAccessionTest() throws Exception {
 		if (!loc.isComplex()) {
 			log.info("simple location: {}", data);
 			log.debug("\taccession: '{}'  expected: '{}'", loc.getAccession().getID(), expected);
-			Assert.assertEquals(expected, loc.getAccession().getID());
+			assertEquals(expected, loc.getAccession().getID());
 		}
 	}
 
 	@Test
-	public void testParser(){
-	String[] testStrings = {
-		"J00194.1:100..202",
-		"A00001.5:34..45",
-		"43..129",
-		"bond(55,110)",
-		"bond(34,35),join(56..80),complement(45,73)",
-		"order(complement(30,40),70..80),bond(34,35),join(56,80),complement(45..56)",
-		"join(join(complement(30,40),complement(70..80)),bond(34,35),join(56,80),complement(45..56))",
-		"complement(join(complement(2000..4000),complement(70..80)),bond(34,35),join(56,80),complement(45..56))",
+	public void testParser() {
+		String[] testStrings = { "J00194.1:100..202", "A00001.5:34..45", "43..129", "bond(55,110)",
+				"bond(34,35),join(56..80),complement(45,73)",
+				"order(complement(30,40),70..80),bond(34,35),join(56,80),complement(45..56)",
+				"join(join(complement(30,40),complement(70..80)),bond(34,35),join(56,80),complement(45..56))",
+				"complement(join(complement(2000..4000),complement(70..80)),bond(34,35),join(56,80),complement(45..56))",
 
-	};
-	InsdcParser p = new InsdcParser();
-	p.setComplexFeaturesAppendMode(complexFeaturesAppendEnum.HIERARCHICAL);
+		};
+		InsdcParser p = new InsdcParser();
+		p.setComplexFeaturesAppendMode(complexFeaturesAppendEnum.HIERARCHICAL);
 
-	for (String s: testStrings){
-		Location l = p.parse(s);
-		assertNotNull(l);
+		for (String s : testStrings) {
+			Location l = p.parse(s);
+			assertNotNull(l);
+		}
 	}
 }
-}

From c1e7610155908fe8babd323de70a69c019a32f94 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sun, 14 Nov 2021 22:58:26 +0000
Subject: [PATCH 245/599] remove GenbankProxySequenceReader main

---
 .../loader/GenbankProxySequenceReader.java    | 105 +-----------------
 1 file changed, 1 insertion(+), 104 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java
index 08c16c672c..006827f321 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java
@@ -25,13 +25,7 @@
 package org.biojava.nbio.core.sequence.loader;
 
 import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
-import org.biojava.nbio.core.sequence.AccessionID;
-import org.biojava.nbio.core.sequence.DNASequence;
-import org.biojava.nbio.core.sequence.ProteinSequence;
-import org.biojava.nbio.core.sequence.compound.AminoAcidCompound;
 import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
-import org.biojava.nbio.core.sequence.compound.DNACompoundSet;
-import org.biojava.nbio.core.sequence.compound.NucleotideCompound;
 import org.biojava.nbio.core.sequence.features.*;
 import org.biojava.nbio.core.sequence.io.GenbankSequenceParser;
 import org.biojava.nbio.core.sequence.io.GenericGenbankHeaderParser;
@@ -183,102 +177,5 @@ public Map<String, List<DBReferenceInfo>> getDatabaseReferences() {
 	public List<String> getKeyWords() {
 		return genbankParser.getKeyWords();
 	}
-
-	public static void main(String[] args) throws Throwable {
-
-		GenbankProxySequenceReader<AminoAcidCompound> genbankProteinReader
-				= new GenbankProxySequenceReader<AminoAcidCompound>("/tmp", "NP_000257", AminoAcidCompoundSet.getAminoAcidCompoundSet());
-		ProteinSequence proteinSequence = new ProteinSequence(genbankProteinReader);
-		genbankProteinReader.getHeaderParser().parseHeader(genbankProteinReader.getHeader(), proteinSequence);
-		logger.info("Sequence ({},{})={}...", proteinSequence.getAccession(), proteinSequence.getLength(), proteinSequence.getSequenceAsString().substring(0, 10));
-		logger.info("Keywords: {}", genbankProteinReader.getKeyWords());
-		logger.info("DatabaseReferences: {}", genbankProteinReader.getDatabaseReferences());
-		proteinSequence.getFeatures();
-
-		GenbankProxySequenceReader<NucleotideCompound> genbankDNAReader
-				= new GenbankProxySequenceReader<NucleotideCompound>("/tmp", "NM_001126", DNACompoundSet.getDNACompoundSet());
-		DNASequence dnaSequence = new DNASequence(genbankDNAReader);
-		genbankDNAReader.getHeaderParser().parseHeader(genbankDNAReader.getHeader(), dnaSequence);
-		dnaSequence.setAccession(new AccessionID("NM_001126"));
-		logger.info("Sequence ({},{})={}...", dnaSequence.getAccession(), dnaSequence.getLength(), dnaSequence.getSequenceAsString().substring(0, 10));
-		logger.info("Keywords: {}", genbankDNAReader.getKeyWords());
-		logger.info("DatabaseReferences: {}", genbankDNAReader.getDatabaseReferences());
-
-		genbankDNAReader
-				= new GenbankProxySequenceReader<NucleotideCompound>("/tmp", "NM_000266", DNACompoundSet.getDNACompoundSet());
-		dnaSequence = new DNASequence(genbankDNAReader);
-		genbankDNAReader.getHeaderParser().parseHeader(genbankDNAReader.getHeader(), dnaSequence);
-		logger.info("Sequence ({},{})={}...", dnaSequence.getAccession(), dnaSequence.getLength(), dnaSequence.getSequenceAsString().substring(0, 10));
-		logger.info("Keywords: {}", genbankDNAReader.getKeyWords());
-		logger.info("DatabaseReferences: {}", genbankDNAReader.getDatabaseReferences());
-
-		genbankDNAReader
-				= new GenbankProxySequenceReader<NucleotideCompound>("/tmp", "AV254721", DNACompoundSet.getDNACompoundSet());
-		dnaSequence = new DNASequence(genbankDNAReader);
-		genbankDNAReader.getHeaderParser().parseHeader(genbankDNAReader.getHeader(), dnaSequence);
-		logger.info("Sequence ({},{})={}...", dnaSequence.getAccession(), dnaSequence.getLength(), dnaSequence.getSequenceAsString().substring(0, 10));
-		logger.info("Keywords: {}", genbankDNAReader.getKeyWords());
-		logger.info("DatabaseReferences: {}", genbankDNAReader.getDatabaseReferences());
-
-		genbankDNAReader
-				= new GenbankProxySequenceReader<NucleotideCompound>("/tmp", "AV254721.2", DNACompoundSet.getDNACompoundSet());
-		dnaSequence = new DNASequence(genbankDNAReader);
-		genbankDNAReader.getHeaderParser().parseHeader(genbankDNAReader.getHeader(), dnaSequence);
-		logger.info("Sequence ({},{})={}...", dnaSequence.getAccession(), dnaSequence.getLength(), dnaSequence.getSequenceAsString().substring(0, 10));
-		logger.info("Keywords: {}", genbankDNAReader.getKeyWords());
-		logger.info("DatabaseReferences: {}", genbankDNAReader.getDatabaseReferences());
-
-		genbankDNAReader
-				= new GenbankProxySequenceReader<NucleotideCompound>("/tmp", "U49845", DNACompoundSet.getDNACompoundSet());
-		dnaSequence = new DNASequence(genbankDNAReader);
-		genbankDNAReader.getHeaderParser().parseHeader(genbankDNAReader.getHeader(), dnaSequence);
-		logger.info("Sequence ({},{})={}...", dnaSequence.getAccession(), dnaSequence.getLength(), dnaSequence.getSequenceAsString().substring(0, 10));
-		logger.info("Keywords: {}", genbankDNAReader.getKeyWords());
-		logger.info("DatabaseReferences: {}", genbankDNAReader.getDatabaseReferences());
-
-		genbankDNAReader
-				= new GenbankProxySequenceReader<NucleotideCompound>("/tmp", "GI:1293613", DNACompoundSet.getDNACompoundSet());
-		dnaSequence = new DNASequence(genbankDNAReader);
-		genbankDNAReader.getHeaderParser().parseHeader(genbankDNAReader.getHeader(), dnaSequence);
-		logger.info("Sequence ({},{})={}...", dnaSequence.getAccession(), dnaSequence.getLength(), dnaSequence.getSequenceAsString().substring(0, 10));
-		logger.info("Keywords: {}", genbankDNAReader.getKeyWords());
-		logger.info("DatabaseReferences: {}", genbankDNAReader.getDatabaseReferences());
-
-		genbankDNAReader
-				= new GenbankProxySequenceReader<NucleotideCompound>("/tmp", "14109166", DNACompoundSet.getDNACompoundSet());
-		dnaSequence = new DNASequence(genbankDNAReader);
-		genbankDNAReader.getHeaderParser().parseHeader(genbankDNAReader.getHeader(), dnaSequence);
-		logger.info("Sequence ({},{})={}...", dnaSequence.getAccession(), dnaSequence.getLength(), dnaSequence.getSequenceAsString().substring(0, 10));
-		logger.info("Keywords: {}", genbankDNAReader.getKeyWords());
-		logger.info("DatabaseReferences: {}", genbankDNAReader.getDatabaseReferences());
-
-		/*
-		 GenbankProxySequenceReader genbankProxyReader = new GenbankProxySequenceReader("/tmp");
-		 Sequence<?> sequence;
-
-		 sequence = genbankProxyReader.getDNASequence(new AccessionID("NM_001126"));
-		 System.out.println("Sequence" + "(" + sequence.getLength() + ")=" + sequence.getSequenceAsString().substring(0, 10) + "...");
-
-		 sequence = genbankProxyReader.getDNASequence(new AccessionID("NM_000266"));
-		 System.out.println("Sequence" + "(" + sequence.getLength() + ")=" + sequence.getSequenceAsString().substring(0, 10) + "...");
-
-		 sequence = genbankProxyReader.getProteinSequence(new AccessionID("NP_000257"));
-		 System.out.println("Sequence" + "(" + sequence.getLength() + ")=" + sequence.getSequenceAsString().substring(0, 10) + "...");
-
-		 sequence = genbankProxyReader.getProteinSequence(new AccessionID("AV254721"));
-		 System.out.println("Sequence" + "(" + sequence.getLength() + ")=" + sequence.getSequenceAsString().substring(0, 10) + "...");
-
-		 sequence = genbankProxyReader.getProteinSequence(new AccessionID("AV254721.2"));
-		 System.out.println("Sequence" + "(" + sequence.getLength() + ")=" + sequence.getSequenceAsString().substring(0, 10) + "...");
-
-		 sequence = genbankProxyReader.getProteinSequence(new AccessionID("U49845"));
-		 System.out.println("Sequence" + "(" + sequence.getLength() + ")=" + sequence.getSequenceAsString().substring(0, 10) + "...");
-
-		 sequence = genbankProxyReader.getProteinSequence(new AccessionID("GI:1293613"));
-		 System.out.println("Sequence" + "(" + sequence.getLength() + ")=" + sequence.getSequenceAsString().substring(0, 10) + "...");
-
-		 sequence = genbankProxyReader.getProteinSequence(new AccessionID("14109166"));
-		 System.out.println("Sequence" + "(" + sequence.getLength() + ")=" + sequence.getSequenceAsString().substring(0, 10) + "...");
-		 */
-	}
+	
 }

From 19680a4f74b27fcc8df7e2b399d7649937456904 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sun, 14 Nov 2021 23:00:18 +0000
Subject: [PATCH 246/599] remove UniprotProxySequenceReader main

---
 .../sequence/loader/UniprotProxySequenceReader.java  | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
index 61099ef46f..820bb03e1a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
@@ -715,18 +715,6 @@ public static void setUniprotDirectoryCache(String aUniprotDirectoryCache) {
 		uniprotDirectoryCache = aUniprotDirectoryCache;
 	}
 
-	public static void main(String[] args) {
-
-		try {
-			UniprotProxySequenceReader<AminoAcidCompound> uniprotSequence = new UniprotProxySequenceReader<AminoAcidCompound>("YA745_GIBZE", AminoAcidCompoundSet.getAminoAcidCompoundSet());
-			ProteinSequence proteinSequence = new ProteinSequence(uniprotSequence);
-			logger.info("Accession: {}", proteinSequence.getAccession().getID());
-			logger.info("Sequence: {}", proteinSequence.getSequenceAsString());
-		} catch (Exception e) {
-			logger.error("Exception: ", e);
-		}
-
-	}
 
 	/**
 	 * Get the gene name associated with this sequence.

From b81a3f6b84f92e02f3624b384e0f800b233e0638 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 15 Nov 2021 08:24:04 +0000
Subject: [PATCH 247/599] remove DNASequence  main

---
 .../org/biojava/nbio/core/sequence/DNASequence.java   | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DNASequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DNASequence.java
index a8d072b4a1..215e3c8a26 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DNASequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DNASequence.java
@@ -166,14 +166,5 @@ public DNAType getDNAType() {
 	public void setDNAType(DNAType dnaType) {
 		this.dnaType = dnaType;
 	}
-
-	public static void main(String[] args) throws Exception {
-		DNASequence dnaSequence = new DNASequence("ATCG");
-		logger.info("DNA Sequence: {}", dnaSequence.toString());
-
-		StringProxySequenceReader<NucleotideCompound> sequenceStringProxyLoader =
-				new StringProxySequenceReader<NucleotideCompound>("GCTA", DNACompoundSet.getDNACompoundSet());
-		DNASequence dnaSequenceFromProxy = new DNASequence(sequenceStringProxyLoader);
-		logger.info("DNA Sequence from Proxy: {}", dnaSequenceFromProxy.toString());
-	}
+	
 }

From d059751d71e1223ea18f834d027a03ed859e694f Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 15 Nov 2021 08:25:54 +0000
Subject: [PATCH 248/599] remove FastaReaderHelper  main

---
 .../biojava/nbio/core/sequence/io/FastaReaderHelper.java   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java
index 4338ff5375..e250a8d4f9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java
@@ -189,11 +189,4 @@ public static LinkedHashMap<String, RNASequence> readFastaRNASequence(
 		return rnaSequences;
 	}
 
-	public static void main(String[] args) throws Exception {
-
-		LinkedHashMap<String, DNASequence> dnaSequences = FastaReaderHelper.readFastaDNASequence(new File("fasta.fna"));
-		for (DNASequence sequence : dnaSequences.values()) {
-			sequence.getRNASequence().getProteinSequence().getSequenceAsString();
-		}
-	}
 }

From b83e1b86bc4ad6d95c77527dffaf070690df8a47 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 15 Nov 2021 08:27:12 +0000
Subject: [PATCH 249/599] remove GenbankReaderHelper  main

---
 .../nbio/core/sequence/io/GenbankReaderHelper.java   | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java
index 51c1f7593b..638e570cc5 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java
@@ -220,16 +220,4 @@ public static LinkedHashMap<String, RNASequence> readGenbankRNASequence(
 		return rnaSequences;
 	}
 
-	public static void main(String[] args) throws Exception {
-
-		LinkedHashMap<String, DNASequence> dnaSequences = GenbankReaderHelper.readGenbankDNASequence(new File("src/test/resources/NM_000266.gb"), true);
-		for (DNASequence sequence : dnaSequences.values()) {
-			logger.info("DNA Sequence: {}", sequence.getRNASequence().getProteinSequence().getSequenceAsString());
-		}
-
-		LinkedHashMap<String, ProteinSequence> proteinSequences = GenbankReaderHelper.readGenbankProteinSequence(new File("src/test/resources/BondFeature.gb"), true);
-		for (ProteinSequence sequence : proteinSequences.values()) {
-			logger.info("Protein Sequence: {}", sequence.getSequenceAsString());
-		}
-	}
 }

From c6404639a2c32bb28e5598f9d428fcfa1041e8d4 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 15 Nov 2021 08:33:52 +0000
Subject: [PATCH 250/599] remove GenericFastaHeaderParser  main- duplicate of
 unit test

---
 .../sequence/io/GenericFastaHeaderParser.java | 89 +------------------
 .../io/GenericFastaHeaderParserTest.java      | 25 +-----
 2 files changed, 2 insertions(+), 112 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
index 1a83dee701..aa7c17bbd7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
@@ -171,92 +171,5 @@ public void parseHeader(String header, S sequence) {
 
 	}
 
-	/**
-	 *
-	 * @param args
-	 */
-	public static void main(String[] args) {
-
-		logger.info("parseHeader");
-		String header = "";
-		ProteinSequence sequence = null;
-		try {
-			sequence = new ProteinSequence("");
-		} catch (CompoundNotFoundException e) {
-			// this should not happen, in case it does we log error
-			logger.error("Could not create empty protein sequence. Error: {}. This is most likely a bug.",e.getMessage());
-		}
-		GenericFastaHeaderParser<ProteinSequence,AminoAcidCompound> instance =
-		  new GenericFastaHeaderParser<ProteinSequence,AminoAcidCompound>();
-
-		header = "gi|gi-number|gb|accession|locus";
-		instance.parseHeader(header, sequence);
-		logger.info("accession = {}", sequence.getAccession());
-		logger.info("Data source: {} = {}", sequence.getAccession().getDataSource(), DataSource.GENBANK);
-
-		header = "gi|gi-number|emb|accession|locus";
-		instance.parseHeader(header, sequence);
-		logger.info("accession = {}", sequence.getAccession());
-		logger.info("Data source: {} = {}", sequence.getAccession().getDataSource(), DataSource.ENA);
-
-		header = "gi|gi-number|dbj|accession|locus";
-		instance.parseHeader(header, sequence);
-		logger.info("accession = {}", sequence.getAccession());
-		logger.info("Data source: {} = {}", sequence.getAccession().getDataSource(), DataSource.DDBJ);
-
-		header = "pir||entry";
-		instance.parseHeader(header, sequence);
-		logger.info("entry = {}", sequence.getAccession());
-		logger.info("Data source: {} = {}", sequence.getAccession().getDataSource(), DataSource.NBRF);
-
-		header = "prf||name";
-		instance.parseHeader(header, sequence);
-		logger.info("name = {}", sequence.getAccession());
-		logger.info("Data source: {}", sequence.getAccession().getDataSource(), DataSource.PRF);
-
-		header = "sp|accession|name";
-		instance.parseHeader(header, sequence);
-		logger.info("accession = ", sequence.getAccession());
-		logger.info("Data source: {} = {}", sequence.getAccession().getDataSource(), DataSource.UNIPROT);
-
-		header = "pdb|entry|chain";
-		instance.parseHeader(header, sequence);
-		logger.info("entry:chain = ", sequence.getAccession());
-		logger.info("Data source: {} = {}", sequence.getAccession().getDataSource(), DataSource.PDB1);
-
-		header = "entry:chain|PDBID|CHAIN|SEQUENCE";
-		instance.parseHeader(header, sequence);
-		logger.info("entry:chain = {}", sequence.getAccession());
-		logger.info("Data source: {} = {}", sequence.getAccession().getDataSource(), DataSource.PDB2);
-
-		header = "PDB:1ECY_A mol:protein length:142  ECOTIN";
-		instance.parseHeader(header, sequence);
-		logger.info("1ECY_A = {}", sequence.getAccession());
-		logger.info("Data source: {} = {}", sequence.getAccession().getDataSource(), DataSource.PDBe);
-
-		header = "pat|country|number";
-		instance.parseHeader(header, sequence);
-		logger.info("number = {}", sequence.getAccession());
-		logger.info("Data source: {}", sequence.getAccession().getDataSource(), DataSource.PATENTS);
-
-		header = "bbs|number";
-		instance.parseHeader(header, sequence);
-		logger.info("number = {}", sequence.getAccession());
-		logger.info("Data source: {} = {}", sequence.getAccession().getDataSource(), DataSource.GENINFO);
-
-		header = "gnl|database|identifier";
-		instance.parseHeader(header, sequence);
-		logger.info("identifier = {}", sequence.getAccession());
-		logger.info("Data source: {} = {}", sequence.getAccession().getDataSource(), DataSource.GENERAL);
-
-		header = "ref|accession|locus";
-		instance.parseHeader(header, sequence);
-		logger.info("accession = {}", sequence.getAccession());
-		logger.info("Data source: {} = {}", sequence.getAccession().getDataSource(), DataSource.NCBI);
-
-		header = "lcl|identifier";
-		instance.parseHeader(header, sequence);
-		logger.info("identifier = {}", sequence.getAccession());
-		logger.info("Data source: {} = {}", sequence.getAccession().getDataSource(), DataSource.LOCAL);
-	}
+	
 }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParserTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParserTest.java
index 1d41e734ac..4d8ae7e8bd 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParserTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParserTest.java
@@ -36,27 +36,6 @@
  */
 public class GenericFastaHeaderParserTest {
 
-	private final static Logger logger = LoggerFactory.getLogger(GenericFastaHeaderParserTest.class);
-
-	public GenericFastaHeaderParserTest() {
-	}
-
-	@BeforeClass
-	public static void setUpClass() throws Exception {
-	}
-
-	@AfterClass
-	public static void tearDownClass() throws Exception {
-	}
-
-	@Before
-	public void setUp() {
-	}
-
-	@After
-	public void tearDown() {
-	}
-
 	/**
 	 * GenBank                           gi|gi-number|gb|accession|locus
 	 * ENA Data Library                 gi|gi-number|emb|accession|locus
@@ -77,7 +56,6 @@ public void tearDown() {
 	 */
 	@Test
 	public void testParseHeader() throws CompoundNotFoundException {
-		logger.info("parseHeader");
 		String header = "";
 		ProteinSequence sequence = new ProteinSequence("");
 		GenericFastaHeaderParser<ProteinSequence,AminoAcidCompound> instance = new GenericFastaHeaderParser<ProteinSequence,AminoAcidCompound>();
@@ -151,7 +129,6 @@ public void testParseHeader() throws CompoundNotFoundException {
 		instance.parseHeader(header, sequence);
 		assertEquals("identifier", sequence.getAccession().getID());
 		assertEquals(sequence.getAccession().getDataSource(), DataSource.LOCAL);
-		// TODO review the generated test code and remove the default call to fail.
-		//fail("The test case is a prototype.");
+		
 	}
 }

From 1e01c21af7150f5345d11ad574911e4628516ffd Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 15 Nov 2021 09:04:53 +0000
Subject: [PATCH 251/599] replace FastaGeneWriter main with unit test

---
 .../nbio/core/sequence/GeneSequence.java      |  1 +
 .../core/sequence/io/FastaGeneWriter.java     | 27 +---------
 .../core/sequence/io/FastaGeneWriterTest.java | 49 +++++++++++++++++++
 3 files changed, 51 insertions(+), 26 deletions(-)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
index db1f4fd26f..d497e17489 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
@@ -259,6 +259,7 @@ public ExonSequence removeExon(String accession) {
 	 * @return exon sequence
 	 */
 	public ExonSequence addExon(AccessionID accession, int begin, int end) throws Exception {
+		// TODO should be IllegalArgumentException, is more specific
 		if (exonSequenceHashMap.containsKey(accession.getID())) {
 			throw new Exception("Duplicate accesion id " + accession.getID());
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaGeneWriter.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaGeneWriter.java
index 741bc2c26f..2297e5e070 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaGeneWriter.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaGeneWriter.java
@@ -29,7 +29,6 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.OutputStream;
-import java.util.ArrayList;
 import java.util.Collection;
 
 /**
@@ -153,29 +152,5 @@ public void setLineLength(int lineLength) {
 		this.lineLength = lineLength;
 	}
 
-	public static void main(String[] args) {
-
-		try {
-			ArrayList<GeneSequence> sequences = new ArrayList<GeneSequence>();
-			ChromosomeSequence seq1 = new ChromosomeSequence("ATATATATATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGCATATATATATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGC");
-			GeneSequence gene1 = seq1.addGene(new AccessionID("gene1"), 1, 20, Strand.POSITIVE);
-
-			gene1.addExon(new AccessionID("t1_1_10"), 1, 10);
-			gene1.addExon(new AccessionID("t1_12_15"), 12, 15);
-			GeneSequence gene2 = seq1.addGene(new AccessionID("gene2"), 1, 20, Strand.NEGATIVE);
-
-			gene2.addExon(new AccessionID("t2_1_10"), 1, 10);
-			gene2.addExon(new AccessionID("t2_12_15"), 12, 15);
-			sequences.add(gene1);
-			sequences.add(gene2);
-
-
-			FastaGeneWriter fastaWriter = new FastaGeneWriter(System.out, sequences, new GenericFastaHeaderFormat<GeneSequence, NucleotideCompound>(), true);
-			fastaWriter.process();
-
-
-		} catch (Exception e) {
-			logger.warn("Exception: ", e);
-		}
-	}
+	
 }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java
new file mode 100644
index 0000000000..5b7a6eee14
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java
@@ -0,0 +1,49 @@
+package org.biojava.nbio.core.sequence.io;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.biojava.nbio.core.sequence.AccessionID;
+import org.biojava.nbio.core.sequence.ChromosomeSequence;
+import org.biojava.nbio.core.sequence.GeneSequence;
+import org.biojava.nbio.core.sequence.Strand;
+import org.biojava.nbio.core.sequence.compound.NucleotideCompound;
+import org.junit.jupiter.api.Test;
+
+class FastaGeneWriterTest {
+
+    @Test
+    void basicGeneWriterTest() throws Exception {
+
+        List<GeneSequence> sequences = new ArrayList<GeneSequence>();
+        ChromosomeSequence seq1 = new ChromosomeSequence(
+                "ATATATATATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGCATATATATATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGC");
+        GeneSequence gene1 = seq1.addGene(new AccessionID("gene1"), 1, 20, Strand.POSITIVE);
+
+        gene1.addExon(new AccessionID("t1_1_10"), 1, 10);
+        gene1.addExon(new AccessionID("t1_12_15"), 12, 15);
+        GeneSequence gene2 = seq1.addGene(new AccessionID("gene2"), 1, 20, Strand.NEGATIVE);
+
+        gene2.addExon(new AccessionID("t2_1_10"), 1, 10);
+        gene2.addExon(new AccessionID("t2_12_15"), 12, 15);
+        sequences.add(gene1);
+        sequences.add(gene2);
+
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        FastaGeneWriter fastaWriter = new FastaGeneWriter(os, sequences,
+                new GenericFastaHeaderFormat<GeneSequence, NucleotideCompound>(), true);
+        fastaWriter.process();
+
+        String output = new String(os.toByteArray(), "UTF-8");
+        String [] lines =  output.split("\n");
+        assertEquals(4,lines.length);
+        assertEquals(">gene1", lines[0]);
+        assertEquals("ATATATATATaTATAtatat", lines[1]);
+        assertEquals(">gene2", lines[2]);
+        assertEquals("tatatATATaTATATATATA", lines[3]);
+    }
+}

From 2e87f554171552bdee5cc68089ac89a3e39afde6 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 15 Nov 2021 21:46:46 +0000
Subject: [PATCH 252/599] remove GenbankWriter main

---
 .../nbio/core/sequence/io/GenbankWriter.java  | 32 -------------------
 1 file changed, 32 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java
index cab8d23db1..e1accaa749 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java
@@ -132,38 +132,6 @@ public void process() throws Exception {
 
 	}
 
-	/*
-	 * public static void main(String[] args) { try { FileInputStream is = new
-	 * FileInputStream("/Users/Scooter/scripps/dyadic/c1-454Scaffolds.faa");
-	 *
-	 *
-	 * FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new
-	 * FastaReader<ProteinSequence, AminoAcidCompound>(is, new
-	 * GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>(), new
-	 * ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
-	 * LinkedHashMap<String, ProteinSequence> proteinSequences =
-	 * fastaReader.process(); is.close();
-	 *
-	 *
-	 * // System.out.println(proteinSequences);
-	 *
-	 * FileOutputStream fileOutputStream = new
-	 * FileOutputStream("/Users/Scooter/scripps/dyadic/c1-454Scaffolds_temp.faa"
-	 * );
-	 *
-	 * BufferedOutputStream bo = new BufferedOutputStream(fileOutputStream);
-	 * long start = System.currentTimeMillis(); FastaWriter<ProteinSequence,
-	 * AminoAcidCompound> fastaWriter = new FastaWriter<ProteinSequence,
-	 * AminoAcidCompound>(bo, proteinSequences.values(), new
-	 * GenericFastaHeaderFormat<ProteinSequence, AminoAcidCompound>());
-	 * fastaWriter.process(); bo.close(); long end = System.currentTimeMillis();
-	 * System.out.println("Took " + (end - start) + " seconds");
-	 *
-	 * fileOutputStream.close();
-	 *
-	 *
-	 * } catch (Exception e) { e.printStackTrace(); } }
-	 */
 	/**
 	 * @return the lineLength
 	 */

From f9a0ea4c2f109c3059611f1e7147962984293b7e Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 15 Nov 2021 21:48:06 +0000
Subject: [PATCH 253/599] remove FastaWriter main

---
 .../nbio/core/sequence/io/FastaWriter.java    | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriter.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriter.java
index 5bdc0df018..ff425bde49 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriter.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriter.java
@@ -128,36 +128,6 @@ public void process() throws IOException {
 
 	}
 
-	public static void main(String[] args) {
-		try {
-			FileInputStream is = new FileInputStream("/Users/Scooter/scripps/dyadic/c1-454Scaffolds.faa");
-
-
-			FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<ProteinSequence, AminoAcidCompound>(is, new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>(), new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
-			LinkedHashMap<String, ProteinSequence> proteinSequences = fastaReader.process();
-			is.close();
-
-
-		  //  logger.debug(proteinSequences);
-
-			FileOutputStream fileOutputStream = new FileOutputStream("/Users/Scooter/scripps/dyadic/c1-454Scaffolds_temp.faa");
-
-			BufferedOutputStream bo = new BufferedOutputStream(fileOutputStream);
-			long start = System.currentTimeMillis();
-			FastaWriter<ProteinSequence, AminoAcidCompound> fastaWriter = new FastaWriter<ProteinSequence, AminoAcidCompound>(bo, proteinSequences.values(), new GenericFastaHeaderFormat<ProteinSequence, AminoAcidCompound>());
-			fastaWriter.process();
-			bo.close();
-			long end = System.currentTimeMillis();
-			logger.info("Took {} seconds", (end - start));
-
-			fileOutputStream.close();
-
-
-		} catch (IOException e) {
-			logger.warn("Exception: ", e);
-		}
-	}
-
 	/**
 	 * @return the lineLength
 	 */

From 3cc7e87023e3fc8c2a63caaee46b8fe567791f41 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 15 Nov 2021 21:49:14 +0000
Subject: [PATCH 254/599] remove FastaReader main

---
 .../nbio/core/sequence/io/FastaReader.java    | 44 +------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java
index 5bd2657ab2..d7c4bde215 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java
@@ -229,47 +229,5 @@ public void close() throws IOException {
 		}
 		this.line=this.header = null;
 	}
-
-	public static void main(String[] args) {
-		try {
-			String inputFile = "/PF00104_small.fasta";
-			InputStream is = FastaReader.class.getResourceAsStream(inputFile);
-
-
-			if ( is == null)
-				System.err.println("Could not get input file " + inputFile);
-			FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<ProteinSequence, AminoAcidCompound>(is, new GenericFastaHeaderParser<ProteinSequence,AminoAcidCompound>(), new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
-			LinkedHashMap<String,ProteinSequence> proteinSequences = fastaReader.process();
-			is.close();
-
-
-			//logger.info("Protein Sequences: {}", proteinSequences);
-
-			File file = new File(inputFile);
-			FastaReader<ProteinSequence,AminoAcidCompound> fastaProxyReader =
-					new FastaReader<ProteinSequence,AminoAcidCompound>(
-							file,
-							new GenericFastaHeaderParser<ProteinSequence,AminoAcidCompound>(),
-							new FileProxyProteinSequenceCreator(
-									file,
-									AminoAcidCompoundSet.getAminoAcidCompoundSet(),
-									new FastaSequenceParser()
-							)
-					);
-			LinkedHashMap<String,ProteinSequence> proteinProxySequences = fastaProxyReader.process();
-
-			for(String key : proteinProxySequences.keySet()){
-				ProteinSequence proteinSequence = proteinProxySequences.get(key);
-				logger.info("Protein Proxy Sequence Key: {}", key);
-//                if(key.equals("Q98SJ1_CHICK/15-61")){
-//                    int dummy = 1;
-//                }
-				logger.info("Protein Sequence: {}", proteinSequence.toString());
-
-			}
-
-		} catch (Exception e) {
-			logger.warn("Exception: ", e);
-		}
-	}
+	
 }

From c3700d5a3038a7fb2b8691a24dda26645f0a33d8 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 15 Nov 2021 22:04:29 +0000
Subject: [PATCH 255/599] move CasePreservingProteinSequenceCreator  main to
 junit

---
 .../CasePreservingProteinSequenceCreator.java |  8 ----
 ...ePreservingProteinSequenceCreatorTest.java | 47 ++++++++++++++-----
 2 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreator.java
index 54865cb132..1a6c20eba1 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreator.java
@@ -23,7 +23,6 @@
 import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
 import org.biojava.nbio.core.sequence.ProteinSequence;
 import org.biojava.nbio.core.sequence.compound.AminoAcidCompound;
-import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
 import org.biojava.nbio.core.sequence.template.AbstractSequence;
 import org.biojava.nbio.core.sequence.template.CompoundSet;
 import org.biojava.nbio.core.sequence.template.ProxySequenceReader;
@@ -53,7 +52,6 @@
  */
 public class CasePreservingProteinSequenceCreator extends ProteinSequenceCreator {
 
-	private final static Logger logger = LoggerFactory.getLogger(CasePreservingProteinSequenceCreator.class);
 
 	public CasePreservingProteinSequenceCreator(
 			CompoundSet<AminoAcidCompound> compoundSet) {
@@ -116,12 +114,6 @@ private static List<Object> getStringCase(String str) {
 		return types;
 	}
 
-	public static void main(String[] args) throws Exception {
-		CasePreservingProteinSequenceCreator creator = new CasePreservingProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet());
-		AbstractSequence<AminoAcidCompound> seq = creator.getSequence("aaAA",0);
-		logger.info("Sequence: {}", seq.getSequenceAsString()); //"AAAA"
-		logger.info("User Collection: {}", seq.getUserCollection()); //"[false, false, true, true]"
-	}
 
 	/**
 	 * Takes a {@link ProteinSequence} which was created by a
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreatorTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreatorTest.java
index 42a11ff7cb..5e98236d80 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreatorTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreatorTest.java
@@ -22,35 +22,56 @@
 
 import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
 import org.biojava.nbio.core.sequence.ProteinSequence;
+import org.biojava.nbio.core.sequence.compound.AminoAcidCompound;
 import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
-import org.junit.Test;
+import org.biojava.nbio.core.sequence.template.AbstractSequence;
+import org.junit.jupiter.api.Test;
 
-import java.util.Collection;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import static org.junit.Assert.*;
+import java.util.Collection;
+import java.util.Iterator;
 
-public class CasePreservingProteinSequenceCreatorTest {
+class CasePreservingProteinSequenceCreatorTest {
 
 	@Test
-	public void testConstructor() throws CompoundNotFoundException {
-		CasePreservingProteinSequenceCreator creator = new CasePreservingProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet());
+	void testConstructor() throws CompoundNotFoundException {
+		CasePreservingProteinSequenceCreator creator = new CasePreservingProteinSequenceCreator(
+				AminoAcidCompoundSet.getAminoAcidCompoundSet());
 
 		String seq = "aCDEfgHI-Jkl";
 		ProteinSequence prot = (ProteinSequence) creator.getSequence(seq, 0);
 		Collection<Object> uppercase = prot.getUserCollection();
 
-		//test some assumptions. Hopefully work on non-english locals too?
+		// test some assumptions. Hopefully work on non-english locals too?
 		assertFalse(Character.isUpperCase('-'));
 		assertFalse(Character.isUpperCase('.'));
 
-		assertEquals("Lengths differ",seq.length(),uppercase.size());
+		assertEquals(seq.length(), uppercase.size(), "Lengths differ");
 
-		int i=0;
-		for(Object obj : uppercase) {
-			assertTrue("Not a Boolean",obj instanceof Boolean);
-			Boolean bool = (Boolean)obj;
-			assertEquals("Doesn't match case of "+seq.charAt(i),Character.isUpperCase(seq.charAt(i)),bool);
+		int i = 0;
+		for (Object obj : uppercase) {
+			assertTrue(obj instanceof Boolean, "Not a Boolean");
+			Boolean bool = (Boolean) obj;
+			assertEquals(Character.isUpperCase(seq.charAt(i)), bool, "Doesn't match case of " + seq.charAt(i));
 			i++;
 		}
 	}
+
+	@Test
+	void booleanConversion() throws CompoundNotFoundException {
+		CasePreservingProteinSequenceCreator creator = new CasePreservingProteinSequenceCreator(
+				AminoAcidCompoundSet.getAminoAcidCompoundSet());
+		AbstractSequence<AminoAcidCompound> seq = creator.getSequence("aaAA", 0);
+		assertEquals("AAAA", seq.getSequenceAsString());
+		Boolean[] expected = new Boolean[] { Boolean.FALSE, Boolean.FALSE, Boolean.TRUE, Boolean.TRUE };
+		Iterator<Object> userCollection = seq.getUserCollection().iterator();
+		for (int i = 0; i < seq.getLength(); i++) {
+			assertEquals(expected[i], userCollection.next());
+		}
+
+	}
+
 }

From 43a533abf340891c2cea6fec124c93e2eb8586bb Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 15 Nov 2021 22:12:58 +0000
Subject: [PATCH 256/599] move ProteinSequence main to junit

---
 .../nbio/core/sequence/ProteinSequence.java   | 10 --------
 .../core/sequence/ProteinSequenceTest.java    | 24 +++++++++++++++++++
 2 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/sequence/ProteinSequenceTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ProteinSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ProteinSequence.java
index e3abbea6bd..2e44cd12c7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ProteinSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ProteinSequence.java
@@ -28,7 +28,6 @@
 import org.biojava.nbio.core.sequence.io.DNASequenceCreator;
 import org.biojava.nbio.core.sequence.io.FastaReader;
 import org.biojava.nbio.core.sequence.io.PlainFastaHeaderParser;
-import org.biojava.nbio.core.sequence.loader.StringProxySequenceReader;
 import org.biojava.nbio.core.sequence.location.InsdcParser;
 import org.biojava.nbio.core.sequence.location.template.Location;
 import org.biojava.nbio.core.sequence.template.AbstractSequence;
@@ -199,13 +198,4 @@ private String getSequence(Location cdna) {
 		}
 	}
 
-	public static void main(String[] args) throws Exception {
-		ProteinSequence proteinSequence = new ProteinSequence("ARNDCEQGHILKMFPSTWYVBZJX");
-		logger.info("Protein Sequence: {}", proteinSequence.toString());
-
-		StringProxySequenceReader<AminoAcidCompound> sequenceStringProxyLoader = new StringProxySequenceReader<AminoAcidCompound>("XRNDCEQGHILKMFPSTWYVBZJA", AminoAcidCompoundSet.getAminoAcidCompoundSet());
-		ProteinSequence proteinSequenceFromProxy = new ProteinSequence(sequenceStringProxyLoader);
-		logger.info("Protein Sequence from Proxy: {}", proteinSequenceFromProxy.toString());
-
-	}
 }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ProteinSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ProteinSequenceTest.java
new file mode 100644
index 0000000000..c60d76da86
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ProteinSequenceTest.java
@@ -0,0 +1,24 @@
+package org.biojava.nbio.core.sequence;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.biojava.nbio.core.sequence.compound.AminoAcidCompound;
+import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
+import org.biojava.nbio.core.sequence.loader.StringProxySequenceReader;
+import org.junit.jupiter.api.Test;
+
+public class ProteinSequenceTest {
+  
+    @Test
+	 void basicTest() throws Exception {
+		ProteinSequence proteinSequence = new ProteinSequence("ARNDCEQGHILKMFPSTWYVBZJX");
+		assertNotNull( proteinSequence.toString());
+        assertEquals(24, proteinSequence.getLength());
+
+		StringProxySequenceReader<AminoAcidCompound> sequenceStringProxyLoader = new StringProxySequenceReader<AminoAcidCompound>("XRNDCEQGHILKMFPSTWYVBZJA", AminoAcidCompoundSet.getAminoAcidCompoundSet());
+		ProteinSequence proteinSequenceFromProxy = new ProteinSequence(sequenceStringProxyLoader);
+		assertNotNull( proteinSequenceFromProxy.toString());
+        assertEquals(24, proteinSequence.getLength());
+	}  
+}

From 362a102eabdb09db2fbc9deebfb2730b3cdb9c82 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 15 Nov 2021 22:26:12 +0000
Subject: [PATCH 257/599] move uncompressinputstream main into demo class

---
 .../src/main/java/demo/UncompressFile.java    | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 biojava-core/src/main/java/demo/UncompressFile.java

diff --git a/biojava-core/src/main/java/demo/UncompressFile.java b/biojava-core/src/main/java/demo/UncompressFile.java
new file mode 100644
index 0000000000..156394f723
--- /dev/null
+++ b/biojava-core/src/main/java/demo/UncompressFile.java
@@ -0,0 +1,42 @@
+package demo;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+import org.biojava.nbio.core.util.UncompressInputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Uncompresses a single tarred or zipped file, writing output to stdandard out
+ */
+public class UncompressFile {
+    private final static Logger logger
+		= LoggerFactory.getLogger(UncompressFile.class);
+
+    /**
+	 * Reads a file, uncompresses it, and sends the result to stdout.
+	 * Also writes trivial statistics to stderr.
+	 * @param args An array with one String element, the name of the file to read.
+	 * @throws IOException for any failure
+	 */
+	public static void main(String[] args) throws Exception {
+
+		if (args.length != 1) {
+			logger.info("Usage: UncompressInputStream <file>");
+			System.exit(1);
+		}
+		long beg = System.currentTimeMillis();
+
+		long tot;
+		try (InputStream in = new FileInputStream(args[0]); 
+         ) {
+			tot = UncompressInputStream.uncompress(in, System.out);
+		}
+
+		long end = System.currentTimeMillis();
+		logger.info("Decompressed {} bytes", tot);
+		logger.info("Time: {} seconds", (end - beg) / 1000);
+	}
+    
+}

From 8aec708321a927653ec65bed7d9721432b43f78e Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Tue, 16 Nov 2021 08:16:49 +0000
Subject: [PATCH 258/599] formatting/ self review

---
 .../nbio/core/util/UncompressInputStream.java | 23 +------------------
 .../core/sequence/ProteinSequenceTest.java    | 17 +++++++-------
 ...ePreservingProteinSequenceCreatorTest.java |  1 -
 .../sequence/location/InsdcParserTest.java    |  5 ----
 4 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/UncompressInputStream.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/UncompressInputStream.java
index 07708f0f4d..51773bcc2f 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/UncompressInputStream.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/UncompressInputStream.java
@@ -514,26 +514,5 @@ public static long uncompress(InputStream in, OutputStream out)
 
 	private static final boolean debugTiming = false;
 
-	/**
-	 * Reads a file, uncompresses it, and sends the result to stdout.
-	 * Also writes trivial statistics to stderr.
-	 * @param args An array with one String element, the name of the file to read.
-	 * @throws IOException for any failure
-	 */
-	public static void main(String[] args) throws Exception {
-		if (args.length != 1) {
-			logger.info("Usage: UncompressInputStream <file>");
-			System.exit(1);
-		}
-		long beg = System.currentTimeMillis();
-
-		long tot;
-		try (InputStream in = new FileInputStream(args[0])) {
-			tot = uncompress(in, System.out);
-		}
-
-		long end = System.currentTimeMillis();
-		logger.info("Decompressed {} bytes", tot);
-		logger.info("Time: {} seconds", (end - beg) / 1000);
-	}
+	
 }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ProteinSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ProteinSequenceTest.java
index c60d76da86..5251c51518 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ProteinSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ProteinSequenceTest.java
@@ -9,16 +9,17 @@
 import org.junit.jupiter.api.Test;
 
 public class ProteinSequenceTest {
-  
+
     @Test
-	 void basicTest() throws Exception {
-		ProteinSequence proteinSequence = new ProteinSequence("ARNDCEQGHILKMFPSTWYVBZJX");
-		assertNotNull( proteinSequence.toString());
+    void basicTest() throws Exception {
+        ProteinSequence proteinSequence = new ProteinSequence("ARNDCEQGHILKMFPSTWYVBZJX");
+        assertNotNull(proteinSequence.toString());
         assertEquals(24, proteinSequence.getLength());
 
-		StringProxySequenceReader<AminoAcidCompound> sequenceStringProxyLoader = new StringProxySequenceReader<AminoAcidCompound>("XRNDCEQGHILKMFPSTWYVBZJA", AminoAcidCompoundSet.getAminoAcidCompoundSet());
-		ProteinSequence proteinSequenceFromProxy = new ProteinSequence(sequenceStringProxyLoader);
-		assertNotNull( proteinSequenceFromProxy.toString());
+        StringProxySequenceReader<AminoAcidCompound> sequenceStringProxyLoader = new StringProxySequenceReader<AminoAcidCompound>(
+                "XRNDCEQGHILKMFPSTWYVBZJA", AminoAcidCompoundSet.getAminoAcidCompoundSet());
+        ProteinSequence proteinSequenceFromProxy = new ProteinSequence(sequenceStringProxyLoader);
+        assertNotNull(proteinSequenceFromProxy.toString());
         assertEquals(24, proteinSequence.getLength());
-	}  
+    }
 }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreatorTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreatorTest.java
index 5e98236d80..0a0c635615 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreatorTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreatorTest.java
@@ -71,7 +71,6 @@ void booleanConversion() throws CompoundNotFoundException {
 		for (int i = 0; i < seq.getLength(); i++) {
 			assertEquals(expected[i], userCollection.next());
 		}
-
 	}
 
 }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java
index 2a1a373199..e8db963609 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java
@@ -43,11 +43,6 @@ public class InsdcParserTest {
 
 	private Logger log = LoggerFactory.getLogger(getClass());
 
-	static Collection<String[]> data() {
-		return Arrays.asList(new String[][] {
-
-		});
-	}
 
 	/**
 	 * Test for issue #254

From 794de2cf89dfa69a72bc8207cdae099ae47f8474 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Tue, 16 Nov 2021 08:54:37 +0000
Subject: [PATCH 259/599] convert old main method for insdbcparser to junit

---
 .../sequence/location/InsdcParserTest.java    | 28 ++++++-------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java
index e8db963609..11051051c6 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/location/InsdcParserTest.java
@@ -21,14 +21,11 @@
 package org.biojava.nbio.core.sequence.location;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import java.util.Arrays;
-import java.util.Collection;
+
 import org.biojava.nbio.core.sequence.DataSource;
 import org.biojava.nbio.core.sequence.location.InsdcParser.complexFeaturesAppendEnum;
 import org.biojava.nbio.core.sequence.location.template.Location;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.slf4j.Logger;
@@ -43,7 +40,6 @@ public class InsdcParserTest {
 
 	private Logger log = LoggerFactory.getLogger(getClass());
 
-
 	/**
 	 * Test for issue #254
 	 *
@@ -64,21 +60,15 @@ public void extractAccessionTest(String data, String expected) throws Exception
 		}
 	}
 
-	@Test
-	public void testParser() {
-		String[] testStrings = { "J00194.1:100..202", "A00001.5:34..45", "43..129", "bond(55,110)",
-				"bond(34,35),join(56..80),complement(45,73)",
-				"order(complement(30,40),70..80),bond(34,35),join(56,80),complement(45..56)",
-				"join(join(complement(30,40),complement(70..80)),bond(34,35),join(56,80),complement(45..56))",
-				"complement(join(complement(2000..4000),complement(70..80)),bond(34,35),join(56,80),complement(45..56))",
-
-		};
+	@ParameterizedTest
+	@CsvSource(delimiterString = "|", value = { "J00194.1:100..202|100..202(+)", "A00001.5:34..45|34..45(+)",
+			"43..129|43..129(+)", "bond(55,110)|55..110(+)", "bond(34,35),join(56..80),complement(45,73)|34..80(.)",
+			"order(complement(30,40),70..80),bond(34,35),join(56,80),complement(45..56)|30..80(.)",
+			"join(join(complement(30,40),complement(70..80)),bond(34,35),join(56,80),complement(45..56))|30..80(.)",
+			"complement(join(complement(2000..4000),complement(70..80)),bond(34,35),join(56,80),complement(45..56))|34..4000(.)" })
+	void testParser(String header, String parsedLocation) {
 		InsdcParser p = new InsdcParser();
 		p.setComplexFeaturesAppendMode(complexFeaturesAppendEnum.HIERARCHICAL);
-
-		for (String s : testStrings) {
-			Location l = p.parse(s);
-			assertNotNull(l);
-		}
+		assertEquals(parsedLocation, p.parse(header).toString());
 	}
 }

From 1eaa00bcb75d3bd978b2c829b6d96fcb640d6a3c Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Tue, 16 Nov 2021 18:13:57 +0000
Subject: [PATCH 260/599] turn exception to IAE

---
 .../java/org/biojava/nbio/core/sequence/GeneSequence.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
index d497e17489..351bc3a166 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
@@ -257,11 +257,11 @@ public ExonSequence removeExon(String accession) {
 	 * @param begin
 	 * @param end
 	 * @return exon sequence
+	 * @throws IllegalArgumentException if accessionID is already added.
 	 */
-	public ExonSequence addExon(AccessionID accession, int begin, int end) throws Exception {
-		// TODO should be IllegalArgumentException, is more specific
+	public ExonSequence addExon(AccessionID accession, int begin, int end) {
 		if (exonSequenceHashMap.containsKey(accession.getID())) {
-			throw new Exception("Duplicate accesion id " + accession.getID());
+			throw new IllegalArgumentException("Duplicate accesion id " + accession.getID());
 		}
 
 		ExonSequence exonSequence = new ExonSequence(this, begin, end); //sense should be the same as parent

From 28c07c6854905018373d9d8c92a3bf5b279afc92 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Tue, 16 Nov 2021 18:18:02 +0000
Subject: [PATCH 261/599] add license to new files

---
 .../src/main/java/demo/UncompressFile.java    | 20 ++++++++++++++++++
 .../core/sequence/ProteinSequenceTest.java    | 20 ++++++++++++++++++
 .../core/sequence/io/FastaGeneWriterTest.java | 21 ++++++++++++++++++-
 3 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/demo/UncompressFile.java b/biojava-core/src/main/java/demo/UncompressFile.java
index 156394f723..bd36ee5983 100644
--- a/biojava-core/src/main/java/demo/UncompressFile.java
+++ b/biojava-core/src/main/java/demo/UncompressFile.java
@@ -1,3 +1,23 @@
+/*
+ *                    BioJava development code
+ *
+ * This code may be freely distributed and modified under the
+ * terms of the GNU Lesser General Public Licence.  This should
+ * be distributed with the code.  If you do not have a copy,
+ * see:
+ *
+ *      http://www.gnu.org/copyleft/lesser.html
+ *
+ * Copyright for this code is held jointly by the individual
+ * authors.  These should be listed in @author doc comments.
+ *
+ * For more information on the BioJava project and its aims,
+ * or to join the biojava-l mailing list, visit the home page
+ * at:
+ *
+ *      http://www.biojava.org/
+ *
+ */
 package demo;
 
 import java.io.FileInputStream;
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ProteinSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ProteinSequenceTest.java
index 5251c51518..5f84ddddf6 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ProteinSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ProteinSequenceTest.java
@@ -1,3 +1,23 @@
+/*
+ *                    BioJava development code
+ *
+ * This code may be freely distributed and modified under the
+ * terms of the GNU Lesser General Public Licence.  This should
+ * be distributed with the code.  If you do not have a copy,
+ * see:
+ *
+ *      http://www.gnu.org/copyleft/lesser.html
+ *
+ * Copyright for this code is held jointly by the individual
+ * authors.  These should be listed in @author doc comments.
+ *
+ * For more information on the BioJava project and its aims,
+ * or to join the biojava-l mailing list, visit the home page
+ * at:
+ *
+ *      http://www.biojava.org/
+ *
+ */
 package org.biojava.nbio.core.sequence;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java
index 5b7a6eee14..d580930193 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java
@@ -1,9 +1,28 @@
+/*
+ *                    BioJava development code
+ *
+ * This code may be freely distributed and modified under the
+ * terms of the GNU Lesser General Public Licence.  This should
+ * be distributed with the code.  If you do not have a copy,
+ * see:
+ *
+ *      http://www.gnu.org/copyleft/lesser.html
+ *
+ * Copyright for this code is held jointly by the individual
+ * authors.  These should be listed in @author doc comments.
+ *
+ * For more information on the BioJava project and its aims,
+ * or to join the biojava-l mailing list, visit the home page
+ * at:
+ *
+ *      http://www.biojava.org/
+ *
+ */
 package org.biojava.nbio.core.sequence.io;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 

From 45435a37af21ac5e88e02699a5e01c5a79b6fa8d Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Tue, 16 Nov 2021 18:51:19 +0000
Subject: [PATCH 262/599] update changelog with breaking api change

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8ea5a0974..edde1da802 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ BioJava 6.0.0
 * In `SubstructureIdentifier`, `StructureName`, `EcodDomain`, `ScopDomain` : `getPdbId()` returns `PdbId` object instead of `String`.
 * Removed `DownloadChemCompProvider.useDefaultUrlLayout` with a more flexible system to provide templated URLs `DownloadChemCompProvider.setChemCompPathUrlTemplate()` and `DownloadChemCompProvider.setServerBaseUrl()`
 * In `Structure` (and `StructureImple`), the accessor methods `String getPdbId()` and `setPdbId(String)` were previously depricated. They were revived in BioJava 6.0.0 but as `PdbId getPdbId()` and `setPdbId(PdbId)` instead.n
+* `GeneSequence#public ExonSequence addExon(AccessionID accession, int begin, int end)` no longer declares a checked exception #966
 
 ### Added
 * New `keywords` field in `PDBHeader` class, populated by PDB and mmCIF parsers #946

From 9ca74355a51c4a9ed8dc1b389326c23d84b6cbd1 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Wed, 17 Nov 2021 21:34:36 +0000
Subject: [PATCH 263/599] unit tests for chromosome sequence

---
 .../core/sequence/ChromosomeSequenceTest.java | 163 ++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java
new file mode 100644
index 0000000000..659ad98c79
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java
@@ -0,0 +1,163 @@
+package org.biojava.nbio.core.sequence;
+
+import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ChromosomeSequenceTest {
+
+    private final String chromosome_seq = "ATATATATATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGCATATATATATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGC";
+
+    @Nested
+    class AfterValidConstruction {
+        ChromosomeSequence seq = null;
+
+        @BeforeEach
+        void before() throws CompoundNotFoundException {
+            seq = new ChromosomeSequence(chromosome_seq);
+        }
+
+        @Test
+        void beginAndEndAreLengthOfSequence() {
+            assertEquals(1, seq.getBioBegin());
+            assertEquals(208, seq.getBioEnd());
+            assertEquals(208, seq.getLength());
+        }
+
+        @Test
+        void noGenesAreDefined() {
+            assertEquals(0, seq.getGeneSequences().size());
+        }
+
+        @Test
+        void chromosomeNumberIsZero() {
+            assertEquals(0, seq.getChromosomeNumber());
+        }
+
+        @Test
+        void sequenceTypeIsUnknown() {
+            assertEquals(DNASequence.DNAType.UNKNOWN, seq.getDNAType());
+        }
+    }
+
+    @Nested
+    class AfterConstructionWithEmptyString {
+        ChromosomeSequence seq = null;
+
+        @BeforeEach
+        void before() throws CompoundNotFoundException {
+            seq = new ChromosomeSequence("");
+        }
+
+        @Test
+        void lengthIsZero() {
+            assertEquals(0, seq.getLength());
+        }
+
+        @Test
+        void endIsBeforeBeginning() {
+            assertEquals(0, seq.getBioEnd());
+            assertEquals(1, seq.getBioBegin());
+        }
+
+    }
+
+    @Test
+    void nullSequenceNotAllowed() throws CompoundNotFoundException {
+        assertThrows(NullPointerException.class, () -> new ChromosomeSequence((String) null));
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = {Integer.MAX_VALUE, Integer.MIN_VALUE, 100, 0, -1, -100})
+    void anyIntegerIsValidChromosomeNumber(int value) throws CompoundNotFoundException {
+        ChromosomeSequence seq = new ChromosomeSequence(chromosome_seq);
+        seq.setChromosomeNumber(value);
+        assertEquals(value, seq.getChromosomeNumber());
+    }
+
+    @ParameterizedTest
+    @EnumSource(DNASequence.DNAType.class)
+    void anyDNATypeIsValid(DNASequence.DNAType dnaType) throws CompoundNotFoundException {
+        ChromosomeSequence seq = new ChromosomeSequence(chromosome_seq);
+        seq.setDNAType(dnaType);
+        assertEquals(dnaType, seq.getDNAType());
+    }
+
+    @Nested
+    class AddingAndRemovingGeneSequences {
+        ChromosomeSequence seq = null;
+        @BeforeEach
+        void before() throws CompoundNotFoundException {
+            seq = new ChromosomeSequence(chromosome_seq);
+        }
+        @Test
+        void canAddSameGeneTwice(){
+            seq.addGene(new AccessionID("ABCDE1"), 1, 20, Strand.POSITIVE);
+            assertEquals(1, seq.getGeneSequences().size());
+            seq.addGene(new AccessionID("ABCDE1"), 1, 20, Strand.POSITIVE);
+            assertEquals(1, seq.getGeneSequences().size());
+        }
+
+        @Test
+        void isOKToRemoveNonExistentSequence(){
+            seq.removeGeneSequence("XXX");
+        }
+
+        @Test
+        void addAndRemove(){
+            final String accessionId = "ABCDE1";
+            GeneSequence geneSequence = seq.addGene(new AccessionID(accessionId), 1, 20, Strand.POSITIVE);
+            assertEquals(geneSequence.getAccession(), seq.getGene(accessionId).getAccession());
+            assertEquals(1, seq.getGeneSequences().size());
+            seq.removeGeneSequence(accessionId);
+            assertEquals(0, seq.getGeneSequences().size());
+
+        }
+
+        @Test
+        void geneSequenceHasCorrectLength(){
+            final String accessionId = "ABCDE1";
+            GeneSequence geneSequence = seq.addGene(new AccessionID(accessionId), 1, 20, Strand.POSITIVE);
+            assertEquals(20, geneSequence.getLength());
+        }
+
+        @Test
+        void geneSequenceCanHaveBeginAndEndOutsideOfChromosomeSeq(){
+            final String accessionId = "ABCDE1";
+            GeneSequence geneSequence = seq.addGene(new AccessionID(accessionId), Integer.MAX_VALUE-10, Integer.MAX_VALUE, Strand.POSITIVE);
+            assertEquals(11, geneSequence.getLength());
+
+        }
+    }
+
+    @Test
+    void addAndRemoveGeneSequence() throws CompoundNotFoundException {
+        ChromosomeSequence seq = new ChromosomeSequence(chromosome_seq);
+        seq.addGene(new AccessionID("ABCDE1"), 1, 20, Strand.POSITIVE);
+        assertEquals(1, seq.getGeneSequences().size());
+
+
+        // still present
+        assertEquals(1, seq.getGeneSequences().size());
+        // can be added again with sam
+        seq.addGene(new AccessionID("ABCDE1"), 1, 20, Strand.POSITIVE);
+        assertEquals(1, seq.getGeneSequences().size());
+
+    }
+
+
+
+    @Test
+    void addGene() {
+    }
+
+    @Test
+    void getGene() {
+    }
+}
\ No newline at end of file

From f9e8ed6737572524dabc264f029714c62f92a29d Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Thu, 18 Nov 2021 09:03:48 +0000
Subject: [PATCH 264/599] docs/formatting; GeneSequenceTest

---
 .../nbio/core/sequence/AccessionID.java       | 23 ++-----
 .../core/sequence/ChromosomeSequence.java     |  8 +--
 .../nbio/core/sequence/ExonComparator.java    |  2 +-
 .../nbio/core/sequence/GeneSequence.java      |  2 +-
 .../core/sequence/ChromosomeSequenceTest.java | 13 ++--
 .../nbio/core/sequence/GeneSequenceTest.java  | 60 +++++++++++++++++++
 6 files changed, 77 insertions(+), 31 deletions(-)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/AccessionID.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/AccessionID.java
index c54c6930a8..542e687afc 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/AccessionID.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/AccessionID.java
@@ -26,7 +26,7 @@
 import org.biojava.nbio.core.util.Hashcoder;
 
 /**
- * Used in Sequences as the unique indentifier. If possible, set the {@link DataSource} to know the
+ * Used in Sequences as the unique identifier. If possible, set the {@link DataSource} to know the
  * source of the id. This allows a SequenceProxy to gather features or related sequences
  * Protein->Gene as an example. When parsing a Blast file it is also possible
  * to identify the type of ID
@@ -42,26 +42,22 @@ public class AccessionID {
 	private String identifier = null;
 
 	/**
-	 *
+	 * Default constructor sets id t empty string
 	 */
-
 	public AccessionID(){
 		id = "";
-
 	}
 
 	/**
-	 *
-	 * @param id
+	 * Creates an id with default DataSource.LOCAL source
+	 * @param id non-null
 	 */
 	public AccessionID(String id) {
 		this.id = id.trim();
 		this.source = DataSource.LOCAL;
 	}
 
-
 	/**
-	 *
 	 * @param id
 	 * @param source
 	 */
@@ -114,11 +110,6 @@ public int hashCode() {
 		return r;
 	}
 
-//   public void setDataSource(DataSource dataSource){
-//       source = dataSource;
-//   }
-
-
 	/**
 	 * In case if the {@link #getID() } is not unique keeps the id version.
 	 * @return the version
@@ -132,10 +123,8 @@ public void setVersion(Integer version) {
 	}
 
 	/**
-	 * In case if {@link #getID() } in not unique keeps the alternative id, eg. NCBI GI number.
-	 *
-	 * This may null.
-	 *
+	 * In case if {@link #getID() } is not unique, keeps the alternative id, e.g. NCBI GI number.
+	 * This may be null.
 	 * @return
 	 */
 	public String getIdentifier() {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ChromosomeSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ChromosomeSequence.java
index f53c539137..8b16c66472 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ChromosomeSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ChromosomeSequence.java
@@ -125,13 +125,11 @@ public GeneSequence removeGeneSequence(String accession) {
 	 * which actually contains the sequence data. Strand is important for positive and negative
 	 * direction where negative strand means we need reverse complement. If negative strand then
 	 * bioBegin will be greater than bioEnd
-	 *
-	 *
 	 * @param accession
-	 * @param begin
-	 * @param end
+	 * @param bioBegin
+	 * @param bioEnd
 	 * @param strand
-	 * @return
+	 * @return A GeneSequence
 	 */
 	public GeneSequence addGene(AccessionID accession, int bioBegin, int bioEnd, Strand strand) {
 		GeneSequence geneSequence = new GeneSequence(this, bioBegin, bioEnd, strand);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonComparator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonComparator.java
index e2e4b31ce7..a256458e7a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonComparator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonComparator.java
@@ -28,7 +28,7 @@
 
 
 /**
- * Sort Exon where it is a little confusing if exons shoud always be ordered left to right
+ * Sort Exon where it is a little confusing if exons should always be ordered left to right
  * where a negative stranded gene should go the other direction. Need to think about this?
  * @author Scooter Willis <willishf at gmail dot com>
  */
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
index db1f4fd26f..2c75dc0209 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
@@ -60,7 +60,7 @@ public class GeneSequence extends DNASequence {
 	 *
 	 * This is also a key class in the biojava-3-genome module for reading and writing GFF3 files
 	 *
-	 * @param parentDNASequence
+	 * @param parentSequence
 	 * @param begin
 	 * @param end inclusive of end
 	 * @param strand force a gene to have strand and transcription sequence will inherit
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java
index 659ad98c79..7afbbbaf7b 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java
@@ -12,7 +12,7 @@
 
 class ChromosomeSequenceTest {
 
-    private final String chromosome_seq = "ATATATATATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGCATATATATATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGC";
+    static final String CHROMOSOME_SEQ = "ATATATATATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGCATATATATATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGC";
 
     @Nested
     class AfterValidConstruction {
@@ -20,7 +20,7 @@ class AfterValidConstruction {
 
         @BeforeEach
         void before() throws CompoundNotFoundException {
-            seq = new ChromosomeSequence(chromosome_seq);
+            seq = new ChromosomeSequence(CHROMOSOME_SEQ);
         }
 
         @Test
@@ -76,7 +76,7 @@ void nullSequenceNotAllowed() throws CompoundNotFoundException {
     @ParameterizedTest
     @ValueSource(ints = {Integer.MAX_VALUE, Integer.MIN_VALUE, 100, 0, -1, -100})
     void anyIntegerIsValidChromosomeNumber(int value) throws CompoundNotFoundException {
-        ChromosomeSequence seq = new ChromosomeSequence(chromosome_seq);
+        ChromosomeSequence seq = new ChromosomeSequence(CHROMOSOME_SEQ);
         seq.setChromosomeNumber(value);
         assertEquals(value, seq.getChromosomeNumber());
     }
@@ -84,7 +84,7 @@ void anyIntegerIsValidChromosomeNumber(int value) throws CompoundNotFoundExcepti
     @ParameterizedTest
     @EnumSource(DNASequence.DNAType.class)
     void anyDNATypeIsValid(DNASequence.DNAType dnaType) throws CompoundNotFoundException {
-        ChromosomeSequence seq = new ChromosomeSequence(chromosome_seq);
+        ChromosomeSequence seq = new ChromosomeSequence(CHROMOSOME_SEQ);
         seq.setDNAType(dnaType);
         assertEquals(dnaType, seq.getDNAType());
     }
@@ -94,7 +94,7 @@ class AddingAndRemovingGeneSequences {
         ChromosomeSequence seq = null;
         @BeforeEach
         void before() throws CompoundNotFoundException {
-            seq = new ChromosomeSequence(chromosome_seq);
+            seq = new ChromosomeSequence(CHROMOSOME_SEQ);
         }
         @Test
         void canAddSameGeneTwice(){
@@ -117,7 +117,6 @@ void addAndRemove(){
             assertEquals(1, seq.getGeneSequences().size());
             seq.removeGeneSequence(accessionId);
             assertEquals(0, seq.getGeneSequences().size());
-
         }
 
         @Test
@@ -138,7 +137,7 @@ void geneSequenceCanHaveBeginAndEndOutsideOfChromosomeSeq(){
 
     @Test
     void addAndRemoveGeneSequence() throws CompoundNotFoundException {
-        ChromosomeSequence seq = new ChromosomeSequence(chromosome_seq);
+        ChromosomeSequence seq = new ChromosomeSequence(CHROMOSOME_SEQ);
         seq.addGene(new AccessionID("ABCDE1"), 1, 20, Strand.POSITIVE);
         assertEquals(1, seq.getGeneSequences().size());
 
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
new file mode 100644
index 0000000000..d73f74948b
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
@@ -0,0 +1,60 @@
+package org.biojava.nbio.core.sequence;
+
+import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class GeneSequenceTest {
+
+    @Nested
+    class AfterValidConstruction {
+        ChromosomeSequence chromosomeSequence;
+        GeneSequence geneSequence;
+
+        @BeforeEach
+        void before() throws CompoundNotFoundException {
+            chromosomeSequence = new ChromosomeSequence(ChromosomeSequenceTest.CHROMOSOME_SEQ);
+            geneSequence = new GeneSequence(chromosomeSequence, 10,19, Strand.POSITIVE);
+        }
+
+        @Test
+        void lengthIsSetByBeginAndEnd() {
+            assertEquals(10, geneSequence.getLength());
+        }
+
+        @Test
+        void noExonsIntronsOrTranscripts() {
+            assertEquals(0, geneSequence.getExonSequences().size());
+            assertEquals(0, geneSequence.getIntronSequences().size());
+            assertEquals(0, geneSequence.getTranscripts().size());
+        }
+        @Test
+        void geneSequenceIsChromosomeSequence() {
+            assertEquals(chromosomeSequence.getSequenceAsString(), geneSequence.getSequenceAsString());
+        }
+    }
+
+
+    @Test
+    void addIntronsUsingExons() {
+    }
+
+    @Test
+    void addTranscript() {
+    }
+
+    @Test
+    void removeExon() {
+    }
+
+    @Test
+    void addExon() {
+    }
+
+    @Test
+    void getSequence5PrimeTo3Prime() {
+    }
+}
\ No newline at end of file

From 3ddfb231aa688dca8f534cc186f226c7e112f4fa Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Thu, 18 Nov 2021 09:11:53 +0000
Subject: [PATCH 265/599] fix typo in message

---
 .../main/java/org/biojava/nbio/core/sequence/GeneSequence.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
index 351bc3a166..9af905ef09 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
@@ -261,7 +261,7 @@ public ExonSequence removeExon(String accession) {
 	 */
 	public ExonSequence addExon(AccessionID accession, int begin, int end) {
 		if (exonSequenceHashMap.containsKey(accession.getID())) {
-			throw new IllegalArgumentException("Duplicate accesion id " + accession.getID());
+			throw new IllegalArgumentException("Duplicate accession id: " + accession.getID());
 		}
 
 		ExonSequence exonSequence = new ExonSequence(this, begin, end); //sense should be the same as parent

From b787ea382c00dadd2e12f5537a0e2aaaae8136d1 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Thu, 18 Nov 2021 18:37:49 +0000
Subject: [PATCH 266/599] reduce risk of NPE

---
 .../java/org/biojava/nbio/core/sequence/GeneSequence.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
index 2c75dc0209..3b742e8ffd 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
@@ -289,7 +289,7 @@ public ArrayList<IntronSequence> getIntronSequences() {
 	/**
 	 * Try to give method clarity where you want a DNASequence coding in the 5' to 3' direction
 	 * Returns the DNASequence representative of the 5' and 3' reading based on strand
-	 * @return dna sequence
+	 * @return dna sequence or null if sequence could not be generated.
 	 */
 	public DNASequence getSequence5PrimeTo3Prime() {
 		String sequence = getSequenceAsString(this.getBioBegin(), this.getBioEnd(), this.getStrand());
@@ -307,11 +307,11 @@ public DNASequence getSequence5PrimeTo3Prime() {
 		DNASequence dnaSequence = null;
 		try {
 			dnaSequence = new DNASequence(sequence.toUpperCase());
+		    dnaSequence.setAccession(new AccessionID(this.getAccession().getID()));
 		} catch (CompoundNotFoundException e) {
 			// this should not happen, the sequence is DNA originally, if it does, there's a bug somewhere
 			logger.error("Could not create new DNA sequence in getSequence5PrimeTo3Prime(). Error: {}",e.getMessage());
 		}
-		dnaSequence.setAccession(new AccessionID(this.getAccession().getID()));
 		return dnaSequence;
 	}
 }

From 73a56e8fe1c44b91d64a1dce5d8b8a62c31e1daf Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Thu, 18 Nov 2021 19:32:30 +0000
Subject: [PATCH 267/599] testing exon/intron addition

---
 .../nbio/core/sequence/GeneSequence.java      |  5 +-
 .../core/sequence/ChromosomeSequenceTest.java |  2 +-
 .../nbio/core/sequence/GeneSequenceTest.java  | 72 ++++++++++++++++---
 3 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
index 3b742e8ffd..81230679fd 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
@@ -116,7 +116,8 @@ public void addIntronsUsingExons() throws Exception {
 		for (int i = 0; i < exonSequenceList.size() - 1; i++) {
 			ExonSequence exon1 = exonSequenceList.get(i);
 			ExonSequence exon2 = exonSequenceList.get(i + 1);
-			this.addIntron(new AccessionID(this.getAccession().getID() + "-" + "intron" + intronIndex), exon1.getBioEnd() - shift, exon2.getBioBegin() + shift);
+			AccessionID intronId= new AccessionID(this.getAccession().getID() + "-" + "intron" + intronIndex);
+			this.addIntron(intronId, exon1.getBioEnd() - shift, exon2.getBioBegin() + shift);
 			intronIndex++;
 		}
 
@@ -194,7 +195,7 @@ public TranscriptSequence addTranscript(AccessionID accession, int begin, int en
 	/**
 	 * Remove the intron by accession
 	 * @param accession
-	 * @return intron sequence
+	 * @return the removed intron sequence, or null if no intron with that accession exists.
 	 */
 	public IntronSequence removeIntron(String accession) {
 		for (IntronSequence intronSequence : intronSequenceList) {
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java
index 7afbbbaf7b..89670da0d3 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java
@@ -12,7 +12,7 @@
 
 class ChromosomeSequenceTest {
 
-    static final String CHROMOSOME_SEQ = "ATATATATATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGCATATATATATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGC";
+    static final String CHROMOSOME_SEQ = "ATATCGACTTATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGCATATATATATATATATATATATATATATATATACGCGCGCGCGCGCGCGCGCGCGCGCGCGCGCATATATATATATATATATATATACGCGCGCGCGCGCGCGC";
 
     @Nested
     class AfterValidConstruction {
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
index d73f74948b..4128b79663 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
@@ -2,23 +2,24 @@
 
 import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 class GeneSequenceTest {
+    GeneSequence geneSequence;
+    ChromosomeSequence chromosomeSequence;
+    @BeforeEach
+    void before() throws CompoundNotFoundException {
+        chromosomeSequence = new ChromosomeSequence(ChromosomeSequenceTest.CHROMOSOME_SEQ);
+        geneSequence = new GeneSequence(chromosomeSequence, 10,19, Strand.POSITIVE);
+    }
 
     @Nested
     class AfterValidConstruction {
-        ChromosomeSequence chromosomeSequence;
-        GeneSequence geneSequence;
 
-        @BeforeEach
-        void before() throws CompoundNotFoundException {
-            chromosomeSequence = new ChromosomeSequence(ChromosomeSequenceTest.CHROMOSOME_SEQ);
-            geneSequence = new GeneSequence(chromosomeSequence, 10,19, Strand.POSITIVE);
-        }
 
         @Test
         void lengthIsSetByBeginAndEnd() {
@@ -35,15 +36,68 @@ void noExonsIntronsOrTranscripts() {
         void geneSequenceIsChromosomeSequence() {
             assertEquals(chromosomeSequence.getSequenceAsString(), geneSequence.getSequenceAsString());
         }
+
+        @Test
+        void geneSequenceIsChromos2omeSequence() {
+            geneSequence.setStrand(Strand.NEGATIVE);
+            geneSequence.getSequenceAsString();
+            geneSequence.getBioBegin();
+        }
     }
 
 
     @Test
-    void addIntronsUsingExons() {
+    void addIntronsUsingExonsPositiveStrand() throws Exception {
+        geneSequence = new GeneSequence(chromosomeSequence, 10,150, Strand.POSITIVE);
+        geneSequence.addExon( new AccessionID("a"), 10,29);
+        geneSequence.addExon( new AccessionID("b"), 33,80);
+        geneSequence.addExon( new AccessionID("c"), 100,120);
+        geneSequence.setAccession(new AccessionID("geneId"));
+        geneSequence.addIntronsUsingExons();
+        assertEquals(2, geneSequence.getIntronSequences().size());
+        assertEquals(30, geneSequence.getIntronSequences().get(0).getBioBegin());
+        assertEquals(32, geneSequence.getIntronSequences().get(0).getBioEnd());
+        assertEquals(81, geneSequence.getIntronSequences().get(1).getBioBegin());
+        assertEquals(99, geneSequence.getIntronSequences().get(1).getBioEnd());
+    }
+
+    @Test
+    @Disabled("gives odd results for intron coords")
+    void addIntronsUsingExonsNegativeStrand() throws Exception {
+        geneSequence = new GeneSequence(chromosomeSequence, 150,10, Strand.NEGATIVE);
+        ExonSequence e1 = geneSequence.addExon( new AccessionID("c"), 120,100);
+
+        geneSequence.addExon( new AccessionID("b"), 80,33);
+        geneSequence.addExon( new AccessionID("a"), 29,10);
+
+        // this MUST be set in order to avoid NPE when adding introns
+        geneSequence.setAccession(new AccessionID("geneId"));
+        geneSequence.addIntronsUsingExons();
+        // actual values generated are (9,81) for I1 and (32,121) for I2
+        assertEquals(2, geneSequence.getIntronSequences().size());
+        assertEquals(99, geneSequence.getIntronSequences().get(0).getBioBegin());
+        assertEquals(81, geneSequence.getIntronSequences().get(0).getBioEnd());
+        assertEquals(32, geneSequence.getIntronSequences().get(1).getBioBegin());
+        assertEquals(30, geneSequence.getIntronSequences().get(1).getBioEnd());
+    }
+
+    @Test
+    void getPositiveStrandSequence5To3Prime() {
+        geneSequence = new GeneSequence(chromosomeSequence, 10,150, Strand.POSITIVE);
+        // this must be set to avoid NPE
+        geneSequence.setAccession(new AccessionID("geneId"));
+        assertEquals(chromosomeSequence.getSequenceAsString().substring(9,150),
+                geneSequence.getSequence5PrimeTo3Prime().getSequenceAsString());
     }
 
     @Test
-    void addTranscript() {
+    @Disabled("not complementing - seems to complement twice???")
+    void getNegativeStrandSequence5To3Prime() {
+        geneSequence = new GeneSequence(chromosomeSequence, 5,15, Strand.NEGATIVE);
+        // this must be set to avoid NPE
+        geneSequence.setAccession(new AccessionID("geneId"));
+        DNASequence seq = geneSequence.getSequence5PrimeTo3Prime();
+        System.err.println(  geneSequence.getSequence5PrimeTo3Prime().getSequenceAsString());
     }
 
     @Test

From 4904bdbdc8e5436da6255b9fe5325ae95682ad8a Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 18 Nov 2021 20:58:12 -0800
Subject: [PATCH 268/599] [maven-release-plugin] prepare release biojava-6.0.1

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index fad80710ad..5bee1832dc 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1-SNAPSHOT</version>
+		<version>6.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 00b6400cde..0d6934c78f 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1-SNAPSHOT</version>
+		<version>6.0.1</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 0b73c6e24e..dca4a916d8 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1-SNAPSHOT</version>
+		<version>6.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index c61c8ba738..6b46f6bef1 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1-SNAPSHOT</version>
+		<version>6.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 9df619b4c0..2d43a274cb 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.0.1</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.1-SNAPSHOT</version>
+    	<version>6.0.1</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index fde6b2a0a2..62a995953a 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1-SNAPSHOT</version>
+		<version>6.0.1</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 5534e8bdfe..d320dfebfe 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.0.1</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index af16e1a19a..cc10e94d2e 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1-SNAPSHOT</version>
+		<version>6.0.1</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 0e14a7da92..e1ad85e16c 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1-SNAPSHOT</version>
+		<version>6.0.1</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 90e1fd90c6..c05d611277 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.1-SNAPSHOT</version>
+		<version>6.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 9d57248901..3bff14b364 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1-SNAPSHOT</version>
+		<version>6.0.1</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 43b8defd48..8b14a7c26a 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.0.1</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index d64f029b73..057f38ddce 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1-SNAPSHOT</version>
+		<version>6.0.1</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1-SNAPSHOT</version>
+			<version>6.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 61d54f87ca..bb935b88e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.1-SNAPSHOT</version>
+	<version>6.0.1</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.1</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From ea18f7a0192f0cf96b0ed6ca2e30fc08876a368d Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 18 Nov 2021 20:58:15 -0800
Subject: [PATCH 269/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 5bee1832dc..49fcc37f8b 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 0d6934c78f..e93fd62869 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index dca4a916d8..ca19b06d28 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 6b46f6bef1..33f48e2df2 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 2d43a274cb..b163355df0 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.1</version>
+    <version>6.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.1</version>
+    	<version>6.0.2-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 62a995953a..6caa24d933 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index d320dfebfe..e1553ed3ce 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.1</version>
+    <version>6.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index cc10e94d2e..ef44bdd76a 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index e1ad85e16c..5e11f379a5 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index c05d611277..f04a5ae1f4 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.1</version>
+		<version>6.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 3bff14b364..7e49892974 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8b14a7c26a..f7f9cef3e7 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 057f38ddce..f31f987845 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.1</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.1</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index bb935b88e4..503bb0e463 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.1</version>
+	<version>6.0.2-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.1</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 1f4998e134c0abe66ed402c636ca44c08e0a1a54 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 18 Nov 2021 21:12:25 -0800
Subject: [PATCH 270/599] Updating to latest release

---
 CHANGELOG.md | 7 +++++++
 README.md    | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index edde1da802..7e95f752c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,15 @@
 BioJava Changelog
 -----------------
 
+BioJava 6.0.1
+==============================
+### Fixed
+* Now actually runnable in a java-8 JRE. Previous release 6.0.0 had a java-11 dependency that made it incompatible. #996
+* Switch JAXB to glassfish implementation for better java 15+ support. Now biojava should run under a java-15 JRE. #996
+
 BioJava 6.0.0 
 ==============================
+Note that BioJava 6.0.0 was intended as java-8 runtime compatible. However, a java-11 dependency crept in making it java-8 incompatible. Please use 6.0.1 instead.
 ### Removed
 * All code related to All-vs-All structural alignments db calculation and access
 * JFatCatClient and all code depending on it
diff --git a/README.md b/README.md
index 5e0678eecb..2fcb086ebd 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-6.0.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-6.0.1-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.1) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From a273e7c3c4634829c5884f0048c1f2011c6daad4 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Fri, 19 Nov 2021 19:21:55 +0000
Subject: [PATCH 271/599] test that breaks encapsulation of collections

---
 .../nbio/core/sequence/GeneSequence.java      |  2 --
 .../nbio/core/sequence/GeneSequenceTest.java  | 32 ++++++++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
index 81230679fd..7f61f64713 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
@@ -169,8 +169,6 @@ public LinkedHashMap<String, TranscriptSequence> getTranscripts() {
 	 * @return transcriptsequence
 	 */
 	public TranscriptSequence removeTranscript(String accession) {
-
-
 		return transcriptSequenceHashMap.remove(accession);
 	}
 
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
index 4128b79663..a5b629a541 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
@@ -6,6 +6,8 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 class GeneSequenceTest {
@@ -101,14 +103,28 @@ void getNegativeStrandSequence5To3Prime() {
     }
 
     @Test
-    void removeExon() {
-    }
-
-    @Test
-    void addExon() {
+    void addRemoveExon() throws Exception {
+        geneSequence = new GeneSequence(chromosomeSequence, 5,150, Strand.POSITIVE);
+        geneSequence.addExon(new AccessionID("a"), 20, 50);
+        geneSequence.addExon(new AccessionID("c"), 20, 50);
+        geneSequence.setAccession(new AccessionID("mygene"));
+        assertEquals(2, geneSequence.getExonSequences().size());
+        geneSequence.removeExon("unknown");
+        assertEquals(2, geneSequence.getExonSequences().size());
+        // this causes NPE in equals() methods as sequence proxy loader isn't set.
+        // either call super constructor in GeneSequence (which will require adding exception)
+        // or alter equals()  in AbstractSequence not to use properties like sequenceStorage, that may be null.
+        // geneSequence.removeExon("b");
+        // assertEquals(1, geneSequence.getExonSequences().size());
     }
 
-    @Test
-    void getSequence5PrimeTo3Prime() {
-    }
+   @Test
+    void returnedCollectionsAreMutable() throws Exception {
+       geneSequence = new GeneSequence(chromosomeSequence, 5,150, Strand.POSITIVE);
+       geneSequence.addExon(new AccessionID("a"), 20, 50);
+       List<ExonSequence> exons  =  geneSequence.getExonSequences();
+       // this breaks encapsulation of the collections
+       exons.remove(0);
+       assertEquals(0, geneSequence.getExonSequences().size());
+   }
 }
\ No newline at end of file

From 451b559390a7390948b717136e9871057a124f0d Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sun, 21 Nov 2021 12:10:14 +0000
Subject: [PATCH 272/599] tests for transcript sequence

---
 .../nbio/core/sequence/ExonComparator.java    |   1 -
 .../nbio/core/sequence/ExonSequence.java      |   3 -
 .../core/sequence/TranscriptSequence.java     |   3 +-
 .../core/sequence/ChromosomeSequenceTest.java |   4 +-
 .../core/sequence/ExonComparatorTest.java     |  51 +++++++++
 .../nbio/core/sequence/ExonSequenceTest.java  |  31 ++++++
 .../nbio/core/sequence/GeneSequenceTest.java  |   8 +-
 .../nbio/core/sequence/SequenceTestUtils.java |  70 ++++++++++++
 .../core/sequence/TranscriptSequenceTest.java | 100 ++++++++++++++++++
 9 files changed, 260 insertions(+), 11 deletions(-)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/sequence/ExonComparatorTest.java
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/sequence/ExonSequenceTest.java
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/sequence/SequenceTestUtils.java
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonComparator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonComparator.java
index a256458e7a..64495b251f 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonComparator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonComparator.java
@@ -37,7 +37,6 @@ public class ExonComparator implements Comparator<ExonSequence>, Serializable{
 
 	@Override
 	public int compare(ExonSequence o1, ExonSequence o2) {
-
 		return o1.getBioBegin() - o2.getBioBegin();
 	}
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonSequence.java
index 2fed9ad8e9..6733139fb9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonSequence.java
@@ -22,15 +22,12 @@
  */
 package org.biojava.nbio.core.sequence;
 
-
-
 /**
  * A gene contains a collection of Exon sequences
  * @author Scooter Willis
  */
 public class ExonSequence extends DNASequence {
 
-	//private static final Logger log = Logger.getLogger(ExonSequence.class.getName());
 
 	/**
 	 * Need a parent gene sequence and the bioBegin and bioEnd. An Exon sequence doesn't actually imply what the
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
index 29e6e60140..eea4a6453e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
@@ -59,7 +59,6 @@ public TranscriptSequence(GeneSequence parentDNASequence, int begin, int end) {
 		setBioBegin(begin);
 		setBioEnd(end);
 		this.setCompoundSet(DNACompoundSet.getDNACompoundSet());
-
 	}
 
 		@Override
@@ -108,7 +107,7 @@ public LinkedHashMap<String, CDSSequence> getCDSSequences() {
 	 */
 	public CDSSequence addCDS(AccessionID accession, int begin, int end, int phase) throws Exception {
 		if (cdsSequenceHashMap.containsKey(accession.getID())) {
-			throw new Exception("Duplicate accesion id " + accession.getID());
+			throw new Exception("Duplicate accession id " + accession.getID());
 		}
 		CDSSequence cdsSequence = new CDSSequence(this, begin, end, phase); //sense should be the same as parent
 		cdsSequence.setAccession(accession);
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java
index 89670da0d3..b8ad48bec9 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ChromosomeSequenceTest.java
@@ -26,8 +26,8 @@ void before() throws CompoundNotFoundException {
         @Test
         void beginAndEndAreLengthOfSequence() {
             assertEquals(1, seq.getBioBegin());
-            assertEquals(208, seq.getBioEnd());
-            assertEquals(208, seq.getLength());
+            assertEquals(210, seq.getBioEnd());
+            assertEquals(210, seq.getLength());
         }
 
         @Test
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ExonComparatorTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ExonComparatorTest.java
new file mode 100644
index 0000000000..67a6c0f3f5
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ExonComparatorTest.java
@@ -0,0 +1,51 @@
+package org.biojava.nbio.core.sequence;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.biojava.nbio.core.sequence.SequenceTestUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+class ExonComparatorTest {
+
+    @Test
+    void sortPositiveStrandExons() throws Exception {
+        GeneSequence geneSequence = anyGeneSequence();
+        // added in order 2,3,1
+        ExonSequence e2 = geneSequence.addExon(new AccessionID("b"), 40, 60);
+        ExonSequence e3 = geneSequence.addExon(new AccessionID("c"), 80, 100);
+        ExonSequence e1 = geneSequence.addExon(new AccessionID("a"), 10, 30);
+        List<ExonSequence> exonsToSort = new ArrayList<>();
+        exonsToSort.add(e2);
+        exonsToSort.add(e3);
+        exonsToSort.add(e1);
+        Collections.sort(exonsToSort, new ExonComparator());
+        // sorted by starting position, in 5' to 3' order
+        assertEquals("a", exonsToSort.get(0).getAccession().getID());
+        assertEquals("b", exonsToSort.get(1).getAccession().getID());
+        assertEquals("c", exonsToSort.get(2).getAccession().getID());
+    }
+
+    @Test
+    void sortNegativeStrandExons() throws Exception {
+        GeneSequence geneSequence = anyGeneSequence();
+        geneSequence.setStrand(Strand.NEGATIVE);
+        // added in order 2,3,1
+        ExonSequence e2 = geneSequence.addExon(new AccessionID("b"), 60, 40);
+        ExonSequence e3 = geneSequence.addExon(new AccessionID("c"), 100, 80);
+        ExonSequence e1 = geneSequence.addExon(new AccessionID("a"), 30, 10);
+        List<ExonSequence> exonsToSort = new ArrayList<>();
+        exonsToSort.add(e2);
+        exonsToSort.add(e3);
+        exonsToSort.add(e1);
+        Collections.sort(exonsToSort, new ExonComparator());
+        // sorted by starting position - this is 3' - 5' order
+        assertEquals("a", exonsToSort.get(0).getAccession().getID());
+        assertEquals("b", exonsToSort.get(1).getAccession().getID());
+        assertEquals("c", exonsToSort.get(2).getAccession().getID());
+    }
+
+}
\ No newline at end of file
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ExonSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ExonSequenceTest.java
new file mode 100644
index 0000000000..628dc5c0e8
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ExonSequenceTest.java
@@ -0,0 +1,31 @@
+package org.biojava.nbio.core.sequence;
+
+import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import static org.biojava.nbio.core.sequence.SequenceTestUtils.anyGeneSequence;
+import static org.junit.jupiter.api.Assertions.*;
+
+class ExonSequenceTest {
+    @Test
+    void createExon() throws CompoundNotFoundException {
+        GeneSequence gene = anyGeneSequence();
+        ExonSequence es = new ExonSequence(gene, 30, 40);
+        assertEquals(11, es.getLength());
+    }
+
+    @Test
+    @Disabled("getAsList throws NPE in AbstractSequence#equals")
+    void equalsAndHaschcode() throws CompoundNotFoundException {
+        GeneSequence gene = anyGeneSequence();
+        ExonSequence es = new ExonSequence(gene, 30, 40);
+        ExonSequence es2 = new ExonSequence(gene, 30, 40);
+        // calling equals throws npe
+        // assertEquals(es, es2);
+
+        // this also throws NPE
+        assertEquals(es.hashCode(), es2.hashCode());
+    }
+
+}
\ No newline at end of file
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
index a5b629a541..352a6dcce7 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
@@ -93,12 +93,14 @@ void getPositiveStrandSequence5To3Prime() {
     }
 
     @Test
-    @Disabled("not complementing - seems to complement twice???")
-    void getNegativeStrandSequence5To3Prime() {
-        geneSequence = new GeneSequence(chromosomeSequence, 5,15, Strand.NEGATIVE);
+   @Disabled("not complementing - seems to complement twice???")
+    void getNegativeStrandSequence5To3Prime() throws CompoundNotFoundException {
+        ChromosomeSequence shortChrSeq= new ChromosomeSequence("TTTTTTTTTTTTTTT");
+        geneSequence = new GeneSequence(shortChrSeq, 5,10, Strand.NEGATIVE);
         // this must be set to avoid NPE
         geneSequence.setAccession(new AccessionID("geneId"));
         DNASequence seq = geneSequence.getSequence5PrimeTo3Prime();
+        //This should be sequence of A's ( as it's on complemetnary strand)but it is TTTTTTTT
         System.err.println(  geneSequence.getSequence5PrimeTo3Prime().getSequenceAsString());
     }
 
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/SequenceTestUtils.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/SequenceTestUtils.java
new file mode 100644
index 0000000000..e8fd3fad22
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/SequenceTestUtils.java
@@ -0,0 +1,70 @@
+package org.biojava.nbio.core.sequence;
+
+import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
+
+/**
+ * Test utility methods for classes in this package
+ */
+public class SequenceTestUtils {
+
+    /**
+     * A gene sequence of 190 bp length on + strand
+     *
+     * @return
+     * @throws CompoundNotFoundException
+     */
+    static GeneSequence anyGeneSequence() throws CompoundNotFoundException {
+        ChromosomeSequence chr = new ChromosomeSequence(ChromosomeSequenceTest.CHROMOSOME_SEQ);
+        GeneSequence gene = new GeneSequence(chr, 10, 200, Strand.POSITIVE);
+        return gene;
+    }
+
+    /**
+     * A gene sequence of 190 bp length on MINUS strand
+     *
+     * @return
+     * @throws CompoundNotFoundException
+     */
+    static GeneSequence any3GeneSequence() throws CompoundNotFoundException {
+        ChromosomeSequence chr = new ChromosomeSequence(ChromosomeSequenceTest.CHROMOSOME_SEQ);
+        GeneSequence gene = new GeneSequence(chr, 10, 200, Strand.NEGATIVE);
+        return gene;
+    }
+
+    /**
+     * Generate a GeneSequence as a subsequence of defined chromosome sequence.
+     * Accession ID is  set to avoid NPE thrown
+     *
+     * @param chromosomeSequence
+     * @param bioStart
+     * @param bioEnd
+     * @param strand
+     * @return
+     * @throws CompoundNotFoundException
+     */
+    static GeneSequence fromSequence(String chromosomeSequence, int bioStart, int bioEnd, Strand strand) throws CompoundNotFoundException {
+        ChromosomeSequence chr = new ChromosomeSequence(chromosomeSequence);
+        GeneSequence gene = new GeneSequence(chr, bioStart, bioEnd, strand);
+        gene.setAccession(new AccessionID("Gene1"));
+        return gene;
+    }
+
+    /**
+     * Creates a transcript from coordinates on the supplied chromosome sequence.
+     * The GeneSequence is set to same length as Chromosomal sequence for simplicity.
+     * Accession ID is set to avoid NPE thrown from some methods
+     *
+     * @param chromosomeSequence
+     * @param bioStart
+     * @param bioEnd
+     * @param strand
+     * @return
+     * @throws CompoundNotFoundException
+     */
+    static TranscriptSequence transcriptFromSequence(String chromosomeSequence, int bioStart, int bioEnd, Strand strand) throws CompoundNotFoundException {
+        GeneSequence gene = fromSequence(chromosomeSequence, 1, chromosomeSequence.length(), strand);
+        TranscriptSequence ts = new TranscriptSequence(gene, bioStart, bioEnd);
+        ts.setAccession(new AccessionID("Transcript1"));
+        return ts;
+    }
+}
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
new file mode 100644
index 0000000000..7607486f74
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
@@ -0,0 +1,100 @@
+package org.biojava.nbio.core.sequence;
+
+import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class TranscriptSequenceTest {
+    GeneSequence anyGeneSequence;
+    GeneSequence anyNegativeGeneSequence;
+    TranscriptSequence transcriptSeq;
+    TranscriptSequence transcriptNegativeSeq;
+
+
+    @BeforeEach
+    void setUp() throws CompoundNotFoundException {
+        anyGeneSequence = SequenceTestUtils.anyGeneSequence();
+        transcriptSeq = new TranscriptSequence(anyGeneSequence, 5, 100);
+        anyNegativeGeneSequence = SequenceTestUtils.any3GeneSequence();
+        transcriptNegativeSeq = new TranscriptSequence(anyNegativeGeneSequence, 5, 100);
+    }
+
+    @Nested
+    class AfterValidConstruction {
+        @Test
+        void lengthIsTSLength() {
+            assertEquals(96, transcriptSeq.getLength());
+        }
+
+        @Test
+        void strandIsSameAsGene() {
+            assertEquals(anyGeneSequence.getStrand(), transcriptSeq.getStrand());
+            assertEquals(anyNegativeGeneSequence.getStrand(), transcriptNegativeSeq.getStrand());
+        }
+
+        @Test
+        void CDSListIsEmpty() {
+            assertEquals(0, transcriptSeq.getCDSSequences().size());
+        }
+
+        @Test
+        @Disabled("NPE thrown from AbstractSequence 'getAsList'")
+        void equals() {
+            assertFalse(transcriptSeq.equals(transcriptNegativeSeq));
+        }
+
+        @Test
+        @Disabled("NPE thrown from AbstractSequence 'getAsList'")
+        void hashcode() {
+            assertFalse(transcriptSeq.hashCode() == (transcriptNegativeSeq.hashCode()));
+        }
+    }
+
+    @Test
+    void addCDS() throws Exception {
+        transcriptSeq.addCDS(new AccessionID("b"), 40, 50, 1);
+        assertEquals(1, transcriptSeq.getCDSSequences().size());
+    }
+
+    @Test
+    void getCDNASeqPositiveStrand() throws Exception {
+        String chrSeq = ChromosomeSequenceTest.CHROMOSOME_SEQ;
+        // must set this to avoid NPE when generating sequence
+
+        transcriptSeq.setAccession(new AccessionID("T1"));
+        // make 2 CDS that are contiguous. These can be added in any order and are sorted OK
+        CDSSequence s1 = transcriptSeq.addCDS(new AccessionID("a"), 11, 20, 1);
+        assertEquals(chrSeq, s1.getSequenceAsString());
+
+        CDSSequence s2 = transcriptSeq.addCDS(new AccessionID("b"), 1, 10, 1);
+        assertEquals(chrSeq, s2.getSequenceAsString());
+
+        DNASequence cDNA = transcriptSeq.getDNACodingSequence();
+        assertEquals(chrSeq.substring(0, 20), cDNA.getSequenceAsString());
+        assertEquals(20, cDNA.getLength());
+    }
+
+    @Test
+    @Disabled("is reversed, not complemented?")
+    void getCDNASeqNegativeStrand() throws Exception {
+        TranscriptSequence ts = SequenceTestUtils.transcriptFromSequence("AAAAACCCCCTTTTGGGGGG", 3, 10, Strand.NEGATIVE);
+        CDSSequence s2 = ts.addCDS(new AccessionID("b"), 1, 10, 0);
+        // this should be GGGGGTTTTT( ie the reverse complement of the chromosome sequence,
+        // but is just reversed and generates CCCCCAAAAA
+        //assertEquals("GGGGGTTTTT", ts.getDNACodingSequence());
+    }
+
+    @Test
+    @Disabled("Can't  remove, as NPE thrown from equals()")
+    void removeCDS() throws Exception {
+        transcriptSeq.addCDS(new AccessionID("a"), 50, 60, 1);
+        assertEquals(1, transcriptSeq.getCDSSequences().size());
+        // throws NPE
+        transcriptSeq.removeCDS("a");
+        assertEquals(0, transcriptSeq.getCDSSequences().size());
+    }
+}
\ No newline at end of file

From b7074de841a17c4154102dd3d651358a8f331dd3 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Wed, 24 Nov 2021 02:08:21 +0800
Subject: [PATCH 273/599] Fix modDate

In case there is only one revision (release), set the modDate to that
value.
---
 .../biojava/nbio/structure/io/PDBFileParser.java  |  2 +-
 .../io/cif/CifStructureConsumerImpl.java          | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index 25ba4d7196..e58d1a0371 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -2877,7 +2877,7 @@ private void triggerEndFileChecks(){
 
 			if (! depositionDate.equals(modDate)){
 				// depDate is 0000-00-00
-				pdbHeader.setDepDate(depositionDate);
+				pdbHeader.setModDate(depositionDate);
 			}
 
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 83c8b675fd..3ee4b25506 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -614,17 +614,21 @@ private Date convert(LocalDate localDate) {
     public void consumeDatabasePDBRev(DatabasePDBRev databasePDBrev) {
         logger.debug("got a database revision:" + databasePDBrev);
 
+        Date modDate = null;
         for (int rowIndex = 0; rowIndex < databasePDBrev.getRowCount(); rowIndex++) {
             if (databasePDBrev.getNum().get(rowIndex) == 1) {
                 String dateOriginal = databasePDBrev.getDateOriginal().get(rowIndex);
                 pdbHeader.setDepDate(convert(LocalDate.parse(dateOriginal, DATE_FORMAT)));
 
                 String date = databasePDBrev.getDate().get(rowIndex);
-                pdbHeader.setRelDate(convert(LocalDate.parse(date, DATE_FORMAT)));
+                final Date relDate = convert(LocalDate.parse(date, DATE_FORMAT));
+				pdbHeader.setRelDate(relDate);
+				modDate = relDate;
             } else {
                 String dbrev = databasePDBrev.getDate().get(rowIndex);
-                pdbHeader.setModDate(convert(LocalDate.parse(dbrev, DATE_FORMAT)));
+                modDate = convert(LocalDate.parse(dbrev, DATE_FORMAT));
             }
+            pdbHeader.setModDate(modDate);
         }
     }
 
@@ -733,18 +737,21 @@ public void consumeExptl(Exptl exptl) {
 
     @Override
     public void consumePdbxAuditRevisionHistory(PdbxAuditRevisionHistory pdbxAuditRevisionHistory) {
+    	Date date = null;
         for (int rowIndex = 0; rowIndex < pdbxAuditRevisionHistory.getRowCount(); rowIndex++) {
             // first entry in revision history is the release date
             if (pdbxAuditRevisionHistory.getOrdinal().get(rowIndex) == 1) {
                 String release = pdbxAuditRevisionHistory.getRevisionDate().get(rowIndex);
-                pdbHeader.setRelDate(convert(LocalDate.parse(release, DATE_FORMAT)));
+                date = convert(LocalDate.parse(release, DATE_FORMAT));
+				pdbHeader.setRelDate(date);
             } else {
                 // all other dates are revision dates;
                 // since this method may be called multiple times,
                 // the last revision date will "stick"
                 String revision = pdbxAuditRevisionHistory.getRevisionDate().get(rowIndex);
-                pdbHeader.setModDate(convert(LocalDate.parse(revision, DATE_FORMAT)));
+                date = convert(LocalDate.parse(revision, DATE_FORMAT));
             }
+            pdbHeader.setModDate(date);
         }
     }
 

From 08482a15ce2dda78eea459014c75535152fc253a Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Wed, 24 Nov 2021 08:50:12 +0800
Subject: [PATCH 274/599] Consistent indentation

---
 .../java/org/biojava/nbio/structure/io/PDBFileParser.java   | 1 -
 .../nbio/structure/io/cif/CifStructureConsumerImpl.java     | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index e58d1a0371..c3dcc330e0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -2879,7 +2879,6 @@ private void triggerEndFileChecks(){
 				// depDate is 0000-00-00
 				pdbHeader.setModDate(depositionDate);
 			}
-
 		}
 
 		structure.setPDBHeader(pdbHeader);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 3ee4b25506..eb56b9a59a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -622,8 +622,8 @@ public void consumeDatabasePDBRev(DatabasePDBRev databasePDBrev) {
 
                 String date = databasePDBrev.getDate().get(rowIndex);
                 final Date relDate = convert(LocalDate.parse(date, DATE_FORMAT));
-				pdbHeader.setRelDate(relDate);
-				modDate = relDate;
+                pdbHeader.setRelDate(relDate);
+                modDate = relDate;
             } else {
                 String dbrev = databasePDBrev.getDate().get(rowIndex);
                 modDate = convert(LocalDate.parse(dbrev, DATE_FORMAT));
@@ -743,7 +743,7 @@ public void consumePdbxAuditRevisionHistory(PdbxAuditRevisionHistory pdbxAuditRe
             if (pdbxAuditRevisionHistory.getOrdinal().get(rowIndex) == 1) {
                 String release = pdbxAuditRevisionHistory.getRevisionDate().get(rowIndex);
                 date = convert(LocalDate.parse(release, DATE_FORMAT));
-				pdbHeader.setRelDate(date);
+                pdbHeader.setRelDate(date);
             } else {
                 // all other dates are revision dates;
                 // since this method may be called multiple times,

From 2d98a5d17b1ccb1315982421c13cd8aeff148e12 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 24 Nov 2021 11:45:42 -0800
Subject: [PATCH 275/599] Removing empy test

---
 .../align/TestAlignDBSearchPairs.java         | 80 -------------------
 .../src/test/resources/db_search.pairs        |  8 --
 2 files changed, 88 deletions(-)
 delete mode 100644 biojava-structure/src/test/java/org/biojava/nbio/structure/align/TestAlignDBSearchPairs.java
 delete mode 100644 biojava-structure/src/test/resources/db_search.pairs

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/TestAlignDBSearchPairs.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/TestAlignDBSearchPairs.java
deleted file mode 100644
index 455af99382..0000000000
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/TestAlignDBSearchPairs.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- * Created on Mar 1, 2010
- * Author: Andreas Prlic
- *
- */
-
-package org.biojava.nbio.structure.align;
-
-
-import org.junit.Test;
-
-public class TestAlignDBSearchPairs
-{
-
-	@Test
-	public void testNothing(){
-
-	}
-
-
-	// speedup... nothing new being tested here, so disabling for now
-//   public void testParsePairs(){
-//
-//      String tmpDir = System.getProperty("java.io.tmpdir");
-//
-//      AtomCache cache = new AtomCache(tmpDir,true);
-//
-//      InputStream inStream = this.getClass().getResourceAsStream("/db_search.pairs");
-//      assertNotNull(inStream);
-//
-//      BufferedReader is = new BufferedReader (new InputStreamReader(inStream)) ;
-//      try {
-//         StructureAlignment algorithm =  StructureAlignmentFactory.getAlgorithm(CeMain.algorithmName);
-//         String line = null;
-//         while ( (line = is.readLine()) != null){
-//            if ( line.startsWith("#"))
-//               continue;
-//           // System.out.println("aligning: " + line);
-//            String[] spl = line.split(" ");
-//            String pdb1 = spl[0];
-//            String pdb2 = spl[1];
-//
-//
-//            Structure structure1 = cache.getStructure(pdb1);
-//            Structure structure2 = cache.getStructure(pdb2);
-//
-//            Atom[] ca1;
-//            Atom[] ca2;
-//
-//
-//            ca1 = StructureTools.getAtomCAArray(structure1);
-//            ca2 = StructureTools.getAtomCAArray(structure2);
-//
-//            algorithm.align(ca1,ca2);
-//
-//         }
-//      } catch (Exception e){
-//         e.printStackTrace();
-//         fail(e.getMessage());
-//      }
-//   }
-}
diff --git a/biojava-structure/src/test/resources/db_search.pairs b/biojava-structure/src/test/resources/db_search.pairs
deleted file mode 100644
index 5a8cec8c0c..0000000000
--- a/biojava-structure/src/test/resources/db_search.pairs
+++ /dev/null
@@ -1,8 +0,0 @@
-4hhb.C 4hhb.D
-4hhb:0 4hhb:1
-1hiv.A 1a4w.H
-1RLW 1BYN
-2sim 1nsb
-1CEW 1mol
-1TEN 3HHR
-4hhb:(A:10-40,B:10-40) 4hhb:(C:10-40,D:10-40)

From cff87dd13969a9ddecf20b6328f0cc273893558c Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Thu, 25 Nov 2021 18:20:45 +0000
Subject: [PATCH 276/599] initialise sequrnce storage, throwing IAE

---
 .../org/biojava/nbio/core/sequence/CDSSequence.java |  8 ++++++++
 .../biojava/nbio/core/sequence/ExonSequence.java    |  9 +++++++++
 .../biojava/nbio/core/sequence/GeneSequence.java    |  9 +++++++--
 .../nbio/core/sequence/TranscriptSequence.java      |  8 +++++++-
 .../core/sequence/template/AbstractSequence.java    |  5 +++++
 .../nbio/core/sequence/ExonSequenceTest.java        |  3 +--
 .../nbio/core/sequence/GeneSequenceTest.java        |  8 +++-----
 .../nbio/core/sequence/TranscriptSequenceTest.java  | 13 ++++++++-----
 8 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/CDSSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/CDSSequence.java
index 5973dd386e..f897622f3c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/CDSSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/CDSSequence.java
@@ -23,6 +23,7 @@
 package org.biojava.nbio.core.sequence;
 
 
+import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
 import org.biojava.nbio.core.sequence.compound.DNACompoundSet;
 import org.biojava.nbio.core.sequence.compound.NucleotideCompound;
 import org.biojava.nbio.core.sequence.template.CompoundSet;
@@ -46,8 +47,15 @@ public class CDSSequence extends DNASequence {
 	 * @param bioBegin
 	 * @param bioEnd
 	 * @param phase
+	 * @throws  IllegalArgumentException if  parentSequence is incompatible with DNACompoundSet
 	 */
 	public CDSSequence(TranscriptSequence parentSequence, int bioBegin, int bioEnd, int phase) {
+		setCompoundSet(DNACompoundSet.getDNACompoundSet());
+		try {
+			initSequenceStorage(parentSequence.getSequenceAsString());
+		} catch (CompoundNotFoundException e) {
+			throw new IllegalArgumentException(e);
+		}
 		parentTranscriptSequence = parentSequence;
 		this.setParentSequence(parentTranscriptSequence);
 		setBioBegin(bioBegin);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonSequence.java
index 6733139fb9..fde268b8db 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonSequence.java
@@ -22,6 +22,9 @@
  */
 package org.biojava.nbio.core.sequence;
 
+import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
+import org.biojava.nbio.core.sequence.compound.DNACompoundSet;
+
 /**
  * A gene contains a collection of Exon sequences
  * @author Scooter Willis
@@ -41,6 +44,12 @@ public class ExonSequence extends DNASequence {
 	 * @param bioEnd
 	 */
 	public ExonSequence(GeneSequence parentGeneSequence, int bioBegin, int bioEnd) {
+		setCompoundSet(DNACompoundSet.getDNACompoundSet());
+		try {
+			initSequenceStorage(parentGeneSequence.getSequenceAsString());
+		} catch (CompoundNotFoundException e) {
+			throw new IllegalArgumentException(e);
+		}
 		this.setParentSequence(parentGeneSequence);
 		setBioBegin(bioBegin);
 		setBioEnd(bioEnd);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
index 7f61f64713..41b4d5923d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
@@ -65,13 +65,18 @@ public class GeneSequence extends DNASequence {
 	 * @param end inclusive of end
 	 * @param strand force a gene to have strand and transcription sequence will inherit
 	 */
-	public GeneSequence(ChromosomeSequence parentSequence, int begin, int end, Strand strand) {
+	public GeneSequence(ChromosomeSequence parentSequence,  int begin, int end, Strand strand) {
+		setCompoundSet(DNACompoundSet.getDNACompoundSet());
+		try {
+			initSequenceStorage(parentSequence.getSequenceAsString());
+		} catch (CompoundNotFoundException e) {
+			throw new IllegalArgumentException(e);
+		}
 		chromosomeSequence = parentSequence;
 		setParentSequence(parentSequence);
 		setBioBegin(begin);
 		setBioEnd(end);
 		setStrand(strand);
-		this.setCompoundSet(DNACompoundSet.getDNACompoundSet());
 	}
 
 	/**
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
index eea4a6453e..07a8cc761f 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
@@ -52,13 +52,19 @@ public class TranscriptSequence extends DNASequence {
 	 * @param parentDNASequence
 	 * @param begin
 	 * @param end inclusive of end
+	 * @throws  IllegalArgumentException if the parentDNASequence is incompatible with DNACompoundSet
 	 */
 	public TranscriptSequence(GeneSequence parentDNASequence, int begin, int end) {
+		setCompoundSet(DNACompoundSet.getDNACompoundSet());
+		try {
+			initSequenceStorage(parentDNASequence.getSequenceAsString());
+		} catch (CompoundNotFoundException e) {
+			throw new IllegalArgumentException(e);
+		}
 		setParentSequence(parentDNASequence);
 		this.parentGeneSequence = parentDNASequence;
 		setBioBegin(begin);
 		setBioEnd(end);
-		this.setCompoundSet(DNACompoundSet.getDNACompoundSet());
 	}
 
 		@Override
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java
index 8f32033869..f68d7614cb 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java
@@ -88,6 +88,11 @@ public AbstractSequence() {
 	 */
 	public AbstractSequence(String seqString, CompoundSet<C> compoundSet) throws CompoundNotFoundException {
 		setCompoundSet(compoundSet);
+		initSequenceStorage(seqString);
+	}
+
+	//  so it can be called from subclass constructors
+	protected void initSequenceStorage(String seqString) throws CompoundNotFoundException {
 		sequenceStorage = new ArrayListSequenceReader<C>();
 		sequenceStorage.setCompoundSet(this.getCompoundSet());
 		sequenceStorage.setContents(seqString);
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ExonSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ExonSequenceTest.java
index 628dc5c0e8..9fd81bb59a 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ExonSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/ExonSequenceTest.java
@@ -16,8 +16,7 @@ void createExon() throws CompoundNotFoundException {
     }
 
     @Test
-    @Disabled("getAsList throws NPE in AbstractSequence#equals")
-    void equalsAndHaschcode() throws CompoundNotFoundException {
+    void equalsAndHashcode() throws CompoundNotFoundException {
         GeneSequence gene = anyGeneSequence();
         ExonSequence es = new ExonSequence(gene, 30, 40);
         ExonSequence es2 = new ExonSequence(gene, 30, 40);
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
index 352a6dcce7..38825952bb 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
@@ -113,11 +113,9 @@ void addRemoveExon() throws Exception {
         assertEquals(2, geneSequence.getExonSequences().size());
         geneSequence.removeExon("unknown");
         assertEquals(2, geneSequence.getExonSequences().size());
-        // this causes NPE in equals() methods as sequence proxy loader isn't set.
-        // either call super constructor in GeneSequence (which will require adding exception)
-        // or alter equals()  in AbstractSequence not to use properties like sequenceStorage, that may be null.
-        // geneSequence.removeExon("b");
-        // assertEquals(1, geneSequence.getExonSequences().size());
+
+         geneSequence.removeExon("c");
+         assertEquals(1, geneSequence.getExonSequences().size());
     }
 
    @Test
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
index 7607486f74..c239f0d5d9 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
@@ -42,15 +42,19 @@ void CDSListIsEmpty() {
         }
 
         @Test
-        @Disabled("NPE thrown from AbstractSequence 'getAsList'")
+        // whether it's -ve or +ve doesn't affect equals?
         void equals() {
-            assertFalse(transcriptSeq.equals(transcriptNegativeSeq));
+            assertTrue(transcriptSeq.equals(transcriptSeq));
+        }
+
+        // whether it's -ve or +ve doesn't affect equals?
+        void equalsDoesntDependOnStrand() {
+            assertTrue(transcriptSeq.equals(transcriptNegativeSeq));
         }
 
         @Test
-        @Disabled("NPE thrown from AbstractSequence 'getAsList'")
         void hashcode() {
-            assertFalse(transcriptSeq.hashCode() == (transcriptNegativeSeq.hashCode()));
+            assertTrue(transcriptSeq.hashCode() == (transcriptNegativeSeq.hashCode()));
         }
     }
 
@@ -89,7 +93,6 @@ void getCDNASeqNegativeStrand() throws Exception {
     }
 
     @Test
-    @Disabled("Can't  remove, as NPE thrown from equals()")
     void removeCDS() throws Exception {
         transcriptSeq.addCDS(new AccessionID("a"), 50, 60, 1);
         assertEquals(1, transcriptSeq.getCDSSequences().size());

From 0e2e841d9ea8867e5e0eceb0c3675623bda14fe6 Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Thu, 25 Nov 2021 18:38:36 +0000
Subject: [PATCH 277/599] add accessionID as a constructor argument

---
 .../nbio/core/sequence/GeneSequence.java      | 33 ++++++++++++++-----
 .../core/sequence/TranscriptSequence.java     | 31 +++++++++++++----
 .../nbio/core/sequence/GeneSequenceTest.java  | 23 +++++--------
 .../nbio/core/sequence/SequenceTestUtils.java | 10 +++---
 .../core/sequence/TranscriptSequenceTest.java |  6 ++--
 5 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
index 41b4d5923d..4913610789 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
@@ -51,19 +51,13 @@ public class GeneSequence extends DNASequence {
 	private ChromosomeSequence chromosomeSequence;
 
 	/**
-	 * A class that keeps track of the details of a GeneSequence which is difficult to properly model. Two important concepts that is difficult
-	 * to make everything flexible but still work. You can have GFF features that only describe Exons or Exons/Introns or CDS regions and one
-	 * or more Transcriptions. You can have exon sequences but that does not imply transcription to the actual protein.
-	 *
-	 * The GeneSequence will keep track of Exons and Introns but to get a Protein sequence you need to start with a
-	 * TranscriptSequence and then add CDS sequences.
-	 *
-	 * This is also a key class in the biojava-3-genome module for reading and writing GFF3 files
-	 *
+	 * Use GeneSequence(ChromosomeSequence parentSequence, AccessionID accessionId,  int begin, int end, Strand strand)
+	 * which mandates an accessionID.
 	 * @param parentSequence
 	 * @param begin
 	 * @param end inclusive of end
 	 * @param strand force a gene to have strand and transcription sequence will inherit
+	 * @deprecated
 	 */
 	public GeneSequence(ChromosomeSequence parentSequence,  int begin, int end, Strand strand) {
 		setCompoundSet(DNACompoundSet.getDNACompoundSet());
@@ -79,6 +73,27 @@ public GeneSequence(ChromosomeSequence parentSequence,  int begin, int end, Stra
 		setStrand(strand);
 	}
 
+	/**
+	 * A class that keeps track of the details of a GeneSequence which is difficult to properly model. Two important concepts that is difficult
+	 * to make everything flexible but still work. You can have GFF features that only describe Exons or Exons/Introns or CDS regions and one
+	 * or more Transcriptions. You can have exon sequences but that does not imply transcription to the actual protein.
+	 *
+	 * The GeneSequence will keep track of Exons and Introns but to get a Protein sequence you need to start with a
+	 * TranscriptSequence and then add CDS sequences.
+	 *
+	 * This is also a key class in the biojava-3-genome module for reading and writing GFF3 files
+	 *
+	 * @param parentSequence
+	 * @param accessionId An identifier for the gene.
+	 * @param begin
+	 * @param end
+	 * @param strand force a gene to have strand and transcription sequence will inherit
+	 */
+	public GeneSequence(ChromosomeSequence parentSequence, AccessionID accessionId,  int begin, int end, Strand strand) {
+		this(parentSequence,begin,end,strand);
+		setAccession(accessionId);
+	}
+
 	/**
 	 * The parent ChromosomeSequence which contains the actual DNA sequence data
 	 * @return Chromosome sequence
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
index 07a8cc761f..5de1bc893a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
@@ -48,11 +48,9 @@ public class TranscriptSequence extends DNASequence {
 	private GeneSequence parentGeneSequence = null;
 
 	/**
-	 *
-	 * @param parentDNASequence
-	 * @param begin
-	 * @param end inclusive of end
-	 * @throws  IllegalArgumentException if the parentDNASequence is incompatible with DNACompoundSet
+	 * Use {@code}public TranscriptSequence(GeneSequence parentDNASequence, AccessionID accessionID, int begin, int end){@code}
+	 * that requires an explicit accessionID
+	 * @deprecated
 	 */
 	public TranscriptSequence(GeneSequence parentDNASequence, int begin, int end) {
 		setCompoundSet(DNACompoundSet.getDNACompoundSet());
@@ -67,6 +65,19 @@ public TranscriptSequence(GeneSequence parentDNASequence, int begin, int end) {
 		setBioEnd(end);
 	}
 
+	/**
+	 *
+	 * @param parentDNASequence
+	 * @param accessionID
+	 * @param begin
+	 * @param end inclusive of end
+	 * @throws  IllegalArgumentException if the parentDNASequence is incompatible with DNACompoundSet
+	 */
+	public TranscriptSequence(GeneSequence parentDNASequence, AccessionID accessionID, int begin, int end) {
+		this(parentDNASequence, begin, end);
+		setAccession(accessionID);
+	}
+
 		@Override
 	public int getLength() {
 		return Math.abs(this.getBioEnd() - this.getBioBegin()) + 1;
@@ -251,7 +262,10 @@ public StartCodonSequence getStartCodonSequence() {
 	}
 
 	/**
-	 * @param startCodonSequence the startCodonSequence to set
+	 *
+	 * @param accession
+	 * @param begin
+	 * @param end
 	 */
 	public void addStartCodonSequence(AccessionID accession, int begin, int end) {
 		this.startCodonSequence = new StartCodonSequence(this, begin, end);
@@ -266,7 +280,10 @@ public StopCodonSequence getStopCodonSequence() {
 	}
 
 	/**
-	 * @param stopCodonSequence the stopCodonSequence to set
+	 *
+	 * @param accession
+	 * @param begin
+	 * @param end
 	 */
 	public void addStopCodonSequence(AccessionID accession, int begin, int end) {
 		this.stopCodonSequence = new StopCodonSequence(this, begin, end);
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
index 38825952bb..0f658ea3dc 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
@@ -16,7 +16,7 @@ class GeneSequenceTest {
     @BeforeEach
     void before() throws CompoundNotFoundException {
         chromosomeSequence = new ChromosomeSequence(ChromosomeSequenceTest.CHROMOSOME_SEQ);
-        geneSequence = new GeneSequence(chromosomeSequence, 10,19, Strand.POSITIVE);
+        geneSequence = new GeneSequence(chromosomeSequence, new AccessionID("mygene"), 10,19, Strand.POSITIVE);
     }
 
     @Nested
@@ -50,11 +50,10 @@ void geneSequenceIsChromos2omeSequence() {
 
     @Test
     void addIntronsUsingExonsPositiveStrand() throws Exception {
-        geneSequence = new GeneSequence(chromosomeSequence, 10,150, Strand.POSITIVE);
+        geneSequence = new GeneSequence(chromosomeSequence,new AccessionID("geneId"), 10,150, Strand.POSITIVE);
         geneSequence.addExon( new AccessionID("a"), 10,29);
         geneSequence.addExon( new AccessionID("b"), 33,80);
         geneSequence.addExon( new AccessionID("c"), 100,120);
-        geneSequence.setAccession(new AccessionID("geneId"));
         geneSequence.addIntronsUsingExons();
         assertEquals(2, geneSequence.getIntronSequences().size());
         assertEquals(30, geneSequence.getIntronSequences().get(0).getBioBegin());
@@ -66,14 +65,13 @@ void addIntronsUsingExonsPositiveStrand() throws Exception {
     @Test
     @Disabled("gives odd results for intron coords")
     void addIntronsUsingExonsNegativeStrand() throws Exception {
-        geneSequence = new GeneSequence(chromosomeSequence, 150,10, Strand.NEGATIVE);
+        geneSequence = new GeneSequence(chromosomeSequence,new AccessionID("geneId"), 150,10, Strand.NEGATIVE);
         ExonSequence e1 = geneSequence.addExon( new AccessionID("c"), 120,100);
 
         geneSequence.addExon( new AccessionID("b"), 80,33);
         geneSequence.addExon( new AccessionID("a"), 29,10);
 
         // this MUST be set in order to avoid NPE when adding introns
-        geneSequence.setAccession(new AccessionID("geneId"));
         geneSequence.addIntronsUsingExons();
         // actual values generated are (9,81) for I1 and (32,121) for I2
         assertEquals(2, geneSequence.getIntronSequences().size());
@@ -85,9 +83,8 @@ void addIntronsUsingExonsNegativeStrand() throws Exception {
 
     @Test
     void getPositiveStrandSequence5To3Prime() {
-        geneSequence = new GeneSequence(chromosomeSequence, 10,150, Strand.POSITIVE);
+        geneSequence = new GeneSequence(chromosomeSequence, new AccessionID("geneId"), 10,150, Strand.POSITIVE);
         // this must be set to avoid NPE
-        geneSequence.setAccession(new AccessionID("geneId"));
         assertEquals(chromosomeSequence.getSequenceAsString().substring(9,150),
                 geneSequence.getSequence5PrimeTo3Prime().getSequenceAsString());
     }
@@ -96,9 +93,8 @@ void getPositiveStrandSequence5To3Prime() {
    @Disabled("not complementing - seems to complement twice???")
     void getNegativeStrandSequence5To3Prime() throws CompoundNotFoundException {
         ChromosomeSequence shortChrSeq= new ChromosomeSequence("TTTTTTTTTTTTTTT");
-        geneSequence = new GeneSequence(shortChrSeq, 5,10, Strand.NEGATIVE);
+        geneSequence = new GeneSequence(shortChrSeq, new AccessionID("geneId"),5,10, Strand.NEGATIVE);
         // this must be set to avoid NPE
-        geneSequence.setAccession(new AccessionID("geneId"));
         DNASequence seq = geneSequence.getSequence5PrimeTo3Prime();
         //This should be sequence of A's ( as it's on complemetnary strand)but it is TTTTTTTT
         System.err.println(  geneSequence.getSequence5PrimeTo3Prime().getSequenceAsString());
@@ -106,21 +102,20 @@ void getNegativeStrandSequence5To3Prime() throws CompoundNotFoundException {
 
     @Test
     void addRemoveExon() throws Exception {
-        geneSequence = new GeneSequence(chromosomeSequence, 5,150, Strand.POSITIVE);
+        geneSequence = new GeneSequence(chromosomeSequence, new AccessionID("mygene"),5,150, Strand.POSITIVE);
         geneSequence.addExon(new AccessionID("a"), 20, 50);
         geneSequence.addExon(new AccessionID("c"), 20, 50);
-        geneSequence.setAccession(new AccessionID("mygene"));
         assertEquals(2, geneSequence.getExonSequences().size());
         geneSequence.removeExon("unknown");
         assertEquals(2, geneSequence.getExonSequences().size());
 
-         geneSequence.removeExon("c");
-         assertEquals(1, geneSequence.getExonSequences().size());
+        geneSequence.removeExon("c");
+        assertEquals(1, geneSequence.getExonSequences().size());
     }
 
    @Test
     void returnedCollectionsAreMutable() throws Exception {
-       geneSequence = new GeneSequence(chromosomeSequence, 5,150, Strand.POSITIVE);
+       geneSequence = new GeneSequence(chromosomeSequence, new AccessionID("geneId"), 5,150, Strand.POSITIVE);
        geneSequence.addExon(new AccessionID("a"), 20, 50);
        List<ExonSequence> exons  =  geneSequence.getExonSequences();
        // this breaks encapsulation of the collections
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/SequenceTestUtils.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/SequenceTestUtils.java
index e8fd3fad22..ba42443e05 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/SequenceTestUtils.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/SequenceTestUtils.java
@@ -15,7 +15,7 @@ public class SequenceTestUtils {
      */
     static GeneSequence anyGeneSequence() throws CompoundNotFoundException {
         ChromosomeSequence chr = new ChromosomeSequence(ChromosomeSequenceTest.CHROMOSOME_SEQ);
-        GeneSequence gene = new GeneSequence(chr, 10, 200, Strand.POSITIVE);
+        GeneSequence gene = new GeneSequence(chr, new AccessionID("someGeneId"), 10, 200, Strand.POSITIVE);
         return gene;
     }
 
@@ -27,13 +27,12 @@ static GeneSequence anyGeneSequence() throws CompoundNotFoundException {
      */
     static GeneSequence any3GeneSequence() throws CompoundNotFoundException {
         ChromosomeSequence chr = new ChromosomeSequence(ChromosomeSequenceTest.CHROMOSOME_SEQ);
-        GeneSequence gene = new GeneSequence(chr, 10, 200, Strand.NEGATIVE);
+        GeneSequence gene = new GeneSequence(chr, new AccessionID("some3PrimeGeneId"),10, 200, Strand.NEGATIVE);
         return gene;
     }
 
     /**
      * Generate a GeneSequence as a subsequence of defined chromosome sequence.
-     * Accession ID is  set to avoid NPE thrown
      *
      * @param chromosomeSequence
      * @param bioStart
@@ -44,7 +43,7 @@ static GeneSequence any3GeneSequence() throws CompoundNotFoundException {
      */
     static GeneSequence fromSequence(String chromosomeSequence, int bioStart, int bioEnd, Strand strand) throws CompoundNotFoundException {
         ChromosomeSequence chr = new ChromosomeSequence(chromosomeSequence);
-        GeneSequence gene = new GeneSequence(chr, bioStart, bioEnd, strand);
+        GeneSequence gene = new GeneSequence(chr, new AccessionID("Gene"), bioStart, bioEnd, strand);
         gene.setAccession(new AccessionID("Gene1"));
         return gene;
     }
@@ -52,7 +51,6 @@ static GeneSequence fromSequence(String chromosomeSequence, int bioStart, int bi
     /**
      * Creates a transcript from coordinates on the supplied chromosome sequence.
      * The GeneSequence is set to same length as Chromosomal sequence for simplicity.
-     * Accession ID is set to avoid NPE thrown from some methods
      *
      * @param chromosomeSequence
      * @param bioStart
@@ -63,7 +61,7 @@ static GeneSequence fromSequence(String chromosomeSequence, int bioStart, int bi
      */
     static TranscriptSequence transcriptFromSequence(String chromosomeSequence, int bioStart, int bioEnd, Strand strand) throws CompoundNotFoundException {
         GeneSequence gene = fromSequence(chromosomeSequence, 1, chromosomeSequence.length(), strand);
-        TranscriptSequence ts = new TranscriptSequence(gene, bioStart, bioEnd);
+        TranscriptSequence ts = new TranscriptSequence(gene, new AccessionID("Transcript"), bioStart, bioEnd);
         ts.setAccession(new AccessionID("Transcript1"));
         return ts;
     }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
index c239f0d5d9..95de95d9fe 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
@@ -18,9 +18,9 @@ class TranscriptSequenceTest {
     @BeforeEach
     void setUp() throws CompoundNotFoundException {
         anyGeneSequence = SequenceTestUtils.anyGeneSequence();
-        transcriptSeq = new TranscriptSequence(anyGeneSequence, 5, 100);
+        transcriptSeq = new TranscriptSequence(anyGeneSequence, new AccessionID("T5"), 5, 100);
         anyNegativeGeneSequence = SequenceTestUtils.any3GeneSequence();
-        transcriptNegativeSeq = new TranscriptSequence(anyNegativeGeneSequence, 5, 100);
+        transcriptNegativeSeq = new TranscriptSequence(anyNegativeGeneSequence, new AccessionID("T3"), 5, 100);
     }
 
     @Nested
@@ -69,7 +69,7 @@ void getCDNASeqPositiveStrand() throws Exception {
         String chrSeq = ChromosomeSequenceTest.CHROMOSOME_SEQ;
         // must set this to avoid NPE when generating sequence
 
-        transcriptSeq.setAccession(new AccessionID("T1"));
+
         // make 2 CDS that are contiguous. These can be added in any order and are sorted OK
         CDSSequence s1 = transcriptSeq.addCDS(new AccessionID("a"), 11, 20, 1);
         assertEquals(chrSeq, s1.getSequenceAsString());

From 508845609636a5716f2bf676b792888b03a90c0f Mon Sep 17 00:00:00 2001
From: Richard Adams <ra22597@gmail.com>
Date: Fri, 26 Nov 2021 17:43:05 +0000
Subject: [PATCH 278/599] fix mutable collections in GeneSequence

---
 .../biojava/nbio/core/sequence/AccessionID.java  |  3 +--
 .../biojava/nbio/core/sequence/GeneSequence.java |  8 ++++----
 .../nbio/core/sequence/SequenceComparator.java   |  2 +-
 .../biojava/nbio/core/sequence/TaxonomyID.java   |  2 ++
 .../nbio/core/sequence/GeneSequenceTest.java     | 16 ++++++++++++++--
 .../core/sequence/TranscriptSequenceTest.java    |  1 -
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/AccessionID.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/AccessionID.java
index 542e687afc..14aaa22d39 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/AccessionID.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/AccessionID.java
@@ -53,8 +53,7 @@ public AccessionID(){
 	 * @param id non-null
 	 */
 	public AccessionID(String id) {
-		this.id = id.trim();
-		this.source = DataSource.LOCAL;
+		this(id, DataSource.LOCAL);
 	}
 
 	/**
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
index 4913610789..d434ee2ad3 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
@@ -290,19 +290,19 @@ public ExonSequence addExon(AccessionID accession, int begin, int end) throws Ex
 	}
 
 	/**
-	 * Get the exons as an ArrayList
+	 * Get the exons as an ArrayList. Modifying this list will not modify the underlying collection
 	 * @return exons
 	 */
 	public ArrayList<ExonSequence> getExonSequences() {
-		return exonSequenceList;
+		return new ArrayList<>(exonSequenceList);
 	}
 
 	/**
-	 * Get the introns as an ArrayList
+	 * Get the introns as an ArrayList. Modifying this list will not modify the underlying collection
 	 * @return introns
 	 */
 	public ArrayList<IntronSequence> getIntronSequences() {
-		return intronSequenceList;
+		return  new ArrayList<>(intronSequenceList);
 	}
 
 	/**
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/SequenceComparator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/SequenceComparator.java
index 6b927611ef..066aa930de 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/SequenceComparator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/SequenceComparator.java
@@ -28,7 +28,7 @@
 import java.util.Comparator;
 
 /**
- * Used to sort sequences
+ * Used to sort sequences in ascending order of  bioBegin property.
  * @author Scooter Willis <willishf at gmail dot com>
  */
 public class SequenceComparator implements Comparator<AbstractSequence<?>>, Serializable{
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TaxonomyID.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TaxonomyID.java
index 64784727bd..49659b5f05 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TaxonomyID.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TaxonomyID.java
@@ -26,8 +26,10 @@
 /**
  * A sequence can be associated with a species or Taxonomy ID
  * @author Scooter Willis
+ *
  */
 public class TaxonomyID {
+   //TODO this should implement equals and hashcode if is value object?
 
 
 	private String id = null;
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
index 0f658ea3dc..ecb1e7d1b2 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -114,12 +115,23 @@ void addRemoveExon() throws Exception {
     }
 
    @Test
-    void returnedCollectionsAreMutable() throws Exception {
+    void returnedExonCollectionsAreNotMutable() throws Exception {
        geneSequence = new GeneSequence(chromosomeSequence, new AccessionID("geneId"), 5,150, Strand.POSITIVE);
        geneSequence.addExon(new AccessionID("a"), 20, 50);
        List<ExonSequence> exons  =  geneSequence.getExonSequences();
        // this breaks encapsulation of the collections
        exons.remove(0);
-       assertEquals(0, geneSequence.getExonSequences().size());
+       assertEquals(1, geneSequence.getExonSequences().size());
    }
+    @Test
+    void returnedIntronCollectionsAreNotMutable() throws Exception {
+        geneSequence = SequenceTestUtils.anyGeneSequence();
+        geneSequence.addExon(new AccessionID("a"), 20, 50);
+        geneSequence.addExon(new AccessionID("b"), 80, 100);
+        geneSequence.addIntronsUsingExons();
+        ArrayList<IntronSequence> introns  =  geneSequence.getIntronSequences();
+        assertEquals(1, introns.size());
+        introns.remove(0);
+        assertEquals(1, geneSequence.getIntronSequences().size());
+    }
 }
\ No newline at end of file
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
index 95de95d9fe..19bb57a8d8 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
@@ -42,7 +42,6 @@ void CDSListIsEmpty() {
         }
 
         @Test
-        // whether it's -ve or +ve doesn't affect equals?
         void equals() {
             assertTrue(transcriptSeq.equals(transcriptSeq));
         }

From 96def7e7b87cf621dde0a40889f42a7129b10727 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Sun, 28 Nov 2021 04:02:50 +0800
Subject: [PATCH 279/599] Parsing REMARK 2 and REMARK 3 (new format)

Apparently it affects only cryo-EM entries.
---
 .../nbio/structure/io/PDBFileParser.java      | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index c3dcc330e0..db6669cc75 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -1351,7 +1351,7 @@ private void pdb_REMARK_Handler(String line) {
 		if (line.startsWith("REMARK 800")) {
 			pdb_REMARK_800_Handler(line);
 
-		}  else if ( line.startsWith("REMARK 350")){
+		} else if ( line.startsWith("REMARK 350")){
 
 			if ( params.isParseBioAssembly()) {
 
@@ -1361,6 +1361,10 @@ private void pdb_REMARK_Handler(String line) {
 
 				bioAssemblyParser.pdb_REMARK_350_Handler(line);
 			}
+		} else if (line.startsWith("REMARK   2")) {
+			//REMARK   2 RESOLUTION.
+			Pattern pR = Pattern.compile("^REMARK   2 RESOLUTION.\\s+(\\d+\\.\\d+)\\s+ANGSTROMS\\..*");
+			handleResolutionLine(line, pR);
 
 		// REMARK 3 (for R free)
 		// note: if more than 1 value present (occurring in hybrid experimental technique entries, e.g. 3ins, 4n9m)
@@ -1396,21 +1400,29 @@ private void pdb_REMARK_Handler(String line) {
 		// then last one encountered will be taken
 		} else if (line.startsWith("REMARK   3   RESOLUTION RANGE HIGH")){
 			Pattern pR = Pattern.compile("^REMARK   3   RESOLUTION RANGE HIGH \\(ANGSTROMS\\) :\\s+(\\d+\\.\\d+).*");
-			Matcher mR = pR.matcher(line);
-			if (mR.matches()) {
-				try {
-					float res = Float.parseFloat(mR.group(1));
-					if (pdbHeader.getResolution()!=PDBHeader.DEFAULT_RESOLUTION) {
-						logger.warn("More than 1 resolution value present, will use last one {} and discard previous {} "
-								,mR.group(1), String.format("%4.2f",pdbHeader.getResolution()));
-					}
-					pdbHeader.setResolution(res);
-				} catch (NumberFormatException e) {
-					logger.info("Could not parse resolution '{}', ignoring it",mR.group(1));
+			handleResolutionLine(line, pR);
+		} else if (line.startsWith("REMARK   3   EFFECTIVE RESOLUTION")){
+			Pattern pR = Pattern.compile("^REMARK   3   EFFECTIVE RESOLUTION \\(ANGSTROMS\\)\\s+:\\s+(\\d+\\.\\d+).*");
+			handleResolutionLine(line, pR);
+		}
+	}
+
+	public void handleResolutionLine(String line, Pattern pR) {
+		Matcher mR = pR.matcher(line);
+		if (mR.matches()) {
+			final String resString = mR.group(1);
+			try {
+				float res = Float.parseFloat(resString);
+				final float resInHeader = pdbHeader.getResolution();
+				if (resInHeader!=PDBHeader.DEFAULT_RESOLUTION && resInHeader != res) {
+					logger.warn("More than 1 resolution value present, will use last one {} and discard previous {} "
+							,resString, String.format("%4.2f",resInHeader));
 				}
+				pdbHeader.setResolution(res);
+			} catch (NumberFormatException e) {
+				logger.info("Could not parse resolution '{}', ignoring it",resString);
 			}
 		}
-
 	}
 
 

From d02632ba1161cb81ae06f483aec10abe095a2c7c Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Sun, 28 Nov 2021 04:30:44 +0800
Subject: [PATCH 280/599] Removed apparently old documentation

This sentence seems from old documentation.
This method does not throw StructureException, nor does its underlying
method.
---
 .../src/main/java/org/biojava/nbio/structure/BondImpl.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java
index b467a7272e..e6a243d7cf 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java
@@ -175,9 +175,7 @@ public int getBondOrder() {
 	/**
 	 * Gets the distance between the two atoms of this bond.
 	 * <p>
-	 * This distance is calculated by {@link Calc#getDistance(Atom, Atom)}, but
-	 * this method will suppress the empty threat of a
-	 * {@link StructureException} that method makes.
+	 * This distance is calculated by {@link Calc#getDistance(Atom, Atom)}.
 	 *
 	 * @return the distance between the two atoms of this bond.
 	 */

From e178cd140fa1d9650270fdc4c54a14b7a785505b Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Sun, 28 Nov 2021 04:33:19 +0800
Subject: [PATCH 281/599] Correcting reporting

Isn't it existing atom which will be ignored if future lookups, or I am
missing some point here?
---
 .../src/main/java/org/biojava/nbio/structure/HetatomImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
index 27a7e6a3a5..cf9dfcbeb9 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
@@ -168,7 +168,7 @@ public void addAtom(Atom atom){
 				String altLocStr = "";
 				char altLoc = atom.getAltLoc();
 				if (altLoc != ' ') altLocStr = "(alt loc '" + altLoc + "')";
-				logger.warn("An atom with name " + atom.getName() + " " + altLocStr + " is already present in group: " + this.toString() + ". The atom with serial " + atom.getPDBserial() + " will be ignored in look-ups.");
+				logger.warn("An atom with name " + atom.getName() + " " + altLocStr + " is already present in group: " + this.toString() + ". The atom with serial " + existingAtom.getPDBserial() + " will be ignored in look-ups.");
 			}
 		}
 	}

From 1ad9c530c37584af962c64ad34eb168b6ad6fead Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Sun, 28 Nov 2021 04:36:14 +0800
Subject: [PATCH 282/599] Correct EOL RegEx for both Windows and Linux

I fixed it for windows.
BTW, What about Mac (iOS) did anybody try to build BioJava on it?
---
 .../org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java
index d580930193..39b1ea3f0a 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java
@@ -58,7 +58,7 @@ void basicGeneWriterTest() throws Exception {
         fastaWriter.process();
 
         String output = new String(os.toByteArray(), "UTF-8");
-        String [] lines =  output.split("\n");
+        String [] lines =  output.split("\r?\n");
         assertEquals(4,lines.length);
         assertEquals(">gene1", lines[0]);
         assertEquals("ATATATATATaTATAtatat", lines[1]);

From 126f4ec3f8723727d067c09be3de9f21281ed0bc Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Thu, 2 Dec 2021 16:18:16 +0800
Subject: [PATCH 283/599] Changing new line delimiters to \\R

---
 .../core/alignment/matrices/SubstitutionMatrixTest.java   | 8 ++++----
 .../nbio/core/sequence/io/FastaGeneWriterTest.java        | 2 +-
 .../nbio/structure/test/align/FlipAFPChainTest.java       | 5 ++---
 .../structure/test/align/fatcat/FlipAFPChainTest.java     | 5 ++---
 .../structure/test/align/fatcat/TestOutputStrings.java    | 4 ++--
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixTest.java
index 1e82bfd572..74b3afda03 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixTest.java
@@ -54,8 +54,8 @@ void getMatrixReturnsCopy(){
     void matrixToString(){
         String asString = sm.toString();
         // description + 5*2 for ATCGNatcgn + 1 header + 1  for '-'
-        assertEquals(13, asString.split("\n").length);
-        String header = asString.split("\r?\n")[1];
+        assertEquals(13, asString.split("\\n").length);
+        String header = asString.split("\\R")[1];
         assertTrue(header.replaceAll(" ","").matches("[ATCGatcgNn-]+"));
     }
 
@@ -64,8 +64,8 @@ void matrixAsString(){
         String asString = sm.getMatrixAsString();
 
         // 5*2 for ATCGNatcgn + 1 header + 1  for '-'
-        assertEquals(12, asString.split("\n").length);
-        String header = asString.split("\r?\n")[0];
+        assertEquals(12, asString.split("\\n").length);
+        String header = asString.split("\\R")[0];
         assertTrue(header.replaceAll(" ","").matches("[ATCGatcgNn-]+"));
     }
 }
\ No newline at end of file
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java
index 39b1ea3f0a..83e3347301 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaGeneWriterTest.java
@@ -58,7 +58,7 @@ void basicGeneWriterTest() throws Exception {
         fastaWriter.process();
 
         String output = new String(os.toByteArray(), "UTF-8");
-        String [] lines =  output.split("\r?\n");
+        String [] lines =  output.split("\\R");
         assertEquals(4,lines.length);
         assertEquals(">gene1", lines[0]);
         assertEquals("ATATATATATaTATAtatat", lines[1]);
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/FlipAFPChainTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/FlipAFPChainTest.java
index 6213503c64..06b9a30634 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/FlipAFPChainTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/FlipAFPChainTest.java
@@ -185,10 +185,9 @@ public static void rotateAtoms2(AFPChain afpChain,Atom[] ca2){
 	}
 
 
-	private static final String newline = System.getProperty("line.separator");
 	private void printFirstMismatch(String s1, String s2){
-		String[] spl1 = s1.split(newline);
-		String[] spl2 = s2.split(newline);
+		String[] spl1 = s1.split("\\R");
+		String[] spl2 = s2.split("\\R");
 
 		for (int i = 0 ; i < spl1.length ; i++){
 
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/fatcat/FlipAFPChainTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/fatcat/FlipAFPChainTest.java
index 41a03bee70..037bd8fa58 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/fatcat/FlipAFPChainTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/fatcat/FlipAFPChainTest.java
@@ -204,10 +204,9 @@ public static void rotateAtoms2(AFPChain afpChain,Atom[] ca2){
 	}
 
 
-	static final String newline = System.getProperty("line.separator");
 	public void printFirstMismatch(String s1, String s2){
-		String[] spl1 = s1.split(newline);
-		String[] spl2 = s2.split(newline);
+		String[] spl1 = s1.split("\\R");
+		String[] spl2 = s2.split("\\R");
 
 		for (int i = 0 ; i < spl1.length ; i++){
 
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/fatcat/TestOutputStrings.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/fatcat/TestOutputStrings.java
index 4917d67cf3..8f6fc84d38 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/fatcat/TestOutputStrings.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/align/fatcat/TestOutputStrings.java
@@ -28,8 +28,8 @@ public class TestOutputStrings {
 	private static final String newline = System.getProperty("line.separator");
 
 	public void printFirstMismatch(String s1, String s2){
-		String[] spl1 = s1.split(newline);
-		String[] spl2 = s2.split(newline);
+		String[] spl1 = s1.split("\\R");
+		String[] spl2 = s2.split("\\R");
 
 		for (int i = 0 ; i < spl1.length ; i++){
 

From c16c2a86a7431c112ea2d327193f6dd544ce665e Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Fri, 3 Dec 2021 05:28:39 +0800
Subject: [PATCH 284/599] Parsing EM resolution in mmCif parser

---
 .../structure/io/cif/CifStructureConsumer.java   |  9 ++++++++-
 .../io/cif/CifStructureConsumerImpl.java         | 16 ++++++++++++++++
 .../structure/io/cif/CifStructureConverter.java  |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumer.java
index c6c5318217..8472bc8056 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumer.java
@@ -10,6 +10,7 @@
 import org.rcsb.cif.schema.mm.DatabasePDBRemark;
 import org.rcsb.cif.schema.mm.DatabasePDBRev;
 import org.rcsb.cif.schema.mm.DatabasePDBRevRecord;
+import org.rcsb.cif.schema.mm.Em3dReconstruction;
 import org.rcsb.cif.schema.mm.Entity;
 import org.rcsb.cif.schema.mm.EntityPoly;
 import org.rcsb.cif.schema.mm.EntityPolySeq;
@@ -107,7 +108,13 @@ public interface CifStructureConsumer extends CifFileConsumer<Structure> {
      */
     void consumeDatabasePDBRevRecord(DatabasePDBRevRecord databasePDBrevRecord);
 
-    /**
+	/**
+	 * Consume Electron Microscopy 3D reconstruction data
+	 * @param em3dReconstruction
+	 */
+	void consumeEm3dReconstruction(Em3dReconstruction em3dReconstruction);
+
+	/**
      * Consume a particular Cif category.
      * @param entity data
      */
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index eb56b9a59a..0cdf8bbb1a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -69,6 +69,7 @@
 import org.rcsb.cif.schema.mm.DatabasePDBRemark;
 import org.rcsb.cif.schema.mm.DatabasePDBRev;
 import org.rcsb.cif.schema.mm.DatabasePDBRevRecord;
+import org.rcsb.cif.schema.mm.Em3dReconstruction;
 import org.rcsb.cif.schema.mm.Entity;
 import org.rcsb.cif.schema.mm.EntityPoly;
 import org.rcsb.cif.schema.mm.EntityPolySeq;
@@ -128,6 +129,7 @@ public class CifStructureConsumerImpl implements CifStructureConsumer {
     private List<Chain> currentModel;
     private PDBHeader pdbHeader;
     private String currentNmrModelNumber;
+	private Em3dReconstruction em3dReconstruction;
     private List<Chain> entityChains;
 
     private Entity entity;
@@ -644,6 +646,16 @@ public void consumeDatabasePDBRevRecord(DatabasePDBRevRecord databasePDBrevRecor
             revRecords.add(new org.biojava.nbio.structure.DatabasePDBRevRecord(databasePDBrevRecord, i));
         }
     }
+    
+    @Override
+    public void consumeEm3dReconstruction(Em3dReconstruction em3dReconstruction) {
+    	this.em3dReconstruction = em3dReconstruction;
+    	
+        for (int rowIndex = 0; rowIndex < em3dReconstruction.getRowCount(); rowIndex++) {
+        	pdbHeader.setResolution((float) em3dReconstruction.getResolution().get(rowIndex)); //can it have more than 1 value?
+        }
+        //TODO other fields (maybe RFree)?
+    }
 
     @Override
     public void consumeEntity(Entity entity) {
@@ -831,6 +843,10 @@ public void consumePdbxStructOperList(PdbxStructOperList pdbxStructOperList) {
     public void consumeRefine(Refine refine) {
         for (int rowIndex = 0; rowIndex < refine.getRowCount(); rowIndex++) {
             // RESOLUTION
+        	ValueKind valueKind = refine.getLsDResHigh().getValueKind(rowIndex);
+        	if (ValueKind.NOT_PRESENT.equals(valueKind)) {
+        		continue;
+        	}
             // in very rare cases (for instance hybrid methods x-ray + neutron diffraction, e.g. 3ins, 4n9m)
             // there are 2 resolution values, one for each method
             // we take the last one found so that behaviour is like in PDB file parsing
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConverter.java
index 1351223982..4f3a1f403a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConverter.java
@@ -118,6 +118,7 @@ public static Structure fromCifFile(CifFile cifFile, FileParsingParameters param
         consumer.consumeDatabasePDBRemark(cifBlock.getDatabasePDBRemark());
         consumer.consumeDatabasePDBRev(cifBlock.getDatabasePDBRev());
         consumer.consumeDatabasePDBRevRecord(cifBlock.getDatabasePDBRevRecord());
+        consumer.consumeEm3dReconstruction(cifBlock.getEm3dReconstruction());
         consumer.consumeEntity(cifBlock.getEntity());
         consumer.consumeEntityPoly(cifBlock.getEntityPoly());
         consumer.consumeEntitySrcGen(cifBlock.getEntitySrcGen());

From 5e374630bc846d49d0a49fcdf074a9d665635eef Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Mon, 6 Dec 2021 11:36:57 +0800
Subject: [PATCH 285/599] trigger build


From 0dea8f5beef88d53e461a0ce9134d6e284ed8855 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Tue, 7 Dec 2021 02:29:00 +0800
Subject: [PATCH 286/599] Safer condition

the safer condition covers both UNKNOWN and NOT_PRESENT values
---
 .../biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 0cdf8bbb1a..4f1a40fab5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -844,7 +844,7 @@ public void consumeRefine(Refine refine) {
         for (int rowIndex = 0; rowIndex < refine.getRowCount(); rowIndex++) {
             // RESOLUTION
         	ValueKind valueKind = refine.getLsDResHigh().getValueKind(rowIndex);
-        	if (ValueKind.NOT_PRESENT.equals(valueKind)) {
+        	if (! ValueKind.PRESENT.equals(valueKind)) {
         		continue;
         	}
             // in very rare cases (for instance hybrid methods x-ray + neutron diffraction, e.g. 3ins, 4n9m)

From 73343ef4c90d7985d38b75ddb4da61493a237687 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Tue, 7 Dec 2021 08:02:15 +0800
Subject: [PATCH 287/599] Resolution defaults to 99 if no value is available.

---
 .../java/org/biojava/nbio/structure/PDBHeader.java     | 10 ++++++++++
 .../structure/io/cif/CifStructureConsumerImpl.java     |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
index ea0f36115c..44fe2b0592 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
@@ -580,6 +580,16 @@ public void setCrystallographicInfo(PDBCrystallographicInfo crystallographicInfo
 		this.crystallographicInfo = crystallographicInfo;
 	}
 
+	/**
+	 * Returns the resolution (or effective resolution) of the experiment. This is
+	 * related to <code>_refine.ls_d_res_high</code> (DIFFRACTION) or
+	 * <code>_em_3d_reconstruction.resolution</code> (ELECTRON MICROSCOPY) for mmCif
+	 * format, or to <code>REMARK 2</code> or <code>REMARK 3</code> for PDB legacy
+	 * format. If more than one value is available (in rare cases), the last one is
+	 * reported. If no value is available, it defaults to 99.
+	 * 
+	 * @return The reported experiment resolution, 99 if no value is available.
+	 */
 	public float getResolution() {
 		return resolution;
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 4f1a40fab5..debadc4c08 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -651,8 +651,10 @@ public void consumeDatabasePDBRevRecord(DatabasePDBRevRecord databasePDBrevRecor
     public void consumeEm3dReconstruction(Em3dReconstruction em3dReconstruction) {
     	this.em3dReconstruction = em3dReconstruction;
     	
-        for (int rowIndex = 0; rowIndex < em3dReconstruction.getRowCount(); rowIndex++) {
-        	pdbHeader.setResolution((float) em3dReconstruction.getResolution().get(rowIndex)); //can it have more than 1 value?
+        for (int rowIndex = 0; rowIndex < em3dReconstruction.getRowCount(); rowIndex++) { //can it have more than 1 value?
+        	final FloatColumn resolution = em3dReconstruction.getResolution();
+			if (ValueKind.PRESENT.equals(resolution.getValueKind(rowIndex)))
+        		pdbHeader.setResolution((float) resolution.get(rowIndex));
         }
         //TODO other fields (maybe RFree)?
     }

From f04916ad4e47ca9e6898b8c0b81844916c7a039a Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Thu, 9 Dec 2021 07:14:37 +0800
Subject: [PATCH 288/599] Referring to DEFAULT_RESOLUTION instead of 99

---
 .../src/main/java/org/biojava/nbio/structure/PDBHeader.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
index 44fe2b0592..a948e3281a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
@@ -586,9 +586,11 @@ public void setCrystallographicInfo(PDBCrystallographicInfo crystallographicInfo
 	 * <code>_em_3d_reconstruction.resolution</code> (ELECTRON MICROSCOPY) for mmCif
 	 * format, or to <code>REMARK 2</code> or <code>REMARK 3</code> for PDB legacy
 	 * format. If more than one value is available (in rare cases), the last one is
-	 * reported. If no value is available, it defaults to 99.
+	 * reported. If no value is available, it defaults to
+	 * {@link #DEFAULT_RESOLUTION} ({@value #DEFAULT_RESOLUTION}).
 	 * 
-	 * @return The reported experiment resolution, 99 if no value is available.
+	 * @return The reported experiment resolution, {@link #DEFAULT_RESOLUTION}
+	 *         ({@value #DEFAULT_RESOLUTION}) if no value is available.
 	 */
 	public float getResolution() {
 		return resolution;

From 8df6a5880796fbb58e770afe16080b29c3c78bba Mon Sep 17 00:00:00 2001
From: Russell Howe <rhowe@siksai.co.uk>
Date: Sat, 11 Dec 2021 19:16:26 +0000
Subject: [PATCH 289/599] Upgrade log4j to 2.15.0 - CVE-2021-44228

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 503bb0e463..ba6eb14649 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 		<maxmem>512M</maxmem>
 		<mmtf.version>1.0.10</mmtf.version>
 		<slf4j.version>1.7.30</slf4j.version>
-		<log4j.version>2.14.0</log4j.version>
+		<log4j.version>2.15.0</log4j.version>
 		<junit-jupiter.version>5.7.2</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>
 		<ciftools.version>3.0.0</ciftools.version>

From 244da5bd9221781375102396cfc5838c8e5cf39f Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 13 Dec 2021 13:46:32 -0800
Subject: [PATCH 290/599] Docs

---
 .../org/biojava/nbio/structure/SubstructureIdentifier.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
index 0d0810b33e..aa1d246b33 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
@@ -193,11 +193,10 @@ public SubstructureIdentifier toCanonical() {
 	 * ligands (technically non-water non-polymer atoms) within
 	 * {@link StructureTools#DEFAULT_LIGAND_PROXIMITY_CUTOFF} of the selected
 	 * range are included, regardless of chain.
-	 * @param input A full structure, e.g. as loaded from the PDB. The structure
+	 * @param s A full structure, e.g. as loaded from the PDB. The structure
 	 * ID should match that returned by getPdbId().
 	 * @return
 	 * @throws StructureException
-	 * @see StructureTools#getReducedStructure(Structure, String)
 	 */
 	@Override
 	public Structure reduce(Structure s) throws StructureException {
@@ -310,7 +309,7 @@ public Structure reduce(Structure s) throws StructureException {
 	/**
 	 * Loads the complete structure based on {@link #getPdbId()}.
 	 *
-	 * @param AtomCache A source of structures
+	 * @param cache A source of structures
 	 * @return A Structure containing at least the atoms identified by this,
 	 *  or null if no PDB ID is set
 	 * @throws StructureException For errors loading and parsing the structure

From 5389fe003662748f11383868809d873c1d3d952a Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 13 Dec 2021 14:39:52 -0800
Subject: [PATCH 291/599] [maven-release-plugin] prepare release biojava-6.0.2

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 49fcc37f8b..0f956a571d 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index e93fd62869..a84c9b9da3 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index ca19b06d28..7935573640 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 33f48e2df2..e89591a729 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index b163355df0..b4d4098867 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.2-SNAPSHOT</version>
+    <version>6.0.2</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.2-SNAPSHOT</version>
+    	<version>6.0.2</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 6caa24d933..a6c655a18c 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index e1553ed3ce..e654f53e4c 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.2-SNAPSHOT</version>
+    <version>6.0.2</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index ef44bdd76a..7f1abe1380 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 5e11f379a5..9e81bd25ee 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index f04a5ae1f4..cb0d36d551 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 7e49892974..4a7dde818d 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index f7f9cef3e7..90a5361347 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.2-SNAPSHOT</version>
+        <version>6.0.2</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index f31f987845..c810404183 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index ba6eb14649..76db806fa7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.2-SNAPSHOT</version>
+	<version>6.0.2</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.2</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 59d1e1c15c750561c5a23b7ecaa4c4826cb65336 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 13 Dec 2021 14:39:55 -0800
Subject: [PATCH 292/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 0f956a571d..a0723de6f1 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a84c9b9da3..48bb55b19b 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 7935573640..fad7c80fda 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index e89591a729..765dfc963c 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index b4d4098867..d984a4a4b4 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.2</version>
+    <version>6.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.2</version>
+    	<version>6.0.3-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index a6c655a18c..8004e45117 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index e654f53e4c..3419cd6418 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.2</version>
+    <version>6.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 7f1abe1380..d9aa9ded4b 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 9e81bd25ee..6b9d4c30d8 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index cb0d36d551..daa0091439 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 4a7dde818d..916d514b39 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 90a5361347..3cbfa19ff0 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index c810404183..0245a790d0 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 76db806fa7..e11e9d0f92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.2</version>
+	<version>6.0.3-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.2</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 19698fefb338c244e68febbb642778f3a1c27e99 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 13 Dec 2021 15:29:16 -0800
Subject: [PATCH 293/599] Revert "[maven-release-plugin] prepare for next
 development iteration"

This reverts commit 59d1e1c15c750561c5a23b7ecaa4c4826cb65336.
---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index a0723de6f1..0f956a571d 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 48bb55b19b..a84c9b9da3 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index fad7c80fda..7935573640 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 765dfc963c..e89591a729 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index d984a4a4b4..b4d4098867 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.3-SNAPSHOT</version>
+    <version>6.0.2</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.3-SNAPSHOT</version>
+    	<version>6.0.2</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 8004e45117..a6c655a18c 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 3419cd6418..e654f53e4c 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.3-SNAPSHOT</version>
+    <version>6.0.2</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index d9aa9ded4b..7f1abe1380 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 6b9d4c30d8..9e81bd25ee 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index daa0091439..cb0d36d551 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 916d514b39..4a7dde818d 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 3cbfa19ff0..90a5361347 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.3-SNAPSHOT</version>
+        <version>6.0.2</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 0245a790d0..c810404183 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index e11e9d0f92..76db806fa7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.3-SNAPSHOT</version>
+	<version>6.0.2</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.2</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 05cddbc38faac067033ccc0dfbefdd429e83756b Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 13 Dec 2021 15:29:46 -0800
Subject: [PATCH 294/599] Revert "[maven-release-plugin] prepare release
 biojava-6.0.2"

This reverts commit 5389fe003662748f11383868809d873c1d3d952a.
---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 0f956a571d..49fcc37f8b 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a84c9b9da3..e93fd62869 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 7935573640..ca19b06d28 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index e89591a729..33f48e2df2 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index b4d4098867..b163355df0 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.2</version>
+    <version>6.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.2</version>
+    	<version>6.0.2-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index a6c655a18c..6caa24d933 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index e654f53e4c..e1553ed3ce 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.2</version>
+    <version>6.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 7f1abe1380..ef44bdd76a 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 9e81bd25ee..5e11f379a5 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index cb0d36d551..f04a5ae1f4 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 4a7dde818d..7e49892974 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 90a5361347..f7f9cef3e7 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index c810404183..f31f987845 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 76db806fa7..ba6eb14649 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.2</version>
+	<version>6.0.2-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.2</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 911394871ae2bd13d42e309f43797a8796aae774 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 13 Dec 2021 15:44:04 -0800
Subject: [PATCH 295/599] [maven-release-plugin] prepare release biojava-6.0.2

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 49fcc37f8b..0f956a571d 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index e93fd62869..a84c9b9da3 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index ca19b06d28..7935573640 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 33f48e2df2..e89591a729 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index b163355df0..b4d4098867 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.2-SNAPSHOT</version>
+    <version>6.0.2</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.2-SNAPSHOT</version>
+    	<version>6.0.2</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 6caa24d933..a6c655a18c 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index e1553ed3ce..e654f53e4c 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.2-SNAPSHOT</version>
+    <version>6.0.2</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index ef44bdd76a..7f1abe1380 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 5e11f379a5..9e81bd25ee 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index f04a5ae1f4..cb0d36d551 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 7e49892974..4a7dde818d 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index f7f9cef3e7..90a5361347 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.2-SNAPSHOT</version>
+        <version>6.0.2</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index f31f987845..c810404183 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2-SNAPSHOT</version>
+		<version>6.0.2</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2-SNAPSHOT</version>
+			<version>6.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index ba6eb14649..76db806fa7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.2-SNAPSHOT</version>
+	<version>6.0.2</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.2</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 857d4ab83735fe794b68c643d2566cb3df96887d Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 13 Dec 2021 15:44:07 -0800
Subject: [PATCH 296/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 0f956a571d..a0723de6f1 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a84c9b9da3..48bb55b19b 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 7935573640..fad7c80fda 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index e89591a729..765dfc963c 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index b4d4098867..d984a4a4b4 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.2</version>
+    <version>6.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.2</version>
+    	<version>6.0.3-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index a6c655a18c..8004e45117 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index e654f53e4c..3419cd6418 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.2</version>
+    <version>6.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 7f1abe1380..d9aa9ded4b 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 9e81bd25ee..6b9d4c30d8 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index cb0d36d551..daa0091439 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 4a7dde818d..916d514b39 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 90a5361347..3cbfa19ff0 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index c810404183..0245a790d0 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.2</version>
+		<version>6.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.2</version>
+			<version>6.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 76db806fa7..e11e9d0f92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.2</version>
+	<version>6.0.3-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.2</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From c1c1e86bfe001d1c658566ec0ebf54a877cd6dd9 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 13 Dec 2021 15:59:30 -0800
Subject: [PATCH 297/599] Updating docs for latest release

---
 CHANGELOG.md | 6 ++++++
 README.md    | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e95f752c7..7e12024687 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 BioJava Changelog
 -----------------
 
+BioJava 6.0.2
+==============================
+### Fixed
+* Log4j dependency upgraded to 2.15.0, to avoid log4hshell vulnerability
+* PDB and mmCIF resolution parsing fixes. #1000
+
 BioJava 6.0.1
 ==============================
 ### Fixed
diff --git a/README.md b/README.md
index 2fcb086ebd..3b67ed13cc 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-6.0.1-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.1) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-6.0.2-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.2) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.2</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From 3616871e61798f527aa47712621e06e0052bcded Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Dec 2021 20:24:02 +0000
Subject: [PATCH 298/599] Bump log4j-api from 2.15.0 to 2.16.0

Bumps log4j-api from 2.15.0 to 2.16.0.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e11e9d0f92..ddcefc3c4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 		<maxmem>512M</maxmem>
 		<mmtf.version>1.0.10</mmtf.version>
 		<slf4j.version>1.7.30</slf4j.version>
-		<log4j.version>2.15.0</log4j.version>
+		<log4j.version>2.16.0</log4j.version>
 		<junit-jupiter.version>5.7.2</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>
 		<ciftools.version>3.0.0</ciftools.version>

From 3f651794de18d53673295ec834e254821a7ececb Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 14 Dec 2021 14:38:02 -0800
Subject: [PATCH 299/599] [maven-release-plugin] prepare release biojava-6.0.3

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index a0723de6f1..d5c8948351 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 48bb55b19b..3824df00fe 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.3</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index fad7c80fda..971f310284 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 765dfc963c..525836bf61 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index d984a4a4b4..64600ac6a0 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.3-SNAPSHOT</version>
+    <version>6.0.3</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.3-SNAPSHOT</version>
+    	<version>6.0.3</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 8004e45117..ab2cbaac60 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.3</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 3419cd6418..72b1ec30b4 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.3-SNAPSHOT</version>
+    <version>6.0.3</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index d9aa9ded4b..66232bc0c4 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.3</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 6b9d4c30d8..2dc43a6d17 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.3</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index daa0091439..0dcc87ee7a 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 916d514b39..5a3941fd9f 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.3</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 3cbfa19ff0..b65b90c65c 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.3-SNAPSHOT</version>
+        <version>6.0.3</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 0245a790d0..cf73d76e63 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3-SNAPSHOT</version>
+		<version>6.0.3</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3-SNAPSHOT</version>
+			<version>6.0.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index ddcefc3c4f..9bff817901 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.3-SNAPSHOT</version>
+	<version>6.0.3</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.3</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 515eab02425bf0c2f5f291cb4bd669ba97077358 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 14 Dec 2021 14:38:05 -0800
Subject: [PATCH 300/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index d5c8948351..07d46c4c80 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3</version>
+		<version>6.0.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 3824df00fe..2148e57e3e 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3</version>
+		<version>6.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 971f310284..aab20d6456 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3</version>
+		<version>6.0.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 525836bf61..15ef26743e 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3</version>
+		<version>6.0.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 64600ac6a0..9be1d0b797 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.3</version>
+    <version>6.0.4-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.3</version>
+    	<version>6.0.4-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index ab2cbaac60..3d48a572bb 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3</version>
+		<version>6.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 72b1ec30b4..5a3c79099f 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 66232bc0c4..a4c8e97ded 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3</version>
+		<version>6.0.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 2dc43a6d17..559dc71c45 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3</version>
+		<version>6.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 0dcc87ee7a..dba36436e1 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.3</version>
+		<version>6.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 5a3941fd9f..ee1610a2e3 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3</version>
+		<version>6.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index b65b90c65c..a949df5e78 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index cf73d76e63..e78bd878b3 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.3</version>
+		<version>6.0.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.3</version>
+			<version>6.0.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 9bff817901..644af82bf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.3</version>
+	<version>6.0.4-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.3</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From f8cf82c023a212baedb3bf5d96caa21809fb6686 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 14 Dec 2021 15:59:08 -0800
Subject: [PATCH 301/599] Updating after release

---
 CHANGELOG.md | 5 +++++
 README.md    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e12024687..4902f2258b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 BioJava Changelog
 -----------------
 
+BioJava 6.0.3
+==============================
+### Fixed
+* Log4j dependency upgraded to 2.16.0, to avoid log4hshell vulnerability
+
 BioJava 6.0.2
 ==============================
 ### Fixed
diff --git a/README.md b/README.md
index 3b67ed13cc..4373692630 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-6.0.2-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.2) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-6.0.3-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.3) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.3</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From 3ce6f75935de46b2c4a96fa2658bd5a5b738bbb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Dec 2021 18:02:24 +0000
Subject: [PATCH 302/599] Bump log4j-api from 2.16.0 to 2.17.0

Bumps log4j-api from 2.16.0 to 2.17.0.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 644af82bf0..cd1b67cd88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 		<maxmem>512M</maxmem>
 		<mmtf.version>1.0.10</mmtf.version>
 		<slf4j.version>1.7.30</slf4j.version>
-		<log4j.version>2.16.0</log4j.version>
+		<log4j.version>2.17.0</log4j.version>
 		<junit-jupiter.version>5.7.2</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>
 		<ciftools.version>3.0.0</ciftools.version>

From 9f4206b6021d51783ba6fbcb109d952b71a90339 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sun, 2 Jan 2022 17:25:38 +0000
Subject: [PATCH 303/599] fix deprecated assertions

---
 .../test/java/org/biojava/nbio/core/sequence/DNATest.java   | 6 +++++-
 .../biojava/nbio/core/sequence/TranscriptSequenceTest.java  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/DNATest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/DNATest.java
index f112284740..eefa044dc6 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/DNATest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/DNATest.java
@@ -31,6 +31,7 @@
 import org.biojava.nbio.core.sequence.transcription.Frame;
 import org.biojava.nbio.core.sequence.views.ComplementSequenceView;
 import org.biojava.nbio.core.sequence.views.ReversedSequenceView;
+import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -39,7 +40,10 @@
 import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 
 public class DNATest {
 
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
index 19bb57a8d8..e568f0c205 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
@@ -26,7 +26,7 @@ void setUp() throws CompoundNotFoundException {
     @Nested
     class AfterValidConstruction {
         @Test
-        void lengthIsTSLength() {
+        void lengthIsTranscriptLength() {
             assertEquals(96, transcriptSeq.getLength());
         }
 

From 76c3bd463741e3431eadde1d05e850343234fe04 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sun, 2 Jan 2022 17:59:37 +0000
Subject: [PATCH 304/599] Strand unit test

---
 .../core/sequence/TranscriptSequence.java     |  6 ++--
 .../nbio/core/sequence/StrandTest.java        | 30 +++++++++++++++++++
 .../core/sequence/TranscriptSequenceTest.java | 16 ++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/sequence/StrandTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
index 5de1bc893a..83e50474bd 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
@@ -262,7 +262,8 @@ public StartCodonSequence getStartCodonSequence() {
 	}
 
 	/**
-	 *
+	 * Sets the start codon sequence at given begin /  end location. Note that calling this method multiple times
+	 * will replace any existing value.
 	 * @param accession
 	 * @param begin
 	 * @param end
@@ -280,7 +281,8 @@ public StopCodonSequence getStopCodonSequence() {
 	}
 
 	/**
-	 *
+	 * Sets the stop codon sequence at given begin /  end location. Note that calling this method multiple times
+	 * will replace any existing value.
 	 * @param accession
 	 * @param begin
 	 * @param end
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/StrandTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/StrandTest.java
new file mode 100644
index 0000000000..378eafbd68
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/StrandTest.java
@@ -0,0 +1,30 @@
+package org.biojava.nbio.core.sequence;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class StrandTest {
+
+    @Test
+    void reverse(){
+        assertEquals(Strand.POSITIVE, Strand.NEGATIVE.getReverse());
+        assertEquals(Strand.NEGATIVE, Strand.POSITIVE.getReverse());
+        assertEquals(Strand.UNDEFINED, Strand.UNDEFINED.getReverse());
+    }
+
+    @Test
+    void stringRepresentation() {
+        assertEquals("+", Strand.POSITIVE.getStringRepresentation());
+        assertEquals("-", Strand.NEGATIVE.getStringRepresentation());
+        assertEquals(".", Strand.UNDEFINED.getStringRepresentation());
+    }
+    
+    @Test
+    void numberRepresentation() {
+        assertEquals(1, Strand.POSITIVE.getNumericRepresentation());
+        assertEquals(-1, Strand.NEGATIVE.getNumericRepresentation());
+        assertEquals(0, Strand.UNDEFINED.getNumericRepresentation());
+    }
+
+}
\ No newline at end of file
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
index e568f0c205..c7a153c5d6 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TranscriptSequenceTest.java
@@ -99,4 +99,20 @@ void removeCDS() throws Exception {
         transcriptSeq.removeCDS("a");
         assertEquals(0, transcriptSeq.getCDSSequences().size());
     }
+
+    @Test
+    void addGetStartCodonSequence () {
+        assertNull(transcriptSeq.getStartCodonSequence());
+        transcriptSeq.addStartCodonSequence(new AccessionID("cds"), 40,42);
+        StartCodonSequence scs = transcriptSeq.getStartCodonSequence();
+        assertEquals(3, scs.getLength());
+    }
+
+    @Test
+    void addGetStopCodonSequence () {
+        assertNull(transcriptSeq.getStopCodonSequence());
+        transcriptSeq.addStopCodonSequence(new AccessionID("cds"), 40,42);
+        StopCodonSequence scs = transcriptSeq.getStopCodonSequence();
+        assertEquals(3, scs.getLength());
+    }
 }
\ No newline at end of file

From 91f4e4c00a51645bfd2aad6245b1167ed3fba095 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sun, 2 Jan 2022 18:08:32 +0000
Subject: [PATCH 305/599] Strand unit test, taxonomyID unit test

---
 .../biojava/nbio/core/sequence/TaxonomyID.java   |  2 +-
 .../biojava/nbio/core/sequence/StrandTest.java   |  2 +-
 .../nbio/core/sequence/TaxonomyIDTest.java       | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/sequence/TaxonomyIDTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TaxonomyID.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TaxonomyID.java
index 49659b5f05..b98457e6ff 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TaxonomyID.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TaxonomyID.java
@@ -31,11 +31,11 @@
 public class TaxonomyID {
    //TODO this should implement equals and hashcode if is value object?
 
-
 	private String id = null;
 	DataSource dataSource = DataSource.UNKNOWN;
 
 	public TaxonomyID(String id, DataSource dataSource) {
+		// TODO should throw IAE if null args?
 		this.id = id;
 		this.dataSource = dataSource;
 	}
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/StrandTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/StrandTest.java
index 378eafbd68..193d9ea3b7 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/StrandTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/StrandTest.java
@@ -19,7 +19,7 @@ void stringRepresentation() {
         assertEquals("-", Strand.NEGATIVE.getStringRepresentation());
         assertEquals(".", Strand.UNDEFINED.getStringRepresentation());
     }
-    
+
     @Test
     void numberRepresentation() {
         assertEquals(1, Strand.POSITIVE.getNumericRepresentation());
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TaxonomyIDTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TaxonomyIDTest.java
new file mode 100644
index 0000000000..6185a456bd
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TaxonomyIDTest.java
@@ -0,0 +1,16 @@
+package org.biojava.nbio.core.sequence;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class TaxonomyIDTest {
+    
+    @Test
+    void createTaxonomyID(){
+        TaxonomyID tId = new TaxonomyID("abc1", DataSource.GENBANK);
+        assertEquals("abc1", tId.getID());
+        assertEquals(DataSource.GENBANK, tId.getDataSource());
+    }
+
+}
\ No newline at end of file

From c1a114fa5c8be7b616e7e7507d7bbe443f5d0b54 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 3 Jan 2022 12:24:48 +0000
Subject: [PATCH 306/599] simplify generics in RNASequence

---
 .../org/biojava/nbio/core/sequence/RNASequence.java    | 10 +++++-----
 .../biojava/nbio/core/sequence/RNASequenceTest.java    |  7 +++++++
 .../org/biojava/nbio/core/sequence/TaxonomyIDTest.java |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/sequence/RNASequenceTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/RNASequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/RNASequence.java
index e44e884552..a3e706716b 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/RNASequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/RNASequence.java
@@ -72,7 +72,7 @@ public RNASequence(String seqString, CompoundSet<NucleotideCompound> compoundSet
 	}
 
 	/**
-	 * Create a RNA sequence from a proxy reader and user defined RNA compound set
+	 * Create a RNA sequence from a proxy reader and user-defined RNA compound set
 	 * @param proxyLoader
 	 * @param compoundSet
 	 */
@@ -86,7 +86,7 @@ public RNASequence(ProxySequenceReader<NucleotideCompound> proxyLoader,
 	 * @return
 	 */
 	public SequenceView<NucleotideCompound> getReverseComplement() {
-		return new ComplementSequenceView<NucleotideCompound>(getInverse());
+		return new ComplementSequenceView<>(getInverse());
 	}
 
 	/**
@@ -97,7 +97,7 @@ public SequenceView<NucleotideCompound> getReverseComplement() {
 	 */
 	@Override
 public SequenceView<NucleotideCompound> getInverse() {
-		return new ReversedSequenceView<NucleotideCompound>(this);
+		return new ReversedSequenceView<>(this);
 	}
 
 	/**
@@ -105,7 +105,7 @@ public SequenceView<NucleotideCompound> getInverse() {
 	 * @return
 	 */
 	public SequenceView<NucleotideCompound> getComplement() {
-		return new ComplementSequenceView<NucleotideCompound>(this);
+		return new ComplementSequenceView<>(this);
 	}
 
 	/**
@@ -117,7 +117,7 @@ public ProteinSequence getProteinSequence() {
 	}
 
 	/**
-	 * Get the ProteinSequene from the RNA sequence with user defined
+	 * Get the ProteinSequence from the RNA sequence with user-defined
 	 * transcription engine
 	 *
 	 * @param engine
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/RNASequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/RNASequenceTest.java
new file mode 100644
index 0000000000..48e4468d9f
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/RNASequenceTest.java
@@ -0,0 +1,7 @@
+package org.biojava.nbio.core.sequence;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class RNASequenceTest {
+
+}
\ No newline at end of file
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TaxonomyIDTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TaxonomyIDTest.java
index 6185a456bd..916b0ea1c0 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TaxonomyIDTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/TaxonomyIDTest.java
@@ -5,7 +5,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 class TaxonomyIDTest {
-    
+
     @Test
     void createTaxonomyID(){
         TaxonomyID tId = new TaxonomyID("abc1", DataSource.GENBANK);

From 570fdaca28c06b7362d41dc06cf6ab6879670465 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 3 Jan 2022 16:31:17 +0000
Subject: [PATCH 307/599] tidy up RNASeqTest

---
 .../nbio/core/sequence/RNASequenceTest.java   | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/RNASequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/RNASequenceTest.java
index 48e4468d9f..3a04226d31 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/RNASequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/RNASequenceTest.java
@@ -1,7 +1,74 @@
 package org.biojava.nbio.core.sequence;
 
+import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
+import org.biojava.nbio.core.sequence.compound.NucleotideCompound;
+import org.biojava.nbio.core.sequence.template.Compound;
+import org.biojava.nbio.core.sequence.template.SequenceView;
+import org.biojava.nbio.core.sequence.transcription.TranscriptionEngine;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static java.util.stream.Collectors.joining;
 import static org.junit.jupiter.api.Assertions.*;
 
 class RNASequenceTest {
 
+    // AUG start, then 3 AA, then stop codon
+    final String rnaSeq    = "AUGGUCGAACUCUGA";
+    final String rnaSeqCompl = "UACCAGCUUGAGACU";
+    final String rnaSeqReversed = "AGUCUCAAGCUGGUA";
+    final String rnaSeqReversedComplement = "UCAGAGUUCGACCAU";
+    RNASequence rna;
+    @BeforeEach
+    void before() throws CompoundNotFoundException {
+        rna = new RNASequence(rnaSeq);
+    }
+
+    @Test
+    void translateToProteinSequence()  {
+        ProteinSequence protein =  rna.getProteinSequence(TranscriptionEngine.getDefault());
+        assertEquals(4, protein.getLength());
+        assertEquals("MVEL", protein.getSequenceAsString());
+    }
+
+    @Test
+    void complement()  {
+        SequenceView<NucleotideCompound> complement = rna.getComplement();
+        assertEquals(rnaSeqCompl, complement.getSequenceAsString());
+        assertEquals(rnaSeq, complement.getViewedSequence().getSequenceAsString());
+        assertEquals(rna.getLength(), complement.getLength());
+    }
+
+    @Test
+    void reverse()  {
+        SequenceView<NucleotideCompound> reversed = rna.getInverse();
+        assertEquals(rnaSeqReversed, reversed.getSequenceAsString());
+        assertEquals(rnaSeq, reversed.getViewedSequence().getSequenceAsString());
+        assertEquals(rna.getLength(), reversed.getLength());
+    }
+
+    @Test
+    void reverseComplement()  {
+        SequenceView<NucleotideCompound> reverseComplement = rna.getReverseComplement();
+        assertEquals(rnaSeqReversedComplement, reverseComplement.getSequenceAsString());
+        assertEquals(rna.getLength(), reverseComplement.getLength());
+        StringBuilder sb = new StringBuilder();
+        for (int i = 1; i <= rna.getLength(); i++) {
+            sb.append(reverseComplement.getCompoundAt(i).toString());
+        }
+        assertEquals(rnaSeqReversedComplement, sb.toString());
+
+        sb = new StringBuilder();
+        for (Compound c: reverseComplement) {
+            sb.append(c.toString());
+        }
+        assertEquals(rnaSeqReversedComplement, sb.toString());
+        assertEquals(rnaSeqReversedComplement, reverseComplement.getAsList().stream().map(Compound::toString).collect(joining("")));
+    }
+
+    @Test
+    void rejectThymineInSequence()  {
+        String dna = rnaSeq.replaceAll("U", "T");
+        assertThrows(CompoundNotFoundException.class, ()->new RNASequence(dna));
+    }
+
 }
\ No newline at end of file

From 4b33b8ff58ab9d16b8cc102ae82f314bf9d530bb Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 3 Jan 2022 16:33:50 +0000
Subject: [PATCH 308/599] remove duplicate generics

---
 .../nbio/core/sequence/MultipleSequenceAlignmentTest.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignmentTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignmentTest.java
index 20acfc2cd2..ea922decf6 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignmentTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignmentTest.java
@@ -43,11 +43,11 @@ public class MultipleSequenceAlignmentTest {
 
 	@Before
 	public void setup() throws CompoundNotFoundException {
-		msaProteins = new MultipleSequenceAlignment<ProteinSequence, AminoAcidCompound>();
+		msaProteins = new MultipleSequenceAlignment<>();
 		for (int i = 0; i < 8; i++) {
 			msaProteins.addAlignedSequence(new ProteinSequence("ARNDCEQGHILKMFPSTWYVBZJX"));
 		}
-		msaDNA = new MultipleSequenceAlignment<DNASequence, NucleotideCompound>();
+		msaDNA = new MultipleSequenceAlignment<>();
 		for (int i = 0; i < 7; i++) {
 			msaDNA.addAlignedSequence(new DNASequence("ATCGATCGATCGATCG"));
 		}
@@ -56,13 +56,13 @@ public void setup() throws CompoundNotFoundException {
 	@Test
 	public void testGetCompoundsAt() {
 		AminoAcidCompound aminoAcid = AminoAcidCompoundSet.getAminoAcidCompoundSet().getCompoundForString("N");
-		List<AminoAcidCompound> colProteins = new ArrayList<AminoAcidCompound>();
+		List<AminoAcidCompound> colProteins = new ArrayList<>();
 		for (int i = 0; i < 8; i++) {
 			colProteins.add(aminoAcid);
 		}
 		assertEquals(msaProteins.getCompoundsAt(3), colProteins);
 		NucleotideCompound nucleotide = DNACompoundSet.getDNACompoundSet().getCompoundForString("C");
-		List<NucleotideCompound> colDNA = new ArrayList<NucleotideCompound>();
+		List<NucleotideCompound> colDNA = new ArrayList<>();
 		for (int i = 0; i < 7; i++) {
 			colDNA.add(nucleotide);
 		}

From 940128b2d88eee7b892c5d116de02673977d9105 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Sat, 1 Jan 2022 17:33:56 +0800
Subject: [PATCH 309/599] proper format of floating point (double) variable.

---
 .../org/biojava/nbio/structure/domain/pdp/ClusterDomains.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java
index 46a5243416..29fd0b6d21 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java
@@ -186,7 +186,7 @@ else if (maximum_values > PDPParameters.CUT_OFF_VALUE1S) {
 				if(verbose) listdomains(domains);
 			}
 			else {
-				if(verbose) System.out.printf(" Maximum value is less than cut off value. (max:%d)%n", maximum_value);
+				if(verbose) System.out.printf(" Maximum value is less than cut off value. (max:%f)%n", maximum_value);
 				maximum_value = -1.0;
 				maximum_values = -1.0;
 				maximum_valuem = -1.0;

From 3c045a73c9a80af6dfa69008a1499383ed264859 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 3 Jan 2022 18:27:49 +0000
Subject: [PATCH 310/599] test MSA

---
 .../sequence/MultipleSequenceAlignment.java   |  2 +-
 .../MultipleSequenceAlignmentTest.java        | 66 ++++++++++++++++---
 .../nbio/core/sequence/SequenceTestUtils.java |  3 +-
 3 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignment.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignment.java
index 1ab060d23e..6633cd717a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignment.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignment.java
@@ -180,7 +180,7 @@ public String toString() {
 	// helper methods
 
 	/**
-	 * Helper method that does all the formating work
+	 * Helper method that does all the formatting work
 	 * @param width
 	 * @param header
 	 * @param idFormat
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignmentTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignmentTest.java
index ea922decf6..43390fa3a7 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignmentTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignmentTest.java
@@ -28,24 +28,34 @@
 import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
 import org.biojava.nbio.core.sequence.compound.DNACompoundSet;
 import org.biojava.nbio.core.sequence.compound.NucleotideCompound;
-import org.junit.Before;
-import org.junit.Test;
+import org.biojava.nbio.core.sequence.template.LightweightProfile;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class MultipleSequenceAlignmentTest {
+
+class MultipleSequenceAlignmentTest {
 
 	private MultipleSequenceAlignment<ProteinSequence, AminoAcidCompound> msaProteins;
 	private MultipleSequenceAlignment<DNASequence,NucleotideCompound> msaDNA;
 
-	@Before
-	public void setup() throws CompoundNotFoundException {
+	private static final String aaSeq = "ARNDCEQGHILKMFPSTWYVBZJX";
+	@BeforeEach
+	 void setup() throws CompoundNotFoundException {
 		msaProteins = new MultipleSequenceAlignment<>();
 		for (int i = 0; i < 8; i++) {
-			msaProteins.addAlignedSequence(new ProteinSequence("ARNDCEQGHILKMFPSTWYVBZJX"));
+			ProteinSequence ps = new ProteinSequence(aaSeq);
+			ps.setAccession(new AccessionID(i+""));
+			msaProteins.addAlignedSequence(ps);
 		}
 		msaDNA = new MultipleSequenceAlignment<>();
 		for (int i = 0; i < 7; i++) {
@@ -54,7 +64,46 @@ public void setup() throws CompoundNotFoundException {
 	}
 
 	@Test
-	public void testGetCompoundsAt() {
+	void allSequencesMustBeSameLength() throws CompoundNotFoundException {
+		ProteinSequence differentLength = new ProteinSequence("ARNDC");
+		assertThrows(IllegalArgumentException.class, ()->msaProteins.addAlignedSequence(differentLength));
+	}
+
+	@Test
+	void addRemoveAlignments() throws CompoundNotFoundException {
+		assertEquals(8, msaProteins.getSize());
+		assertEquals(8, msaProteins.getAlignedSequences().size());
+		assertEquals(aaSeq.length(), msaProteins.getLength());
+		msaProteins.removeAlignedSequence(new ProteinSequence(aaSeq));
+		assertEquals(7, msaProteins.getSize());
+		assertEquals(7, msaProteins.getAlignedSequences().size());
+	}
+
+	@ParameterizedTest
+	@EnumSource(LightweightProfile.StringFormat.class)
+	void formattedAlignmentToString(LightweightProfile.StringFormat format){
+		String formatted = msaProteins.toString(format);
+		assertTrue(formatted.length() > 0);
+	}
+
+	@Test
+	void alignmentToBasicString(){
+		String alnStr = msaProteins.toString();
+		String [] lines  = alnStr.split(System.lineSeparator());
+		assertEquals(8, lines.length);
+
+		//lines all same length
+		Set<Integer> collect = Arrays.stream(lines).map(String::length).collect(Collectors.toSet());
+		assertEquals(1, collect.size());
+	}
+	@Test
+	void alignmentToWidth() {
+		String alnStr = msaProteins.toString(10);
+		assertEquals(29, alnStr.split(System.lineSeparator()).length);
+	}
+
+	@Test
+	 void testGetCompoundsAt() {
 		AminoAcidCompound aminoAcid = AminoAcidCompoundSet.getAminoAcidCompoundSet().getCompoundForString("N");
 		List<AminoAcidCompound> colProteins = new ArrayList<>();
 		for (int i = 0; i < 8; i++) {
@@ -69,4 +118,5 @@ public void testGetCompoundsAt() {
 		assertEquals(msaDNA.getCompoundsAt(3), colDNA);
 	}
 
+
 }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/SequenceTestUtils.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/SequenceTestUtils.java
index ba42443e05..5db188372c 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/SequenceTestUtils.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/SequenceTestUtils.java
@@ -15,8 +15,7 @@ public class SequenceTestUtils {
      */
     static GeneSequence anyGeneSequence() throws CompoundNotFoundException {
         ChromosomeSequence chr = new ChromosomeSequence(ChromosomeSequenceTest.CHROMOSOME_SEQ);
-        GeneSequence gene = new GeneSequence(chr, new AccessionID("someGeneId"), 10, 200, Strand.POSITIVE);
-        return gene;
+        return new GeneSequence(chr, new AccessionID("someGeneId"), 10, 200, Strand.POSITIVE);
     }
 
     /**

From 9e44b2425dc48e1e7d75609e4773f16422ad8ac8 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Sun, 2 Jan 2022 17:03:33 +0000
Subject: [PATCH 311/599] fixes #1008

---
 .../biojava/nbio/core/util/SequenceTools.java | 18 +++--------------
 .../nbio/core/util/SequenceToolsTest.java     | 20 +++----------------
 2 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java
index 61f7e44135..a7c7b3a398 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java
@@ -35,28 +35,16 @@ public class SequenceTools {
 	 * @param n The number of characters to permute by; can be positive or negative; values greater than the length of the array are acceptable
 	 */
 	public static String permuteCyclic(String string, int n) {
-		// single letters are char[]; full names are Character[]
-		Character[] permuted = new Character[string.length()];
-		char[] c = string.toCharArray();
-		Character[] charArray = new Character[c.length];
-		for (int i = 0; i < c.length; i++) {
-			charArray[i] = c[i];
-		}
-		permuteCyclic(charArray, permuted, n);
-		char[] p = new char[permuted.length];
-		for (int i = 0; i < p.length; i++) {
-			p[i] = permuted[i];
-		}
-		return String.valueOf(p);
+		return permuteCyclic2(string, n);
 	}
 
-	/**
+	/*
 	 * Improved implementation that is generally 10-100x faster, and fixes some edge-case bugs.
 	 * @param string The string to permute
 	 * @param n The number of characters to permute by; can be positive or negative; values greater than the length of the array are acceptable
 	 * @return
 	 */
-	public static String permuteCyclic2(String string, int n) {
+	private static String permuteCyclic2(String string, int n) {
 		String toMutate = string + string;
 		n = n % string.length();
 		if (n < 0) {
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/SequenceToolsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/SequenceToolsTest.java
index 420e574c28..eda9eacdea 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/SequenceToolsTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/SequenceToolsTest.java
@@ -57,25 +57,11 @@ void permuteCycleIntMaxMin(String original, String expected) {
 		@DisplayName("Edge case fixed")
 		void permuteCycleIntMaxMin2(String original, String expected) {
 			assertAll(
-					()->assertEquals(expected, SequenceTools.permuteCyclic2(original, Integer.MAX_VALUE)),
-					()->assertEquals(expected, SequenceTools.permuteCyclic2(original, Integer.MIN_VALUE))
+					()->assertEquals(expected, SequenceTools.permuteCyclic(original, Integer.MAX_VALUE)),
+					()->assertEquals(expected, SequenceTools.permuteCyclic(original, Integer.MIN_VALUE))
 				);
 		}
-		
-		@Test
-		void permuteCyclicPerformance() {
-			String dna = randomDNA(10_000_000);
-			long start = System.currentTimeMillis();
-			String rotated = SequenceTools.permuteCyclic(dna, 5_000_000);
-			long end = System.currentTimeMillis();
-			System.err.println(end-start);
-			
-			long start2 = System.currentTimeMillis();
-			String rotated2 = SequenceTools.permuteCyclic2(dna, 5_000_000);
-			long end2 = System.currentTimeMillis();
-			System.err.println(end2-start2);
-			assertTrue((end-start)/(end2-start2) > 5);
-		}
+
 	}
 
 	@Nested

From 0df9ccac2cc2348bf48a3b09a382da4b8004cca2 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Mon, 3 Jan 2022 18:38:54 +0000
Subject: [PATCH 312/599] address PR comment

---
 .../java/org/biojava/nbio/core/util/SequenceTools.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java
index a7c7b3a398..f23467126b 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/SequenceTools.java
@@ -35,16 +35,6 @@ public class SequenceTools {
 	 * @param n The number of characters to permute by; can be positive or negative; values greater than the length of the array are acceptable
 	 */
 	public static String permuteCyclic(String string, int n) {
-		return permuteCyclic2(string, n);
-	}
-
-	/*
-	 * Improved implementation that is generally 10-100x faster, and fixes some edge-case bugs.
-	 * @param string The string to permute
-	 * @param n The number of characters to permute by; can be positive or negative; values greater than the length of the array are acceptable
-	 * @return
-	 */
-	private static String permuteCyclic2(String string, int n) {
 		String toMutate = string + string;
 		n = n % string.length();
 		if (n < 0) {

From 4b6ea4943dbc8ffe3d12dbda7618f51cae6d2425 Mon Sep 17 00:00:00 2001
From: richard <ra22597@gmail.com>
Date: Tue, 4 Jan 2022 11:49:49 +0000
Subject: [PATCH 313/599] fix typo in filename

---
 biojava-ontology/src/main/java/demo/ParseGO.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-ontology/src/main/java/demo/ParseGO.java b/biojava-ontology/src/main/java/demo/ParseGO.java
index cbe72b50e0..e0209dcfe2 100644
--- a/biojava-ontology/src/main/java/demo/ParseGO.java
+++ b/biojava-ontology/src/main/java/demo/ParseGO.java
@@ -49,7 +49,7 @@ public class ParseGO {
 	public static void main(String[] args) {
 
 		OboParser parser = new OboParser();
-		try (InputStream inStream = OboParser.class.getResourceAsStream("/ontology/bio sapiens.obo");
+		try (InputStream inStream = OboParser.class.getResourceAsStream("/ontology/biosapiens.obo");
 				BufferedReader oboFile = new BufferedReader(new InputStreamReader(inStream))) {
 			Ontology ontology = parser.parseOBO(oboFile, "BioSapiens", "the BioSapiens ontology");
 			Set<Term> keys = ontology.getTerms();

From d7e2b0ffd92e7119636ad0d202742ece3f76ebdd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jan 2022 16:30:47 +0000
Subject: [PATCH 314/599] Bump log4j-core from 2.17.0 to 2.17.1

Bumps log4j-core from 2.17.0 to 2.17.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cd1b67cd88..4709b2a7c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 		<maxmem>512M</maxmem>
 		<mmtf.version>1.0.10</mmtf.version>
 		<slf4j.version>1.7.30</slf4j.version>
-		<log4j.version>2.17.0</log4j.version>
+		<log4j.version>2.17.1</log4j.version>
 		<junit-jupiter.version>5.7.2</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>
 		<ciftools.version>3.0.0</ciftools.version>

From 00d0c67137f3d681e436b97e872f977e5cb0158c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Jan 2022 16:30:57 +0000
Subject: [PATCH 315/599] Bump log4j-api from 2.17.0 to 2.17.1

Bumps log4j-api from 2.17.0 to 2.17.1.

---
updated-dependencies:
- dependency-name: org.apache.logging.log4j:log4j-api
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cd1b67cd88..4709b2a7c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 		<maxmem>512M</maxmem>
 		<mmtf.version>1.0.10</mmtf.version>
 		<slf4j.version>1.7.30</slf4j.version>
-		<log4j.version>2.17.0</log4j.version>
+		<log4j.version>2.17.1</log4j.version>
 		<junit-jupiter.version>5.7.2</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>
 		<ciftools.version>3.0.0</ciftools.version>

From 6445a870dd891c67d525e63049884c9dfb63d234 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 4 Jan 2022 21:25:52 -0800
Subject: [PATCH 316/599] [maven-release-plugin] prepare release biojava-6.0.4

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 07d46c4c80..ceb1082b79 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4-SNAPSHOT</version>
+		<version>6.0.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 2148e57e3e..8544405ca3 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4-SNAPSHOT</version>
+		<version>6.0.4</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index aab20d6456..3d3dc6646b 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4-SNAPSHOT</version>
+		<version>6.0.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 15ef26743e..d96cf1d427 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4-SNAPSHOT</version>
+		<version>6.0.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 9be1d0b797..fd1387f0b7 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.4-SNAPSHOT</version>
+    <version>6.0.4</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.4-SNAPSHOT</version>
+    	<version>6.0.4</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 3d48a572bb..db99e09d26 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4-SNAPSHOT</version>
+		<version>6.0.4</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 5a3c79099f..78c62cffb3 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.4-SNAPSHOT</version>
+    <version>6.0.4</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index a4c8e97ded..023383dd6b 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4-SNAPSHOT</version>
+		<version>6.0.4</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 559dc71c45..aa95715fd4 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4-SNAPSHOT</version>
+		<version>6.0.4</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index dba36436e1..b6f3a924b1 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.4-SNAPSHOT</version>
+		<version>6.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index ee1610a2e3..eff473b3ec 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4-SNAPSHOT</version>
+		<version>6.0.4</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index a949df5e78..ebf69ef8e0 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.4-SNAPSHOT</version>
+        <version>6.0.4</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index e78bd878b3..92021a07ea 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4-SNAPSHOT</version>
+		<version>6.0.4</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4-SNAPSHOT</version>
+			<version>6.0.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 4709b2a7c9..4fd457478d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.4-SNAPSHOT</version>
+	<version>6.0.4</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.4</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From ed83fb717cfdeade51b4320ef7bb7973dd30565c Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 4 Jan 2022 21:25:55 -0800
Subject: [PATCH 317/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index ceb1082b79..0e88a40ae6 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4</version>
+		<version>6.0.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 8544405ca3..bb0a7d414b 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4</version>
+		<version>6.0.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 3d3dc6646b..887588dfdf 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4</version>
+		<version>6.0.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index d96cf1d427..c24dc88be0 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4</version>
+		<version>6.0.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index fd1387f0b7..d49bab5837 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.4</version>
+    <version>6.0.5-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.4</version>
+    	<version>6.0.5-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index db99e09d26..9715ab2f7a 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4</version>
+		<version>6.0.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 78c62cffb3..880fa885a9 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.4</version>
+    <version>6.0.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 023383dd6b..a557230e90 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4</version>
+		<version>6.0.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index aa95715fd4..f619227e95 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4</version>
+		<version>6.0.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index b6f3a924b1..fc54992dbc 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.4</version>
+		<version>6.0.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index eff473b3ec..79427a27af 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4</version>
+		<version>6.0.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index ebf69ef8e0..a64fd367ca 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.4</version>
+        <version>6.0.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 92021a07ea..c98e9138bd 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.4</version>
+		<version>6.0.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.4</version>
+			<version>6.0.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 4fd457478d..57bdf239d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.4</version>
+	<version>6.0.5-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.4</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From f5791b64f8ca79d1738f69494bb3c9d0bbe3b76e Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 4 Jan 2022 21:38:35 -0800
Subject: [PATCH 318/599] Updating after release

---
 CHANGELOG.md | 8 ++++++++
 README.md    | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4902f2258b..02628a85cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 BioJava Changelog
 -----------------
 
+BioJava 6.0.4
+==============================
+### Fixed
+* Log4j dependency upgraded to 2.17.1 to avoid new vulnerabilities
+* Some new tests
+* Fixes in tests and docs
+* Bugfix in LocalProteinDomainParser #1009 
+
 BioJava 6.0.3
 ==============================
 ### Fixed
diff --git a/README.md b/README.md
index 4373692630..48efdeab0a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-6.0.3-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.3) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-6.0.4-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.4) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From c84cf73c23e63f6e742227f31324218a89d6c5cc Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 31 Jan 2022 15:23:06 -0800
Subject: [PATCH 319/599] Handling some nulls in PdbId creation, #1019

---
 .../org/biojava/nbio/structure/SubstructureIdentifier.java  | 4 ++--
 .../main/java/org/biojava/nbio/structure/URLIdentifier.java | 6 +++++-
 .../biojava/nbio/structure/io/mmtf/MmtfStructureReader.java | 4 +++-
 .../java/org/biojava/nbio/structure/scop/ScopDomain.java    | 6 ++++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
index aa1d246b33..44f799cac0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
@@ -117,8 +117,8 @@ public SubstructureIdentifier(String id) {
 	 * Create a new identifier based on a set of ranges.
 	 *
 	 * If ranges is empty, includes all residues.
-	 * @param pdbId
-	 * @param ranges
+	 * @param pdbId a pdb id, can't be null
+	 * @param ranges the ranges
 	 */
 	public SubstructureIdentifier(String pdbId, List<ResidueRange> ranges) {
 		this(new PdbId(pdbId), ranges);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
index 189dc3c5de..1864bcde31 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
@@ -122,7 +122,11 @@ public SubstructureIdentifier toCanonical() throws StructureException{
 			String path = url.getPath();
 			pdbId = guessPDBID(path.substring(path.lastIndexOf("/") + 1));
 		}
-		return new SubstructureIdentifier(new PdbId(pdbId), ranges);
+		PdbId pdbIdObj = null;
+		if (pdbId != null) {
+			pdbIdObj = new PdbId(pdbId);
+		}
+		return new SubstructureIdentifier(pdbIdObj, ranges);
 	}
 
 	@Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
index e3975463ec..c2830c1685 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
@@ -167,7 +167,9 @@ public void finalizeStructure() {
 	@Override
 	public void initStructure(int totalNumBonds, int totalNumAtoms, int totalNumGroups,
 			int totalNumChains, int totalNumModels, String modelId) {
-		structure.setPdbId(new PdbId(modelId));
+		if (modelId != null) {
+			structure.setPdbId(new PdbId(modelId));
+		}
 		allAtoms = new Atom[totalNumAtoms];
 	}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java
index d9b926afbb..7d1446cb9d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java
@@ -138,8 +138,10 @@ public PdbId getPdbId() {
 	 */
 	@Deprecated
 	public void setPdbId(String pdbId) {
-		if(pdbId == null) this.pdbId = null;
-		this.pdbId = new PdbId(pdbId);
+		if (pdbId == null)
+			this.pdbId = null;
+		else
+			this.pdbId = new PdbId(pdbId);
 	}
 
 	

From 93d299c7ca2aa51769585d0b3d7f60afd3d08461 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 31 Jan 2022 16:29:31 -0800
Subject: [PATCH 320/599] More readable

---
 .../main/java/org/biojava/nbio/structure/URLIdentifier.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
index 1864bcde31..de50af7907 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
@@ -122,11 +122,7 @@ public SubstructureIdentifier toCanonical() throws StructureException{
 			String path = url.getPath();
 			pdbId = guessPDBID(path.substring(path.lastIndexOf("/") + 1));
 		}
-		PdbId pdbIdObj = null;
-		if (pdbId != null) {
-			pdbIdObj = new PdbId(pdbId);
-		}
-		return new SubstructureIdentifier(pdbIdObj, ranges);
+		return new SubstructureIdentifier((pdbId==null?null:new PdbId(pdbId)), ranges);
 	}
 
 	@Override

From 0fe0e262459971dcfa4f24c8f69a18ac6824b621 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 31 Jan 2022 21:40:46 -0800
Subject: [PATCH 321/599] Make sure there's no ambiguity in constructor to call

---
 .../src/main/java/org/biojava/nbio/structure/URLIdentifier.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
index de50af7907..796362809f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
@@ -122,7 +122,7 @@ public SubstructureIdentifier toCanonical() throws StructureException{
 			String path = url.getPath();
 			pdbId = guessPDBID(path.substring(path.lastIndexOf("/") + 1));
 		}
-		return new SubstructureIdentifier((pdbId==null?null:new PdbId(pdbId)), ranges);
+		return new SubstructureIdentifier((pdbId==null?(PdbId)null:new PdbId(pdbId)), ranges);
 	}
 
 	@Override

From 0e47572ab6b66bf21f074edbe16c793eb775c6fe Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 1 Feb 2022 09:16:03 -0800
Subject: [PATCH 322/599] Removing a utility tool that was really internal to
 biojava, but that was using external resources that are now gone. Also
 removed some tests that were using external resources.

---
 .../twobit/SimpleTwoBitFileProvider.java      |  90 -----
 .../genome/parsers/twobit/TwoBitFacade.java   |   9 +-
 .../genome/util/ChromosomeMappingTools.java   |  18 +-
 .../nbio/genome/TestGenomeMapping.java        | 327 +-----------------
 4 files changed, 29 insertions(+), 415 deletions(-)
 delete mode 100644 biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/SimpleTwoBitFileProvider.java

diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/SimpleTwoBitFileProvider.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/SimpleTwoBitFileProvider.java
deleted file mode 100644
index b587a5950f..0000000000
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/SimpleTwoBitFileProvider.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.genome.parsers.twobit;
-
-import org.biojava.nbio.core.util.FileDownloadUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-/**
- * Created by yana on 4/4/17.
- */
-public class SimpleTwoBitFileProvider {
-	private static final Logger logger = LoggerFactory.getLogger(SimpleTwoBitFileProvider.class);
-
-	public static synchronized void downloadIfNoTwoBitFileExists(File twoBitFileLocalLocation, String genomeAssembly) throws IOException {
-
-		if ( ! twoBitFileLocalLocation.exists() ) {
-
-			// download to a temporary file
-			File tmp = File.createTempFile(genomeAssembly,".2bit");
-			URL twoBitFileURL = getTwoBitURL(genomeAssembly);
-
-			logger.info("downloading " + twoBitFileURL + " to " + tmp.getAbsolutePath());
-
-			// 2bit files are large and take a while to download
-			FileDownloadUtils.downloadFile(twoBitFileURL, tmp);
-
-			// check the parent directory exists
-
-			Path p = Paths.get(twoBitFileLocalLocation.getAbsolutePath());
-
-			Path dir = p.getParent();
-			if (! Files.exists(dir)) {
-				Files.createDirectories(dir);
-			}
-
-			logger.info("renaming " + tmp.getAbsolutePath() +" to " + twoBitFileLocalLocation.getAbsolutePath());
-			// after the download rename
-			tmp.renameTo(twoBitFileLocalLocation);
-
-		}
-	}
-
-	public static URL getTwoBitURL(String genomeAssembly) throws MalformedURLException {
-
-		String url="";
-		if (genomeAssembly.equals("hg19") || genomeAssembly.equals("hg37") ) {
-			url = "http://cdn.rcsb.org/gene/hg37/hg19.2bit";
-		}
-		else if (genomeAssembly.equals("hg38")) {
-			url = "http://cdn.rcsb.org/gene/hg38/hg38.2bit";
-		}
-		return new URL(url);
-	}
-
-	public static void main(String[] args){
-		try {
-			downloadIfNoTwoBitFileExists(new File("/Users/yana/spark/2bit/hg38.2bit"),"hg38");
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-}
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitFacade.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitFacade.java
index 71dfc4174f..1cbafc91fc 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitFacade.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitFacade.java
@@ -22,7 +22,8 @@
 
 import java.io.File;
 
-/** A facade that makes it easier to work with a 2bit file.
+/**
+ * A facade that makes it easier to work with a 2bit file.
  *
  * Created by yana on 3/27/17.
  */
@@ -49,7 +50,8 @@ public void close() throws Exception {
 
 	}
 
-	/** Sets a chromosome for TwoBitParser.
+	/**
+	 * Sets a chromosome for TwoBitParser.
 	 *
 	 * @param chr The chromosome name (e.g. chr21)
 	 */
@@ -67,7 +69,8 @@ public void setChromosome(String chr) throws Exception {
 		}
 	}
 
-	/** Extract a sequence from a chromosome, using chromosomal coordinates
+	/**
+	 * Extract a sequence from a chromosome, using chromosomal coordinates
 	 *
 	 * @param chromosomeName
 	 * @param start
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/util/ChromosomeMappingTools.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/util/ChromosomeMappingTools.java
index a63a78a236..8d7030f3d4 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/util/ChromosomeMappingTools.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/util/ChromosomeMappingTools.java
@@ -899,8 +899,8 @@ public static int getCDSPosReverse(int chromPos, List<Integer> exonStarts, List<
 	public static List<Range<Integer>> getCDSRegions(List<Integer> origExonStarts, List<Integer> origExonEnds, int cdsStart, int cdsEnd) {
 
 		// remove exons that are fully landed in UTRs
-		List<Integer> exonStarts = new ArrayList<Integer>(origExonStarts);
-		List<Integer> exonEnds = new ArrayList<Integer>(origExonEnds);
+		List<Integer> exonStarts = new ArrayList<>(origExonStarts);
+		List<Integer> exonEnds = new ArrayList<>(origExonEnds);
 
 		int j=0;
 		for (int i = 0; i < origExonStarts.size(); i++) {
@@ -920,7 +920,7 @@ public static List<Range<Integer>> getCDSRegions(List<Integer> origExonStarts, L
 		exonEnds.remove(nExons-1);
 		exonEnds.add(cdsEnd);
 
-		List<Range<Integer>> cdsRegion = new ArrayList<Range<Integer>>();
+		List<Range<Integer>> cdsRegion = new ArrayList<>();
 		for ( int i=0; i<nExons; i++ ) {
 			Range<Integer> r = Range.closed(exonStarts.get(i), exonEnds.get(i));
 			cdsRegion.add(r);
@@ -956,17 +956,17 @@ public static DNASequence getTranscriptDNASequence(TwoBitFacade twoBitFacade, St
 
 		List<Range<Integer>> cdsRegion = getCDSRegions(exonStarts, exonEnds, cdsStart, cdsEnd);
 
-		String dnaSequence = "";
+		StringBuilder dnaSequence = new StringBuilder();
 		for (Range<Integer> range : cdsRegion) {
 			String exonSequence = twoBitFacade.getSequence(chromosome,range.lowerEndpoint(), range.upperEndpoint());
-			dnaSequence += exonSequence;
+			dnaSequence.append(exonSequence);
 		}
 		if (orientation.equals('-')) {
-			dnaSequence = new StringBuilder(dnaSequence).reverse().toString();
-			DNASequence dna = new DNASequence(dnaSequence);
+			dnaSequence = new StringBuilder(new StringBuilder(dnaSequence.toString()).reverse().toString());
+			DNASequence dna = new DNASequence(dnaSequence.toString());
 			SequenceView<NucleotideCompound> compliment = dna.getComplement();
-			dnaSequence = compliment.getSequenceAsString();
+			dnaSequence = new StringBuilder(compliment.getSequenceAsString());
 		}
-		return new DNASequence(dnaSequence.toUpperCase());
+		return new DNASequence(dnaSequence.toString().toUpperCase());
 	}
 }
diff --git a/biojava-genome/src/test/java/org/biojava/nbio/genome/TestGenomeMapping.java b/biojava-genome/src/test/java/org/biojava/nbio/genome/TestGenomeMapping.java
index c8c20780f1..4999cfa6fb 100644
--- a/biojava-genome/src/test/java/org/biojava/nbio/genome/TestGenomeMapping.java
+++ b/biojava-genome/src/test/java/org/biojava/nbio/genome/TestGenomeMapping.java
@@ -20,355 +20,56 @@
  */
 package org.biojava.nbio.genome;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Range;
-import org.biojava.nbio.genome.parsers.genename.GeneChromosomePosition;
-import org.biojava.nbio.genome.parsers.genename.GeneChromosomePositionParser;
 import org.biojava.nbio.genome.util.ChromosomeMappingTools;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
-import java.io.InputStream;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.zip.GZIPInputStream;
 
 /**
  * Created by andreas on 7/19/16.
  */
 public class TestGenomeMapping {
 
-	private static final String geneChromosomeFile = "https://cdn.rcsb.org/gene/hg38/geneChromosome38.tsf.gz";
-
-	private List<GeneChromosomePosition> gcps = null;
-
-	@Before
-	public void setUp() throws Exception {
-		InputStream input = new GZIPInputStream(new URL(geneChromosomeFile).openStream());
-		gcps = GeneChromosomePositionParser.getChromosomeMappings(input);
-	}
-
-	@Test
-	public void testAK1() {
-		String geneName = "AK1";
-
-		Assert.assertNotNull(gcps);
-		Assert.assertTrue("Problems with downloading refFlat file from UCSC browser ", gcps.size() > 100);
-
-		int uniProtLength = 194;
-
-		try {
-
-			for (GeneChromosomePosition pos : gcps) {
-
-				//System.out.println(pos.getGeneName());
-				if (!pos.getGeneName().equals(geneName))
-					continue;
-
-				/// there are three alternative transcripts for AK1.
-				// we are just testing one here:
-
-				if ( ! pos.getGenebankId().equals("NM_000476"))
-					continue;
-
-				Assert.assertTrue(pos.getGeneName().equals(geneName));
-				Assert.assertTrue(pos.getOrientation().equals('-'));
-				Assert.assertTrue(pos.getChromosome().equals("chr9"));
-
-				List<Range<Integer>> cdsranges = ChromosomeMappingTools.getCDSExonRanges(pos);
-
-				validateExon(0,0,7, cdsranges  );
-				validateExon(1,7,43, cdsranges  );
-				validateExon(2,43,207, cdsranges  );
-				validateExon(3,207,324, cdsranges  );
-				validateExon(4,324,516, cdsranges  );
-				validateExon(5,516,585, cdsranges  );
-
-
-				int cdslength = ChromosomeMappingTools.getCDSLength(pos);
-
-				Assert.assertTrue("CDS length should be 582, but is " + cdslength, cdslength == (uniProtLength * 3));
-
-				List<Range<Integer>> chromranges = ChromosomeMappingTools.getChromosomalRangesForCDS(pos);
-
-				// we are reverse strand. reverse the order
-				chromranges = Lists.reverse(chromranges);
-
-				Assert.assertTrue(chromranges.size() == 6);
-
-				// compare with https://www.ncbi.nlm.nih.gov/CCDS/CcdsBrowse.cgi?REQUEST=CCDS&DATA=CCDS6881
-				validateExon(0,127868008,127868076, chromranges  );
-				validateExon(1,127868320,127868512, chromranges  );
-				validateExon(2,127871822,127871939, chromranges  );
-				validateExon(3,127872689,127872853, chromranges  );
-				validateExon(4,127873025,127873061, chromranges  );
-				validateExon(5,127874610,127874617, chromranges  );
-
-			}
-		} catch (Exception e) {
-			Assert.fail(e.getMessage());
-		}
-	}
-
-	@Test
-	public void testHBA(){
-
-		String geneName = "HBA1";
-		Assert.assertNotNull(gcps);
-
-		Assert.assertTrue("Problems with downloading refFlat file from UCSC browser ", gcps.size() > 100);
-
-		try {
-
-			for ( GeneChromosomePosition pos : gcps){
-
-				//System.out.println(pos.getGeneName());
-				if ( ! pos.getGeneName().equals(geneName))
-					continue;
-
-				Assert.assertTrue(pos.getGeneName().equals("HBA1"));
-				Assert.assertTrue(pos.getGenebankId().equals("NM_000558"));
-				Assert.assertTrue(pos.getChromosome().equals("chr16"));
-				Assert.assertTrue(pos.getTranscriptionStart().equals(176650));
-				Assert.assertTrue(pos.getTranscriptionEnd().equals(177522));
-				Assert.assertTrue(pos.getOrientation().equals('+'));
-
-				List<Range<Integer>> cdsranges = ChromosomeMappingTools.getCDSExonRanges(pos);
-
-				Assert.assertTrue(cdsranges.size() == 3);
-
-				validateExon(0,0,95,cdsranges);
-				validateExon(1,95,300,cdsranges);
-				validateExon(2,300,429,cdsranges);
-
-
-				List<Range<Integer>> chromranges = ChromosomeMappingTools.getChromosomalRangesForCDS(pos);
-
-				validateExon(0,176716,176811, chromranges  );
-				validateExon(1,176928,177133, chromranges  );
-				validateExon(2,177282,177411, chromranges  );
-
-
-			}
-		} catch (Exception e){
-			Assert.fail(e.getMessage());
-		}
-
-
-	}
-
-	private void validateExon(int exonNr, int start, int stop, List<Range<Integer>> cdsranges) {
-
-		Range<Integer> exon = cdsranges.get(exonNr);
-		Assert.assertTrue("Exon " + exonNr + " boundary " + exon.lowerEndpoint() + " does not match " + start, exon.lowerEndpoint().equals(start));
-		Assert.assertTrue("Exon " + exonNr + " boundary " + exon.upperEndpoint() + " does not match " + stop, exon.upperEndpoint().equals(stop));
-
-	}
-
-	/** Get the position of the nucleotide base corresponding to the position of that base on the mRNA sequence
-	 * for a gene living on the reverse DNA strand.
-	 *
-	 * @author Yana Valasatava
-	 */
-	private int getPositionInmRNA(String geneName, String genebankId, int posChrom) {
-		for (GeneChromosomePosition gcp : gcps) {
-			if ( gcp.getGeneName().equals(geneName) ) {
-				if ( gcp.getGenebankId().equals(genebankId) ) {
-					return ChromosomeMappingTools.getCDSPosForChromosomeCoordinate(posChrom, gcp);
-				}
-			}
-		}
-		return -1;
-	}
-
-	/** Make sure the mapping tool correctly retrieves the mRNA position for a gene
-	 * living on the forward DNA strand for different chromosome positions.
-	 *
-	 * @author Yana Valasatava
-	 */
-	@Test
-	public void testForwardMappingPositions() {
-
-		String geneName = "HORMAD2"; // gene on the forward DNA strand
-		String genebankId = "NM_152510"; // GeneBank ID for the transcript used for testing (ENST00000336726)
-
-		List<String> scenarios = Arrays.asList("first1exon", "last1exon", "last3exon");
-
-		int cds;
-		int posExonStart;
-		int posInmRNA;
-		for (String scenario : scenarios) {
-
-			switch (scenario) {
-
-				case "first1exon":
-			    	posExonStart = 30093953; // ending position of the last exon coding region (on forward strand)
-			    	posInmRNA = 1; // base 1 position in mRNA sequence
-					cds = getPositionInmRNA(geneName, genebankId, posExonStart);
-					Assert.assertEquals(cds, posInmRNA);
-					break;
-
-				case "last1exon":
-			    	posExonStart = 30094003; // starting position of the last exon coding region (on forward strand)
-			    	posInmRNA = 51; // position in mRNA sequence equals to the length of the exon
-					cds = getPositionInmRNA(geneName, genebankId, posExonStart);
-					Assert.assertEquals(cds, posInmRNA);
-					break;
-
-				case "last3exon":
-					posExonStart = 30103500; // starting position of the first base in a coding region (3rd exon)
-					posInmRNA = 257; // position in mRNA sequence equals to the sum length of the 3 last exons
-					cds = getPositionInmRNA(geneName, genebankId, posExonStart);
-					Assert.assertEquals(cds, posInmRNA);
-					break;
-			}
-		}
-	}
-
-	/** Make sure the mapping tool correctly retrieves the mRNA position for a gene
-	 * living on the reverse DNA strand for different chromosome positions.
-	 *
-	 * @author Yana Valasatava
-	 */
-	@Test
-	public void testReverseMappingPositions() {
-
-		String geneName = "BCL11B"; // gene on the reverse DNA strand
-		String genebankId = "NM_138576"; // GeneBank ID for the transcript used for testing (ENST00000357195)
-
-		List<String> scenarios = Arrays.asList("first1exon", "last1exon", "last3exon");
-
-		int cds;
-		int posExonStart;
-		int posInmRNA;
-		for (String scenario : scenarios) {
-
-			switch (scenario) {
-
-				case "first1exon":
-			    	posExonStart = 99271218; // ending position of the last exon coding region (on forward strand)
-			    	posInmRNA = 1; // base 1 position in mRNA sequence
-					cds = getPositionInmRNA(geneName, genebankId, posExonStart);
-					Assert.assertEquals(cds, posInmRNA);
-					break;
-
-				case "last1exon":
-			    	posExonStart = 99271161; // starting position of the last exon coding region (on forward strand)
-			    	posInmRNA = 58; // position in mRNA sequence equals to the length of the exon
-					cds = getPositionInmRNA(geneName, genebankId, posExonStart);
-					Assert.assertEquals(cds, posInmRNA);
-					break;
-
-				case "last3exon":
-					posExonStart = 99231345; // starting position of the first base in a coding region (3rd exon)
-					posInmRNA = 640; // position in mRNA sequence equals to the sum length of the 3 last exons
-					cds = getPositionInmRNA(geneName, genebankId, posExonStart);
-					Assert.assertEquals(cds, posInmRNA);
-					break;
-			}
-		}
-	}
-
-	/** Test to make sure the mapping tool correctly identify that position falls outside the coding region
-	 * for a gene living on the forward DNA strand.
-	 *
-	 * @author Yana Valasatava
-	 */
-	@Test
-	public void testForwardMappingForExonBoundaries() {
-
-		String geneName = "HBA1"; // gene on the reverse DNA strand
-		String genebankId = "NM_000558"; // GeneBank ID for the transcript used for testing (ENST00000320868)
-
-		int posExonStart = 176717; // starting position of the first base in a coding region (1st exon)
-		int posExonEnd = 176811; // ending position of the first base in a coding region (1st exon)
-
-		int cdsSE = getPositionInmRNA(geneName, genebankId, posExonStart-1);
-		Assert.assertEquals(cdsSE, -1);
-
-		int cdsEE = getPositionInmRNA(geneName, genebankId, posExonEnd+1);
-		Assert.assertEquals(cdsEE, -1);
-	}
-
-	/** Test to make sure the mapping tool correctly identify that position falls outside the coding region
-	 * for a gene living on the reverse DNA strand.
-	 *
-	 * @author Yana Valasatava
-	 */
-	@Test
-	public void testReverseMappingForExonBoundaries() {
-
-		String geneName = "BCL11B"; // gene on the reverse DNA strand
-		String genebankId = "NM_138576"; // GeneBank ID for the transcript used for testing (ENST00000357195)
-
-		int posExonStart = 99174151; // starting position of the first base in a coding region (1st exon)
-		int posExonEnd = 99176195; // ending position of the first base in a coding region (1st exon)
-
-		int cdsSE = getPositionInmRNA(geneName, genebankId, posExonStart-1);
-		Assert.assertEquals(cdsSE, -1);
-
-		int cdsEE = getPositionInmRNA(geneName, genebankId, posExonEnd+1);
-		Assert.assertEquals(cdsEE, -1);
-	}
-
-	/** Test to make sure the mapping tool correctly converts the genetic position to a position on mRNA
-	 * when multiple UTR regions are consecutive.
-	 *
-	 * @author Yana Valasatava
-	 */
-	@Test
-	public void testMappingCromosomePosTomRNAMultiUTRs() {
-
-		String geneName = "ILK"; // gene on the reverse DNA strand
-		String genebankId = "NM_001278442"; // GeneBank ID for the transcript used for testing (ENST00000532063)
-
-		int chromPos = 6608760;
-		int mRNAPos = 16;
-
-		int cds = getPositionInmRNA(geneName, genebankId, chromPos);
-		Assert.assertEquals(cds, mRNAPos);
-
-	}
-
 	@Test
 	public void testGenomeMappingToolGetCDSRanges(){
 
-		List<Integer> lst1 = new ArrayList<>(Arrays.asList( new Integer[]{86346823, 86352858, 86354529}));
-		List<Integer> lst2 = new ArrayList<>(Arrays.asList(new Integer[]{86348878, 86352984, 86354692}));
+		List<Integer> lst1 = new ArrayList<>(Arrays.asList( 86346823, 86352858, 86354529));
+		List<Integer> lst2 = new ArrayList<>(Arrays.asList(86348878, 86352984, 86354692));
 
-		Integer cdsStart=86348749, cdsEnd=86387027;
+		int cdsStart=86348749, cdsEnd=86387027;
 
 		List<Range<Integer>> result = ChromosomeMappingTools.getCDSRegions(lst1,lst2,cdsStart,cdsEnd);
 
 		// makes sure the first list does not get  changed;
-		Assert.assertTrue(lst1.get(0) == 86346823);
+		Assert.assertEquals(86346823, (int) lst1.get(0));
 
 
-		Assert.assertTrue(result.get(0).lowerEndpoint() == 86348749);
-		Assert.assertTrue(result.get(1).lowerEndpoint() == 86352858);
-		Assert.assertTrue(result.get(2).lowerEndpoint() == 86354529);
+		Assert.assertEquals(86348749, (int) result.get(0).lowerEndpoint());
+		Assert.assertEquals(86352858, (int) result.get(1).lowerEndpoint());
+		Assert.assertEquals(86354529, (int) result.get(2).lowerEndpoint());
 
-		Assert.assertTrue(result.get(0).upperEndpoint() == 86348878);
-		Assert.assertTrue(result.get(1).upperEndpoint() == 86352984);
-		Assert.assertTrue(result.get(2).upperEndpoint() == 86387027);
+		Assert.assertEquals(86348878, (int) result.get(0).upperEndpoint());
+		Assert.assertEquals(86352984, (int) result.get(1).upperEndpoint());
+		Assert.assertEquals(86387027, (int) result.get(2).upperEndpoint());
 
 	}
 
 	@Test
 	public void testGenomeMappingToolGetCDSRangesSERINC2(){
 
-		List<Integer> lst1 = new ArrayList<>(Arrays.asList( new Integer[]{31413812, 31415872, 31423692}));
-		List<Integer> lst2 = new ArrayList<>(Arrays.asList(new Integer[]{31414777, 31415907, 31423854}));
+		List<Integer> lst1 = new ArrayList<>(Arrays.asList(31413812, 31415872, 31423692));
+		List<Integer> lst2 = new ArrayList<>(Arrays.asList(31414777, 31415907, 31423854));
 
-		Integer cdsStart=31423818, cdsEnd=31434199;
+		int cdsStart=31423818, cdsEnd=31434199;
 
 		List<Range<Integer>> result = ChromosomeMappingTools.getCDSRegions(lst1,lst2,cdsStart,cdsEnd);
 
 		// makes sure the first list does not get  changed;
-		Assert.assertTrue(result.get(0).lowerEndpoint() == 31423818);
+		Assert.assertEquals(31423818, (int) result.get(0).lowerEndpoint());
 
 	}
 }

From d0055ab24831ad7712059a7eb2a22852b5633ec5 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 1 Feb 2022 09:37:52 -0800
Subject: [PATCH 323/599] [maven-release-plugin] prepare release biojava-6.0.5

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 0e88a40ae6..577d2b0d7e 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5-SNAPSHOT</version>
+		<version>6.0.5</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index bb0a7d414b..3bd1062d6b 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5-SNAPSHOT</version>
+		<version>6.0.5</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 887588dfdf..d387b17c86 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5-SNAPSHOT</version>
+		<version>6.0.5</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index c24dc88be0..ee64756388 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5-SNAPSHOT</version>
+		<version>6.0.5</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index d49bab5837..ad24104fd6 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.5-SNAPSHOT</version>
+    <version>6.0.5</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.5-SNAPSHOT</version>
+    	<version>6.0.5</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 9715ab2f7a..a845f131ae 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5-SNAPSHOT</version>
+		<version>6.0.5</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 880fa885a9..fce27dc8db 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.5-SNAPSHOT</version>
+    <version>6.0.5</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index a557230e90..b401ba8356 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5-SNAPSHOT</version>
+		<version>6.0.5</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index f619227e95..feea1e1887 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5-SNAPSHOT</version>
+		<version>6.0.5</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index fc54992dbc..430ae043bc 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.5-SNAPSHOT</version>
+		<version>6.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 79427a27af..cd87e2d8b7 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5-SNAPSHOT</version>
+		<version>6.0.5</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index a64fd367ca..5d54fba7d1 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.5-SNAPSHOT</version>
+        <version>6.0.5</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index c98e9138bd..38df093603 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5-SNAPSHOT</version>
+		<version>6.0.5</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5-SNAPSHOT</version>
+			<version>6.0.5</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 57bdf239d1..0c22dc9786 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.5-SNAPSHOT</version>
+	<version>6.0.5</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.0.5</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 91412e290d73afd89436e02d1120d72cc5c1d4f8 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 1 Feb 2022 09:37:56 -0800
Subject: [PATCH 324/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 577d2b0d7e..d8e3629741 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5</version>
+		<version>6.0.6-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 3bd1062d6b..f36f45fe25 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5</version>
+		<version>6.0.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index d387b17c86..3eb9f4994e 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5</version>
+		<version>6.0.6-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index ee64756388..eb196b35c1 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5</version>
+		<version>6.0.6-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -85,13 +85,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index ad24104fd6..8c770abe7a 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.5</version>
+    <version>6.0.6-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.5</version>
+    	<version>6.0.6-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index a845f131ae..f8bb87a51b 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5</version>
+		<version>6.0.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index fce27dc8db..14762b4f5c 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.5</version>
+    <version>6.0.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index b401ba8356..cf32403db6 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5</version>
+		<version>6.0.6-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index feea1e1887..06bd62fdac 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5</version>
+		<version>6.0.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 430ae043bc..b3e412ba05 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.5</version>
+		<version>6.0.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index cd87e2d8b7..3151924f82 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5</version>
+		<version>6.0.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 5d54fba7d1..b73c366a10 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.5</version>
+        <version>6.0.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 38df093603..7271f2ca7b 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.5</version>
+		<version>6.0.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.5</version>
+			<version>6.0.6-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 0c22dc9786..6c96f9f9d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.5</version>
+	<version>6.0.6-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.0.5</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 8267ca528770ca29b58d446a69c13da4fcc58039 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 1 Feb 2022 09:56:06 -0800
Subject: [PATCH 325/599] Updating changelog

---
 CHANGELOG.md | 5 +++++
 README.md    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02628a85cb..58282bdbeb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 BioJava Changelog
 -----------------
 
+BioJava 6.0.5
+==============================
+### Fixed
+* Null handling in a few places related to loading PDB, CIF, mmtf files (issue introduced in 6.0.0). #1019
+
 BioJava 6.0.4
 ==============================
 ### Fixed
diff --git a/README.md b/README.md
index 48efdeab0a..7a8ad9c30a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-6.0.4-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.4) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-6.0.5-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.5) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>6.0.4</version>
+        <version>6.0.5</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From 4186eedc2ba1b53a84666d483760e898b355e382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Augusto=20Salim?=
 <zedomel@users.noreply.github.com>
Date: Tue, 15 Feb 2022 14:37:07 -0300
Subject: [PATCH 326/599] Fix NullPointerException

---
 .../org/biojava/nbio/structure/io/BondMaker.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
index d5afa97a92..7ead1726cc 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
@@ -296,15 +296,15 @@ private void formDisulfideBond(SSBondImpl disulfideBond) {
 			// The PDB format uses author chain ids to reference chains. But one author chain id corresponds to multiple asym ids,
 			// thus we need to grab all the possible asym ids (poly and nonpoly) and then try to find the atoms
 			// See issue https://github.com/biojava/biojava/issues/929
-			String polyChainId1 = structure.getPolyChainByPDB(disulfideBond.getChainID1()).getId();
-			String polyChainId2 = structure.getPolyChainByPDB(disulfideBond.getChainID2()).getId();
+			Chain polyChain1 = structure.getPolyChainByPDB(disulfideBond.getChainID1());
+			Chain polyChain2 = structure.getPolyChainByPDB(disulfideBond.getChainID2());
 			List<Chain> nonpolyChains1 = structure.getNonPolyChainsByPDB(disulfideBond.getChainID1());
 			List<Chain> nonpolyChains2 = structure.getNonPolyChainsByPDB(disulfideBond.getChainID2());
 
 			List<String> allChainIds1 = new ArrayList<>();
 			List<String> allChainIds2 = new ArrayList<>();
-			if (polyChainId1!=null) allChainIds1.add(polyChainId1);
-			if (polyChainId2!=null) allChainIds2.add(polyChainId2);
+			if (polyChain1!=null) allChainIds1.add(polyChain1.getId());
+			if (polyChain2!=null) allChainIds2.add(polyChain2.getId());
 			if (nonpolyChains1!=null) nonpolyChains1.forEach(npc -> allChainIds1.add(npc.getId()));
 			if (nonpolyChains2!=null) nonpolyChains2.forEach(npc -> allChainIds2.add(npc.getId()));
 
@@ -348,8 +348,8 @@ public void formLinkRecordBond(LinkRecord linkRecord) {
 			// The PDB format uses author chain ids to reference chains. But one author chain id corresponds to multiple asym ids,
 			// thus we need to grab all the possible asym ids (poly and nonpoly) and then try to find the atoms
 			// See issue https://github.com/biojava/biojava/issues/943
-			String polyChainId1 = structure.getPolyChainByPDB(linkRecord.getChainID1()).getId();
-			String polyChainId2 = structure.getPolyChainByPDB(linkRecord.getChainID2()).getId();
+			Chain polyChain1 = structure.getPolyChainByPDB(linkRecord.getChainID1());
+			Chain polyChain2 = structure.getPolyChainByPDB(linkRecord.getChainID2());
 			List<Chain> nonpolyChains1 = structure.getNonPolyChainsByPDB(linkRecord.getChainID1());
 			List<Chain> nonpolyChains2 = structure.getNonPolyChainsByPDB(linkRecord.getChainID2());
 			Chain waterChain1 = structure.getWaterChainByPDB(linkRecord.getChainID1());
@@ -357,8 +357,8 @@ public void formLinkRecordBond(LinkRecord linkRecord) {
 
 			List<String> allChainIds1 = new ArrayList<>();
 			List<String> allChainIds2 = new ArrayList<>();
-			if (polyChainId1!=null) allChainIds1.add(polyChainId1);
-			if (polyChainId2!=null) allChainIds2.add(polyChainId2);
+			if (polyChain1!=null) allChainIds1.add(polyChain1.getId());
+			if (polyChain2!=null) allChainIds2.add(polyChain2.getId());
 			if (nonpolyChains1!=null) nonpolyChains1.forEach(npc -> allChainIds1.add(npc.getId()));
 			if (nonpolyChains2!=null) nonpolyChains2.forEach(npc -> allChainIds2.add(npc.getId()));
 			if (waterChain1!=null && linkRecord.getResName1().equals("HOH")) allChainIds1.add(waterChain1.getId());

From b8e69a4b022aaa6b5f5ecfbd31de70e32358ce85 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Mon, 21 Feb 2022 07:35:59 +0800
Subject: [PATCH 327/599] Two utility methods to validate the downloaded file

Currently, we validate the file size only.
We could validate the content using any hashing function later.
---
 .../nbio/core/util/FileDownloadUtils.java     | 61 +++++++++++++++++++
 .../nbio/structure/ecod/EcodFactory.java      |  3 +
 .../nbio/structure/ecod/EcodInstallation.java |  5 +-
 .../nbio/structure/io/LocalPDBDirectory.java  |  8 +++
 .../io/sifts/SiftsMappingProvider.java        |  5 ++
 .../nbio/structure/scop/ScopInstallation.java | 11 ++--
 6 files changed, 88 insertions(+), 5 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index e3b678ce8d..51e0718382 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -23,9 +23,11 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.PrintStream;
 import java.net.HttpURLConnection;
 import java.net.SocketTimeoutException;
 import java.net.URL;
@@ -39,6 +41,7 @@
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Scanner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -161,6 +164,64 @@ public static void downloadFile(URL url, File destination) throws IOException {
 		tempFile.delete();
 
 	}
+	
+	public static void createValidationFiles(URL url, File localDestination, URL hashURL){
+		try {
+			URLConnection resourceConnection = url.openConnection();
+			createValidationFiles(resourceConnection, localDestination, hashURL);
+		} catch (IOException e) {
+			logger.warn("could not open connection to resource file due to exception", e);
+		}
+	}
+	public static void createValidationFiles(URLConnection resourceUrlConnection, File localDestination, URL hashURL){
+		long size = resourceUrlConnection.getContentLengthLong();
+		if(size != -1) {
+			System.out.println("Content-Length: " + size);
+			File sizeFile = new File(localDestination.getParentFile(), localDestination.getName()+".size");
+			try (PrintStream sizePrintStream = new PrintStream(sizeFile)) {
+				sizePrintStream.print(size);
+				sizePrintStream.close();
+			} catch (FileNotFoundException e) {
+				logger.warn("could not write validation size file due to exception", e);
+			}
+		}
+		
+		if(hashURL == null)
+			return;
+
+		try {
+			File hashFile = new File(localDestination.getParentFile(), localDestination.getName()+".hash");
+			downloadFile(hashURL, hashFile);
+		} catch (IOException e) {
+			logger.warn("could not write validation hash file due to exception", e);
+		}
+	}
+	
+	public static boolean validateFile(File localFile) {
+		File sizeFile = new File(localFile.getParentFile(), localFile.getName()+".size");
+		if(sizeFile.exists()) {
+			Scanner scanner = null;
+			try {
+				scanner = new Scanner(sizeFile);
+				long expectedSize = scanner.nextLong();
+				if (expectedSize != localFile.length()) {
+					logger.warn("File size does not match expected");
+					return false;
+				}
+			} catch (FileNotFoundException e) {
+				logger.warn("could not validate size of file ["+ localFile+ "] due to exception", e);
+			} finally {
+				scanner.close();
+			}
+		}
+
+		File hashFile = new File(localFile.getParentFile(), localFile.getName()+".hash");
+		if(hashFile.exists()) {
+			throw new UnsupportedOperationException("Not yet implemented");
+		}
+		
+		return true;
+	}
 
 	/**
 	 * Converts path to Unix convention and adds a terminating slash if it was
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodFactory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodFactory.java
index 89791c59e1..0f8f7b6654 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodFactory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodFactory.java
@@ -89,6 +89,9 @@ public static EcodDatabase getEcodDatabase(String version) {
 					}
 				} catch (IOException e) {
 					// For parsing errors, just use the requested version
+					// What about corrupted downloading errors?? Amr
+					logger.warn("Cound not get Ecod version, or file is corrupted", e);
+					return null;
 				}
 			}
 			logger.trace("Releasing EcodFactory lock after getting version "+version);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
index 004e2634ac..e89dab092a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
@@ -369,7 +369,7 @@ private boolean domainsAvailable() {
 		try {
 			File f = getDomainFile();
 
-			if (!f.exists() || f.length() <= 0 )
+			if (! (f.exists() && FileDownloadUtils.validateFile(f)))
 				return false;
 
 			// Re-download old copies of "latest"
@@ -406,7 +406,10 @@ private void downloadDomains() throws IOException {
 			File localFile = getDomainFile();
 
 			logger.info("Downloading {} to: {}",domainsURL, localFile);
+			FileDownloadUtils.createValidationFiles(domainsURL, localFile, null);
 			FileDownloadUtils.downloadFile(domainsURL, localFile);
+			if(! FileDownloadUtils.validateFile(localFile))
+				throw new IOException("Downloaded file invalid: "+ localFile);
 		} catch (MalformedURLException e) {
 			logger.error("Malformed url: "+ url + DOMAINS_PATH + getDomainFilename(),e);
 		} finally {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index 0051180acb..4b4cc000fd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -373,6 +373,9 @@ protected InputStream getInputStream(PdbId pdbId) throws IOException{
 			throw new IOException("Structure "+pdbId+" not found and unable to download.");
 		}
 
+		if(! FileDownloadUtils.validateFile(file))
+			throw new IOException("Downloaded file invalid: "+file);
+		
 		InputStreamProvider isp = new InputStreamProvider();
 
 		InputStream inputStream = isp.getInputStream(file);
@@ -395,6 +398,8 @@ public void prefetchStructure(String pdbId) throws IOException {
 		if(!file.exists()) {
 			throw new IOException("Structure "+pdbId+" not found and unable to download.");
 		}
+		if(! FileDownloadUtils.validateFile(file))
+			throw new IOException("Downloaded file invalid: "+file);
 	}
 
 	/**
@@ -576,7 +581,10 @@ private File downloadStructure(PdbId pdbId, String pathOnServer, boolean obsolet
 		logger.info("Fetching " + ftp);
 		logger.info("Writing to "+ realFile);
 
+		FileDownloadUtils.createValidationFiles(url, realFile, null);
 		FileDownloadUtils.downloadFile(url, realFile);
+		if(! FileDownloadUtils.validateFile(realFile))
+			throw new IOException("Downloaded file invalid: "+realFile);
 
 		return realFile;
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java
index ed697b55fd..3701c87e29 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java
@@ -87,10 +87,15 @@ public static List<SiftsEntity> getSiftsMapping(String pdbId) throws IOException
 		if ( ! dest.exists()){
 			String u = String.format(fileLoc,pdbId);
 			URL url = new URL(u);
+			logger.debug("Downloading SIFTS file {} validation metadata.",url);
+			FileDownloadUtils.createValidationFiles(url, dest, null);
 			logger.debug("Downloading SIFTS file {} to {}",url,dest);
 			FileDownloadUtils.downloadFile(url, dest);
 		}
 
+		if(! FileDownloadUtils.validateFile(dest))
+			throw new IOException("Downloaded file invalid: "+dest);
+
 		InputStreamProvider prov = new InputStreamProvider();
 		InputStream is = prov.getInputStream(dest);
 		SiftsXMLParser parser = new SiftsXMLParser();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
index 252ccfabfb..bcf4f32306 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
@@ -741,7 +741,10 @@ protected void downloadComFile() throws FileNotFoundException, IOException{
 
 	protected void downloadFileFromRemote(URL remoteURL, File localFile) throws IOException{
 		logger.info("Downloading " + remoteURL + " to: " + localFile);
+		FileDownloadUtils.createValidationFiles(remoteURL, localFile, null);
 		FileDownloadUtils.downloadFile(remoteURL, localFile);
+		if(! FileDownloadUtils.validateFile(localFile))
+			throw new IOException("Downloaded file invalid: "+localFile);
 	}
 
 	private boolean claFileAvailable(){
@@ -749,14 +752,14 @@ private boolean claFileAvailable(){
 
 		File f = new File(fileName);
 
-		return f.exists() && f.length()>0;
+		return f.exists() && FileDownloadUtils.validateFile(f);
 	}
 
 	private boolean desFileAvailable(){
 		String fileName = getDesFilename();
 
 		File f = new File(fileName);
-		return f.exists() && f.length()>0;
+		return f.exists() && FileDownloadUtils.validateFile(f);
 	}
 
 	private boolean hieFileAvailable(){
@@ -764,7 +767,7 @@ private boolean hieFileAvailable(){
 
 		File f = new File(fileName);
 
-		return f.exists() && f.length()>0;
+		return f.exists() && FileDownloadUtils.validateFile(f);
 	}
 
 	private boolean comFileAvailable(){
@@ -772,7 +775,7 @@ private boolean comFileAvailable(){
 
 		File f = new File(fileName);
 
-		return f.exists() && f.length()>0;
+		return f.exists() && FileDownloadUtils.validateFile(f);
 	}
 
 	protected String getClaFilename(){

From aed24fad9664484780dce00fb3f073921e34ae36 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Mon, 21 Feb 2022 18:09:29 +0800
Subject: [PATCH 328/599] JavaDock

---
 .../nbio/core/util/FileDownloadUtils.java     | 38 +++++++++++++++++++
 .../nbio/structure/ecod/EcodInstallation.java |  4 +-
 .../nbio/structure/io/LocalPDBDirectory.java  |  8 ++--
 .../nbio/structure/scop/ScopInstallation.java |  6 +++
 4 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index 51e0718382..0371f1d86a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -165,6 +165,17 @@ public static void downloadFile(URL url, File destination) throws IOException {
 
 	}
 	
+	/**
+	 * Creates validation files beside a file to be downloaded.<br>
+	 * Whenever possible, for a <code>file.ext</code> file, it creates 
+	 * <code>file.ext.size</code> and <code>file.hash</code> for in the same 
+	 * folder where <code>file.ext</code> exists.
+	 * If the file connection size could not be deduced from the URL, no size file is created. 
+	 * If <code>hashURL</code> is <code>null</code>, no hash file is created.
+	 * @param url the remote file URL to download
+	 * @param localDestination the local file to download into
+	 * @param hashURL the URL of the hash file to download. Can be <code>null</code>.
+	 */
 	public static void createValidationFiles(URL url, File localDestination, URL hashURL){
 		try {
 			URLConnection resourceConnection = url.openConnection();
@@ -173,6 +184,19 @@ public static void createValidationFiles(URL url, File localDestination, URL has
 			logger.warn("could not open connection to resource file due to exception", e);
 		}
 	}
+	/**
+	 * Creates validation files beside a file to be downloaded.<br>
+	 * Whenever possible, for a <code>file.ext</code> file, it creates 
+	 * <code>file.ext.size</code> and <code>file.hash</code> for in the same 
+	 * folder where <code>file.ext</code> exists.
+	 * If the file connection size could not be deduced from the resourceUrlConnection 
+	 * {@link URLConnection}, no size file is created. 
+	 * If <code>hashURL</code> is <code>null</code>, no hash file is created.
+	 * @param resourceUrlConnection the remote file URLConnection to download
+	 * @param localDestination the local file to download into
+	 * @param hashURL the URL of the hash file to download. Can be <code>null</code>.
+	 * @since 6.0.6
+	 */
 	public static void createValidationFiles(URLConnection resourceUrlConnection, File localDestination, URL hashURL){
 		long size = resourceUrlConnection.getContentLengthLong();
 		if(size != -1) {
@@ -197,6 +221,20 @@ public static void createValidationFiles(URLConnection resourceUrlConnection, Fi
 		}
 	}
 	
+	/**
+	 * Validate a local file based on pre-existing metadata files for size and hash.<br>
+	 * If the passed in <code>localFile</code> parameter is a file named <code>file.ext</code>, the function searches in the same folder for:
+	 * <ul>
+	 * <li><code>file.ext.size</code>: if found, it compares the size stored in it to the length of <code>localFile</code> (in bytes).</li>
+	 * <li><code>file.ext.hash</code>: if found, it compares the size stored in it to the hash code of <code>localFile</code>.</li>
+	 * </ul>
+	 * If any of these comparisons fail, the function returns <code>false</code>. otherwise it returns true.
+	 * <p>
+	 * This function does not implement hash code verification yet.
+	 * @param localFile The file to validate
+	 * @return <code>false</code> if any of the size or hash code metadata files exists but its contents does not match the expected value in the file, <code>true'</code> otherwise.
+	 * @since 6.0.6
+	 */
 	public static boolean validateFile(File localFile) {
 		File sizeFile = new File(localFile.getParentFile(), localFile.getName()+".size");
 		if(sizeFile.exists()) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
index e89dab092a..74f49f8dd5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
@@ -395,8 +395,8 @@ private boolean domainsAvailable() {
 	}
 
 	/**
-	 * Downloads the domains file, overwriting any existing file
-	 * @throws IOException
+	 * Downloads the domains file +/- its validation metadata, overwriting any existing file
+	 * @throws IOException in cases of file I/O, including failure to download a healthy (non-corrupted) file.
 	 */
 	private void downloadDomains() throws IOException {
 		domainsFileLock.writeLock().lock();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index 4b4cc000fd..dce7e9853d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -362,7 +362,7 @@ public Structure getStructureById(PdbId pdbId) throws IOException {
 	 * for direct parsing.
 	 * @param pdbId
 	 * @return
-	 * @throws IOException
+	 * @throws IOException in cases of file I/O, including failure to download a healthy (non-corrupted) file.
 	 */
 	protected InputStream getInputStream(PdbId pdbId) throws IOException{
 
@@ -388,7 +388,7 @@ protected InputStream getInputStream(PdbId pdbId) throws IOException{
 	 *
 	 * Used to pre-fetch large numbers of structures.
 	 * @param pdbId
-	 * @throws IOException
+	 * @throws IOException in cases of file I/O, including failure to download a healthy (non-corrupted) file.
 	 */
 	public void prefetchStructure(String pdbId) throws IOException {
 		
@@ -530,14 +530,14 @@ protected File downloadStructure(PdbId pdbId) throws IOException {
 	}
 
 	/**
-	 * Download a file from the ftp server, replacing any existing files if needed
+	 * Download a file from the ftp server +/- its validation metadata, replacing any existing files if needed
 	 * @param pdbId PDB ID
 	 * @param pathOnServer Path on the FTP server, e.g. data/structures/divided/pdb
 	 * @param obsolete Whether or not file should be saved to the obsolete location locally
 	 * @param existingFile if not null and checkServerFileDate is true, the last modified date of the
 	 * server file and this file will be compared to decide whether to download or not
 	 * @return
-	 * @throws IOException
+	 * @throws IOException in cases of file I/O, including failure to download a healthy (non-corrupted) file.
 	 */
 	private File downloadStructure(PdbId pdbId, String pathOnServer, boolean obsolete, File existingFile)
 			throws IOException{
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
index bcf4f32306..e46dbca9f1 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
@@ -739,6 +739,12 @@ protected void downloadComFile() throws FileNotFoundException, IOException{
 		throw new IOException("Unable to download SCOP .com file",exception);
 	}
 
+	/**
+	 * Downloads the SCOP installation file +/- its validation metadata files.
+	 * @param remoteURL The remote file to download
+	 * @param localFile the local file to download to
+	 * @throws IOException in cases of file I/O, including failure to download a healthy (non-corrupted) file.
+	 */
 	protected void downloadFileFromRemote(URL remoteURL, File localFile) throws IOException{
 		logger.info("Downloading " + remoteURL + " to: " + localFile);
 		FileDownloadUtils.createValidationFiles(remoteURL, localFile, null);

From f59de95988bde2e1e6cb5fd3042d1f8ee3175ebc Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Tue, 22 Feb 2022 09:08:10 +0800
Subject: [PATCH 329/599] more verbose

---
 .../java/org/biojava/nbio/core/util/FileDownloadUtils.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index 0371f1d86a..4bc0c4afb8 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -199,14 +199,16 @@ public static void createValidationFiles(URL url, File localDestination, URL has
 	 */
 	public static void createValidationFiles(URLConnection resourceUrlConnection, File localDestination, URL hashURL){
 		long size = resourceUrlConnection.getContentLengthLong();
-		if(size != -1) {
+		if(size == -1) {
+			logger.warn("could not find expected file size for resource {}.", resourceUrlConnection.getURL());
+		} else {
 			System.out.println("Content-Length: " + size);
 			File sizeFile = new File(localDestination.getParentFile(), localDestination.getName()+".size");
 			try (PrintStream sizePrintStream = new PrintStream(sizeFile)) {
 				sizePrintStream.print(size);
 				sizePrintStream.close();
 			} catch (FileNotFoundException e) {
-				logger.warn("could not write validation size file due to exception", e);
+				logger.warn("could not write size validation file due to exception", e);
 			}
 		}
 		

From a26adde89e07cc2cd9e931a00e489922b6c7cb6d Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <alhossary@gmail.com>
Date: Tue, 22 Feb 2022 10:42:13 +0800
Subject: [PATCH 330/599] Unit testing

---
 .../nbio/core/util/FileDownloadUtilsTest.java | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
index 374001ec5a..761d06d097 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
@@ -4,12 +4,15 @@
 import static org.biojava.nbio.core.util.FileDownloadUtils.getFilePrefix;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.PrintStream;
+import java.net.URL;
 import java.nio.file.Files;
 
 import org.junit.jupiter.api.Nested;
@@ -190,4 +193,50 @@ void deleteFolderTree() throws IOException{
             assertFalse(toDelete.exists());
         }
     }
+    
+    @Nested
+    class CreateValidationFiles{
+    	
+    	@Test
+    	void testValidationFiles() throws IOException{
+    		URL sourceUrl = new URL("https://ftp.wwpdb.org/pub/pdb/data/structures/divided/mmCIF/45/145d.cif.gz");
+    		File destFile = new File(System.getProperty("java.io.tmpdir"), "145d.cif.gz");
+    		File sizeFile = new File(destFile.getParentFile(), destFile.getName()+".size");
+    		File hashFile = new File(destFile.getParentFile(), destFile.getName()+".hash");
+    		System.out.println(destFile.getAbsolutePath());
+    		destFile.delete();
+    		sizeFile.delete();
+    		hashFile.delete();
+    		assertFalse(destFile.exists(), "couldn't delete dest file");
+    		assertFalse(sizeFile.exists(), "couldn't delete size file");
+    		assertFalse(hashFile.exists(), "couldn't delete hash file");
+    		
+    		FileDownloadUtils.downloadFile(sourceUrl, destFile);
+    		assertTrue(destFile.exists(), "couldn't create dest file");
+
+    		assertTrue(FileDownloadUtils.validateFile(destFile), "file not detected to be invalid although there are no validation files");
+
+    		PrintStream temp1 = new PrintStream(sizeFile);
+    		temp1.print(15); // some wrong size value
+    		temp1.close();
+    		assertFalse(FileDownloadUtils.validateFile(destFile), "file not detected to be invalid although size value is wrong.");
+    		System.out.println("Just ignore the previous warning. It is expected.");
+    		
+    		FileDownloadUtils.createValidationFiles(sourceUrl, destFile, null);
+    		assertTrue(sizeFile.exists(), "couldn't create size file");
+    		assertTrue(FileDownloadUtils.validateFile(destFile), "file not detected to be invalid although there is correct size validation file");
+
+    		PrintStream temp2 = new PrintStream(hashFile);
+    		temp2.print("ABCD"); // some wrong hash value
+    		temp2.close();
+    		//This is not yet implemented. I am using this test for documentation purpose.
+    		assertThrows(UnsupportedOperationException.class, 
+    				() -> FileDownloadUtils.validateFile(destFile), 
+    				"file not detected to be invalid although size value is wrong.");
+    		
+    		destFile.delete();
+    		sizeFile.delete();
+    		hashFile.delete();
+    	}
+    }
 }

From 717e333911f88bddac6664c1f9fce7876284470d Mon Sep 17 00:00:00 2001
From: Michael L Heuer <heuermh@acm.org>
Date: Sun, 3 Apr 2022 14:42:27 -0500
Subject: [PATCH 331/599] Update guava dependency version to 31.1-jre.

---
 biojava-genome/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index eb196b35c1..6c1bfe81fa 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -75,7 +75,7 @@
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<scope>compile</scope>
-			<version>30.1.1-jre</version>
+			<version>31.1-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

From 1c94548cfa9fde74b970bcc0e4e07c073215524e Mon Sep 17 00:00:00 2001
From: marty-rabens <54688881+marty-rabens@users.noreply.github.com>
Date: Mon, 20 Jun 2022 14:57:22 -0400
Subject: [PATCH 332/599] Prevent XXE processing in XMLHelper

---
 .../src/main/java/org/biojava/nbio/core/util/XMLHelper.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
index 5f682bdc29..d4eab71660 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
@@ -34,6 +34,7 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
+import javax.xml.XMLConstants;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
@@ -105,6 +106,7 @@ public static Document inputStreamToDocument(InputStream inputStream) throws SAX
 		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 
 		DocumentBuilder db = dbf.newDocumentBuilder();
+		dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
 
 		Document doc = db.parse(inputStream);
 		doc.getDocumentElement().normalize();

From 25d0a6866749d2a34489ba221e9fa3c5ed693dc7 Mon Sep 17 00:00:00 2001
From: Sebastian Bittrich <sebastian.bittrich@rcsb.org>
Date: Mon, 20 Jun 2022 15:12:49 -0700
Subject: [PATCH 333/599] ciftools-java-jdk8@4.0.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6c96f9f9d4..7e3e806d13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 		<log4j.version>2.17.1</log4j.version>
 		<junit-jupiter.version>5.7.2</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>
-		<ciftools.version>3.0.0</ciftools.version>
+		<ciftools.version>4.0.2</ciftools.version>
 	</properties>
 	<scm>
 		<connection>scm:git:git://github.com/biojava/biojava.git</connection>

From 1f04cafbadb45a7a403be69b0913f387c932aff5 Mon Sep 17 00:00:00 2001
From: Sebastian Bittrich <sebastian.bittrich@rcsb.org>
Date: Mon, 20 Jun 2022 15:55:33 -0700
Subject: [PATCH 334/599] update assembly file test to new location

---
 .../org/biojava/nbio/structure/io/TestURLBasedFileParsing.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestURLBasedFileParsing.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestURLBasedFileParsing.java
index 2adb5ab358..e5e8b7bf2a 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestURLBasedFileParsing.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestURLBasedFileParsing.java
@@ -37,7 +37,7 @@ public class TestURLBasedFileParsing {
 	@Test
 	public void testMMcifURL() throws StructureException, IOException{
 
-		String u = "https://ftp.wwpdb.org/pub/pdb/data/biounit/mmCIF/divided/nw/4nwr-assembly1.cif.gz";
+		String u = "https://ftp.wwpdb.org/pub/pdb/data/assemblies/mmCIF/divided/nw/4nwr-assembly1.cif.gz";
 
 		Structure s = StructureIO.getStructure(u);
 

From 152ea74120974628e1e8011f6b81dcc0b3af52c8 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Wed, 6 Jul 2022 17:38:16 +0100
Subject: [PATCH 335/599] Fixed issue #886 by escaping percent symbols when
 feature attributes are created

---
 .../biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
index 97e37f30cd..3ccff4111f 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
@@ -125,7 +125,7 @@ protected String _write_feature(FeatureInterface<AbstractSequence<C>, C> feature
 		//Now the qualifiers...
 		for(List<Qualifier>  qualifiers : feature.getQualifiers().values()) {
 			for(Qualifier q : qualifiers){
-				line += _write_feature_qualifier(q.getName(), q.getValue(), q.needsQuotes());
+				line += _write_feature_qualifier(q.getName().replaceAll("%", "%%"), q.getValue().replaceAll("%", "%%"), q.needsQuotes());
 			}
 		}
 		return line;

From 008595b4e3cf08b21c73f37859179c92bdaaf290 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Wed, 6 Jul 2022 17:40:16 +0100
Subject: [PATCH 336/599] Added test for issue #886

---
 .../core/sequence/io/GenbankWriterTest.java   | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
index 6b54346226..af73ab0c7a 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
@@ -24,15 +24,26 @@
 package org.biojava.nbio.core.sequence.io;
 
 
+import org.biojava.nbio.core.sequence.AccessionID;
 import org.biojava.nbio.core.sequence.DNASequence;
+import org.biojava.nbio.core.sequence.features.AbstractFeature;
+import org.biojava.nbio.core.sequence.features.Qualifier;
+import org.biojava.nbio.core.sequence.features.TextFeature;
+import org.biojava.nbio.core.sequence.location.SimpleLocation;
+import org.biojava.nbio.core.sequence.Strand;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -67,4 +78,66 @@ public void testProcess() throws Exception {
 		fragwriter.close();
 		Assert.assertEquals(seqs.get(0).getSequenceAsString(), dnaSequences.values().iterator().next().getSequenceAsString());
 	}
+	
+	/**
+	 * String Formatter error when key or value of Qualifier has character "%"
+	 * https://github.com/biojava/biojava/issues/886
+	 */
+	@Test
+	public void testGithub886() throws Exception {
+		
+		DNASequence seq = new DNASequence("ATGC");
+		seq.setAccession(new AccessionID("."));
+		AbstractFeature feature = new TextFeature("CDS", "source", "short description", "description");
+		feature.setLocation(new SimpleLocation(1, 10, Strand.POSITIVE));
+
+		// no percent symbols in key or value
+		feature.addQualifier("note1", new Qualifier("note1", "50", true));
+		// percent symbol in key
+		feature.addQualifier("note2", new Qualifier("%note2", "50", true));
+		feature.addQualifier("note3", new Qualifier("not%e3", "50", true));
+		feature.addQualifier("note4", new Qualifier("note4%", "50", true));
+		// percent symbol in value
+		feature.addQualifier("note5", new Qualifier("note5", "%50", true));
+		feature.addQualifier("note6", new Qualifier("note6", "5%0", true));
+		feature.addQualifier("note7", new Qualifier("note7", "50%", true));
+		
+		seq.addFeature(feature);
+		
+		ByteArrayOutputStream fragwriter = new ByteArrayOutputStream();
+		GenbankWriterHelper.writeNucleotideSequence(
+				fragwriter, 
+				Arrays.asList(seq), 
+				GenbankWriterHelper.LINEAR_DNA);
+		fragwriter.close();
+		System.out.println(fragwriter.toString().replaceAll("\r\n", "\n"));
+		
+		// now read in the file that was created and check that the qualifiers were created correctly
+		InputStream readerInputStream = new ByteArrayInputStream(fragwriter.toByteArray());
+		DNASequence newSeq = GenbankReaderHelper.readGenbankDNASequence(readerInputStream).values().iterator().next();
+		AbstractFeature newFeature = (TextFeature) seq.getFeaturesByType("CDS").get(0);
+		Map<String, List<Qualifier>> newQualifiers = newFeature.getQualifiers();
+		
+		assertEquals("note1", newQualifiers.get("note1").get(0).getName());
+		assertEquals("50", newQualifiers.get("note1").get(0).getValue());
+		
+		assertEquals("%note2", newQualifiers.get("note2").get(0).getName());
+		assertEquals("50", newQualifiers.get("note2").get(0).getValue());
+		
+		assertEquals("not%e3", newQualifiers.get("note3").get(0).getName());
+		assertEquals("50", newQualifiers.get("note3").get(0).getValue());
+		
+		assertEquals("note4%", newQualifiers.get("note4").get(0).getName());
+		assertEquals("50", newQualifiers.get("note4").get(0).getValue());
+		
+		assertEquals("note5", newQualifiers.get("note5").get(0).getName());
+		assertEquals("%50", newQualifiers.get("note5").get(0).getValue());
+		
+		assertEquals("note6", newQualifiers.get("note6").get(0).getName());
+		assertEquals("5%0", newQualifiers.get("note6").get(0).getValue());
+		
+		assertEquals("note7", newQualifiers.get("note7").get(0).getName());
+		assertEquals("50%", newQualifiers.get("note7").get(0).getValue());
+		
+	}
 }

From bff5de7a3b6ee9157ce5fbbd46e297a90d61ffce Mon Sep 17 00:00:00 2001
From: aegugup <aegugup@user.org>
Date: Mon, 25 Jul 2022 20:07:23 -0600
Subject: [PATCH 337/599] Fix pointers[y] is null error

Initialize pointers array to dimension (ye,1)
---
 .../java/org/biojava/nbio/alignment/routines/AlignerHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AlignerHelper.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AlignerHelper.java
index edba157916..f00ce2101f 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AlignerHelper.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AlignerHelper.java
@@ -581,7 +581,7 @@ public static Last[][] setScoreVector(int x, int xb, int yb, int ye, int gep, in
 		if (x == xb) {
 			pointers = new Last[ye + 1][1];
 		} else {
-			pointers = new Last[ye + 1][];
+			pointers = new Last[ye + 1][1];
 			pointers[0] = new Last[1];
 			for (int y = 1; y < scores[x].length; y++) {
 				pointers[y][0] = setScorePoint(x, y, gep, subs[y], scores);

From 8a64963585cd4b2c42943f5aff700fca471bf615 Mon Sep 17 00:00:00 2001
From: aegugup <aegugup@user.org>
Date: Mon, 25 Jul 2022 20:19:39 -0600
Subject: [PATCH 338/599] Fix pointers[y] is null error

Initialize pointers to size (ye+1,1)

From 278129387c7ad6ddcf05fe102dcaa2a5a63e5f4b Mon Sep 17 00:00:00 2001
From: aegugup <aegugup@user.org>
Date: Mon, 25 Jul 2022 20:21:26 -0600
Subject: [PATCH 339/599] Test local, linear scheme alignment

---
 .../org/biojava/nbio/alignment/TestDNAAlignment.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/biojava-alignment/src/test/java/org/biojava/nbio/alignment/TestDNAAlignment.java b/biojava-alignment/src/test/java/org/biojava/nbio/alignment/TestDNAAlignment.java
index a50d8c4cde..169babaf04 100644
--- a/biojava-alignment/src/test/java/org/biojava/nbio/alignment/TestDNAAlignment.java
+++ b/biojava-alignment/src/test/java/org/biojava/nbio/alignment/TestDNAAlignment.java
@@ -165,4 +165,16 @@ public void testLinearAlignment() throws CompoundNotFoundException {
 		PairwiseSequenceAligner<DNASequence, NucleotideCompound> aligner = Alignments.getPairwiseAligner(query, target, PairwiseSequenceAlignerType.GLOBAL, gapP, matrix);
 		Assert.assertEquals(String.format("GTAAAA-G----------%nG-AAAACGTTTTTTTTTT%n"), aligner.getPair().toString());;
 	}
+	/**
+	* @author aegugup
+	*/
+	@Test
+	public void testLinearAlignmentLocal() throws CompoundNotFoundException {
+		DNASequence query = new DNASequence("TGTTACGG", DNACompoundSet.getDNACompoundSet());
+		DNASequence target = new DNASequence("GGTTGACTA", DNACompoundSet.getDNACompoundSet());
+		SubstitutionMatrix<NucleotideCompound> matrix = SubstitutionMatrixHelper.getNuc4_4();
+		SimpleGapPenalty gapP = new SimpleGapPenalty((short)0, (short)8);
+		PairwiseSequenceAligner<DNASequence, NucleotideCompound> aligner = Alignments.getPairwiseAligner(query, target, PairwiseSequenceAlignerType.LOCAL, gapP, matrix);
+		Assert.assertEquals(String.format("GTT-AC%nGTTGAC%n"), aligner.getPair().toString());;
+	}
 }

From 2834ada62c65b70ad6b1bdb9ac6bd5ba12bdeecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Renato=20Sim=C3=B5es?= <renatosm@gmail.com>
Date: Sat, 6 Aug 2022 14:28:30 -0300
Subject: [PATCH 340/599] Aromaticity calculation (Protein) #1037

Calculates the aromaticity value of a protein according to Lobry, 1994.
It is simply the relative frequency of Phe(F)+Trp(W)+Tyr(Y).
---
 .../nbio/aaproperties/IPeptideProperties.java | 11 +++++++
 .../nbio/aaproperties/PeptideProperties.java  | 24 ++++++++++++++
 .../aaproperties/PeptidePropertiesImpl.java   | 31 +++++++++++++++++++
 .../PeptidePropertiesImplTest.java            |  8 +++++
 4 files changed, 74 insertions(+)

diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
index babe1e54d8..807a72e0e5 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
@@ -312,4 +312,15 @@ public AminoAcidCompositionTable obtainAminoAcidCompositionTable(File elementMas
 	 * @see AminoAcidCompound
 	 */
 	public Map<AminoAcidCompound, Double> getAAComposition(ProteinSequence sequence);
+        
+        /**
+         * Calculates the aromaticity value of a protein according to Lobry, 1994. 
+         * It is simply the relative frequency of Phe+Trp+Tyr.
+         * 
+         * @param sequence
+         *              a protein sequence consisting of non-ambiguous characters only
+         * @return the aromaticity of a protein sequence
+         * @see ProteinSequence
+         */
+	public double getAromaticity(ProteinSequence sequence);
 }
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java
index a46b857314..ee51d71b75 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java
@@ -590,4 +590,28 @@ public static final int[] getPolarityOfAminoAcids(String sequence) {
 		}
 		return polarity;
 	}
+        
+        /**
+	 * An adaptor method to return the aromaticity value of sequence. The sequence argument
+	 * must be a protein sequence consisting of only non-ambiguous characters.
+	 * 
+         * Calculates the aromaticity value of a protein according to Lobry, 1994. 
+         * It is simply the relative frequency of Phe+Trp+Tyr.
+         * 	 *
+	 * @param sequence
+	 * 		a protein sequence consisting of non-ambiguous characters only
+	 * @return the aromaticity value of sequence
+	 */
+	public static final double getAromaticity(String sequence) {
+		sequence = Utils.checkSequence(sequence);
+		ProteinSequence pSequence = null;
+		try {
+			pSequence = new ProteinSequence(sequence);
+		} catch (CompoundNotFoundException e) {
+			// the sequence was checked with Utils.checkSequence, this shouldn't happen
+			logger.error("The protein sequence contains invalid characters ({}), this should not happen. This is most likely a bug in Utils.checkSequence()", e.getMessage());
+		}
+		IPeptideProperties pp = new PeptidePropertiesImpl();
+		return pp.getAromaticity(pSequence);
+	}
 }
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java
index 98e14c6a83..c11fd29150 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java
@@ -582,4 +582,35 @@ public Map<AminoAcidCompound, Double> getAAComposition(ProteinSequence sequence)
 		}
 		return aa2Composition;
 	}
+        
+        
+	@Override
+	public double getAromaticity(ProteinSequence sequence) {
+                int validLength = sequence.getSequenceAsString().length();
+		
+		if (validLength==0) {
+			logger.warn("Valid length of sequence is 0, can't divide by 0 to calculate aromaticity: setting aromaticity to 0");
+			return 0.0;
+		}
+                
+                //Phe - Phenylalanine
+                int totalF=0;
+                //Tyr - Tyrosine
+                int totalY=0;
+                //Trp - Tryptophan
+                int totalW=0;
+                
+		char[] seq = this.getSequence(sequence.toString(), true);
+		for(char aa:seq){
+                    char amino = Character.toUpperCase(aa);
+                    switch(amino){
+                        case 'F' : totalF++;break;
+                        case 'Y' : totalY++;break;
+                        case 'W' : totalW++;break;
+                    }
+		}
+                
+                return (totalF+totalY+totalW)/(double)(validLength);        
+	}
 }
+
diff --git a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/PeptidePropertiesImplTest.java b/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/PeptidePropertiesImplTest.java
index 6220ea0b28..eddeb138cd 100644
--- a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/PeptidePropertiesImplTest.java
+++ b/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/PeptidePropertiesImplTest.java
@@ -358,4 +358,12 @@ public void testNetCharge(){
 	public void testNetChargeNull(){
 		assertEquals(8.6, PeptideProperties.getNetCharge(null), delta);
 	}
+        
+        @Test
+	public void testAromaticity(){
+                assertEquals(1, PeptideProperties.getAromaticity("WWWYYYYFFFWWWYYYYFFF"), 0.001);
+		assertEquals(0.5, PeptideProperties.getAromaticity("WWWYYYYFFFAAAAAAAAAA"), 0.001);
+		assertEquals(0.08, PeptideProperties.getAromaticity(sequence), 0.001);
+		assertEquals(0.0, PeptideProperties.getAromaticity(fullInvalidSequence), 0.001);
+	}
 }

From 4883086800bb811840eeefab4f776844fe0e49ae Mon Sep 17 00:00:00 2001
From: Alex <aleksandrosansan@gmail.com>
Date: Sat, 24 Sep 2022 21:57:56 +0200
Subject: [PATCH 341/599] build: harden master.yml permissions

Signed-off-by: Alex <aleksandrosansan@gmail.com>
---
 .github/workflows/master.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index f18042cfd1..5cbb2b390c 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -5,6 +5,9 @@ on:
     branches:
       - master
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   test:
     runs-on: ${{ matrix.os }}

From 2c00d98d0e26a9dc7007243964d390bc5324e48d Mon Sep 17 00:00:00 2001
From: Alex <aleksandrosansan@gmail.com>
Date: Sat, 24 Sep 2022 21:58:29 +0200
Subject: [PATCH 342/599] build: harden pull_request.yml permissions

Signed-off-by: Alex <aleksandrosansan@gmail.com>
---
 .github/workflows/pull_request.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index b9e93ba1f5..7a5e20608e 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -8,6 +8,9 @@ on:
     branches:
       - master
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   test:
     runs-on: ${{ matrix.os }}

From 843c117c52a1e07711d6b05de5b115046d4913c5 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Mon, 3 Oct 2022 13:37:29 +0100
Subject: [PATCH 343/599] Changes to fix a number of issues we have seen
 including empty locus name and not processing joins correctly

---
 .../nbio/core/sequence/io/GenbankReader.java  |  13 ++-
 .../sequence/io/GenbankSequenceParser.java    |  47 +++++++-
 .../nbio/core/sequence/io/GenbankWriter.java  |   4 +-
 .../core/sequence/io/GenbankWriterHelper.java |  18 +++
 .../io/GenericGenbankHeaderFormat.java        |  57 +++++++--
 .../io/GenericGenbankHeaderParser.java        | 109 +++++++++++++++---
 .../sequence/io/GenericInsdcHeaderFormat.java |  69 +++++++++--
 7 files changed, 274 insertions(+), 43 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
index bd78282bbe..b56919c1c7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
@@ -26,6 +26,7 @@
 package org.biojava.nbio.core.sequence.io;
 
 import org.biojava.nbio.core.exceptions.CompoundNotFoundException;
+import org.biojava.nbio.core.sequence.AccessionID;
 import org.biojava.nbio.core.sequence.DataSource;
 import org.biojava.nbio.core.sequence.TaxonomyID;
 import org.biojava.nbio.core.sequence.features.DBReferenceInfo;
@@ -162,8 +163,16 @@ public LinkedHashMap<String,S> process(final int max) throws IOException, Compou
 			if(seqString==null) break;
 			@SuppressWarnings("unchecked")
 			S sequence = (S) sequenceCreator.getSequence(seqString, 0);
-			genbankParser.getSequenceHeaderParser().parseHeader(genbankParser.getHeader(), sequence);
-
+			GenericGenbankHeaderParser<S, C> genbankHeaderParser = genbankParser.getSequenceHeaderParser();
+			
+			genbankHeaderParser.parseHeader(genbankParser.getHeader(), sequence);
+			
+			String id = genbankHeaderParser.getAccession();
+			int version = genbankHeaderParser.getVersion();
+			String identifier = genbankHeaderParser.getIdentifier();
+			AccessionID accession = new AccessionID(id , DataSource.UNKNOWN, version, identifier);
+			sequence.setAccession(accession);
+			
 			// add features to new sequence
 			genbankParser.getFeatures().values().stream()
 			.flatMap(List::stream)
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
index 7d7eab9d43..ad414ac87d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
@@ -109,8 +109,10 @@ public class GenbankSequenceParser<S extends AbstractSequence<C>, C extends Comp
 	protected static final String PRIMARY = "PRIMARY";
 	protected static final String DBLINK = "DBLINK";
 	protected static final String END_SEQUENCE_TAG = "//";
-	// locus line
-	protected static final Pattern lp = Pattern.compile("^(\\S+)\\s+(\\d+)\\s+(bp|BP|aa|AA)\\s{0,4}(([dmsDMS][sS]-)?(\\S+))?\\s*(circular|CIRCULAR|linear|LINEAR)?\\s*(\\S+)?\\s*(\\S+)?$");
+	// locus line with name that may contain spaces but must start and end with non whitespace character
+	protected static final Pattern lp = Pattern.compile("^(\\S+[\\S ]*\\S*)\\s+(\\d+)\\s+(bp|BP|aa|AA)\\s{0,4}(([dmsDMS][sS]-)?(\\S+))?\\s*(circular|CIRCULAR|linear|LINEAR)?\\s*(\\S+)?\\s*(\\S+)?$");
+	// locus line with no name
+	protected static final Pattern lp2 = Pattern.compile("^(\\d+)\\s+(bp|BP|aa|AA)\\s{0,4}(([dmsDMS][sS]-)?(\\S+))?\\s*(circular|CIRCULAR|linear|LINEAR)?\\s*(\\S+)?\\s*(\\S+)?$");	
 	// version line
 	protected static final Pattern vp = Pattern.compile("^(\\S*?)(\\.(\\d+))?(\\s+GI:(\\S+))?$");
 	// reference line
@@ -267,6 +269,7 @@ private void parseReferenceTag(List<String[]> section) {
 	}
 
 	private void parseVersionTag(List<String[]> section) {
+		
 		String ver = section.get(0)[1];
 		Matcher m = vp.matcher(ver);
 		if (m.matches()) {
@@ -304,9 +307,13 @@ private void parseLocusTag(List<String[]> section) {
 		String loc = section.get(0)[1];
 		header = loc;
 		Matcher m = lp.matcher(loc);
+		Matcher m2 = lp2.matcher(loc);
+		
 		if (m.matches()) {
-			headerParser.setName(m.group(1));
-			headerParser.setAccession(m.group(1)); // default if no accession found
+			//remove any preceding or trailing whitespace from the locus name
+			String name = m.group(1).trim().replaceAll(" ","_");		
+			headerParser.setName(name);
+			headerParser.setAccession(name); // default if no accession found			
 			long sequenceLength = Long.valueOf(m.group(2));
 			String lengthUnits = m.group(3);
 			String type = m.group(6);
@@ -333,6 +340,37 @@ private void parseLocusTag(List<String[]> section) {
 
 			log.debug("compound type: {}", compoundType.getClass().getSimpleName());
 
+		} else if (m2.matches()) {
+			// Locus Name Missing - use different Locus regex
+			headerParser.setName("");
+			headerParser.setAccession(""); // default if no accession found			
+			long sequenceLength = Long.valueOf(m2.group(1));
+			String lengthUnits = m2.group(2);
+			String type = m2.group(5);
+
+			if (lengthUnits.equalsIgnoreCase("aa")) {
+				compoundType = AminoAcidCompoundSet.getAminoAcidCompoundSet();
+			} else if (lengthUnits.equalsIgnoreCase("bp")) {
+				if (type != null) {
+					if (type.contains("RNA")) {
+						compoundType = RNACompoundSet.getRNACompoundSet();
+					} else {
+						compoundType = DNACompoundSet.getDNACompoundSet();
+					}
+				} else {
+					compoundType = DNACompoundSet.getDNACompoundSet();
+				}
+			}
+
+			if (m2.group(6) != null) isCircularSequence = m2.group(6).equalsIgnoreCase("circular");
+
+			// configure location parser with needed information
+			locationParser.setSequenceLength(sequenceLength);
+			locationParser.setSequenceCircular(isCircularSequence);
+
+			log.debug("compound type: {}", compoundType.getClass().getSimpleName());
+			
+			
 		} else {
 			throw new ParserException("Bad locus line");
 		}
@@ -346,6 +384,7 @@ private void parseLocusTag(List<String[]> section) {
 	// reads an indented section, combining split lines and creating a list of
 	// key->value tuples
 	private List<String[]> readSection(BufferedReader bufferedReader) {
+		
 		List<String[]> section = new ArrayList<>();
 		String line;
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java
index e1accaa749..eb661ad0c0 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java
@@ -92,10 +92,10 @@ public void process() throws Exception {
 		PrintWriter writer = new PrintWriter(os);
 		for (S sequence : sequences) {
 			String header = headerFormat.getHeader(sequence);
-			writer.format(header);
+			writer.print(header);
 			writer.println();
 			// os.write(lineSep);
-
+			
 			/*
 			 * if isinstance(record.seq, UnknownSeq): #We have already recorded
 			 * the length, and there is no need #to record a long sequence of
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriterHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriterHelper.java
index 19e26bd3a7..a0ba83aec0 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriterHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriterHelper.java
@@ -135,6 +135,24 @@ public static void writeNucleotideSequence(OutputStream outputStream,
 		genbankWriter.process();
 	}
 
+	/**
+	 * Write a collection of NucleotideSequences to a file using the NucleotideSequences
+	 * original header as the LOCUS line rather than generating it
+	 *
+	 * @param outputStream
+	 * @param dnaSequences
+	 * @throws Exception
+	 */
+
+	public static void writeNucleotideSequenceOriginal(OutputStream outputStream, Collection<DNASequence> dnaSequences)
+			throws Exception {
+		GenericGenbankHeaderFormat<DNASequence, NucleotideCompound> genericGenbankHeaderFormat = new GenericGenbankHeaderFormat<DNASequence, NucleotideCompound>(
+				true);
+		GenbankWriter<DNASequence, NucleotideCompound> genbankWriter = new GenbankWriter<DNASequence, NucleotideCompound>(
+				outputStream, dnaSequences, genericGenbankHeaderFormat);
+		genbankWriter.process();
+	}
+	
 	/**
 	 * Write a sequence to a file
 	 *
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
index b1a7963593..bd0b592891 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
@@ -20,6 +20,7 @@
  */
 package org.biojava.nbio.core.sequence.io;
 
+import org.biojava.nbio.core.sequence.AccessionID;
 import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
 import org.biojava.nbio.core.sequence.compound.DNACompoundSet;
 import org.biojava.nbio.core.sequence.compound.RNACompoundSet;
@@ -38,6 +39,7 @@ public class GenericGenbankHeaderFormat<S extends AbstractSequence<C>, C extends
 	private static final int HEADER_WIDTH = 12;
 	private static final String lineSep = "%n";
 	private String seqType = null;
+	private Boolean useOriginalHeader = false;
 
 	public GenericGenbankHeaderFormat() {
 		seqType = null;
@@ -46,6 +48,10 @@ public GenericGenbankHeaderFormat() {
 	public GenericGenbankHeaderFormat(String seqType) {
 		this.seqType = seqType;
 	}
+	
+	public GenericGenbankHeaderFormat(Boolean useOriginalHeader) {
+		this.useOriginalHeader = useOriginalHeader;
+	}
 
 	/**
 	 * Used in the the 'header' of each GenBank record.
@@ -222,6 +228,22 @@ private String _write_the_first_line(S sequence) {
 		 */
 	}
 
+	/**
+	 * Write the original LOCUS line.
+	 *
+	 * @param sequence
+	 */
+	private String _write_original_first_line(S sequence) {
+
+		StringBuilder sb = new StringBuilder();
+		Formatter formatter = new Formatter(sb, Locale.US);
+		formatter.format("LOCUS       %s" + lineSep,
+				StringManipulationHelper.padRight(sequence.getOriginalHeader(), 16));
+		String output = formatter.toString();
+		formatter.close();
+		return output;
+	}
+	
 	/**
 	 * This is a bit complicated due to the range of possible ways people might
 	 * have done their annotation... Currently the parser uses a single string
@@ -243,12 +265,30 @@ private String _write_comment(S sequence) {
 
 	@Override
 	public String getHeader(S sequence) {
-		String header = _write_the_first_line(sequence);
-		String acc_with_version;
+		
+		String header;
+		
+		if (useOriginalHeader) {
+			header = _write_original_first_line(sequence);
+		} else {
+			header = _write_the_first_line(sequence);
+		}
+		
+		AccessionID accessionIdObj = sequence.getAccession();
 		String accession;
+		String acc_with_version;
+		
 		try {
-			acc_with_version = sequence.getAccession().getID();
-			accession = acc_with_version.split("\\.", 1)[0];
+			accession = accessionIdObj.getID();
+
+			if (accessionIdObj.getIdentifier() != null) {
+				acc_with_version = sequence.getAccession().getID() + "." + sequence.getAccession().getVersion() + " GI:"
+						+ accessionIdObj.getIdentifier();
+
+			} else {
+				acc_with_version = sequence.getAccession().getID() + "." + sequence.getAccession().getVersion();
+			}
+
 		} catch (Exception e) {
 			acc_with_version = "";
 			accession = "";
@@ -262,13 +302,6 @@ public String getHeader(S sequence) {
 		header += _write_multi_line("VERSION", acc_with_version);
 
 		/*
-		 * gi = self._get_annotation_str(record, "gi", just_first=True)
-		 *
-		 * self._write_single_line("ACCESSION", accession) if gi != ".":
-		 * self._write_single_line("VERSION", "%s  GI:%s" \ % (acc_with_version,
-		 * gi)) else: self._write_single_line("VERSION", "%s" %
-		 * (acc_with_version))
-		 *
 		 * #The NCBI only expect two types of link so far, #e.g. "Project:28471"
 		 * and "Trace Assembly Archive:123456" #TODO - Filter the dbxrefs list
 		 * to just these? self._write_multi_entries("DBLINK", record.dbxrefs)
@@ -319,7 +352,7 @@ public String getHeader(S sequence) {
 			header += _write_feature(feature, rec_length);
 		}
 
-		return header;
+		return String.format(header);
 	}
 
 }
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
index 7c828b54f2..26ce437c58 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
@@ -35,17 +35,60 @@
 
 import org.biojava.nbio.core.sequence.DataSource;
 
-public class GenericGenbankHeaderParser<S extends AbstractSequence<C>, C extends Compound> implements SequenceHeaderParserInterface<S,C> {
+public class GenericGenbankHeaderParser<S extends AbstractSequence<C>, C extends Compound>
+		implements SequenceHeaderParserInterface<S, C> {
 
+	@SuppressWarnings("unused")
+
+	// Brief description of sequence; includes information such as source organism,
+	// gene name/protein name, or some description of the sequence's function (if
+	// the sequence is non-coding). If the sequence has a coding region (CDS),
+	// description may be followed by a completeness qualifier, such as "complete
+	// cds".
+	private String description;
+	
+	// The unique identifier for a sequence record
 	private String accession = null;
+
 	private String identifier = null;
+
 	private String name = null;
-	@SuppressWarnings("unused")
+
+	// A nucleotide sequence identification number that represents a single,
+	// specific sequence in the GenBank database. This identification number uses
+	// the accession.version format implemented by GenBank/EMBL/DDBJ in February
+	// 1999.
 	private int version;
+
 	private boolean versionSeen;
+
 	private ArrayList<String> comments = new ArrayList<>();
+
+	// Publications by the authors of the sequence that discuss the data reported in
+	// the record. References are automatically sorted within the record based on
+	// date of publication, showing the oldest references first.
 	private List<AbstractReference> references = new ArrayList<>();
 
+	// Word or phrase describing the sequence. If no keywords are included in the
+	// entry, the field contains only a period.
+	private List<String> keywords = new ArrayList();
+
+	// Free-format information including an abbreviated form of the organism name,
+	// sometimes followed by a molecule type. (See section 3.4.10 of the GenBank
+	// release notes for more info.)
+	private String source = null;
+
+	// The formal scientific name for the source organism (genus and species, where
+	// appropriate) and its lineage, based on the phylogenetic classification scheme
+	// used in the NCBI Taxonomy Database. If the complete lineage of an organism is
+	// very long, an abbreviated lineage will be shown in the GenBank record and the
+	// complete lineage will be available in the Taxonomy Database. (See also the
+	// /db_xref=taxon:nnnn Feature qualifer, below.)
+	private List<String> organism = new ArrayList();
+	
+	// GI sequence identifier
+	private String gi = null;
+
 	/**
 	 * Parse the header and set the values in the sequence
 	 * @param header
@@ -54,12 +97,41 @@ public class GenericGenbankHeaderParser<S extends AbstractSequence<C>, C extends
 	@Override
 	public void parseHeader(String header, S sequence) {
 		sequence.setOriginalHeader(header);
+		sequence.setLocusName(name);
 		sequence.setAccession(new AccessionID(accession, DataSource.GENBANK, version, identifier));
 		sequence.setDescription(description);
 		sequence.setComments(comments);
 		sequence.setReferences(references);
 	}
 
+	public String getAccession() {
+		return accession;
+	}
+
+	public String getIdentifier() {
+		return identifier;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public int getVersion() {
+		return version;
+	}
+
+	public ArrayList<String> getComments() {
+		return comments;
+	}
+
+	public List<AbstractReference> getReferences() {
+		return references;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
 	/**
 	 * Sets the sequence info back to default values, ie. in order to start
 	 * constructing a new sequence from scratch.
@@ -77,9 +149,11 @@ private void reset() {
 
 	/**
 	 * {@inheritDoc}
+	 * The last accession passed to this routine will always be the one used.
 	 */
 	public void setVersion(int version) throws ParserException {
-		if (this.versionSeen) throw new ParserException("Current BioEntry already has a version");
+		if (this.versionSeen)
+			throw new ParserException("Current BioEntry already has a version");
 		else {
 			try {
 				this.version = version;
@@ -90,13 +164,13 @@ public void setVersion(int version) throws ParserException {
 		}
 	}
 
-
 	/**
-	 * {@inheritDoc}
-	 * The last accession passed to this routine will always be the one used.
+	 * {@inheritDoc} The last accession passed to this routine will always be the
+	 * one used.
 	 */
 	public void setAccession(String accession) throws ParserException {
-		if (accession==null) throw new ParserException("Accession cannot be null");
+		if (accession == null)
+			throw new ParserException("Accession cannot be null");
 		this.accession = accession;
 	}
 
@@ -104,17 +178,19 @@ public void setAccession(String accession) throws ParserException {
 	 * {@inheritDoc}
 	 */
 	public void setDescription(String description) throws ParserException {
-		if (this.description!=null) throw new ParserException("Current BioEntry already has a description");
+		if (this.description != null)
+			throw new ParserException("Current BioEntry already has a description");
 		this.description = description;
 	}
-	private String description;
 
 	/**
 	 * {@inheritDoc}
 	 */
 	public void setIdentifier(String identifier) throws ParserException {
-		if (identifier==null) throw new ParserException("Identifier cannot be null");
-		if (this.identifier!=null) throw new ParserException("Current BioEntry already has a identifier");
+		if (identifier == null)
+			throw new ParserException("Identifier cannot be null");
+		if (this.identifier != null)
+			throw new ParserException("Current BioEntry already has a identifier");
 		this.identifier = identifier;
 	}
 
@@ -122,8 +198,10 @@ public void setIdentifier(String identifier) throws ParserException {
 	 * {@inheritDoc}
 	 */
 	public void setName(String name) throws ParserException {
-		if (name==null) throw new ParserException("Name cannot be null");
-		if (this.name!=null) throw new ParserException("Current BioEntry already has a name");
+		if (name == null)
+			throw new ParserException("Name cannot be null");
+		if (this.name != null)
+			throw new ParserException("Current BioEntry already has a name");
 		this.name = name;
 	}
 
@@ -131,11 +209,12 @@ public void setName(String name) throws ParserException {
 	 * {@inheritDoc}
 	 */
 	public void setComment(String comment) throws ParserException {
-		if (comment==null) throw new ParserException("Comment cannot be null");
+		if (comment == null)
+			throw new ParserException("Comment cannot be null");
 		this.comments.add(comment);
 	}
 
-	public void addReference(AbstractReference abstractReference){
+	public void addReference(AbstractReference abstractReference) {
 		this.references.add(abstractReference);
 	}
 }
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
index 3ccff4111f..11b7550173 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
@@ -27,6 +27,7 @@
 import org.biojava.nbio.core.sequence.features.FeatureInterface;
 import org.biojava.nbio.core.sequence.features.Qualifier;
 import org.biojava.nbio.core.sequence.location.template.AbstractLocation;
+import org.biojava.nbio.core.sequence.location.template.Location;
 import org.biojava.nbio.core.sequence.location.template.Point;
 import org.biojava.nbio.core.sequence.template.AbstractSequence;
 import org.biojava.nbio.core.sequence.template.Compound;
@@ -101,7 +102,7 @@ private String _wrap_location(String location) {
 		if(location.length() <= length) {
 			return location;
 		}
-		int index = location.substring(length).lastIndexOf(",");
+		int index = location.substring(0, length).lastIndexOf(",");
 		if(-1 == index) {
 			//No good place to split (!)
 			return location;
@@ -115,6 +116,7 @@ private String _wrap_location(String location) {
 	 */
 	protected String _write_feature(FeatureInterface<AbstractSequence<C>, C> feature, int record_length) {
 		String location = _insdc_feature_location_string(feature, record_length);
+		
 		String f_type = feature.getType().replace(" ", "_");
 		StringBuilder sb = new StringBuilder();
 		Formatter formatter = new Formatter(sb,Locale.US);
@@ -125,7 +127,7 @@ protected String _write_feature(FeatureInterface<AbstractSequence<C>, C> feature
 		//Now the qualifiers...
 		for(List<Qualifier>  qualifiers : feature.getQualifiers().values()) {
 			for(Qualifier q : qualifiers){
-				line += _write_feature_qualifier(q.getName().replaceAll("%", "%%"), q.getValue().replaceAll("%", "%%"), q.needsQuotes());
+				line += _write_feature_qualifier(q.getName().replaceAll("%","%%"), q.getValue().replaceAll("%","%%"), q.needsQuotes());
 			}
 		}
 		return line;
@@ -168,21 +170,72 @@ no strand (either 0 or None) while the child features should have either
 	 * @param record_length
 	 */
 	private String _insdc_feature_location_string(FeatureInterface<AbstractSequence<C>, C> feature, int record_length) {
+		
 		if(feature.getChildrenFeatures().isEmpty()) {
-			//Non-recursive.
-			String location = _insdc_location_string_ignoring_strand_and_subfeatures(feature.getLocations(), record_length);
-			if(feature.getLocations().getStrand() == Strand.NEGATIVE) {
+			
+			if(feature.getLocations().getSubLocations().isEmpty()) {
+				
+				//Non-recursive.
+				String location = _insdc_location_string_ignoring_strand_and_subfeatures(feature.getLocations(), record_length);
+				if(feature.getLocations().getStrand() == Strand.NEGATIVE) {
+					StringBuilder sb = new StringBuilder();
+					Formatter formatter = new Formatter(sb,Locale.US);
+					formatter.format("complement(%s)", location);
+					String output = formatter.toString();
+					formatter.close();
+					location = output;
+				}
+				return location;	
+				
+			} else if (feature.getLocations().getStrand() == Strand.NEGATIVE) {
+				
+				// As noted above, treat reverse complement strand features carefully:
+
+				// check if any of the sublocations strand differs from the parent features strand
+				for(Location l  : feature.getLocations().getSubLocations()) {					
+					if (l.getStrand() != Strand.NEGATIVE) {						
+						StringBuilder sb = new StringBuilder();
+						Formatter formatter = new Formatter(sb, Locale.US);
+						formatter.format("Inconsistent strands: %s for parent, %s for child",
+								feature.getLocations().getStrand(), l.getStrand());
+						String output = formatter.toString();
+						formatter.close();
+						throw new RuntimeException(output);						
+					}					
+				}
+				
+				StringBuilder sb = new StringBuilder();
+				Formatter formatter = new Formatter(sb, Locale.US);
+				ArrayList<String> locations = new ArrayList<String>();
+				for(Location l  : feature.getLocations().getSubLocations()) {	
+					locations.add(_insdc_location_string_ignoring_strand_and_subfeatures((AbstractLocation) l, record_length));					
+				}
+				String location = StringManipulationHelper.join(locations, ",");
+				formatter.format("complement(%s(%s))", /* feature.location_operator */ "join", location);
+				String output = formatter.toString();
+				formatter.close();
+				return output;
+
+			} else {
+				//Convert feature sub-locations into joins
+				//This covers typical forward strand features, and also an evil mixed strand:
 				StringBuilder sb = new StringBuilder();
 				Formatter formatter = new Formatter(sb,Locale.US);
-				formatter.format("complement(%s)", location);
+				ArrayList<String> locations = new ArrayList<String>();
+				for(Location l  : feature.getLocations().getSubLocations()) {	
+					locations.add(_insdc_location_string_ignoring_strand_and_subfeatures((AbstractLocation) l, record_length));					
+				}
+				String location =  StringManipulationHelper.join(locations, ",");
+				formatter.format("%s(%s)", /*feature.location_operator*/ "join", location);
 				String output = formatter.toString();
 				formatter.close();
-				location = output;
+				return output;
 			}
-			return location;
+			
 		}
 		// As noted above, treat reverse complement strand features carefully:
 		if(feature.getLocations().getStrand() == Strand.NEGATIVE) {
+			
 			for(FeatureInterface<?, ?> f  : feature.getChildrenFeatures()) {
 				if(f.getLocations().getStrand() != Strand.NEGATIVE) {
 					StringBuilder sb = new StringBuilder();

From ab221dceb80b9bc823ec8b826b72efab9e2fa3ba Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Mon, 3 Oct 2022 13:44:19 +0100
Subject: [PATCH 344/599] Removed getLocusName()

---
 .../io/GenericGenbankHeaderParser.java        |   1 -
 .../core/sequence/location/InsdcParser.java   |   4 +-
 .../core/sequence/io/GenbankWriterTest.java   | 200 +++++++++++++++++-
 biojava-core/src/test/resources/with_joins.gb |  15 ++
 4 files changed, 216 insertions(+), 4 deletions(-)
 create mode 100644 biojava-core/src/test/resources/with_joins.gb

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
index 26ce437c58..5f2bd4445c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
@@ -97,7 +97,6 @@ public class GenericGenbankHeaderParser<S extends AbstractSequence<C>, C extends
 	@Override
 	public void parseHeader(String header, S sequence) {
 		sequence.setOriginalHeader(header);
-		sequence.setLocusName(name);
 		sequence.setAccession(new AccessionID(accession, DataSource.GENBANK, version, identifier));
 		sequence.setDescription(description);
 		sequence.setComments(comments);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
index 7370c7e4a3..648f84fe77 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
@@ -66,7 +66,7 @@ public class InsdcParser {
 	 * complement(location,location...location): consider locations in their
 	 * complement versus
 	 *
-	 * takes in input a comma splitted location string. The split must be done
+	 * takes in input a comma split location string. The split must be done
 	 * for outer level commas group(1) is the qualifier group(2) is the location
 	 * string to getFeatures. In case of complex splits it will contain the
 	 * nested expression
@@ -74,7 +74,7 @@ public class InsdcParser {
 	 * Not really sure that they are not declared obsolete but they are still in
 	 * several files.
 	 */
-	protected static final Pattern genbankSplitPattern = Pattern.compile("^\\s?(join|order|bond|complement|)\\(?(.+)\\)?");
+	protected static final Pattern genbankSplitPattern = Pattern.compile("^\\s?(join|order|bond|complement|)\\(?([\\s\\S]+)\\)?");
 	/**
 	 * designed to recursively split a location string in tokens. Valid tokens
 	 * are those divided by coma that are not inside a bracket. I. e. split on
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
index af73ab0c7a..648316cbc4 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
@@ -27,10 +27,14 @@
 import org.biojava.nbio.core.sequence.AccessionID;
 import org.biojava.nbio.core.sequence.DNASequence;
 import org.biojava.nbio.core.sequence.features.AbstractFeature;
+import org.biojava.nbio.core.sequence.features.FeatureInterface;
 import org.biojava.nbio.core.sequence.features.Qualifier;
 import org.biojava.nbio.core.sequence.features.TextFeature;
 import org.biojava.nbio.core.sequence.location.SimpleLocation;
+import org.biojava.nbio.core.sequence.location.template.Location;
+import org.biojava.nbio.core.sequence.template.AbstractSequence;
 import org.biojava.nbio.core.sequence.Strand;
+import org.biojava.nbio.core.sequence.compound.NucleotideCompound;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -110,7 +114,7 @@ public void testGithub886() throws Exception {
 				Arrays.asList(seq), 
 				GenbankWriterHelper.LINEAR_DNA);
 		fragwriter.close();
-		System.out.println(fragwriter.toString().replaceAll("\r\n", "\n"));
+		//System.out.println(fragwriter.toString().replaceAll("\r\n", "\n"));
 		
 		// now read in the file that was created and check that the qualifiers were created correctly
 		InputStream readerInputStream = new ByteArrayInputStream(fragwriter.toByteArray());
@@ -140,4 +144,198 @@ public void testGithub886() throws Exception {
 		assertEquals("50%", newQualifiers.get("note7").get(0).getValue());
 		
 	}
+	
+	@Test
+	public void testLocationJoins() throws Exception {
+		
+		// First read a GenBank file containing location joins
+		InputStream inStream = GenbankWriterTest.class.getResourceAsStream("/with_joins.gb");
+		DNASequence sequence = GenbankReaderHelper.readGenbankDNASequence(inStream).values().iterator().next();
+		
+		// Check the joins are read correctly
+		List<FeatureInterface<AbstractSequence<NucleotideCompound>, NucleotideCompound>> features = sequence.getFeatures();
+		
+		FeatureInterface<AbstractSequence<NucleotideCompound>, NucleotideCompound> join1 = features.get(0);
+		List<Location> join1SubLocs = join1.getLocations().getSubLocations();
+		
+		assertEquals("join1, getType()", "CDS", join1.getType());
+		assertEquals("join1, getLocations().getStrand()", "POSITIVE", join1.getLocations().getStrand().toString());
+		assertEquals("join1, getLocations().getSubLocations().size()", 8, join1SubLocs.size());
+		
+		assertEquals("join1, SubLocation 1)", 3356, join1SubLocs.get(0).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 1)", 3356, join1SubLocs.get(0).getEnd().getPosition().intValue());
+		
+		assertEquals("join1, SubLocation 2)", 3500, join1SubLocs.get(1).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 2)", 3792, join1SubLocs.get(1).getEnd().getPosition().intValue());
+		
+		assertEquals("join1, SubLocation 3)", 3793, join1SubLocs.get(2).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 3)", 3793, join1SubLocs.get(2).getEnd().getPosition().intValue());
+		
+		assertEquals("join1, SubLocation 4)", 4185, join1SubLocs.get(3).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 4)", 4228, join1SubLocs.get(3).getEnd().getPosition().intValue());
+		
+		assertEquals("join1, SubLocation 5)", 4229, join1SubLocs.get(4).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 5)", 4229, join1SubLocs.get(4).getEnd().getPosition().intValue());
+		
+		assertEquals("join1, SubLocation 6)", 4348, join1SubLocs.get(5).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 6)", 4676, join1SubLocs.get(5).getEnd().getPosition().intValue());
+		
+		assertEquals("join1, SubLocation 7)", 4677, join1SubLocs.get(6).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 7)", 4677, join1SubLocs.get(6).getEnd().getPosition().intValue());
+		
+		assertEquals("join1, SubLocation 8)", 4775, join1SubLocs.get(7).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 8)", 5094, join1SubLocs.get(7).getEnd().getPosition().intValue());
+		
+		//qualifiers
+		assertEquals("join1, getType()", "Joined feature", join1.getQualifiers().get("standard_name").get(0).getValue());
+		
+		//Join 2
+		FeatureInterface<AbstractSequence<NucleotideCompound>, NucleotideCompound> join2 = features.get(1);
+		List<Location> join2SubLocs = join1.getLocations().getSubLocations();
+		
+		assertEquals("join1, getType()", "CDS", join2.getType());
+		assertEquals("join1, getLocations().getStrand()", "NEGATIVE", join2.getLocations().getStrand().toString());
+		assertEquals("join1, getLocations().getSubLocations().size()", 8, join2SubLocs.size());
+		
+		assertEquals("join2, SubLocation 1)", 3356, join2SubLocs.get(0).getStart().getPosition().intValue());
+		assertEquals("join2, SubLocation 1)", 3356, join2SubLocs.get(0).getEnd().getPosition().intValue());
+		
+		assertEquals("join2, SubLocation 2)", 3500, join2SubLocs.get(1).getStart().getPosition().intValue());
+		assertEquals("join2, SubLocation 2)", 3792, join2SubLocs.get(1).getEnd().getPosition().intValue());
+		
+		assertEquals("join2, SubLocation 3)", 3793, join2SubLocs.get(2).getStart().getPosition().intValue());
+		assertEquals("join2, SubLocation 3)", 3793, join2SubLocs.get(2).getEnd().getPosition().intValue());
+		
+		assertEquals("join2, SubLocation 4)", 4185, join2SubLocs.get(3).getStart().getPosition().intValue());
+		assertEquals("join2, SubLocation 4)", 4228, join2SubLocs.get(3).getEnd().getPosition().intValue());
+		
+		assertEquals("join2, SubLocation 5)", 4229, join2SubLocs.get(4).getStart().getPosition().intValue());
+		assertEquals("join2, SubLocation 5)", 4229, join2SubLocs.get(4).getEnd().getPosition().intValue());
+	
+		assertEquals("join2, SubLocation 6)", 4348, join2SubLocs.get(5).getStart().getPosition().intValue());
+		assertEquals("join2, SubLocation 6)", 4676, join2SubLocs.get(5).getEnd().getPosition().intValue());
+		
+		assertEquals("join2, SubLocation 7)", 4677, join2SubLocs.get(6).getStart().getPosition().intValue());
+		assertEquals("join2, SubLocation 7)", 4677, join2SubLocs.get(6).getEnd().getPosition().intValue());
+		
+		assertEquals("join2, SubLocation 8)", 4775, join2SubLocs.get(7).getStart().getPosition().intValue());
+		assertEquals("join2, SubLocation 8)", 5094, join2SubLocs.get(7).getEnd().getPosition().intValue());
+		
+		//qualifiers
+		assertEquals("join1, getType()", "Joined feature on complement", join2.getQualifiers().get("standard_name").get(0).getValue());
+		
+		// Now write the joins back to a file using the GenbankWriterHelper
+		ByteArrayOutputStream fragwriter = new ByteArrayOutputStream();
+		GenbankWriterHelper.writeNucleotideSequenceOriginal(
+				fragwriter, 
+				Arrays.asList(sequence));
+		fragwriter.close();
+		
+		System.out.println(fragwriter.toString().replaceAll("\r\n", "\n"));
+		
+		// Read the output file and test that no information is lost
+		InputStream readerInputStream = new ByteArrayInputStream(fragwriter.toByteArray());
+		DNASequence newSequence = GenbankReaderHelper.readGenbankDNASequence(readerInputStream).values().iterator().next();
+		
+		List<FeatureInterface<AbstractSequence<NucleotideCompound>, NucleotideCompound>> newFeatures = newSequence.getFeatures();
+		
+		// Check the output matches the original sequence feature
+		for (int i=0; i < features.size(); i++ ) {
+			assertEquals("getFeatures(), getType()", features.get(i).getType(), newFeatures.get(i).getType());
+			assertEquals("getFeatures(), getLocations()", features.get(i).getLocations(), newFeatures.get(i).getLocations());
+			assertEquals("getFeatures(), getStrand()", features.get(i).getLocations().getStrand(), newFeatures.get(i).getLocations().getStrand());
+
+			List<Location> subLocations = features.get(i).getLocations().getSubLocations();
+			List<Location> newSubLocations = newFeatures.get(i).getLocations().getSubLocations();
+			assertEquals("getSubLocations()", subLocations.size(), newSubLocations.size());
+		
+			assertEquals("getSubLocations()", subLocations, newSubLocations);
+			
+			for (int j=0; j < subLocations.size(); j++ ) {
+				assertEquals("getSubLocations()", subLocations.get(j).toString(), newSubLocations.get(j).toString());
+			}
+			
+			Map<String, List<Qualifier>> qualifiers = features.get(i).getQualifiers();
+			Map<String, List<Qualifier>> newQualifiers = newFeatures.get(i).getQualifiers();
+			
+			for (String qualifierType:  qualifiers.keySet()) {
+				assertEquals("getSubLocations()", qualifiers.get(qualifierType).get(0).getValue(), newQualifiers.get(qualifierType).get(0).getValue());				
+			}
+			
+		}
+		
+	}
+	
+	/**
+	 * Going from GenBank file -> DNASequence object -> GenBank file looses information
+	 * https://github.com/biojava/biojava/issues/942
+	 */
+	@Test
+	public void testGithub942() throws Exception {
+		
+		// Important information is lost when reading and writing a
+		// GenBank file through GenbankReaderHelper & GenbankWriterHelper
+
+		// First read the sample GenBank file from
+		// https://www.ncbi.nlm.nih.gov/Sitemap/samplerecord.html using the
+		// GenbankReaderHelper
+		InputStream inStream = GenbankWriterTest.class.getResourceAsStream("/NC_000913.gb");
+		DNASequence sequence = GenbankReaderHelper.readGenbankDNASequence(inStream).values().iterator().next();
+
+		// Then write sequence back to a file using the GenbankWriterHelper
+		ByteArrayOutputStream fragwriter = new ByteArrayOutputStream();
+		GenbankWriterHelper.writeNucleotideSequenceOriginal(
+				fragwriter, 
+				Arrays.asList(sequence));
+		fragwriter.close();
+		
+		// Test no important information is lost
+		InputStream readerInputStream = new ByteArrayInputStream(fragwriter.toByteArray());
+		DNASequence newSequence = GenbankReaderHelper.readGenbankDNASequence(readerInputStream).values().iterator().next();
+		
+		//System.out.println(fragwriter.toString().replaceAll("\r\n", "\n"));
+
+		assertEquals("getOriginalHeader()", sequence.getOriginalHeader(), newSequence.getOriginalHeader());
+		assertEquals("getLength()", sequence.getLength(), newSequence.getLength());
+		assertEquals("getAccession().getID()", sequence.getAccession().getID(), newSequence.getAccession().getID());
+		assertEquals("getAccession().getVersion()", sequence.getAccession().getVersion(), newSequence.getAccession().getVersion());
+		assertEquals("getDescription()", sequence.getDescription(), newSequence.getDescription());
+		assertEquals("getSource()", sequence.getSource(), newSequence.getSource());
+		assertEquals("getDNAType()", sequence.getDNAType(), newSequence.getDNAType());
+		assertEquals("getTaxonomy()", sequence.getTaxonomy(), newSequence.getTaxonomy());		
+		assertEquals("getReferences()", sequence.getReferences(), newSequence.getReferences());
+		assertEquals("getComments()", sequence.getComments(), newSequence.getComments());
+		assertEquals("getNotesList()", sequence.getNotesList(), newSequence.getNotesList());
+		
+		List<FeatureInterface<AbstractSequence<NucleotideCompound>, NucleotideCompound>> features = sequence.getFeatures();
+		List<FeatureInterface<AbstractSequence<NucleotideCompound>, NucleotideCompound>> newFeatures = newSequence.getFeatures();
+				
+		//feature locations and qualifiers
+		for (int i=0; i < features.size(); i++ ) {
+			assertEquals("getFeatures(), getType()", features.get(i).getType(), newFeatures.get(i).getType());
+			assertEquals("getFeatures(), getLocations()", features.get(i).getLocations(), newFeatures.get(i).getLocations());
+			assertEquals("getFeatures(), getStrand()", features.get(i).getLocations().getStrand(), newFeatures.get(i).getLocations().getStrand());
+
+			List<Location> subLocations = features.get(i).getLocations().getSubLocations();
+			List<Location> newSubLocations = newFeatures.get(i).getLocations().getSubLocations();
+			assertEquals("getSubLocations()", subLocations.size(), newSubLocations.size());
+		
+			assertEquals("getSubLocations()", subLocations, newSubLocations);
+			
+			for (int j=0; j < subLocations.size(); j++ ) {
+				assertEquals("getSubLocations()", subLocations.get(j).toString(), newSubLocations.get(j).toString());
+			}
+			
+			Map<String, List<Qualifier>> qualifiers = features.get(i).getQualifiers();
+			Map<String, List<Qualifier>> newQualifiers = newFeatures.get(i).getQualifiers();
+			
+			for (String qualifierType:  qualifiers.keySet()) {
+				assertEquals("getSubLocations()", qualifiers.get(qualifierType).get(0).getValue(), newQualifiers.get(qualifierType).get(0).getValue());				
+			}
+			
+		}
+		
+		assertEquals("getSequenceAsString()", sequence.getSequenceAsString(), newSequence.getSequenceAsString());
+		
+	}
 }
diff --git a/biojava-core/src/test/resources/with_joins.gb b/biojava-core/src/test/resources/with_joins.gb
new file mode 100644
index 0000000000..4b5299d09d
--- /dev/null
+++ b/biojava-core/src/test/resources/with_joins.gb
@@ -0,0 +1,15 @@
+LOCUS                         4 bp    DNA     circular SYN 26-SEP-2022
+DEFINITION  .
+ACCESSION   .
+VERSION     .
+KEYWORDS    .
+SOURCE      .      
+FEATURES             Location/Qualifiers
+     CDS             join(3356,3500..3792,3793,4185..4228,4229,4348..4676,4677,
+                     4775..5094)
+                     /standard_name="Joined feature"
+     CDS             complement(join(3356,3500..3792,3793,4185..4228,4229,4348..4676,4677,4775..5094))
+                     /standard_name="Joined feature on complement"                     
+ORIGIN      
+        1 acgg
+//

From a4d7729a517a39a1520ad9667fc8d83ae6436066 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Mon, 3 Oct 2022 14:01:51 +0100
Subject: [PATCH 345/599] updated the source of the accession to GENBANK

---
 .../java/org/biojava/nbio/core/sequence/io/GenbankReader.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
index b56919c1c7..74998d6b1a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
@@ -170,7 +170,7 @@ public LinkedHashMap<String,S> process(final int max) throws IOException, Compou
 			String id = genbankHeaderParser.getAccession();
 			int version = genbankHeaderParser.getVersion();
 			String identifier = genbankHeaderParser.getIdentifier();
-			AccessionID accession = new AccessionID(id , DataSource.UNKNOWN, version, identifier);
+			AccessionID accession = new AccessionID(id , DataSource.GENBANK, version, identifier);
 			sequence.setAccession(accession);
 			
 			// add features to new sequence

From 232372de36ce4cd81dd03024233deed6d9a58609 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Wed, 12 Oct 2022 11:08:12 +0100
Subject: [PATCH 346/599] added file to test for handling features containing
 joins

---
 biojava-core/src/test/resources/with_joins.gb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-core/src/test/resources/with_joins.gb b/biojava-core/src/test/resources/with_joins.gb
index 4b5299d09d..ab98c2c568 100644
--- a/biojava-core/src/test/resources/with_joins.gb
+++ b/biojava-core/src/test/resources/with_joins.gb
@@ -9,7 +9,7 @@ FEATURES             Location/Qualifiers
                      4775..5094)
                      /standard_name="Joined feature"
      CDS             complement(join(3356,3500..3792,3793,4185..4228,4229,4348..4676,4677,4775..5094))
-                     /standard_name="Joined feature on complement"                     
+                     /standard_name="Joined feature on complement"
 ORIGIN      
         1 acgg
 //

From a69e00ab266981d4373c308994a63c2752a39bc0 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Wed, 12 Oct 2022 11:10:45 +0100
Subject: [PATCH 347/599] Changed the file used for testing to one whith a much
 smaller sequence and hence much faster to test

---
 .../org/biojava/nbio/core/sequence/io/GenbankWriterTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
index 648316cbc4..651f614ede 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
@@ -231,7 +231,7 @@ public void testLocationJoins() throws Exception {
 				Arrays.asList(sequence));
 		fragwriter.close();
 		
-		System.out.println(fragwriter.toString().replaceAll("\r\n", "\n"));
+		//System.out.println(fragwriter.toString().replaceAll("\r\n", "\n"));
 		
 		// Read the output file and test that no information is lost
 		InputStream readerInputStream = new ByteArrayInputStream(fragwriter.toByteArray());
@@ -279,7 +279,7 @@ public void testGithub942() throws Exception {
 		// First read the sample GenBank file from
 		// https://www.ncbi.nlm.nih.gov/Sitemap/samplerecord.html using the
 		// GenbankReaderHelper
-		InputStream inStream = GenbankWriterTest.class.getResourceAsStream("/NC_000913.gb");
+		InputStream inStream = GenbankWriterTest.class.getResourceAsStream("/NM_000266.gb");
 		DNASequence sequence = GenbankReaderHelper.readGenbankDNASequence(inStream).values().iterator().next();
 
 		// Then write sequence back to a file using the GenbankWriterHelper

From 21ec595f87ca5e20608287d8186ea82d63daaeeb Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Wed, 12 Oct 2022 11:12:31 +0100
Subject: [PATCH 348/599] Handle partial locations in typical cases

---
 .../sequence/io/GenericInsdcHeaderFormat.java   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
index 11b7550173..4e23a00314 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
@@ -283,6 +283,8 @@ private String _insdc_location_string_ignoring_strand_and_subfeatures(
 		ref = ""
 	assert not location.ref_db
 	*/
+		
+		
 		String ref = "";
 		if(!sequenceLocation.getStart().isUncertain() && !sequenceLocation.getEnd().isUncertain() && sequenceLocation.getStart() == sequenceLocation.getEnd()) {
 			//Special case, for 12:12 return 12^13
@@ -338,7 +340,20 @@ private String _insdc_location_string_ignoring_strand_and_subfeatures(
 			}
 		} else {
 			//Typical case, e.g. 12..15 gets mapped to 11:15
-			return ref + _insdc_feature_position_string(sequenceLocation.getStart(), 0) + ".." + _insdc_feature_position_string(sequenceLocation.getEnd());
+			String start = _insdc_feature_position_string(sequenceLocation.getStart());
+			String end = _insdc_feature_position_string(sequenceLocation.getEnd()); 
+			
+			if (sequenceLocation.isPartial()) {
+				if (sequenceLocation.isPartialOn5prime()) {
+					start = "<" + start;
+				}
+				
+				if (sequenceLocation.isPartialOn3prime()) {
+					end = ">" + end;
+				}	
+			}
+			
+			return ref + start + ".." + end;
 		}
 	}
 	private String _insdc_feature_position_string(Point location) {

From f27305efde2ede543f0185c4dd0dbb5c0d420fce Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Wed, 12 Oct 2022 11:13:42 +0100
Subject: [PATCH 349/599] maintain quotes around feature qualifiers if they are
 present

---
 .../nbio/core/sequence/io/GenbankSequenceParser.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
index ad414ac87d..9b0e610d87 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
@@ -200,10 +200,12 @@ private void parseFeatureTag(List<String[]> section) {
 				if (gbFeature == null) {
 					throw new ParserException("Malformed GenBank file: found a qualifier without feature.");
 				}
+				Boolean needsQuotes = false;
 				key = key.substring(1); // strip leading slash
 				val = val.replaceAll("\\s*[\\n\\r]+\\s*", " ").trim();
 				if (val.endsWith("\"")) {
 					val = val.substring(1, val.length() - 1); // strip quotes
+					needsQuotes = true; // as the value has quotes then set that it needs quotes when written back out					
 				}
 				// parameter on old feature
 				if (key.equals("db_xref")) {
@@ -221,17 +223,17 @@ private void parseFeatureTag(List<String[]> section) {
 						throw new ParserException("Bad dbxref");
 					}
 				} else if (key.equalsIgnoreCase("organism")) {
-					Qualifier q = new Qualifier(key, val.replace('\n', ' '));
+					Qualifier q = new Qualifier(key, val.replace('\n', ' '), needsQuotes);
 					gbFeature.addQualifier(key, q);
 				} else {
 					if (key.equalsIgnoreCase("translation") || key.equals("anticodon")
 							|| key.equals("transl_except")) {
 						// strip spaces from sequence
 						val = val.replaceAll("\\s+", "");
-						Qualifier q = new Qualifier(key, val);
+						Qualifier q = new Qualifier(key, val, needsQuotes);
 						gbFeature.addQualifier(key, q);
 					} else {
-						Qualifier q = new Qualifier(key, val);
+						Qualifier q = new Qualifier(key, val, needsQuotes);
 						gbFeature.addQualifier(key, q);
 					}
 				}

From 78a6e2134938c455b744609959ed0b11f9349633 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Wed, 12 Oct 2022 11:21:13 +0100
Subject: [PATCH 350/599] Updated test file

---
 biojava-core/src/test/resources/with_joins.gb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/biojava-core/src/test/resources/with_joins.gb b/biojava-core/src/test/resources/with_joins.gb
index ab98c2c568..39d7c44056 100644
--- a/biojava-core/src/test/resources/with_joins.gb
+++ b/biojava-core/src/test/resources/with_joins.gb
@@ -5,10 +5,11 @@ VERSION     .
 KEYWORDS    .
 SOURCE      .      
 FEATURES             Location/Qualifiers
-     CDS             join(3356,3500..3792,3793,4185..4228,4229,4348..4676,4677,
-                     4775..5094)
+     CDS             join(1,10..12,30,41..42,43..46,
+                     47..50)
                      /standard_name="Joined feature"
-     CDS             complement(join(3356,3500..3792,3793,4185..4228,4229,4348..4676,4677,4775..5094))
+     CDS             complement(join(33,35..37,41..42,
+                     43..46,47..50))
                      /standard_name="Joined feature on complement"
 ORIGIN      
         1 acgg

From 14434787052de64d9b128a768ebab807e81eaae0 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Wed, 12 Oct 2022 15:52:19 +0100
Subject: [PATCH 351/599] updated the test data and tests

---
 .../core/sequence/io/GenbankWriterTest.java   | 85 ++++++++-----------
 biojava-core/src/test/resources/with_joins.gb |  6 +-
 2 files changed, 37 insertions(+), 54 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
index 651f614ede..d59648b3c5 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
@@ -160,69 +160,54 @@ public void testLocationJoins() throws Exception {
 		
 		assertEquals("join1, getType()", "CDS", join1.getType());
 		assertEquals("join1, getLocations().getStrand()", "POSITIVE", join1.getLocations().getStrand().toString());
-		assertEquals("join1, getLocations().getSubLocations().size()", 8, join1SubLocs.size());
+		assertEquals("join1, getLocations().getSubLocations().size()", 6, join1SubLocs.size());
 		
-		assertEquals("join1, SubLocation 1)", 3356, join1SubLocs.get(0).getStart().getPosition().intValue());
-		assertEquals("join1, SubLocation 1)", 3356, join1SubLocs.get(0).getEnd().getPosition().intValue());
+		assertEquals("join1, SubLocation 1)", 1, join1SubLocs.get(0).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 1)", 1, join1SubLocs.get(0).getEnd().getPosition().intValue());
 		
-		assertEquals("join1, SubLocation 2)", 3500, join1SubLocs.get(1).getStart().getPosition().intValue());
-		assertEquals("join1, SubLocation 2)", 3792, join1SubLocs.get(1).getEnd().getPosition().intValue());
+		assertEquals("join1, SubLocation 2)", 10, join1SubLocs.get(1).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 2)", 12, join1SubLocs.get(1).getEnd().getPosition().intValue());
 		
-		assertEquals("join1, SubLocation 3)", 3793, join1SubLocs.get(2).getStart().getPosition().intValue());
-		assertEquals("join1, SubLocation 3)", 3793, join1SubLocs.get(2).getEnd().getPosition().intValue());
+		assertEquals("join1, SubLocation 3)", 30, join1SubLocs.get(2).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 3)", 30, join1SubLocs.get(2).getEnd().getPosition().intValue());
 		
-		assertEquals("join1, SubLocation 4)", 4185, join1SubLocs.get(3).getStart().getPosition().intValue());
-		assertEquals("join1, SubLocation 4)", 4228, join1SubLocs.get(3).getEnd().getPosition().intValue());
+		assertEquals("join1, SubLocation 3)", 35, join1SubLocs.get(3).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 3)", 38, join1SubLocs.get(3).getEnd().getPosition().intValue());
 		
-		assertEquals("join1, SubLocation 5)", 4229, join1SubLocs.get(4).getStart().getPosition().intValue());
-		assertEquals("join1, SubLocation 5)", 4229, join1SubLocs.get(4).getEnd().getPosition().intValue());
+		assertEquals("join1, SubLocation 5)", 43, join1SubLocs.get(4).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 5)", 46, join1SubLocs.get(4).getEnd().getPosition().intValue());
 		
-		assertEquals("join1, SubLocation 6)", 4348, join1SubLocs.get(5).getStart().getPosition().intValue());
-		assertEquals("join1, SubLocation 6)", 4676, join1SubLocs.get(5).getEnd().getPosition().intValue());
-		
-		assertEquals("join1, SubLocation 7)", 4677, join1SubLocs.get(6).getStart().getPosition().intValue());
-		assertEquals("join1, SubLocation 7)", 4677, join1SubLocs.get(6).getEnd().getPosition().intValue());
-		
-		assertEquals("join1, SubLocation 8)", 4775, join1SubLocs.get(7).getStart().getPosition().intValue());
-		assertEquals("join1, SubLocation 8)", 5094, join1SubLocs.get(7).getEnd().getPosition().intValue());
+		assertEquals("join1, SubLocation 6)", 47, join1SubLocs.get(5).getStart().getPosition().intValue());
+		assertEquals("join1, SubLocation 6)", 50, join1SubLocs.get(5).getEnd().getPosition().intValue());
 		
 		//qualifiers
 		assertEquals("join1, getType()", "Joined feature", join1.getQualifiers().get("standard_name").get(0).getValue());
 		
 		//Join 2
 		FeatureInterface<AbstractSequence<NucleotideCompound>, NucleotideCompound> join2 = features.get(1);
-		List<Location> join2SubLocs = join1.getLocations().getSubLocations();
-		
-		assertEquals("join1, getType()", "CDS", join2.getType());
-		assertEquals("join1, getLocations().getStrand()", "NEGATIVE", join2.getLocations().getStrand().toString());
-		assertEquals("join1, getLocations().getSubLocations().size()", 8, join2SubLocs.size());
+		List<Location> join2SubLocs = join2.getLocations().getSubLocations();
 		
-		assertEquals("join2, SubLocation 1)", 3356, join2SubLocs.get(0).getStart().getPosition().intValue());
-		assertEquals("join2, SubLocation 1)", 3356, join2SubLocs.get(0).getEnd().getPosition().intValue());
+		assertEquals("join2, getType()", "CDS", join2.getType());
+		assertEquals("join2, getLocations().getStrand()", "NEGATIVE", join2.getLocations().getStrand().toString());
+		assertEquals("join2, getLocations().getSubLocations().size()", 5, join2SubLocs.size());
 		
-		assertEquals("join2, SubLocation 2)", 3500, join2SubLocs.get(1).getStart().getPosition().intValue());
-		assertEquals("join2, SubLocation 2)", 3792, join2SubLocs.get(1).getEnd().getPosition().intValue());
+		assertEquals("join2, SubLocation 1)", 33, join2SubLocs.get(0).getStart().getPosition().intValue());
+		assertEquals("join2, SubLocation 1)", 33, join2SubLocs.get(0).getEnd().getPosition().intValue());
 		
-		assertEquals("join2, SubLocation 3)", 3793, join2SubLocs.get(2).getStart().getPosition().intValue());
-		assertEquals("join2, SubLocation 3)", 3793, join2SubLocs.get(2).getEnd().getPosition().intValue());
+		assertEquals("join2, SubLocation 2)", 35, join2SubLocs.get(1).getStart().getPosition().intValue());
+		assertEquals("join2, SubLocation 2)", 37, join2SubLocs.get(1).getEnd().getPosition().intValue());
 		
-		assertEquals("join2, SubLocation 4)", 4185, join2SubLocs.get(3).getStart().getPosition().intValue());
-		assertEquals("join2, SubLocation 4)", 4228, join2SubLocs.get(3).getEnd().getPosition().intValue());
+		assertEquals("join2, SubLocation 3)", 41, join2SubLocs.get(2).getStart().getPosition().intValue());
+		assertEquals("join2, SubLocation 3)", 43, join2SubLocs.get(2).getEnd().getPosition().intValue());
 		
-		assertEquals("join2, SubLocation 5)", 4229, join2SubLocs.get(4).getStart().getPosition().intValue());
-		assertEquals("join2, SubLocation 5)", 4229, join2SubLocs.get(4).getEnd().getPosition().intValue());
-	
-		assertEquals("join2, SubLocation 6)", 4348, join2SubLocs.get(5).getStart().getPosition().intValue());
-		assertEquals("join2, SubLocation 6)", 4676, join2SubLocs.get(5).getEnd().getPosition().intValue());
-		
-		assertEquals("join2, SubLocation 7)", 4677, join2SubLocs.get(6).getStart().getPosition().intValue());
-		assertEquals("join2, SubLocation 7)", 4677, join2SubLocs.get(6).getEnd().getPosition().intValue());
+		assertEquals("join2, SubLocation 4)", 44, join2SubLocs.get(3).getStart().getPosition().intValue());
+		assertEquals("join2, SubLocation 4)", 46, join2SubLocs.get(3).getEnd().getPosition().intValue());
 		
-		assertEquals("join2, SubLocation 8)", 4775, join2SubLocs.get(7).getStart().getPosition().intValue());
-		assertEquals("join2, SubLocation 8)", 5094, join2SubLocs.get(7).getEnd().getPosition().intValue());
+		assertEquals("join2, SubLocation 5)", 47, join2SubLocs.get(4).getStart().getPosition().intValue());
+		assertEquals("join2, SubLocation 5)", 50, join2SubLocs.get(4).getEnd().getPosition().intValue());
 		
 		//qualifiers
-		assertEquals("join1, getType()", "Joined feature on complement", join2.getQualifiers().get("standard_name").get(0).getValue());
+		assertEquals("join2, getType()", "Joined feature on complement", join2.getQualifiers().get("standard_name").get(0).getValue());
 		
 		// Now write the joins back to a file using the GenbankWriterHelper
 		ByteArrayOutputStream fragwriter = new ByteArrayOutputStream();
@@ -231,7 +216,7 @@ public void testLocationJoins() throws Exception {
 				Arrays.asList(sequence));
 		fragwriter.close();
 		
-		//System.out.println(fragwriter.toString().replaceAll("\r\n", "\n"));
+		System.out.println(fragwriter.toString().replaceAll("\r\n", "\n"));
 		
 		// Read the output file and test that no information is lost
 		InputStream readerInputStream = new ByteArrayInputStream(fragwriter.toByteArray());
@@ -242,17 +227,17 @@ public void testLocationJoins() throws Exception {
 		// Check the output matches the original sequence feature
 		for (int i=0; i < features.size(); i++ ) {
 			assertEquals("getFeatures(), getType()", features.get(i).getType(), newFeatures.get(i).getType());
-			assertEquals("getFeatures(), getLocations()", features.get(i).getLocations(), newFeatures.get(i).getLocations());
+			assertEquals("getFeatures(), getStart()", features.get(i).getLocations().getStart(), newFeatures.get(i).getLocations().getStart());
+			assertEquals("getFeatures(), getEnd()", features.get(i).getLocations().getEnd(), newFeatures.get(i).getLocations().getEnd());
 			assertEquals("getFeatures(), getStrand()", features.get(i).getLocations().getStrand(), newFeatures.get(i).getLocations().getStrand());
 
 			List<Location> subLocations = features.get(i).getLocations().getSubLocations();
 			List<Location> newSubLocations = newFeatures.get(i).getLocations().getSubLocations();
 			assertEquals("getSubLocations()", subLocations.size(), newSubLocations.size());
-		
-			assertEquals("getSubLocations()", subLocations, newSubLocations);
-			
-			for (int j=0; j < subLocations.size(); j++ ) {
-				assertEquals("getSubLocations()", subLocations.get(j).toString(), newSubLocations.get(j).toString());
+		for (int j=0; j < subLocations.size(); j++ ) {
+				assertEquals("getSubLocations(), getStart()",  subLocations.get(j).getStart(), newSubLocations.get(j).getStart());
+				assertEquals("getSubLocations(), getEnd()",    subLocations.get(j).getEnd(), newSubLocations.get(j).getEnd());
+				assertEquals("getSubLocations(), getStrand()", subLocations.get(j).getStrand(), newSubLocations.get(j).getStrand());
 			}
 			
 			Map<String, List<Qualifier>> qualifiers = features.get(i).getQualifiers();
diff --git a/biojava-core/src/test/resources/with_joins.gb b/biojava-core/src/test/resources/with_joins.gb
index 39d7c44056..aafd8756bb 100644
--- a/biojava-core/src/test/resources/with_joins.gb
+++ b/biojava-core/src/test/resources/with_joins.gb
@@ -5,11 +5,9 @@ VERSION     .
 KEYWORDS    .
 SOURCE      .      
 FEATURES             Location/Qualifiers
-     CDS             join(1,10..12,30,41..42,43..46,
-                     47..50)
+     CDS             join(1,10..12,30,35..38,43..46,47..50)
                      /standard_name="Joined feature"
-     CDS             complement(join(33,35..37,41..42,
-                     43..46,47..50))
+     CDS             complement(join(33,35..37,41..43,44..46,47..50))
                      /standard_name="Joined feature on complement"
 ORIGIN      
         1 acgg

From 72347b0080bb376fab1f3a8337a4b1455f69bf47 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Wed, 12 Oct 2022 15:52:59 +0100
Subject: [PATCH 352/599] updated test data and tests

---
 .../org/biojava/nbio/core/sequence/io/GenbankWriterTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
index d59648b3c5..06455f8469 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
@@ -216,7 +216,7 @@ public void testLocationJoins() throws Exception {
 				Arrays.asList(sequence));
 		fragwriter.close();
 		
-		System.out.println(fragwriter.toString().replaceAll("\r\n", "\n"));
+		//System.out.println(fragwriter.toString().replaceAll("\r\n", "\n"));
 		
 		// Read the output file and test that no information is lost
 		InputStream readerInputStream = new ByteArrayInputStream(fragwriter.toByteArray());

From fc978f78584251fac58cd55ed73e32cec22e2049 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 11:09:15 +0100
Subject: [PATCH 353/599] Changed the 'name' set by the super() call to the
 Qualifier constructor from dbxref -> db_xref as the second form is most
 commonly used and appears in reference material for GenBank files

---
 .../biojava/nbio/core/sequence/features/DBReferenceInfo.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java
index ce8793c561..fc9f7fc8f6 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java
@@ -47,7 +47,7 @@ public class DBReferenceInfo extends Qualifier {
 	 * @param id
 	 */
 	public DBReferenceInfo(String database, String id){
-		super("dbxref","");
+		super("db_xref","");
 		this.database = database;
 		this.id = id;
 	}

From df591fd9dd1200a8bc800bb0a6f010885ec69f2f Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 11:12:02 +0100
Subject: [PATCH 354/599] Set if a db_xref qualifier requires quotes

---
 .../biojava/nbio/core/sequence/io/GenbankSequenceParser.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
index 9b0e610d87..d8514731f3 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
@@ -203,9 +203,10 @@ private void parseFeatureTag(List<String[]> section) {
 				Boolean needsQuotes = false;
 				key = key.substring(1); // strip leading slash
 				val = val.replaceAll("\\s*[\\n\\r]+\\s*", " ").trim();
+				
 				if (val.endsWith("\"")) {
 					val = val.substring(1, val.length() - 1); // strip quotes
-					needsQuotes = true; // as the value has quotes then set that it needs quotes when written back out					
+					needsQuotes = true; // as the value has quotes then set that it needs quotes when written back out
 				}
 				// parameter on old feature
 				if (key.equals("db_xref")) {
@@ -214,6 +215,7 @@ private void parseFeatureTag(List<String[]> section) {
 						String dbname = m.group(1);
 						String raccession = m.group(2);
 						DBReferenceInfo xref = new DBReferenceInfo(dbname, raccession);
+						xref.setNeedsQuotes(needsQuotes);
 						gbFeature.addQualifier(key, xref);
 
 						ArrayList<DBReferenceInfo> listDBEntry = new ArrayList<>();

From 4dcfbed7987fb81f4db86b2d580616c84b25f66a Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 11:14:24 +0100
Subject: [PATCH 355/599] When writing out feature qualifiers if they are
 db_xref values handle this differently because they don't have a value.
 Rather we need to use the database and ID values to create the output

---
 .../nbio/core/sequence/io/GenericInsdcHeaderFormat.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
index 4e23a00314..8c958d18c1 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
@@ -24,6 +24,7 @@
 package org.biojava.nbio.core.sequence.io;
 
 import org.biojava.nbio.core.sequence.Strand;
+import org.biojava.nbio.core.sequence.features.DBReferenceInfo;
 import org.biojava.nbio.core.sequence.features.FeatureInterface;
 import org.biojava.nbio.core.sequence.features.Qualifier;
 import org.biojava.nbio.core.sequence.location.template.AbstractLocation;
@@ -127,7 +128,12 @@ protected String _write_feature(FeatureInterface<AbstractSequence<C>, C> feature
 		//Now the qualifiers...
 		for(List<Qualifier>  qualifiers : feature.getQualifiers().values()) {
 			for(Qualifier q : qualifiers){
-				line += _write_feature_qualifier(q.getName().replaceAll("%","%%"), q.getValue().replaceAll("%","%%"), q.needsQuotes());
+				if (q instanceof DBReferenceInfo) {
+					DBReferenceInfo db = (DBReferenceInfo) q;
+					line += _write_feature_qualifier(q.getName().replaceAll("%","%%"), db.getDatabase().replaceAll("%","%%") + ":" + db.getId().replaceAll("%","%%"), db.needsQuotes());	
+				} else {
+					line += _write_feature_qualifier(q.getName().replaceAll("%","%%"), q.getValue().replaceAll("%","%%"), q.needsQuotes());
+				}
 			}
 		}
 		return line;

From a44070c2b2120db0eff3ae6ce20c895ced262ce7 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 11:16:04 +0100
Subject: [PATCH 356/599] Changes to improve the testGithub942 test

---
 .../core/sequence/io/GenbankWriterTest.java   | 76 +++++++++++++------
 1 file changed, 52 insertions(+), 24 deletions(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
index 06455f8469..72bc7d5b23 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
@@ -27,6 +27,7 @@
 import org.biojava.nbio.core.sequence.AccessionID;
 import org.biojava.nbio.core.sequence.DNASequence;
 import org.biojava.nbio.core.sequence.features.AbstractFeature;
+import org.biojava.nbio.core.sequence.features.DBReferenceInfo;
 import org.biojava.nbio.core.sequence.features.FeatureInterface;
 import org.biojava.nbio.core.sequence.features.Qualifier;
 import org.biojava.nbio.core.sequence.features.TextFeature;
@@ -45,6 +46,7 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -285,39 +287,65 @@ public void testGithub942() throws Exception {
 		assertEquals("getAccession().getID()", sequence.getAccession().getID(), newSequence.getAccession().getID());
 		assertEquals("getAccession().getVersion()", sequence.getAccession().getVersion(), newSequence.getAccession().getVersion());
 		assertEquals("getDescription()", sequence.getDescription(), newSequence.getDescription());
-		assertEquals("getSource()", sequence.getSource(), newSequence.getSource());
-		assertEquals("getDNAType()", sequence.getDNAType(), newSequence.getDNAType());
-		assertEquals("getTaxonomy()", sequence.getTaxonomy(), newSequence.getTaxonomy());		
-		assertEquals("getReferences()", sequence.getReferences(), newSequence.getReferences());
-		assertEquals("getComments()", sequence.getComments(), newSequence.getComments());
-		assertEquals("getNotesList()", sequence.getNotesList(), newSequence.getNotesList());
-		
+		//assertEquals("getSource()", sequence.getSource(), newSequence.getSource());
+		//assertEquals("getDNAType()", sequence.getDNAType(), newSequence.getDNAType());
+		//assertEquals("getTaxonomy()", sequence.getTaxonomy(), newSequence.getTaxonomy());		
+		//assertEquals("getReferences()", sequence.getReferences(), newSequence.getReferences());
+		//assertEquals("getComments()", sequence.getComments(), newSequence.getComments());
+		//assertEquals("getNotesList()", sequence.getNotesList(), newSequence.getNotesList());
+		
+		//Assuming the features will be in the same order
 		List<FeatureInterface<AbstractSequence<NucleotideCompound>, NucleotideCompound>> features = sequence.getFeatures();
 		List<FeatureInterface<AbstractSequence<NucleotideCompound>, NucleotideCompound>> newFeatures = newSequence.getFeatures();
-				
+		
 		//feature locations and qualifiers
 		for (int i=0; i < features.size(); i++ ) {
-			assertEquals("getFeatures(), getType()", features.get(i).getType(), newFeatures.get(i).getType());
-			assertEquals("getFeatures(), getLocations()", features.get(i).getLocations(), newFeatures.get(i).getLocations());
-			assertEquals("getFeatures(), getStrand()", features.get(i).getLocations().getStrand(), newFeatures.get(i).getLocations().getStrand());
-
-			List<Location> subLocations = features.get(i).getLocations().getSubLocations();
-			List<Location> newSubLocations = newFeatures.get(i).getLocations().getSubLocations();
-			assertEquals("getSubLocations()", subLocations.size(), newSubLocations.size());
-		
-			assertEquals("getSubLocations()", subLocations, newSubLocations);
 			
-			for (int j=0; j < subLocations.size(); j++ ) {
-				assertEquals("getSubLocations()", subLocations.get(j).toString(), newSubLocations.get(j).toString());
-			}
+			FeatureInterface<AbstractSequence<NucleotideCompound>, NucleotideCompound> feature = features.get(i);
+			Location location           = feature.getLocations();
+			List<Location> subLocations = location.getSubLocations();
+			Map<String, List<Qualifier>> qualifiers  = feature.getQualifiers();
 			
-			Map<String, List<Qualifier>> qualifiers = features.get(i).getQualifiers();
-			Map<String, List<Qualifier>> newQualifiers = newFeatures.get(i).getQualifiers();
+			FeatureInterface<AbstractSequence<NucleotideCompound>, NucleotideCompound> newFeature = newFeatures.get(i);
+			Location newLocation           = newFeature.getLocations();
+			List<Location> newSubLocations = newLocation.getSubLocations();
+			Map<String, List<Qualifier>> newQualifiers  = newFeature.getQualifiers();
 			
-			for (String qualifierType:  qualifiers.keySet()) {
-				assertEquals("getSubLocations()", qualifiers.get(qualifierType).get(0).getValue(), newQualifiers.get(qualifierType).get(0).getValue());				
+			assertEquals("feature, getType()",       feature.getType(),    newFeature.getType());
+			assertEquals("feature, Location start",  location.getStart(),  newLocation.getStart());
+			assertEquals("feature, Location end",    location.getEnd(),    newLocation.getEnd());
+			assertEquals("feature, Location strand", location.getStrand(), newLocation.getStrand());
+			assertEquals("feature, sublocations",    subLocations.size(),  newSubLocations.size());
+			
+			for (int j=0; j < subLocations.size(); j++ ) {
+				assertEquals("SubLocations, start",  subLocations.get(j).getStart(),  newSubLocations.get(j).getStart());
+				assertEquals("SubLocations, end",    subLocations.get(j).getEnd(),    newSubLocations.get(j).getEnd());
+				assertEquals("SubLocations, strand", subLocations.get(j).getStrand(), newSubLocations.get(j).getStrand());
+				
 			}
 			
+			assertEquals("getQualifiers()", qualifiers.size(), newQualifiers.size());
+			
+			for (String qualifierType: qualifiers.keySet()) {
+				
+				List<Qualifier> qualifier   = new ArrayList<Qualifier>(qualifiers.get(qualifierType));
+				List<Qualifier> newQualifier = new ArrayList<Qualifier>(newQualifiers.get(qualifierType));
+				
+				assertEquals("getQualifiers()", qualifier.size(), newQualifier.size());
+				
+				for (int k=0; k < qualifier.size(); k++) {
+					if (qualifier.get(k) instanceof DBReferenceInfo) {
+						DBReferenceInfo dbxref = (DBReferenceInfo) qualifier.get(k);
+						DBReferenceInfo newDbxref = (DBReferenceInfo) newQualifier.get(k);
+						assertEquals("getQualifiers() DBReferenceInfo", dbxref.getDatabase(), newDbxref.getDatabase());
+						assertEquals("getQualifiers() DBReferenceInfo", dbxref.getId(), newDbxref.getId());
+						
+					} else {
+						assertEquals("getQualifiers()", qualifier.get(k).getValue(), newQualifier.get(k).getValue());
+						
+					}					
+				}					
+			}			
 		}
 		
 		assertEquals("getSequenceAsString()", sequence.getSequenceAsString(), newSequence.getSequenceAsString());

From d872145f2484d5a16049c5a015197cbda30add4c Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 14:57:21 +0100
Subject: [PATCH 357/599] undone formatting changes

---
 .../io/GenericGenbankHeaderParser.java        | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
index 5f2bd4445c..c15d4f4439 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
@@ -35,8 +35,7 @@
 
 import org.biojava.nbio.core.sequence.DataSource;
 
-public class GenericGenbankHeaderParser<S extends AbstractSequence<C>, C extends Compound>
-		implements SequenceHeaderParserInterface<S, C> {
+public class GenericGenbankHeaderParser<S extends AbstractSequence<C>, C extends Compound> implements SequenceHeaderParserInterface<S, C> {
 
 	@SuppressWarnings("unused")
 
@@ -151,8 +150,7 @@ private void reset() {
 	 * The last accession passed to this routine will always be the one used.
 	 */
 	public void setVersion(int version) throws ParserException {
-		if (this.versionSeen)
-			throw new ParserException("Current BioEntry already has a version");
+		if (this.versionSeen) throw new ParserException("Current BioEntry already has a version");
 		else {
 			try {
 				this.version = version;
@@ -164,12 +162,11 @@ public void setVersion(int version) throws ParserException {
 	}
 
 	/**
-	 * {@inheritDoc} The last accession passed to this routine will always be the
-	 * one used.
+	 * {@inheritDoc} 
+	 * The last accession passed to this routine will always be the one used.
 	 */
 	public void setAccession(String accession) throws ParserException {
-		if (accession == null)
-			throw new ParserException("Accession cannot be null");
+		if (accession == null) throw new ParserException("Accession cannot be null");
 		this.accession = accession;
 	}
 
@@ -177,8 +174,7 @@ public void setAccession(String accession) throws ParserException {
 	 * {@inheritDoc}
 	 */
 	public void setDescription(String description) throws ParserException {
-		if (this.description != null)
-			throw new ParserException("Current BioEntry already has a description");
+		if (this.description != null) throw new ParserException("Current BioEntry already has a description");
 		this.description = description;
 	}
 
@@ -186,10 +182,8 @@ public void setDescription(String description) throws ParserException {
 	 * {@inheritDoc}
 	 */
 	public void setIdentifier(String identifier) throws ParserException {
-		if (identifier == null)
-			throw new ParserException("Identifier cannot be null");
-		if (this.identifier != null)
-			throw new ParserException("Current BioEntry already has a identifier");
+		if (identifier == null) throw new ParserException("Identifier cannot be null");
+		if (this.identifier != null) throw new ParserException("Current BioEntry already has a identifier");
 		this.identifier = identifier;
 	}
 
@@ -197,10 +191,8 @@ public void setIdentifier(String identifier) throws ParserException {
 	 * {@inheritDoc}
 	 */
 	public void setName(String name) throws ParserException {
-		if (name == null)
-			throw new ParserException("Name cannot be null");
-		if (this.name != null)
-			throw new ParserException("Current BioEntry already has a name");
+		if (name == null) throw new ParserException("Name cannot be null");
+		if (this.name != null) throw new ParserException("Current BioEntry already has a name");
 		this.name = name;
 	}
 
@@ -208,8 +200,7 @@ public void setName(String name) throws ParserException {
 	 * {@inheritDoc}
 	 */
 	public void setComment(String comment) throws ParserException {
-		if (comment == null)
-			throw new ParserException("Comment cannot be null");
+		if (comment == null) throw new ParserException("Comment cannot be null");
 		this.comments.add(comment);
 	}
 

From 14def30ff28e0c19c888252eb350962b98230be2 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 15:03:20 +0100
Subject: [PATCH 358/599] more fixes to formatting

---
 .../io/GenericGenbankHeaderParser.java        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
index c15d4f4439..8acae612a2 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
@@ -35,7 +35,7 @@
 
 import org.biojava.nbio.core.sequence.DataSource;
 
-public class GenericGenbankHeaderParser<S extends AbstractSequence<C>, C extends Compound> implements SequenceHeaderParserInterface<S, C> {
+public class GenericGenbankHeaderParser<S extends AbstractSequence<C>, C extends Compound> implements SequenceHeaderParserInterface<S,C> {
 
 	@SuppressWarnings("unused")
 
@@ -162,11 +162,11 @@ public void setVersion(int version) throws ParserException {
 	}
 
 	/**
-	 * {@inheritDoc} 
+	 * {@inheritDoc}
 	 * The last accession passed to this routine will always be the one used.
 	 */
 	public void setAccession(String accession) throws ParserException {
-		if (accession == null) throw new ParserException("Accession cannot be null");
+		if (accession==null) throw new ParserException("Accession cannot be null");
 		this.accession = accession;
 	}
 
@@ -174,7 +174,7 @@ public void setAccession(String accession) throws ParserException {
 	 * {@inheritDoc}
 	 */
 	public void setDescription(String description) throws ParserException {
-		if (this.description != null) throw new ParserException("Current BioEntry already has a description");
+		if (this.description!=null) throw new ParserException("Current BioEntry already has a description");
 		this.description = description;
 	}
 
@@ -182,8 +182,8 @@ public void setDescription(String description) throws ParserException {
 	 * {@inheritDoc}
 	 */
 	public void setIdentifier(String identifier) throws ParserException {
-		if (identifier == null) throw new ParserException("Identifier cannot be null");
-		if (this.identifier != null) throw new ParserException("Current BioEntry already has a identifier");
+		if (identifier==null) throw new ParserException("Identifier cannot be null");
+		if (this.identifier!=null) throw new ParserException("Current BioEntry already has a identifier");
 		this.identifier = identifier;
 	}
 
@@ -191,8 +191,8 @@ public void setIdentifier(String identifier) throws ParserException {
 	 * {@inheritDoc}
 	 */
 	public void setName(String name) throws ParserException {
-		if (name == null) throw new ParserException("Name cannot be null");
-		if (this.name != null) throw new ParserException("Current BioEntry already has a name");
+		if (name==null) throw new ParserException("Name cannot be null");
+		if (this.name!=null) throw new ParserException("Current BioEntry already has a name");
 		this.name = name;
 	}
 
@@ -200,11 +200,11 @@ public void setName(String name) throws ParserException {
 	 * {@inheritDoc}
 	 */
 	public void setComment(String comment) throws ParserException {
-		if (comment == null) throw new ParserException("Comment cannot be null");
+		if (comment==null) throw new ParserException("Comment cannot be null");
 		this.comments.add(comment);
 	}
 
-	public void addReference(AbstractReference abstractReference) {
+	public void addReference(AbstractReference abstractReference){
 		this.references.add(abstractReference);
 	}
 }

From 63b5d850aee3f492c0f73aec3af886a6e26882b8 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 15:05:08 +0100
Subject: [PATCH 359/599] added back empty line that was removed

---
 .../nbio/core/sequence/io/GenericGenbankHeaderParser.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
index 8acae612a2..4310fe0607 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
@@ -161,6 +161,7 @@ public void setVersion(int version) throws ParserException {
 		}
 	}
 
+	
 	/**
 	 * {@inheritDoc}
 	 * The last accession passed to this routine will always be the one used.

From 339ef92291d60a2d75b087215fe6cf92f11796cf Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 15:06:17 +0100
Subject: [PATCH 360/599] fixed formatting change

---
 .../nbio/core/sequence/io/GenericGenbankHeaderParser.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
index 4310fe0607..f5329f6422 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
@@ -161,7 +161,7 @@ public void setVersion(int version) throws ParserException {
 		}
 	}
 
-	
+
 	/**
 	 * {@inheritDoc}
 	 * The last accession passed to this routine will always be the one used.

From 7f116c9a87c95b82237b3286d51c2bb73e6288c6 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 15:08:13 +0100
Subject: [PATCH 361/599] removed unused import

---
 .../org/biojava/nbio/core/sequence/io/GenbankWriterTest.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
index 72bc7d5b23..cdd466f6f0 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
@@ -46,7 +46,6 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

From 2dac5d9992d94127fae116cf7a71264d4f5e4b43 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 15:17:40 +0100
Subject: [PATCH 362/599] reversing formatting changes made during development

---
 .../sequence/io/GenericInsdcHeaderFormat.java     | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
index 8c958d18c1..6e1fbccf16 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
@@ -116,8 +116,7 @@ private String _wrap_location(String location) {
 	 * @param record_length
 	 */
 	protected String _write_feature(FeatureInterface<AbstractSequence<C>, C> feature, int record_length) {
-		String location = _insdc_feature_location_string(feature, record_length);
-		
+		String location = _insdc_feature_location_string(feature, record_length);		
 		String f_type = feature.getType().replace(" ", "_");
 		StringBuilder sb = new StringBuilder();
 		Formatter formatter = new Formatter(sb,Locale.US);
@@ -176,11 +175,8 @@ no strand (either 0 or None) while the child features should have either
 	 * @param record_length
 	 */
 	private String _insdc_feature_location_string(FeatureInterface<AbstractSequence<C>, C> feature, int record_length) {
-		
-		if(feature.getChildrenFeatures().isEmpty()) {
-			
+		if(feature.getChildrenFeatures().isEmpty()) {			
 			if(feature.getLocations().getSubLocations().isEmpty()) {
-				
 				//Non-recursive.
 				String location = _insdc_location_string_ignoring_strand_and_subfeatures(feature.getLocations(), record_length);
 				if(feature.getLocations().getStrand() == Strand.NEGATIVE) {
@@ -236,8 +232,7 @@ private String _insdc_feature_location_string(FeatureInterface<AbstractSequence<
 				String output = formatter.toString();
 				formatter.close();
 				return output;
-			}
-			
+			}			
 		}
 		// As noted above, treat reverse complement strand features carefully:
 		if(feature.getLocations().getStrand() == Strand.NEGATIVE) {
@@ -288,9 +283,7 @@ private String _insdc_location_string_ignoring_strand_and_subfeatures(
 	else:
 		ref = ""
 	assert not location.ref_db
-	*/
-		
-		
+	*/		
 		String ref = "";
 		if(!sequenceLocation.getStart().isUncertain() && !sequenceLocation.getEnd().isUncertain() && sequenceLocation.getStart() == sequenceLocation.getEnd()) {
 			//Special case, for 12:12 return 12^13

From f3212e387a8b5ed7f0e0d68e7a9721abe292b8b0 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 15:21:59 +0100
Subject: [PATCH 363/599] More formatting changes

---
 .../nbio/core/sequence/io/GenericInsdcHeaderFormat.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
index 6e1fbccf16..2dd66ee1e7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
@@ -116,7 +116,7 @@ private String _wrap_location(String location) {
 	 * @param record_length
 	 */
 	protected String _write_feature(FeatureInterface<AbstractSequence<C>, C> feature, int record_length) {
-		String location = _insdc_feature_location_string(feature, record_length);		
+		String location = _insdc_feature_location_string(feature, record_length);
 		String f_type = feature.getType().replace(" ", "_");
 		StringBuilder sb = new StringBuilder();
 		Formatter formatter = new Formatter(sb,Locale.US);
@@ -235,8 +235,7 @@ private String _insdc_feature_location_string(FeatureInterface<AbstractSequence<
 			}			
 		}
 		// As noted above, treat reverse complement strand features carefully:
-		if(feature.getLocations().getStrand() == Strand.NEGATIVE) {
-			
+		if(feature.getLocations().getStrand() == Strand.NEGATIVE) {			
 			for(FeatureInterface<?, ?> f  : feature.getChildrenFeatures()) {
 				if(f.getLocations().getStrand() != Strand.NEGATIVE) {
 					StringBuilder sb = new StringBuilder();
@@ -283,7 +282,7 @@ private String _insdc_location_string_ignoring_strand_and_subfeatures(
 	else:
 		ref = ""
 	assert not location.ref_db
-	*/		
+	*/
 		String ref = "";
 		if(!sequenceLocation.getStart().isUncertain() && !sequenceLocation.getEnd().isUncertain() && sequenceLocation.getStart() == sequenceLocation.getEnd()) {
 			//Special case, for 12:12 return 12^13

From 54640b7587a6082ed60974f9de3591ac763b5d60 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 15:23:11 +0100
Subject: [PATCH 364/599] more formatting changes

---
 .../biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
index 2dd66ee1e7..973403a2b5 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
@@ -235,7 +235,7 @@ private String _insdc_feature_location_string(FeatureInterface<AbstractSequence<
 			}			
 		}
 		// As noted above, treat reverse complement strand features carefully:
-		if(feature.getLocations().getStrand() == Strand.NEGATIVE) {			
+		if(feature.getLocations().getStrand() == Strand.NEGATIVE) {
 			for(FeatureInterface<?, ?> f  : feature.getChildrenFeatures()) {
 				if(f.getLocations().getStrand() != Strand.NEGATIVE) {
 					StringBuilder sb = new StringBuilder();

From 0737dfe6ddce90b5ee6aedd5c7cc4132c202e38e Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 15:26:22 +0100
Subject: [PATCH 365/599] formatting changes

---
 .../org/biojava/nbio/core/sequence/io/GenbankReader.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
index 74998d6b1a..1b182f02dc 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
@@ -163,10 +163,8 @@ public LinkedHashMap<String,S> process(final int max) throws IOException, Compou
 			if(seqString==null) break;
 			@SuppressWarnings("unchecked")
 			S sequence = (S) sequenceCreator.getSequence(seqString, 0);
-			GenericGenbankHeaderParser<S, C> genbankHeaderParser = genbankParser.getSequenceHeaderParser();
-			
-			genbankHeaderParser.parseHeader(genbankParser.getHeader(), sequence);
-			
+			GenericGenbankHeaderParser<S, C> genbankHeaderParser = genbankParser.getSequenceHeaderParser();			
+			genbankHeaderParser.parseHeader(genbankParser.getHeader(), sequence);			
 			String id = genbankHeaderParser.getAccession();
 			int version = genbankHeaderParser.getVersion();
 			String identifier = genbankHeaderParser.getIdentifier();

From 199a50e9b8abfc5810e2b8ca25307b6fc1b02cd2 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 15:30:08 +0100
Subject: [PATCH 366/599] formatting changes

---
 .../nbio/core/sequence/io/GenbankSequenceParser.java | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
index d8514731f3..54cb825850 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
@@ -202,8 +202,7 @@ private void parseFeatureTag(List<String[]> section) {
 				}
 				Boolean needsQuotes = false;
 				key = key.substring(1); // strip leading slash
-				val = val.replaceAll("\\s*[\\n\\r]+\\s*", " ").trim();
-				
+				val = val.replaceAll("\\s*[\\n\\r]+\\s*", " ").trim();				
 				if (val.endsWith("\"")) {
 					val = val.substring(1, val.length() - 1); // strip quotes
 					needsQuotes = true; // as the value has quotes then set that it needs quotes when written back out
@@ -272,8 +271,7 @@ private void parseReferenceTag(List<String[]> section) {
 		headerParser.addReference(genbankReference);
 	}
 
-	private void parseVersionTag(List<String[]> section) {
-		
+	private void parseVersionTag(List<String[]> section) {		
 		String ver = section.get(0)[1];
 		Matcher m = vp.matcher(ver);
 		if (m.matches()) {
@@ -311,8 +309,7 @@ private void parseLocusTag(List<String[]> section) {
 		String loc = section.get(0)[1];
 		header = loc;
 		Matcher m = lp.matcher(loc);
-		Matcher m2 = lp2.matcher(loc);
-		
+		Matcher m2 = lp2.matcher(loc);		
 		if (m.matches()) {
 			//remove any preceding or trailing whitespace from the locus name
 			String name = m.group(1).trim().replaceAll(" ","_");		
@@ -387,8 +384,7 @@ private void parseLocusTag(List<String[]> section) {
 	// key->value tuples
 	// reads an indented section, combining split lines and creating a list of
 	// key->value tuples
-	private List<String[]> readSection(BufferedReader bufferedReader) {
-		
+	private List<String[]> readSection(BufferedReader bufferedReader) {		
 		List<String[]> section = new ArrayList<>();
 		String line;
 

From 6365b6b2034239df25bbbd1de2564d4f4bafd2af Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 15:31:09 +0100
Subject: [PATCH 367/599] formatting changes

---
 .../java/org/biojava/nbio/core/sequence/io/GenbankWriter.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java
index eb661ad0c0..c99a9c23fd 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java
@@ -94,8 +94,7 @@ public void process() throws Exception {
 			String header = headerFormat.getHeader(sequence);
 			writer.print(header);
 			writer.println();
-			// os.write(lineSep);
-			
+			// os.write(lineSep);			
 			/*
 			 * if isinstance(record.seq, UnknownSeq): #We have already recorded
 			 * the length, and there is no need #to record a long sequence of

From 1df1734ed67b15ddb21f1922d8700452fb1ce2be Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Tue, 18 Oct 2022 15:37:40 +0100
Subject: [PATCH 368/599] formatting changes

---
 .../biojava/nbio/core/sequence/io/GenbankSequenceParser.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
index 54cb825850..2673d9af75 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
@@ -271,7 +271,7 @@ private void parseReferenceTag(List<String[]> section) {
 		headerParser.addReference(genbankReference);
 	}
 
-	private void parseVersionTag(List<String[]> section) {		
+	private void parseVersionTag(List<String[]> section) {
 		String ver = section.get(0)[1];
 		Matcher m = vp.matcher(ver);
 		if (m.matches()) {
@@ -384,7 +384,7 @@ private void parseLocusTag(List<String[]> section) {
 	// key->value tuples
 	// reads an indented section, combining split lines and creating a list of
 	// key->value tuples
-	private List<String[]> readSection(BufferedReader bufferedReader) {		
+	private List<String[]> readSection(BufferedReader bufferedReader) {
 		List<String[]> section = new ArrayList<>();
 		String line;
 

From 61b14125f0e2753bd1eaa0e1723fe94c9f177762 Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Wed, 19 Oct 2022 13:58:12 +0100
Subject: [PATCH 369/599] changed to use primitive boolean rather than the
 wrapper class

---
 .../nbio/core/sequence/io/GenericGenbankHeaderFormat.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
index bd0b592891..5732561718 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
@@ -39,7 +39,7 @@ public class GenericGenbankHeaderFormat<S extends AbstractSequence<C>, C extends
 	private static final int HEADER_WIDTH = 12;
 	private static final String lineSep = "%n";
 	private String seqType = null;
-	private Boolean useOriginalHeader = false;
+	private boolean useOriginalHeader = false;
 
 	public GenericGenbankHeaderFormat() {
 		seqType = null;
@@ -49,7 +49,7 @@ public GenericGenbankHeaderFormat(String seqType) {
 		this.seqType = seqType;
 	}
 	
-	public GenericGenbankHeaderFormat(Boolean useOriginalHeader) {
+	public GenericGenbankHeaderFormat(boolean useOriginalHeader) {
 		this.useOriginalHeader = useOriginalHeader;
 	}
 

From 95f5d204cb2dc14da6a83228cc284532c959aacb Mon Sep 17 00:00:00 2001
From: jamesmorris <kslb056@UKCMXL308504186.astrazeneca.net>
Date: Wed, 19 Oct 2022 14:08:20 +0100
Subject: [PATCH 370/599] Changed comments to javadoc

---
 .../io/GenericGenbankHeaderParser.java        | 70 ++++++++++++-------
 1 file changed, 43 insertions(+), 27 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
index f5329f6422..bf8338dc47 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
@@ -39,53 +39,69 @@ public class GenericGenbankHeaderParser<S extends AbstractSequence<C>, C extends
 
 	@SuppressWarnings("unused")
 
-	// Brief description of sequence; includes information such as source organism,
-	// gene name/protein name, or some description of the sequence's function (if
-	// the sequence is non-coding). If the sequence has a coding region (CDS),
-	// description may be followed by a completeness qualifier, such as "complete
-	// cds".
+	/**
+	 * Brief description of sequence; includes information such as source
+	 * organism,gene name/protein name, or some description of the sequence's
+	 * function (if the sequence is non-coding). If the sequence has a coding region
+	 * (CDS), description may be followed by a completeness qualifier, such as
+	 * "complete CDS".
+	 */
 	private String description;
 	
-	// The unique identifier for a sequence record
+	/** 
+	 * The unique identifier for a sequence record
+	 */
 	private String accession = null;
 
 	private String identifier = null;
 
 	private String name = null;
 
-	// A nucleotide sequence identification number that represents a single,
-	// specific sequence in the GenBank database. This identification number uses
-	// the accession.version format implemented by GenBank/EMBL/DDBJ in February
-	// 1999.
+	/**
+	 * A nucleotide sequence identification number that represents a single,
+	 * specific sequence in the GenBank database. This identification number uses
+	 * the accession.version format implemented by GenBank/EMBL/DDBJ in February
+	 * 1999.
+	 */
 	private int version;
 
 	private boolean versionSeen;
 
 	private ArrayList<String> comments = new ArrayList<>();
 
-	// Publications by the authors of the sequence that discuss the data reported in
-	// the record. References are automatically sorted within the record based on
-	// date of publication, showing the oldest references first.
+	/**
+	 * Publications by the authors of the sequence that discuss the data reported in
+	 * the record. References are automatically sorted within the record based on
+	 * date of publication, showing the oldest references first.
+	 */
 	private List<AbstractReference> references = new ArrayList<>();
 
-	// Word or phrase describing the sequence. If no keywords are included in the
-	// entry, the field contains only a period.
-	private List<String> keywords = new ArrayList();
+	/**
+	 * Word or phrase describing the sequence. If no keywords are included in the
+	 * entry, the field contains only a period.
+	 */
+	private List<String> keywords = new ArrayList<>();
 
-	// Free-format information including an abbreviated form of the organism name,
-	// sometimes followed by a molecule type. (See section 3.4.10 of the GenBank
-	// release notes for more info.)
+	/**
+	 * Free-format information including an abbreviated form of the organism name,
+	 * sometimes followed by a molecule type. (See section 3.4.10 of the GenBank
+	 * release notes for more info.)
+	 */	
 	private String source = null;
 
-	// The formal scientific name for the source organism (genus and species, where
-	// appropriate) and its lineage, based on the phylogenetic classification scheme
-	// used in the NCBI Taxonomy Database. If the complete lineage of an organism is
-	// very long, an abbreviated lineage will be shown in the GenBank record and the
-	// complete lineage will be available in the Taxonomy Database. (See also the
-	// /db_xref=taxon:nnnn Feature qualifer, below.)
-	private List<String> organism = new ArrayList();
+	/**
+	 * The formal scientific name for the source organism (genus and species, where
+	 * appropriate) and its lineage, based on the phylogenetic classification scheme
+	 * used in the NCBI Taxonomy Database. If the complete lineage of an organism is
+	 * very long, an abbreviated lineage will be shown in the GenBank record and the
+	 * complete lineage will be available in the Taxonomy Database. (See also the
+	 * /db_xref=taxon:nnnn Feature qualifer, below.)
+	 */
+	private List<String> organism = new ArrayList<>();
 	
-	// GI sequence identifier
+	/**
+	 * GI sequence identifier
+	 */
 	private String gi = null;
 
 	/**

From 231afc193dbd2d55385803311c4e1337fa06e234 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 24 Oct 2022 09:37:35 -0700
Subject: [PATCH 371/599] Removing old pointer to biojava.org maven repo

---
 biojava-genome/pom.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 6c1bfe81fa..6ecbf97eed 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -17,20 +17,6 @@
 		</license>
 	</licenses>
 
-	<repositories>
-		<repository>
-			<id>biojava-maven-repo</id>
-			<name>BioJava repository</name>
-			<url>http://www.biojava.org/download/maven/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-	</repositories>
-	<url>http://maven.apache.org</url>
 	<build>
 		<plugins>
 

From 3bd0fba6afd2571248c0df1e8097a775e300cfce Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 24 Oct 2022 09:59:16 -0700
Subject: [PATCH 372/599] Lib upgrades

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7e3e806d13..b4560e804f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,9 +40,9 @@
 		<!-- needed for failsafe plugin in integrationtest module - JD 2018-03-08 -->
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maxmem>512M</maxmem>
-		<mmtf.version>1.0.10</mmtf.version>
+		<mmtf.version>1.0.11</mmtf.version>
 		<slf4j.version>1.7.30</slf4j.version>
-		<log4j.version>2.17.1</log4j.version>
+		<log4j.version>2.17.2</log4j.version>
 		<junit-jupiter.version>5.7.2</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>
 		<ciftools.version>4.0.2</ciftools.version>

From 3b90e2b4d779de499f1ad369caccb2afb6db0f93 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 24 Oct 2022 10:14:33 -0700
Subject: [PATCH 373/599] Making dependency explicit and avoiding vulnerability

---
 biojava-structure/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 3151924f82..486402e319 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -78,6 +78,12 @@
 			<artifactId>jaxb-runtime</artifactId>
 		</dependency>
 
+		<!-- Used for json deserialization in PDBStatus -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.13.4.2</version>
+		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
 		<dependency>

From 3fab24dfe6b16d4927c2548c0cf277d325e55c3e Mon Sep 17 00:00:00 2001
From: James Morris <jamesanthonymorris@gmail.com>
Date: Wed, 26 Oct 2022 11:16:11 +0100
Subject: [PATCH 374/599] Update CHANGELOG.md

Updated changelog with a new release and details from pull request #1042
---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58282bdbeb..667777bd7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,21 @@
 BioJava Changelog
 -----------------
 
+
+BioJava 6.1.0
+==============================
+### Added
+* GenBankWriterHelper method that uses the original locus line rather than creating a new one, preventing loss of information
+* GenBankReader - the ability to successfully parse GenBank files with a LOCUS ID containing white space
+* GenBankReadr - the ability to successfully parse GenBank files missing a LOCUS ID
+
+### Fixed
+* GenBankWriter - outputting db_xref feature qualifiers
+* GenBankWriter - outputting the accession version and GI ID
+* GenBankWriter - outputting feature locations containing joins and partial locations
+* GenBankReader - reading locations split over multiple lines
+* GenBankReader - set if a feature qualifier values requires quotes
+
 BioJava 6.0.5
 ==============================
 ### Fixed

From 71d7eb59cf110796cc07d60f20b3f20a8275e676 Mon Sep 17 00:00:00 2001
From: James Morris <jamesanthonymorris@gmail.com>
Date: Wed, 26 Oct 2022 11:26:40 +0100
Subject: [PATCH 375/599] Update CHANGELOG.md

fixed typos
---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 667777bd7b..5e03eb71a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,16 +5,16 @@ BioJava Changelog
 BioJava 6.1.0
 ==============================
 ### Added
-* GenBankWriterHelper method that uses the original locus line rather than creating a new one, preventing loss of information
+* GenBankWriterHelper - method that uses the original locus line rather than creating a new one, preventing loss of information
 * GenBankReader - the ability to successfully parse GenBank files with a LOCUS ID containing white space
-* GenBankReadr - the ability to successfully parse GenBank files missing a LOCUS ID
+* GenBankReader - the ability to successfully parse GenBank files missing a LOCUS ID
 
 ### Fixed
 * GenBankWriter - outputting db_xref feature qualifiers
 * GenBankWriter - outputting the accession version and GI ID
 * GenBankWriter - outputting feature locations containing joins and partial locations
 * GenBankReader - reading locations split over multiple lines
-* GenBankReader - set if a feature qualifier values requires quotes
+* GenBankReader - set if feature qualifier values require quotes
 
 BioJava 6.0.5
 ==============================

From 977c1ad6c0af7931143eec6741dc5e9dab51732c Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 26 Oct 2022 09:46:39 -0700
Subject: [PATCH 376/599] Indentation

---
 .../nbio/aaproperties/IPeptideProperties.java | 19 ++++---
 .../nbio/aaproperties/PeptideProperties.java  | 16 +++---
 .../aaproperties/PeptidePropertiesImpl.java   | 50 +++++++++++--------
 .../PeptidePropertiesImplTest.java            |  8 +--
 4 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
index 807a72e0e5..5499509820 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
@@ -312,15 +312,14 @@ public AminoAcidCompositionTable obtainAminoAcidCompositionTable(File elementMas
 	 * @see AminoAcidCompound
 	 */
 	public Map<AminoAcidCompound, Double> getAAComposition(ProteinSequence sequence);
-        
-        /**
-         * Calculates the aromaticity value of a protein according to Lobry, 1994. 
-         * It is simply the relative frequency of Phe+Trp+Tyr.
-         * 
-         * @param sequence
-         *              a protein sequence consisting of non-ambiguous characters only
-         * @return the aromaticity of a protein sequence
-         * @see ProteinSequence
-         */
+
+	/**
+	 * Calculates the aromaticity value of a protein according to Lobry, 1994.
+	 * It is simply the relative frequency of Phe+Trp+Tyr.
+	 *
+	 * @param sequence a protein sequence consisting of non-ambiguous characters only
+	 * @return the aromaticity of a protein sequence
+	 * @see ProteinSequence
+	 */
 	public double getAromaticity(ProteinSequence sequence);
 }
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java
index ee51d71b75..edf76339d9 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java
@@ -590,16 +590,16 @@ public static final int[] getPolarityOfAminoAcids(String sequence) {
 		}
 		return polarity;
 	}
-        
-        /**
+
+	/**
 	 * An adaptor method to return the aromaticity value of sequence. The sequence argument
 	 * must be a protein sequence consisting of only non-ambiguous characters.
-	 * 
-         * Calculates the aromaticity value of a protein according to Lobry, 1994. 
-         * It is simply the relative frequency of Phe+Trp+Tyr.
-         * 	 *
-	 * @param sequence
-	 * 		a protein sequence consisting of non-ambiguous characters only
+	 * <p>
+	 * Calculates the aromaticity value of a protein according to Lobry, 1994.
+	 * It is simply the relative frequency of Phe+Trp+Tyr.
+	 * *
+	 *
+	 * @param sequence a protein sequence consisting of non-ambiguous characters only
 	 * @return the aromaticity value of sequence
 	 */
 	public static final double getAromaticity(String sequence) {
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java
index c11fd29150..c75554f9e6 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java
@@ -582,35 +582,41 @@ public Map<AminoAcidCompound, Double> getAAComposition(ProteinSequence sequence)
 		}
 		return aa2Composition;
 	}
-        
-        
+
+
 	@Override
 	public double getAromaticity(ProteinSequence sequence) {
-                int validLength = sequence.getSequenceAsString().length();
-		
-		if (validLength==0) {
+		int validLength = sequence.getSequenceAsString().length();
+
+		if (validLength == 0) {
 			logger.warn("Valid length of sequence is 0, can't divide by 0 to calculate aromaticity: setting aromaticity to 0");
 			return 0.0;
 		}
-                
-                //Phe - Phenylalanine
-                int totalF=0;
-                //Tyr - Tyrosine
-                int totalY=0;
-                //Trp - Tryptophan
-                int totalW=0;
-                
+
+		//Phe - Phenylalanine
+		int totalF = 0;
+		//Tyr - Tyrosine
+		int totalY = 0;
+		//Trp - Tryptophan
+		int totalW = 0;
+
 		char[] seq = this.getSequence(sequence.toString(), true);
-		for(char aa:seq){
-                    char amino = Character.toUpperCase(aa);
-                    switch(amino){
-                        case 'F' : totalF++;break;
-                        case 'Y' : totalY++;break;
-                        case 'W' : totalW++;break;
-                    }
+		for (char aa : seq) {
+			char amino = Character.toUpperCase(aa);
+			switch (amino) {
+				case 'F':
+					totalF++;
+					break;
+				case 'Y':
+					totalY++;
+					break;
+				case 'W':
+					totalW++;
+					break;
+			}
 		}
-                
-                return (totalF+totalY+totalW)/(double)(validLength);        
+
+		return (totalF + totalY + totalW) / (double) (validLength);
 	}
 }
 
diff --git a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/PeptidePropertiesImplTest.java b/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/PeptidePropertiesImplTest.java
index eddeb138cd..4f0439a5d4 100644
--- a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/PeptidePropertiesImplTest.java
+++ b/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/PeptidePropertiesImplTest.java
@@ -358,10 +358,10 @@ public void testNetCharge(){
 	public void testNetChargeNull(){
 		assertEquals(8.6, PeptideProperties.getNetCharge(null), delta);
 	}
-        
-        @Test
-	public void testAromaticity(){
-                assertEquals(1, PeptideProperties.getAromaticity("WWWYYYYFFFWWWYYYYFFF"), 0.001);
+
+	@Test
+	public void testAromaticity() {
+		assertEquals(1, PeptideProperties.getAromaticity("WWWYYYYFFFWWWYYYYFFF"), 0.001);
 		assertEquals(0.5, PeptideProperties.getAromaticity("WWWYYYYFFFAAAAAAAAAA"), 0.001);
 		assertEquals(0.08, PeptideProperties.getAromaticity(sequence), 0.001);
 		assertEquals(0.0, PeptideProperties.getAromaticity(fullInvalidSequence), 0.001);

From 17a893f1434c75605302f577c48ce56545377ef4 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 26 Oct 2022 09:56:45 -0700
Subject: [PATCH 377/599] Switching to new DNS name for wwpdb http file server

---
 CHANGELOG.md                                                | 4 ++++
 .../org/biojava/nbio/structure/io/LocalPDBDirectory.java    | 6 +++---
 .../biojava/nbio/structure/io/TestURLBasedFileParsing.java  | 5 +----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e03eb71a9..4078825c9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ BioJava 6.1.0
 * GenBankWriterHelper - method that uses the original locus line rather than creating a new one, preventing loss of information
 * GenBankReader - the ability to successfully parse GenBank files with a LOCUS ID containing white space
 * GenBankReader - the ability to successfully parse GenBank files missing a LOCUS ID
+* Aromaticity calculation in biojava-aa-prop module
 
 ### Fixed
 * GenBankWriter - outputting db_xref feature qualifiers
@@ -15,6 +16,9 @@ BioJava 6.1.0
 * GenBankWriter - outputting feature locations containing joins and partial locations
 * GenBankReader - reading locations split over multiple lines
 * GenBankReader - set if feature qualifier values require quotes
+* Local alignment with linear gap penalty was producing an NPE #1036
+* New default server for PDB files
+* Dependency upgrades
 
 BioJava 6.0.5
 ==============================
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index 0051180acb..01439a0554 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -66,7 +66,7 @@ public abstract class LocalPDBDirectory implements StructureIOFile {
 	 * Note that we don't support file stamp retrieving for ftp protocol, thus some of the
 	 * fetch modes will not work properly with ftp protocol
 	 */
-	public static final String DEFAULT_PDB_FILE_SERVER = "https://ftp.wwpdb.org";
+	public static final String DEFAULT_PDB_FILE_SERVER = "https://files.wwpdb.org";
 	public static final String PDB_FILE_SERVER_PROPERTY = "PDB.FILE.SERVER";
 
 	/**
@@ -123,7 +123,7 @@ public static enum FetchBehavior {
 	 */
 	public static final long LAST_REMEDIATION_DATE ;
 	private static final String LAST_REMEDIATION_DATE_STRING = "2011/07/12";
-	
+
 	static {
 
 		SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd", Locale.US);
@@ -388,7 +388,7 @@ protected InputStream getInputStream(PdbId pdbId) throws IOException{
 	 * @throws IOException
 	 */
 	public void prefetchStructure(String pdbId) throws IOException {
-		
+
 		// Check existing
 		File file = downloadStructure(new PdbId(pdbId));
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestURLBasedFileParsing.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestURLBasedFileParsing.java
index e5e8b7bf2a..f5ee4b78c4 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestURLBasedFileParsing.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestURLBasedFileParsing.java
@@ -36,13 +36,10 @@ public class TestURLBasedFileParsing {
 
 	@Test
 	public void testMMcifURL() throws StructureException, IOException{
-
-		String u = "https://ftp.wwpdb.org/pub/pdb/data/assemblies/mmCIF/divided/nw/4nwr-assembly1.cif.gz";
+		String u = "https://files.wwpdb.org/pub/pdb/data/assemblies/mmCIF/divided/nw/4nwr-assembly1.cif.gz";
 
 		Structure s = StructureIO.getStructure(u);
 
 		assertNotNull(s);
-
-
 	}
 }

From 16babd4afddbade6014fb8f929767777b669046b Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 26 Oct 2022 10:23:11 -0700
Subject: [PATCH 378/599] Changelog update

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4078825c9d..4c15fe96b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,9 @@ BioJava 6.1.0
 * GenBankReader - reading locations split over multiple lines
 * GenBankReader - set if feature qualifier values require quotes
 * Local alignment with linear gap penalty was producing an NPE #1036
-* New default server for PDB files
+* New default server for PDB files. Note that from Aug 2023 older versions of BioJava will 
+not be able to fetch PDB files unless PDB.FILE.SERVER system property is used to override 
+the default server
 * Dependency upgrades
 
 BioJava 6.0.5

From 320b35dc44a990c61458dde464c27f0049f22e9b Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 26 Oct 2022 10:27:54 -0700
Subject: [PATCH 379/599] Changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e03eb71a9..676f74bd2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ BioJava 6.1.0
 * GenBankReader - the ability to successfully parse GenBank files missing a LOCUS ID
 
 ### Fixed
+* String Formatter error when key or value of Qualifier has character "%", #886
 * GenBankWriter - outputting db_xref feature qualifiers
 * GenBankWriter - outputting the accession version and GI ID
 * GenBankWriter - outputting feature locations containing joins and partial locations

From 5c09b3d17754b79b0b7980ab474af6f387bfbe00 Mon Sep 17 00:00:00 2001
From: Sebastian Bittrich <sebastian.bittrich@rcsb.org>
Date: Wed, 26 Oct 2022 14:57:43 -0700
Subject: [PATCH 380/599] keep ciftools up-to-date

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b4560e804f..a0a22bdadd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 		<log4j.version>2.17.2</log4j.version>
 		<junit-jupiter.version>5.7.2</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>
-		<ciftools.version>4.0.2</ciftools.version>
+		<ciftools.version>4.0.3</ciftools.version>
 	</properties>
 	<scm>
 		<connection>scm:git:git://github.com/biojava/biojava.git</connection>

From 65767c42b2a4223d883658c2a3b9ea2cfc58a9e5 Mon Sep 17 00:00:00 2001
From: Sebastian Bittrich <sebastian.bittrich@rcsb.org>
Date: Wed, 26 Oct 2022 15:01:00 -0700
Subject: [PATCH 381/599] add myself to dev list

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index a0a22bdadd..e519fde038 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,6 +154,10 @@
 		<developer>
 			<name>Scooter Willis</name>
 		</developer>
+		<developer>
+			<id>JonStargaryen</id>
+			<name>Sebastian Bittrich</name>
+		</developer>
 		<developer>
 			<name>Spencer Bliven</name>
 		</developer>

From 128a24a559a55e75e641a07f0f793bec8cd9ceae Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 26 Oct 2022 17:05:51 -0700
Subject: [PATCH 382/599] Changelog update

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fb7182ffb..4d167900b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,17 +11,18 @@ BioJava 6.1.0
 * Aromaticity calculation in biojava-aa-prop module
 
 ### Fixed
-* String Formatter error when key or value of Qualifier has character "%", #886
+* GenBankWriter - String Formatter error when key or value of Qualifier has character "%", #886
 * GenBankWriter - outputting db_xref feature qualifiers
 * GenBankWriter - outputting the accession version and GI ID
 * GenBankWriter - outputting feature locations containing joins and partial locations
 * GenBankReader - reading locations split over multiple lines
 * GenBankReader - set if feature qualifier values require quotes
-* Local alignment with linear gap penalty was producing an NPE #1036
+* Local alignment with linear gap penalty was producing an NPE, #1036
 * New default server for PDB files. Note that from Aug 2023 older versions of BioJava will 
 not be able to fetch PDB files unless PDB.FILE.SERVER system property is used to override 
 the default server
 * Dependency upgrades
+* Some bug and security fixes
 
 BioJava 6.0.5
 ==============================

From 2792cd737b4bb0df4a7557e0aa47563ffad575ff Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 26 Oct 2022 17:18:15 -0700
Subject: [PATCH 383/599] [maven-release-plugin] prepare release biojava-6.1.0

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index d8e3629741..86e680b888 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.6-SNAPSHOT</version>
+		<version>6.1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index f36f45fe25..27ba587240 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.6-SNAPSHOT</version>
+		<version>6.1.0</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 3eb9f4994e..84a08f4ecb 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.6-SNAPSHOT</version>
+		<version>6.1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 6ecbf97eed..1f4fe64d22 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.6-SNAPSHOT</version>
+		<version>6.1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 8c770abe7a..eefa10a2dc 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.0.6-SNAPSHOT</version>
+    <version>6.1.0</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.0.6-SNAPSHOT</version>
+    	<version>6.1.0</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index f8bb87a51b..7faa873576 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.6-SNAPSHOT</version>
+		<version>6.1.0</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 14762b4f5c..504bc04d55 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.0.6-SNAPSHOT</version>
+    <version>6.1.0</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index cf32403db6..939db19716 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.6-SNAPSHOT</version>
+		<version>6.1.0</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 06bd62fdac..8854c4de5f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.6-SNAPSHOT</version>
+		<version>6.1.0</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index b3e412ba05..36e46ea373 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.0.6-SNAPSHOT</version>
+		<version>6.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 486402e319..5337505410 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.6-SNAPSHOT</version>
+		<version>6.1.0</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index b73c366a10..7962b79f84 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.0.6-SNAPSHOT</version>
+        <version>6.1.0</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 7271f2ca7b..5c75694867 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.0.6-SNAPSHOT</version>
+		<version>6.1.0</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.0.6-SNAPSHOT</version>
+			<version>6.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index e519fde038..3c97ccd1a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.0.6-SNAPSHOT</version>
+	<version>6.1.0</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-6.1.0</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 53885194aff3a797d092e39fb471973d4bef6276 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 26 Oct 2022 17:18:18 -0700
Subject: [PATCH 384/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 86e680b888..1f47f2aa7a 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.0</version>
+		<version>6.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 27ba587240..b58719da88 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.0</version>
+		<version>6.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 84a08f4ecb..b40abe3fef 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.0</version>
+		<version>6.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 1f4fe64d22..c92d19c3e5 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.0</version>
+		<version>6.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index eefa10a2dc..7cdd79db46 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.1.0</version>
+    <version>6.1.1-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.1.0</version>
+    	<version>6.1.1-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 7faa873576..dde1a147bb 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.0</version>
+		<version>6.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 504bc04d55..af9d1fd3b9 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.1.0</version>
+    <version>6.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 939db19716..a2d2c29b37 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.0</version>
+		<version>6.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 8854c4de5f..c146c80e4c 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.0</version>
+		<version>6.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 36e46ea373..e343072410 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.1.0</version>
+		<version>6.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 5337505410..ed19b36102 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.0</version>
+		<version>6.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 7962b79f84..b71fb7f5b1 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.1.0</version>
+        <version>6.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 5c75694867..61c118bf2b 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.0</version>
+		<version>6.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 3c97ccd1a1..38e557d680 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.1.0</version>
+	<version>6.1.1-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -52,7 +52,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-6.1.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 4eac468cae5aa7e6d502c21cc53a4d92121e9ec7 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 26 Oct 2022 21:38:38 -0700
Subject: [PATCH 385/599] Docs

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7a8ad9c30a..dc8007b9d8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-6.0.5-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.0.5) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-6.1.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.1.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>6.0.5</version>
+        <version>6.1.0</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From e3ecec524d13bfaa51f1a7089dfb21ffdbf7b24b Mon Sep 17 00:00:00 2001
From: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
Date: Fri, 18 Nov 2022 22:48:05 +0000
Subject: [PATCH 386/599] vuln-fix: Temporary File Information Disclosure

This fixes temporary file information disclosure vulnerability due to the use
of the vulnerable `File.createTempFile()` method. The vulnerability is fixed by
using the `Files.createTempFile()` method which sets the correct posix permissions.

Weakness: CWE-377: Insecure Temporary File
Severity: Medium
CVSSS: 5.5
Detection: CodeQL & OpenRewrite (https://public.moderne.io/recipes/org.openrewrite.java.security.SecureTempFileCreation)

Reported-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>

Bug-tracker: https://github.com/JLLeitschuh/security-research/issues/18


Co-authored-by: Moderne <team@moderne.io>
---
 .../nbio/core/util/FileDownloadUtils.java     |  4 ++--
 .../nbio/core/util/FileDownloadUtilsTest.java |  4 ++--
 .../nbio/core/util/FlatFileCacheTest.java     |  3 ++-
 .../biojava/nbio/core/util/XMLHelperTest.java |  4 ++--
 .../nbio/genome/GeneFeatureHelperTest.java    |  9 ++++----
 .../io/fastq/AbstractFastqReaderTest.java     |  7 +++---
 .../io/fastq/AbstractFastqWriterTest.java     | 23 ++++++++++---------
 .../nbio/genome/io/fastq/ConvertTest.java     |  3 ++-
 .../org/biojava/nbio/phosphosite/Dataset.java |  2 +-
 .../nbio/structure/cath/CathInstallation.java |  3 ++-
 .../chem/DownloadChemCompProvider.java        |  2 +-
 .../io/FastaAFPChainConverterTest.java        |  3 ++-
 .../nbio/structure/io/TestMMCIFWriting.java   |  3 ++-
 .../sifts/SiftsChainToUniprotMappingTest.java |  3 ++-
 14 files changed, 41 insertions(+), 32 deletions(-)
 mode change 100755 => 100644 biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/AbstractFastqReaderTest.java
 mode change 100755 => 100644 biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/AbstractFastqWriterTest.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index e3b678ce8d..e8913f036d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -124,7 +124,7 @@ public static void downloadFile(URL url, File destination) throws IOException {
 		int maxTries = 10;
 		int timeout = 60000; //60 sec
 
-		File tempFile = File.createTempFile(getFilePrefix(destination), "." + getFileExtension(destination));
+		File tempFile = Files.createTempFile(getFilePrefix(destination), "." + getFileExtension(destination)).toFile();
 
 		// Took following recipe from stackoverflow:
 		// http://stackoverflow.com/questions/921262/how-to-download-and-save-a-file-from-internet-using-java
@@ -296,4 +296,4 @@ public static void deleteDirectory(String dir) throws IOException {
 		deleteDirectory(Paths.get(dir));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
index 374001ec5a..e253e9c64f 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
@@ -22,7 +22,7 @@ class FileCopy {
         
         private File createSrcFile () throws IOException {
             byte [] toSave = new byte []{1,2,3,4,5};
-            File src = File.createTempFile("test", ".dat");
+            File src = Files.createTempFile("test", ".dat").toFile();
             try (FileOutputStream fos = new FileOutputStream(src);){
                 fos.write(toSave);
             }
@@ -34,7 +34,7 @@ void copyFile() throws IOException {
             File src = createSrcFile();
             //sanity check
             assertEquals(5, src.length());
-            File dest = File.createTempFile("dest", ".dat");
+            File dest = Files.createTempFile("dest", ".dat").toFile();
             assertEquals(0, dest.length());
             FileDownloadUtils.copy(src, dest);
             assertEquals(5, dest.length());
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
index e61a3023bb..86da192310 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FlatFileCacheTest.java
@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -24,7 +25,7 @@ void before(){
     }
 
     File createSmallTmpFile() throws IOException{
-        File f = File.createTempFile("flatFile","txt");
+        File f = Files.createTempFile("flatFile", "txt").toFile();
        writeToFile( aDNA, f);
         return f;
     }
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
index 70d78e55f8..0a9ace033f 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
@@ -67,7 +67,7 @@ Document readTestDoc() throws SAXException, IOException, ParserConfigurationExce
 
     @Test
     void fileToDocument() throws IOException, SAXException, ParserConfigurationException {
-        File tmpFile = File.createTempFile("xml", ".xml");
+        File tmpFile = Files.createTempFile("xml", ".xml").toFile();
         Files.write(Paths.get(tmpFile.getAbsolutePath()), TEST_XML.getBytes());
         Document doc = XMLHelper.loadXML(tmpFile.getAbsolutePath());
         assertParsedDocument(doc);
@@ -190,4 +190,4 @@ Document createDocumentWithRootElement() throws ParserConfigurationException {
         doc.appendChild(root);
         return doc;
     }
-}
\ No newline at end of file
+}
diff --git a/biojava-genome/src/test/java/org/biojava/nbio/genome/GeneFeatureHelperTest.java b/biojava-genome/src/test/java/org/biojava/nbio/genome/GeneFeatureHelperTest.java
index db4fa31328..ba0a5d21a3 100644
--- a/biojava-genome/src/test/java/org/biojava/nbio/genome/GeneFeatureHelperTest.java
+++ b/biojava-genome/src/test/java/org/biojava/nbio/genome/GeneFeatureHelperTest.java
@@ -36,6 +36,7 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.nio.file.Files;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 
@@ -78,7 +79,7 @@ public void testLoadFastaAddGeneFeaturesFromUpperCaseExonFastaFile() throws Exce
 				.loadFastaAddGeneFeaturesFromUpperCaseExonFastaFile(fastaSequenceFile, uppercaseFastaFile,
 						throwExceptionGeneNotFound);
 
-		File tmp = File.createTempFile("volvox_all_genes_exon_uppercase", "gff3");
+		File tmp = Files.createTempFile("volvox_all_genes_exon_uppercase","gff3").toFile();
 		tmp.deleteOnExit();
 		FileOutputStream fo = new FileOutputStream(tmp);
 		GFF3Writer gff3Writer = new GFF3Writer();
@@ -95,7 +96,7 @@ public void testOutputFastaSequenceLengthGFF3() throws Exception {
 		// logger.info("outputFastaSequenceLengthGFF3");
 
 		File fastaSequenceFile = new File("src/test/resources/volvox_all.fna");
-		File gffFile = File.createTempFile("volvox_length", "gff3");
+		File gffFile = Files.createTempFile("volvox_length","gff3").toFile();
 		gffFile.deleteOnExit();
 		GeneFeatureHelper.outputFastaSequenceLengthGFF3(fastaSequenceFile, gffFile);
 		FileAssert.assertEquals("volvox_length.gff3 and volvox_length_output.gff3 are not equal", gffFile,
@@ -135,7 +136,7 @@ public void testGetProteinSequences() throws Exception {
 		// for(ProteinSequence proteinSequence : proteinSequenceList.values()){
 		// logger.info("Output={}", proteinSequence.getSequenceAsString());
 		// }
-		File tmp = File.createTempFile("volvox_all", "faa");
+		File tmp = Files.createTempFile("volvox_all","faa").toFile();
 		tmp.deleteOnExit();
 		FastaWriterHelper.writeProteinSequence(tmp, proteinSequenceList.values());
 		FileAssert.assertEquals("volvox_all_reference.faa and volvox_all.faa are not equal", new File(
@@ -155,7 +156,7 @@ public void testGetGeneSequences() throws Exception {
 				.getGeneSequences(chromosomeSequenceList.values());
 		Collection<GeneSequence> geneSequences = geneSequenceHashMap.values();
 
-		File tmp = File.createTempFile("volvox_all_genes_exon_uppercase", "fna");
+		File tmp = Files.createTempFile("volvox_all_genes_exon_uppercase","fna").toFile();
 		tmp.deleteOnExit();
 		FastaWriterHelper.writeGeneSequence(tmp, geneSequences, true);
 	}
diff --git a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/AbstractFastqReaderTest.java b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/AbstractFastqReaderTest.java
old mode 100755
new mode 100644
index 6dbfbe968c..7cde3d3ec9
--- a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/AbstractFastqReaderTest.java
+++ b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/AbstractFastqReaderTest.java
@@ -28,6 +28,7 @@
 import java.io.InputStream;
 import java.io.StringReader;
 import java.net.URL;
+import java.nio.file.Files;
 
 
 /**
@@ -132,7 +133,7 @@ public void testReadFile() throws Exception
 	public void testReadEmptyFile() throws Exception
 	{
 		FastqReader reader = createFastqReader();
-		File empty = File.createTempFile("abstractFastqReaderTest", null);
+		File empty = Files.createTempFile("abstractFastqReaderTest",null).toFile();
 		Iterable<Fastq> iterable = reader.read(empty);
 		Assert.assertNotNull(iterable);
 		int count = 0;
@@ -148,7 +149,7 @@ public void testReadEmptyFile() throws Exception
 	public void testReadRoundTripSingleFile() throws Exception
 	{
 		FastqReader reader = createFastqReader();
-		File single = File.createTempFile("abstractFastqReaderTest", null);
+		File single = Files.createTempFile("abstractFastqReaderTest",null).toFile();
 		Fastq fastq = createFastq();
 		FastqWriter writer = createFastqWriter();
 		writer.write(single, fastq);
@@ -167,7 +168,7 @@ public void testReadRoundTripSingleFile() throws Exception
 	public void testReadRoundTripMultipleFile() throws Exception
 	{
 		FastqReader reader = createFastqReader();
-		File multiple = File.createTempFile("abstractFastqReaderTest", null);
+		File multiple = Files.createTempFile("abstractFastqReaderTest",null).toFile();
 		Fastq fastq0 = createFastq();
 		Fastq fastq1 = createFastq();
 		Fastq fastq2 = createFastq();
diff --git a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/AbstractFastqWriterTest.java b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/AbstractFastqWriterTest.java
old mode 100755
new mode 100644
index b2596dd51b..cf2b695968
--- a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/AbstractFastqWriterTest.java
+++ b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/AbstractFastqWriterTest.java
@@ -26,6 +26,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -134,15 +135,15 @@ public void testWriteFileVararg() throws Exception
 		Fastq fastq0 = createFastq();
 		Fastq fastq1 = createFastq();
 		Fastq fastq2 = createFastq();
-		File file0 = File.createTempFile("abstractFastqWriterTest", null);
+		File file0 = Files.createTempFile("abstractFastqWriterTest",null).toFile();
 		writer.write(file0, fastq0);
-		File file1 = File.createTempFile("abstractFastqWriterTest", null);
+		File file1 = Files.createTempFile("abstractFastqWriterTest",null).toFile();
 		writer.write(file1, fastq0, fastq1);
-		File file2 = File.createTempFile("abstractFastqWriterTest", null);
+		File file2 = Files.createTempFile("abstractFastqWriterTest",null).toFile();
 		writer.write(file2, fastq0, fastq1, fastq2);
-		File file3 = File.createTempFile("abstractFastqWriterTest", null);
+		File file3 = Files.createTempFile("abstractFastqWriterTest",null).toFile();
 		writer.write(file3, fastq0, fastq1, fastq2, null);
-		File file4 = File.createTempFile("abstractFastqWriterTest", null);
+		File file4 = Files.createTempFile("abstractFastqWriterTest",null).toFile();
 		writer.write(file4, (Fastq) null);
 
 		try
@@ -164,26 +165,26 @@ public void testWriteFileIterable() throws Exception
 		Fastq fastq1 = createFastq();
 		Fastq fastq2 = createFastq();
 		List<Fastq> list = new ArrayList<Fastq>();
-		File file0 = File.createTempFile("abstractFastqWriterTest", null);
+		File file0 = Files.createTempFile("abstractFastqWriterTest",null).toFile();
 		writer.write(file0, list);
 
 		list.add(fastq0);
-		File file1 = File.createTempFile("abstractFastqWriterTest", null);
+		File file1 = Files.createTempFile("abstractFastqWriterTest",null).toFile();
 		writer.write(file1, list);
 
 		list.add(fastq1);
-		File file2 = File.createTempFile("abstractFastqWriterTest", null);
+		File file2 = Files.createTempFile("abstractFastqWriterTest",null).toFile();
 		writer.write(file2, list);
 
 		list.add(fastq2);
-		File file3 = File.createTempFile("abstractFastqWriterTest", null);
+		File file3 = Files.createTempFile("abstractFastqWriterTest",null).toFile();
 		writer.write(file3, list);
 
 		list.add(null);
-		File file4 = File.createTempFile("abstractFastqWriterTest", null);
+		File file4 = Files.createTempFile("abstractFastqWriterTest",null).toFile();
 		writer.write(file4, list);
 
-		File file5 = File.createTempFile("abstractFastqWriterTest", null);
+		File file5 = Files.createTempFile("abstractFastqWriterTest",null).toFile();
 
 		try
 		{
diff --git a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/ConvertTest.java b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/ConvertTest.java
index 0c6775a659..b07e237ef2 100644
--- a/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/ConvertTest.java
+++ b/biojava-genome/src/test/java/org/biojava/nbio/genome/io/fastq/ConvertTest.java
@@ -22,6 +22,7 @@
 
 import java.io.File;
 import java.io.FileWriter;
+import java.nio.file.Files;
 import java.util.List;
 import java.util.Map;
 
@@ -74,7 +75,7 @@ public void testConvert() throws Exception
 				FastqWriter writer = writers.get(variant2);
 				String expectedFileName = expectedFileNames.get(new FastqVariantPair(variant1, variant2));
 
-				File tmp = File.createTempFile("convertTest", "fastq");
+				File tmp = Files.createTempFile("convertTest","fastq").toFile();
 				FileWriter fileWriter = new FileWriter(tmp);
 
 				for (Fastq fastq : reader.read(getClass().getResource(inputFileName))) {
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Dataset.java b/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Dataset.java
index f2d3ee2e6f..2ad301d112 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Dataset.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Dataset.java
@@ -152,7 +152,7 @@ public void downloadFile(URL u, File localFile) throws IOException {
 
 		logger.info("Downloading " + u);
 
-		File tmp = File.createTempFile("tmp","phosphosite");
+		File tmp = Files.createTempFile("tmp","phosphosite").toFile();
 
 		InputStream is = u.openStream();
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java
index 45914f6208..3b7f94981a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java
@@ -31,6 +31,7 @@
 
 import java.io.*;
 import java.net.URL;
+import java.nio.file.Files;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.ParseException;
@@ -639,7 +640,7 @@ protected void downloadFileFromRemote(URL remoteURL, File localFile) throws IOEx
 		LOGGER.info("Downloading file {} to local file {}", remoteURL, localFile);
 
 		long timeS = System.currentTimeMillis();
-		File tempFile  = File.createTempFile(FileDownloadUtils.getFilePrefix(localFile), "."+ FileDownloadUtils.getFileExtension(localFile));
+		File tempFile  = Files.createTempFile(FileDownloadUtils.getFilePrefix(localFile),"." + FileDownloadUtils.getFileExtension(localFile)).toFile();
 
 		FileOutputStream out = new FileOutputStream(tempFile);
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
index a0a44433a7..f2180dba03 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -378,7 +378,7 @@ private static boolean downloadChemCompRecord(String recordName) {
         String localName = getLocalFileName(recordName);
         File newFile;
         try {
-            newFile = File.createTempFile("chemcomp" + recordName, "cif");
+            newFile = Files.createTempFile("chemcomp" + recordName,"cif").toFile();
             logger.debug("Will write chem comp file to temp file {}", newFile.toString());
         } catch(IOException e) {
             logger.error("Could not write to temp directory {} to create the chemical component download temp file", System.getProperty("java.io.tmpdir"));
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/FastaAFPChainConverterTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/FastaAFPChainConverterTest.java
index da9242e80f..29f4332936 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/FastaAFPChainConverterTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/FastaAFPChainConverterTest.java
@@ -43,6 +43,7 @@
 import org.xml.sax.SAXException;
 
 import java.io.*;
+import java.nio.file.Files;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -164,7 +165,7 @@ public void testFromFasta() throws IOException, StructureException, CompoundNotF
 		assertEquals("Wrong number of alnLength",53,afpChain.getAlnLength());
 		String xml = AFPChainXMLConverter.toXML(afpChain);
 		File expected = new File("src/test/resources/1w0p_1qdm.xml");
-		File x = File.createTempFile("1w0p_1qdm_output", "xml.tmp");
+		File x = Files.createTempFile("1w0p_1qdm_output","xml.tmp").toFile();
 		x.deleteOnExit();
 		BufferedWriter bw = new BufferedWriter(new FileWriter(x));
 		bw.write(xml);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java
index 12b3d1a3b7..d33978cbde 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestMMCIFWriting.java
@@ -25,6 +25,7 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.Arrays;
 
 import org.biojava.nbio.structure.AminoAcidImpl;
@@ -83,7 +84,7 @@ private static void testRoundTrip(String pdbId) throws IOException, StructureExc
 
 		Structure originalStruct = StructureIO.getStructure(pdbId);
 
-		File outputFile = File.createTempFile("biojava_testing_", ".cif");
+		File outputFile = Files.createTempFile("biojava_testing_",".cif").toFile();
 		outputFile.deleteOnExit();
 
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/sifts/SiftsChainToUniprotMappingTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/sifts/SiftsChainToUniprotMappingTest.java
index 66f3485248..012d01eb13 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/sifts/SiftsChainToUniprotMappingTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/sifts/SiftsChainToUniprotMappingTest.java
@@ -30,6 +30,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
+import java.nio.file.Files;
 
 import static org.junit.Assert.assertEquals;
 
@@ -44,7 +45,7 @@ public class SiftsChainToUniprotMappingTest {
 
 	@Test
 	public void test() throws IOException {
-		SiftsChainToUniprotMapping.DEFAULT_FILE = File.createTempFile("biojavaSiftsTest-", "");
+		SiftsChainToUniprotMapping.DEFAULT_FILE = Files.createTempFile("biojavaSiftsTest-","").toFile();
 		SiftsChainToUniprotMapping.DEFAULT_FILE.deleteOnExit();
 
 		BufferedReader br = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream("mock_sifts.tsv")));

From 06cde1b621156af3a6a768c4cad005b65864a478 Mon Sep 17 00:00:00 2001
From: Amr <amr_alhossary@hotmail.com>
Date: Fri, 23 Dec 2022 17:03:07 -0500
Subject: [PATCH 387/599] Minor corrections

Typos, wording, and version correction
---
 .../java/org/biojava/nbio/core/util/FileDownloadUtils.java  | 6 +++---
 .../org/biojava/nbio/core/util/FileDownloadUtilsTest.java   | 4 ++--
 .../java/org/biojava/nbio/structure/ecod/EcodFactory.java   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index 4bc0c4afb8..e5894982cf 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -195,7 +195,7 @@ public static void createValidationFiles(URL url, File localDestination, URL has
 	 * @param resourceUrlConnection the remote file URLConnection to download
 	 * @param localDestination the local file to download into
 	 * @param hashURL the URL of the hash file to download. Can be <code>null</code>.
-	 * @since 6.0.6
+	 * @since 6.1.1
 	 */
 	public static void createValidationFiles(URLConnection resourceUrlConnection, File localDestination, URL hashURL){
 		long size = resourceUrlConnection.getContentLengthLong();
@@ -234,8 +234,8 @@ public static void createValidationFiles(URLConnection resourceUrlConnection, Fi
 	 * <p>
 	 * This function does not implement hash code verification yet.
 	 * @param localFile The file to validate
-	 * @return <code>false</code> if any of the size or hash code metadata files exists but its contents does not match the expected value in the file, <code>true'</code> otherwise.
-	 * @since 6.0.6
+	 * @return <code>false</code> if any of the size or hash code metadata files exists but its contents does not match the expected value in the file, <code>true</code> otherwise.
+	 * @since 6.1.1
 	 */
 	public static boolean validateFile(File localFile) {
 		File sizeFile = new File(localFile.getParentFile(), localFile.getName()+".size");
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
index 761d06d097..7bf0f679ab 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
@@ -214,7 +214,7 @@ void testValidationFiles() throws IOException{
     		FileDownloadUtils.downloadFile(sourceUrl, destFile);
     		assertTrue(destFile.exists(), "couldn't create dest file");
 
-    		assertTrue(FileDownloadUtils.validateFile(destFile), "file not detected to be invalid although there are no validation files");
+    		assertTrue(FileDownloadUtils.validateFile(destFile), "file detected to be invalid although there are no validation files");
 
     		PrintStream temp1 = new PrintStream(sizeFile);
     		temp1.print(15); // some wrong size value
@@ -232,7 +232,7 @@ void testValidationFiles() throws IOException{
     		//This is not yet implemented. I am using this test for documentation purpose.
     		assertThrows(UnsupportedOperationException.class, 
     				() -> FileDownloadUtils.validateFile(destFile), 
-    				"file not detected to be invalid although size value is wrong.");
+    				"file not detected to be invalid although hash value is wrong.");
     		
     		destFile.delete();
     		sizeFile.delete();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodFactory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodFactory.java
index 0f8f7b6654..998d8ab4a5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodFactory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodFactory.java
@@ -89,8 +89,8 @@ public static EcodDatabase getEcodDatabase(String version) {
 					}
 				} catch (IOException e) {
 					// For parsing errors, just use the requested version
-					// What about corrupted downloading errors?? Amr
-					logger.warn("Cound not get Ecod version, or file is corrupted", e);
+					// TODO What about corrupted downloading errors?? Amr
+					logger.warn("Could not get Ecod version, or file is corrupted", e);
 					return null;
 				}
 			}

From 630bb64fcf03354cd5e89a391c3ac654610b0dc9 Mon Sep 17 00:00:00 2001
From: Amr <amr_alhossary@hotmail.com>
Date: Sat, 24 Dec 2022 08:52:56 -0500
Subject: [PATCH 388/599] Addressing reviewer's comments

---
 .../nbio/core/util/FileDownloadUtils.java     | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index e5894982cf..f07a5849fc 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -48,6 +48,8 @@
 
 public class FileDownloadUtils {
 
+	private static final String SIZE_EXT = ".size";
+	private static final String HASH_EXT = ".hash";
 	private static final Logger logger = LoggerFactory.getLogger(FileDownloadUtils.class);
 
 	/**
@@ -157,7 +159,7 @@ public static void downloadFile(URL url, File destination) throws IOException {
 			}
 		}
 
-		logger.debug("Copying temp file {} to final location {}", tempFile, destination);
+		logger.debug("Copying temp file [{}] to final location [{}]", tempFile, destination);
 		copy(tempFile, destination);
 
 		// delete the tmp file
@@ -181,7 +183,7 @@ public static void createValidationFiles(URL url, File localDestination, URL has
 			URLConnection resourceConnection = url.openConnection();
 			createValidationFiles(resourceConnection, localDestination, hashURL);
 		} catch (IOException e) {
-			logger.warn("could not open connection to resource file due to exception", e);
+			logger.warn("could not open connection to resource file due to exception:\n\t", e.getMessage());
 		}
 	}
 	/**
@@ -202,13 +204,13 @@ public static void createValidationFiles(URLConnection resourceUrlConnection, Fi
 		if(size == -1) {
 			logger.warn("could not find expected file size for resource {}.", resourceUrlConnection.getURL());
 		} else {
-			System.out.println("Content-Length: " + size);
-			File sizeFile = new File(localDestination.getParentFile(), localDestination.getName()+".size");
+			logger.debug("Content-Length: " + size);
+			File sizeFile = new File(localDestination.getParentFile(), localDestination.getName() + SIZE_EXT);
 			try (PrintStream sizePrintStream = new PrintStream(sizeFile)) {
 				sizePrintStream.print(size);
 				sizePrintStream.close();
 			} catch (FileNotFoundException e) {
-				logger.warn("could not write size validation file due to exception", e);
+				logger.warn("could not write size validation file due to exception:\n\t", e.getMessage());
 			}
 		}
 		
@@ -216,10 +218,10 @@ public static void createValidationFiles(URLConnection resourceUrlConnection, Fi
 			return;
 
 		try {
-			File hashFile = new File(localDestination.getParentFile(), localDestination.getName()+".hash");
+			File hashFile = new File(localDestination.getParentFile(), localDestination.getName() + HASH_EXT);
 			downloadFile(hashURL, hashFile);
 		} catch (IOException e) {
-			logger.warn("could not write validation hash file due to exception", e);
+			logger.warn("could not write validation hash file due to exception:\n\t{}", e.getMessage());
 		}
 	}
 	
@@ -238,24 +240,25 @@ public static void createValidationFiles(URLConnection resourceUrlConnection, Fi
 	 * @since 6.1.1
 	 */
 	public static boolean validateFile(File localFile) {
-		File sizeFile = new File(localFile.getParentFile(), localFile.getName()+".size");
+		File sizeFile = new File(localFile.getParentFile(), localFile.getName() + SIZE_EXT);
 		if(sizeFile.exists()) {
 			Scanner scanner = null;
 			try {
 				scanner = new Scanner(sizeFile);
 				long expectedSize = scanner.nextLong();
-				if (expectedSize != localFile.length()) {
-					logger.warn("File size does not match expected");
+				long actualLSize = localFile.length();
+				if (expectedSize != actualLSize) {
+					logger.warn("File [{}] size ({}) does not match expected size ({}).", localFile, actualLSize, expectedSize);
 					return false;
 				}
 			} catch (FileNotFoundException e) {
-				logger.warn("could not validate size of file ["+ localFile+ "] due to exception", e);
+				logger.warn("could not validate size of file [{}] because no size metadata file exists.", localFile);
 			} finally {
 				scanner.close();
 			}
 		}
 
-		File hashFile = new File(localFile.getParentFile(), localFile.getName()+".hash");
+		File hashFile = new File(localFile.getParentFile(), localFile.getName() + HASH_EXT);
 		if(hashFile.exists()) {
 			throw new UnsupportedOperationException("Not yet implemented");
 		}

From 3c7b04fab2de76b00d5259490ca36a1d06689d13 Mon Sep 17 00:00:00 2001
From: Amr <amr_alhossary@hotmail.com>
Date: Sat, 24 Dec 2022 10:03:56 -0500
Subject: [PATCH 389/599] Adding placeholder for several common hashing
 algorithms

The expected hashing algorithms are MD5, SHA1, and SHA256
---
 .../nbio/core/util/FileDownloadUtils.java     | 53 ++++++++++++++-----
 .../nbio/core/util/FileDownloadUtilsTest.java |  4 +-
 .../nbio/structure/ecod/EcodInstallation.java |  2 +-
 .../nbio/structure/io/LocalPDBDirectory.java  |  2 +-
 .../io/sifts/SiftsMappingProvider.java        |  2 +-
 .../nbio/structure/scop/ScopInstallation.java |  2 +-
 6 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index f07a5849fc..2c65813eb4 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -25,6 +25,7 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
@@ -52,6 +53,10 @@ public class FileDownloadUtils {
 	private static final String HASH_EXT = ".hash";
 	private static final Logger logger = LoggerFactory.getLogger(FileDownloadUtils.class);
 
+	public enum Hash{
+		MD5, SHA1, SHA256, UNKNOWN
+	}
+
 	/**
 	 * Copy the content of file src to dst TODO since java 1.7 this is provided
 	 * in java.nio.file.Files
@@ -177,11 +182,12 @@ public static void downloadFile(URL url, File destination) throws IOException {
 	 * @param url the remote file URL to download
 	 * @param localDestination the local file to download into
 	 * @param hashURL the URL of the hash file to download. Can be <code>null</code>.
+	 * @param hash The Hashing algorithm. Ignored if <code>hashURL</code> is <code>null</code>.
 	 */
-	public static void createValidationFiles(URL url, File localDestination, URL hashURL){
+	public static void createValidationFiles(URL url, File localDestination, URL hashURL, Hash hash){
 		try {
 			URLConnection resourceConnection = url.openConnection();
-			createValidationFiles(resourceConnection, localDestination, hashURL);
+			createValidationFiles(resourceConnection, localDestination, hashURL, FileDownloadUtils.Hash.UNKNOWN);
 		} catch (IOException e) {
 			logger.warn("could not open connection to resource file due to exception:\n\t", e.getMessage());
 		}
@@ -189,17 +195,19 @@ public static void createValidationFiles(URL url, File localDestination, URL has
 	/**
 	 * Creates validation files beside a file to be downloaded.<br>
 	 * Whenever possible, for a <code>file.ext</code> file, it creates 
-	 * <code>file.ext.size</code> and <code>file.hash</code> for in the same 
-	 * folder where <code>file.ext</code> exists.
+	 * <code>file.ext.size</code> and <code>file.hash_XXXX</code> in the same 
+	 * folder where <code>file.ext</code> exists (XXXX may be DM5, SHA1, or SHA256).
 	 * If the file connection size could not be deduced from the resourceUrlConnection 
 	 * {@link URLConnection}, no size file is created. 
-	 * If <code>hashURL</code> is <code>null</code>, no hash file is created.
+	 * If <code>hashURL</code> is <code>null</code>, no hash file is created.<br>
+	 * <b>N.B.</b> None of the hashing algorithms is implemented (yet), because we did not need any of them yet.
 	 * @param resourceUrlConnection the remote file URLConnection to download
 	 * @param localDestination the local file to download into
 	 * @param hashURL the URL of the hash file to download. Can be <code>null</code>.
+	 * @param hash The Hashing algorithm. Ignored if <code>hashURL</code> is <code>null</code>.
 	 * @since 6.1.1
 	 */
-	public static void createValidationFiles(URLConnection resourceUrlConnection, File localDestination, URL hashURL){
+	public static void createValidationFiles(URLConnection resourceUrlConnection, File localDestination, URL hashURL, Hash hash){
 		long size = resourceUrlConnection.getContentLengthLong();
 		if(size == -1) {
 			logger.warn("could not find expected file size for resource {}.", resourceUrlConnection.getURL());
@@ -217,8 +225,10 @@ public static void createValidationFiles(URLConnection resourceUrlConnection, Fi
 		if(hashURL == null)
 			return;
 
+		if(hash == Hash.UNKNOWN)
+			throw new IllegalArgumentException("Hash URL given but algorithm is unknown");
 		try {
-			File hashFile = new File(localDestination.getParentFile(), localDestination.getName() + HASH_EXT);
+			File hashFile = new File(localDestination.getParentFile(), String.format("%s%s_%s", localDestination.getName(), HASH_EXT, hash));
 			downloadFile(hashURL, hashFile);
 		} catch (IOException e) {
 			logger.warn("could not write validation hash file due to exception:\n\t{}", e.getMessage());
@@ -229,12 +239,12 @@ public static void createValidationFiles(URLConnection resourceUrlConnection, Fi
 	 * Validate a local file based on pre-existing metadata files for size and hash.<br>
 	 * If the passed in <code>localFile</code> parameter is a file named <code>file.ext</code>, the function searches in the same folder for:
 	 * <ul>
-	 * <li><code>file.ext.size</code>: if found, it compares the size stored in it to the length of <code>localFile</code> (in bytes).</li>
-	 * <li><code>file.ext.hash</code>: if found, it compares the size stored in it to the hash code of <code>localFile</code>.</li>
+	 * <li><code>file.ext.size</code>: If found, it compares the size stored in it to the length of <code>localFile</code> (in bytes).</li>
+	 * <li><code>file.ext.hash_XXXX (where XXXX is DM5, SHA1, or SHA256)</code>: If found, it compares the size stored in it to the hash code of <code>localFile</code>.</li>
 	 * </ul>
 	 * If any of these comparisons fail, the function returns <code>false</code>. otherwise it returns true.
 	 * <p>
-	 * This function does not implement hash code verification yet.
+	 * <b>N.B.</b> None of the 3 common verification hashing algorithms are implement yet.
 	 * @param localFile The file to validate
 	 * @return <code>false</code> if any of the size or hash code metadata files exists but its contents does not match the expected value in the file, <code>true</code> otherwise.
 	 * @since 6.1.1
@@ -258,9 +268,26 @@ public static boolean validateFile(File localFile) {
 			}
 		}
 
-		File hashFile = new File(localFile.getParentFile(), localFile.getName() + HASH_EXT);
-		if(hashFile.exists()) {
-			throw new UnsupportedOperationException("Not yet implemented");
+		File[] hashFiles = localFile.getParentFile().listFiles(new FilenameFilter() {
+			String hashPattern = String.format("%s%s_(%s|%s|%s)", localFile.getName(), HASH_EXT, Hash.MD5, Hash.SHA1, Hash.SHA256);
+			@Override
+			public boolean accept(File dir, String name) {
+				return name.matches(hashPattern);
+			}
+		});
+		if(hashFiles.length > 0) {
+			File hashFile = hashFiles[0];
+			String name = hashFile.getName();
+			String algo = name.substring(name.lastIndexOf('_') + 1);
+			switch (Hash.valueOf(algo)) {
+			case MD5:
+			case SHA1:
+			case SHA256:
+				throw new UnsupportedOperationException("Not yet implemented");
+			case UNKNOWN:
+			default: // No need. Already checked above
+				throw new IllegalArgumentException("Hashing algorithm not known: " + algo);
+			}
 		}
 		
 		return true;
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
index 7bf0f679ab..9bf0a68231 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
@@ -202,7 +202,7 @@ void testValidationFiles() throws IOException{
     		URL sourceUrl = new URL("https://ftp.wwpdb.org/pub/pdb/data/structures/divided/mmCIF/45/145d.cif.gz");
     		File destFile = new File(System.getProperty("java.io.tmpdir"), "145d.cif.gz");
     		File sizeFile = new File(destFile.getParentFile(), destFile.getName()+".size");
-    		File hashFile = new File(destFile.getParentFile(), destFile.getName()+".hash");
+    		File hashFile = new File(destFile.getParentFile(), destFile.getName()+".hash_MD5");
     		System.out.println(destFile.getAbsolutePath());
     		destFile.delete();
     		sizeFile.delete();
@@ -222,7 +222,7 @@ void testValidationFiles() throws IOException{
     		assertFalse(FileDownloadUtils.validateFile(destFile), "file not detected to be invalid although size value is wrong.");
     		System.out.println("Just ignore the previous warning. It is expected.");
     		
-    		FileDownloadUtils.createValidationFiles(sourceUrl, destFile, null);
+    		FileDownloadUtils.createValidationFiles(sourceUrl, destFile, null, FileDownloadUtils.Hash.UNKNOWN);
     		assertTrue(sizeFile.exists(), "couldn't create size file");
     		assertTrue(FileDownloadUtils.validateFile(destFile), "file not detected to be invalid although there is correct size validation file");
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
index 74f49f8dd5..7a39423077 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
@@ -406,7 +406,7 @@ private void downloadDomains() throws IOException {
 			File localFile = getDomainFile();
 
 			logger.info("Downloading {} to: {}",domainsURL, localFile);
-			FileDownloadUtils.createValidationFiles(domainsURL, localFile, null);
+			FileDownloadUtils.createValidationFiles(domainsURL, localFile, null, FileDownloadUtils.Hash.UNKNOWN);
 			FileDownloadUtils.downloadFile(domainsURL, localFile);
 			if(! FileDownloadUtils.validateFile(localFile))
 				throw new IOException("Downloaded file invalid: "+ localFile);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index dce7e9853d..87163b5ea7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -581,7 +581,7 @@ private File downloadStructure(PdbId pdbId, String pathOnServer, boolean obsolet
 		logger.info("Fetching " + ftp);
 		logger.info("Writing to "+ realFile);
 
-		FileDownloadUtils.createValidationFiles(url, realFile, null);
+		FileDownloadUtils.createValidationFiles(url, realFile, null, FileDownloadUtils.Hash.UNKNOWN);
 		FileDownloadUtils.downloadFile(url, realFile);
 		if(! FileDownloadUtils.validateFile(realFile))
 			throw new IOException("Downloaded file invalid: "+realFile);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java
index 3701c87e29..f386140cdf 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java
@@ -88,7 +88,7 @@ public static List<SiftsEntity> getSiftsMapping(String pdbId) throws IOException
 			String u = String.format(fileLoc,pdbId);
 			URL url = new URL(u);
 			logger.debug("Downloading SIFTS file {} validation metadata.",url);
-			FileDownloadUtils.createValidationFiles(url, dest, null);
+			FileDownloadUtils.createValidationFiles(url, dest, null, FileDownloadUtils.Hash.UNKNOWN);
 			logger.debug("Downloading SIFTS file {} to {}",url,dest);
 			FileDownloadUtils.downloadFile(url, dest);
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
index e46dbca9f1..3a54bce234 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
@@ -747,7 +747,7 @@ protected void downloadComFile() throws FileNotFoundException, IOException{
 	 */
 	protected void downloadFileFromRemote(URL remoteURL, File localFile) throws IOException{
 		logger.info("Downloading " + remoteURL + " to: " + localFile);
-		FileDownloadUtils.createValidationFiles(remoteURL, localFile, null);
+		FileDownloadUtils.createValidationFiles(remoteURL, localFile, null, FileDownloadUtils.Hash.UNKNOWN);
 		FileDownloadUtils.downloadFile(remoteURL, localFile);
 		if(! FileDownloadUtils.validateFile(localFile))
 			throw new IOException("Downloaded file invalid: "+localFile);

From d045cc237f49007b2c1b1ac9a676dc1c165255a7 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <amr_alhossary@hotmail.com>
Date: Sun, 8 Jan 2023 21:05:31 -0500
Subject: [PATCH 390/599] Bump dependency ciftools-java-jdk8 to 4.0.5

Bump dependency 4.0.5 to Fix cif writing in non-US locales.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 38e557d680..f809aff3f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
 		<log4j.version>2.17.2</log4j.version>
 		<junit-jupiter.version>5.7.2</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>
-		<ciftools.version>4.0.3</ciftools.version>
+		<ciftools.version>4.0.5</ciftools.version>
 	</properties>
 	<scm>
 		<connection>scm:git:git://github.com/biojava/biojava.git</connection>

From 1e6cac7d636be1ef1683e97b2eff885068e565ce Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 24 Jan 2023 15:51:24 -0800
Subject: [PATCH 391/599] Upgrading source and target to be java 11

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f809aff3f7..70ae5731ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 	</licenses>
 	<properties>
 		<!-- Notice: if using java 9 or 10 jres, it is possible to simply use here "8", "9" or "10". But if using java 8 jre, "8" is not an allowed value but only "1.8"-->
-		<jdk.version>1.8</jdk.version>
+		<jdk.version>11</jdk.version>
 		<maven.enforcer.jdk-version>1.8</maven.enforcer.jdk-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.targetEncoding>UTF-8</project.build.targetEncoding>

From 07e65b22f1579a912532a3e757e275c05da71b26 Mon Sep 17 00:00:00 2001
From: Amr ALHOSSARY <amr_alhossary@hotmail.com>
Date: Wed, 25 Jan 2023 10:24:13 -0500
Subject: [PATCH 392/599] Addressing reviewer's comments

---
 .../org/biojava/nbio/core/util/FileDownloadUtils.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index 2c65813eb4..7b9c1f0cc6 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -189,7 +189,7 @@ public static void createValidationFiles(URL url, File localDestination, URL has
 			URLConnection resourceConnection = url.openConnection();
 			createValidationFiles(resourceConnection, localDestination, hashURL, FileDownloadUtils.Hash.UNKNOWN);
 		} catch (IOException e) {
-			logger.warn("could not open connection to resource file due to exception:\n\t", e.getMessage());
+			logger.warn("could not open connection to resource file due to exception: {}", e.getMessage());
 		}
 	}
 	/**
@@ -205,7 +205,7 @@ public static void createValidationFiles(URL url, File localDestination, URL has
 	 * @param localDestination the local file to download into
 	 * @param hashURL the URL of the hash file to download. Can be <code>null</code>.
 	 * @param hash The Hashing algorithm. Ignored if <code>hashURL</code> is <code>null</code>.
-	 * @since 6.1.1
+	 * @since 7.0.0
 	 */
 	public static void createValidationFiles(URLConnection resourceUrlConnection, File localDestination, URL hashURL, Hash hash){
 		long size = resourceUrlConnection.getContentLengthLong();
@@ -218,7 +218,7 @@ public static void createValidationFiles(URLConnection resourceUrlConnection, Fi
 				sizePrintStream.print(size);
 				sizePrintStream.close();
 			} catch (FileNotFoundException e) {
-				logger.warn("could not write size validation file due to exception:\n\t", e.getMessage());
+				logger.warn("could not write size validation file due to exception: {}", e.getMessage());
 			}
 		}
 		
@@ -231,7 +231,7 @@ public static void createValidationFiles(URLConnection resourceUrlConnection, Fi
 			File hashFile = new File(localDestination.getParentFile(), String.format("%s%s_%s", localDestination.getName(), HASH_EXT, hash));
 			downloadFile(hashURL, hashFile);
 		} catch (IOException e) {
-			logger.warn("could not write validation hash file due to exception:\n\t{}", e.getMessage());
+			logger.warn("could not write validation hash file due to exception: {}", e.getMessage());
 		}
 	}
 	
@@ -247,7 +247,7 @@ public static void createValidationFiles(URLConnection resourceUrlConnection, Fi
 	 * <b>N.B.</b> None of the 3 common verification hashing algorithms are implement yet.
 	 * @param localFile The file to validate
 	 * @return <code>false</code> if any of the size or hash code metadata files exists but its contents does not match the expected value in the file, <code>true</code> otherwise.
-	 * @since 6.1.1
+	 * @since 7.0.0
 	 */
 	public static boolean validateFile(File localFile) {
 		File sizeFile = new File(localFile.getParentFile(), localFile.getName() + SIZE_EXT);

From 554987833ff0af6d42e359f90d1c76648374d63c Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 25 Jan 2023 12:01:08 -0800
Subject: [PATCH 393/599] Maven enforcer bump to 11, unified variables

---
 pom.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 70ae5731ad..c58aac69d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 	<url>http://www.biojava.org</url>
 	<organization>
 		<name>BioJava</name>
-		<url>http://www.biojava.org</url>
+		<url>http ://www.biojava.org</url>
 	</organization>
 	<licenses>
 		<license>
@@ -34,7 +34,6 @@
 	<properties>
 		<!-- Notice: if using java 9 or 10 jres, it is possible to simply use here "8", "9" or "10". But if using java 8 jre, "8" is not an allowed value but only "1.8"-->
 		<jdk.version>11</jdk.version>
-		<maven.enforcer.jdk-version>1.8</maven.enforcer.jdk-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
 		<!-- needed for failsafe plugin in integrationtest module - JD 2018-03-08 -->
@@ -312,7 +311,7 @@
 							<configuration>
 								<rules>
 									<requireJavaVersion>
-										<version>${maven.enforcer.jdk-version}</version>
+										<version>${jdk.version}</version>
 									</requireJavaVersion>
 								</rules>
 							</configuration>

From be227fd1e9da9727d5d4dca2483f7a52f3ffb286 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 25 Jan 2023 12:04:09 -0800
Subject: [PATCH 394/599] Upgrading ciftools to latest j11-based

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c58aac69d4..43c3abafca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
 		<slf4j.version>1.7.30</slf4j.version>
 		<log4j.version>2.17.2</log4j.version>
 		<junit-jupiter.version>5.7.2</junit-jupiter.version>
-		<ciftools.artifact>ciftools-java-jdk8</ciftools.artifact>
+		<ciftools.artifact>ciftools-java</ciftools.artifact>
 		<ciftools.version>4.0.5</ciftools.version>
 	</properties>
 	<scm>

From f1ef01a75fceef0efe1b9652566ef1df5e0b0fc0 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 25 Jan 2023 12:14:57 -0800
Subject: [PATCH 395/599] Biojava urls

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 43c3abafca..e9a59d7da9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,10 +19,10 @@
         manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application
         development for bioinformatics.
         </description>
-	<url>http://www.biojava.org</url>
+	<url>https://www.biojava.org</url>
 	<organization>
 		<name>BioJava</name>
-		<url>http ://www.biojava.org</url>
+		<url>https://www.biojava.org</url>
 	</organization>
 	<licenses>
 		<license>

From d61321bd4802374ceb96e849bb9c09ff8f9fd712 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 27 Jan 2023 12:11:47 -0800
Subject: [PATCH 396/599] Latest ciftools-java

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e9a59d7da9..9e7f821422 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 		<log4j.version>2.17.2</log4j.version>
 		<junit-jupiter.version>5.7.2</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java</ciftools.artifact>
-		<ciftools.version>4.0.5</ciftools.version>
+		<ciftools.version>5.0.0</ciftools.version>
 	</properties>
 	<scm>
 		<connection>scm:git:git://github.com/biojava/biojava.git</connection>

From b0a1da5a3864205db6de6a9ecac9db398d4ed048 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Sun, 29 Jan 2023 09:43:51 -0800
Subject: [PATCH 397/599] Fix for entity_src_nat category parsing, when some
 items missing

---
 .../nbio/structure/io/cif/CifStructureConsumerImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index debadc4c08..1aefbb5114 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -1403,8 +1403,8 @@ private void addInformationFromEntitySrcSyn(int rowIndex, EntityInfo entityInfo)
     }
 
     private void addInformationFromEntitySrcNat(int rowIndex, EntityInfo entityInfo) {
-        entityInfo.setAtcc(entitySrcNat.getPdbxAtcc().get(rowIndex));
-        entityInfo.setCell(entitySrcNat.getPdbxCell().get(rowIndex));
+        entityInfo.setAtcc(entitySrcNat.getPdbxAtcc().values().skip(rowIndex).findFirst().orElse(""));
+        entityInfo.setCell(entitySrcNat.getPdbxCell().values().skip(rowIndex).findFirst().orElse(""));
         entityInfo.setOrganismCommon(entitySrcNat.getCommonName().get(rowIndex));
         entityInfo.setOrganismScientific(entitySrcNat.getPdbxOrganismScientific().get(rowIndex));
         entityInfo.setOrganismTaxId(entitySrcNat.getPdbxNcbiTaxonomyId().get(rowIndex));

From 5b99e7ae5eb4d1bd7043ad1c30d377919dfdd408 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 30 Jan 2023 13:33:15 -0800
Subject: [PATCH 398/599] More comprehensive fix

---
 .../io/cif/CifStructureConsumerImpl.java      | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 1aefbb5114..a71f25b0df 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -14,7 +14,6 @@
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.OptionalInt;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import javax.vecmath.Matrix4d;
@@ -1397,27 +1396,34 @@ private void addAncilliaryEntityData(int asymRowIndex, EntityInfo entityInfo) {
     }
 
     private void addInformationFromEntitySrcSyn(int rowIndex, EntityInfo entityInfo) {
-        entityInfo.setOrganismCommon(entitySrcSyn.getOrganismCommonName().get(rowIndex));
-        entityInfo.setOrganismScientific(entitySrcSyn.getOrganismScientific().get(rowIndex));
-        entityInfo.setOrganismTaxId(entitySrcSyn.getNcbiTaxonomyId().get(rowIndex));
+        entityInfo.setOrganismCommon(getCifFieldNullAware(entitySrcSyn.getOrganismCommonName(), rowIndex, null));
+        entityInfo.setOrganismScientific(getCifFieldNullAware(entitySrcSyn.getOrganismScientific(), rowIndex, null));
+        entityInfo.setOrganismTaxId(getCifFieldNullAware(entitySrcSyn.getNcbiTaxonomyId(), rowIndex, null));
     }
 
     private void addInformationFromEntitySrcNat(int rowIndex, EntityInfo entityInfo) {
-        entityInfo.setAtcc(entitySrcNat.getPdbxAtcc().values().skip(rowIndex).findFirst().orElse(""));
-        entityInfo.setCell(entitySrcNat.getPdbxCell().values().skip(rowIndex).findFirst().orElse(""));
-        entityInfo.setOrganismCommon(entitySrcNat.getCommonName().get(rowIndex));
-        entityInfo.setOrganismScientific(entitySrcNat.getPdbxOrganismScientific().get(rowIndex));
-        entityInfo.setOrganismTaxId(entitySrcNat.getPdbxNcbiTaxonomyId().get(rowIndex));
+        entityInfo.setAtcc(getCifFieldNullAware(entitySrcNat.getPdbxAtcc(), rowIndex, null));
+        entityInfo.setCell(getCifFieldNullAware(entitySrcNat.getPdbxCell(), rowIndex, null));
+        entityInfo.setOrganismCommon(getCifFieldNullAware(entitySrcNat.getCommonName(), rowIndex, null));
+        entityInfo.setOrganismScientific(getCifFieldNullAware(entitySrcNat.getPdbxOrganismScientific(), rowIndex, null));
+        entityInfo.setOrganismTaxId(getCifFieldNullAware(entitySrcNat.getPdbxNcbiTaxonomyId(), rowIndex, null));
     }
 
     private void addInformationFromEntitySrcGen(int rowIndex, EntityInfo entityInfo) {
-        entityInfo.setAtcc(entitySrcGen.getPdbxGeneSrcAtcc().get(rowIndex));
-        entityInfo.setCell(entitySrcGen.getPdbxGeneSrcCell().get(rowIndex));
-        entityInfo.setOrganismCommon(entitySrcGen.getGeneSrcCommonName().get(rowIndex));
-        entityInfo.setOrganismScientific(entitySrcGen.getPdbxGeneSrcScientificName().get(rowIndex));
-        entityInfo.setOrganismTaxId(entitySrcGen.getPdbxGeneSrcNcbiTaxonomyId().get(rowIndex));
-        entityInfo.setExpressionSystemTaxId(entitySrcGen.getPdbxHostOrgNcbiTaxonomyId().get(rowIndex));
-        entityInfo.setExpressionSystem(entitySrcGen.getPdbxHostOrgScientificName().get(rowIndex));
+        entityInfo.setAtcc(getCifFieldNullAware(entitySrcGen.getPdbxGeneSrcAtcc(), rowIndex, null));
+        entityInfo.setCell(getCifFieldNullAware(entitySrcGen.getPdbxGeneSrcCell(), rowIndex, null));
+        entityInfo.setOrganismCommon(getCifFieldNullAware(entitySrcGen.getGeneSrcCommonName(), rowIndex, null));
+        entityInfo.setOrganismScientific(getCifFieldNullAware(entitySrcGen.getPdbxGeneSrcScientificName(), rowIndex, null));
+        entityInfo.setOrganismTaxId(getCifFieldNullAware(entitySrcGen.getPdbxGeneSrcNcbiTaxonomyId(), rowIndex, null));
+        entityInfo.setExpressionSystemTaxId(getCifFieldNullAware(entitySrcGen.getPdbxHostOrgNcbiTaxonomyId(), rowIndex, null));
+        entityInfo.setExpressionSystem(getCifFieldNullAware(entitySrcGen.getPdbxHostOrgScientificName(), rowIndex, null));
+    }
+
+    private String getCifFieldNullAware(StrColumn column, int rowIndex, String defaultValue) {
+        if (column.isDefined())
+            return column.get(rowIndex);
+        else
+            return defaultValue;
     }
 
     private void setStructNcsOps() {

From 043eb404099fb1b241faf6f10789ecc620298954 Mon Sep 17 00:00:00 2001
From: Jose Manuel Duarte <jose.m.duarte@gmail.com>
Date: Mon, 30 Jan 2023 15:41:32 -0800
Subject: [PATCH 399/599] More nullpdbid tests (#1056)

* Fix CE-Symm bug

Fix NullPointer if the structure identifier was missing

* Test current handling of identifiers in structures

Currently `Structure` has 4 identifiers which may or may not be set
depending on the source, file format, and parsing method. These should
be revisited and harmonized in the future, but for now I just document
them in this test.

Summary of results:

| Format | With ID | Parse Method    | PdbId | Identifier | Name | StructureIdentifier |
|--------|---------|-----------------|-------|------------|------|---------------------|
| cif    | No      | fromInputStream | null  | ""         | ""   | null                |
| pdb    | No      | fromInputStream | null  | ""         | ""   | null                |
| cif    | No      | fromUrl         | null  | ""         | ""   | null                |
| cif    | No      | StructureIO     | null  | file:      | 5PTI | file:               |
| pdb    | No      | StructureIO     | null  | file:      | ""   | file:               |
| cif    | Yes     | fromInputStream | 5PTI  | ""         | ""   | null                |
| pdb    | Yes     | fromInputStream | 5PTI  | ""         | ""   | null                |
| cif    | Yes     | fromUrl         | 5PTI  | ""         | ""   | null                |
| cif    | Yes     | StructureIO     | 5PTI  | file:      | 5PTI | file:               |
| pdb    | Yes     | StructureIO     | 5PTI  | file:      | 5PTI | file:               |

- `getPdbId` reflects the ID parsed from the file
- Only StructureIO is setting the StructureIdentifier (by design, but
  indicates StructureIO should be used wherever possible)
- StructureIO does not set the name properly for PDB files. This should
  be fixed.

* Test NullPointerException when loading Alphafold models (#1019)

The core URLIdentifier bug was fixed in #1020, but this improves the
test.

The parser changes are mostly for logging, and are there to indicate that
null PdbId is an expected situation rather than an error.

* Truncate file

---------

Co-authored-by: Spencer Bliven <spencer.bliven@gmail.com>
---
 .../test/io/TestIdentifiersInStructure.java   | 131 ++++++++++++++++++
 .../src/test/resources/5pti_noid.cif          |  73 ++++++++++
 .../src/test/resources/5pti_noid.pdb          |   9 ++
 .../nbio/structure/io/PDBFileParser.java      |  29 ++--
 .../io/cif/CifStructureConsumerImpl.java      |  20 +--
 .../structure/symmetry/internal/CeSymm.java   |   6 +-
 .../symmetry/internal/TestCeSymm.java         |  17 +++
 .../resources/AF-A0A0R4IYF1-F1-model_v2.pdb   |  86 ++++++++++++
 8 files changed, 348 insertions(+), 23 deletions(-)
 create mode 100644 biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestIdentifiersInStructure.java
 create mode 100644 biojava-integrationtest/src/test/resources/5pti_noid.cif
 create mode 100644 biojava-integrationtest/src/test/resources/5pti_noid.pdb
 create mode 100644 biojava-structure/src/test/resources/AF-A0A0R4IYF1-F1-model_v2.pdb

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestIdentifiersInStructure.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestIdentifiersInStructure.java
new file mode 100644
index 0000000000..5b14bb4026
--- /dev/null
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestIdentifiersInStructure.java
@@ -0,0 +1,131 @@
+package org.biojava.nbio.structure.test.io;
+
+import static org.junit.Assume.assumeNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureIO;
+import org.biojava.nbio.structure.align.client.StructureName;
+import org.biojava.nbio.structure.io.PDBFileParser;
+import org.biojava.nbio.structure.io.cif.CifStructureConverter;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Test that various identifiers in Structure are parsed consistently across
+ * file types.
+ * 
+ * These tests are not intended to be prescriptive, but merely to document the
+ * current state and force changes to be committed to git.
+ */
+public class TestIdentifiersInStructure {
+	@Test
+	public void testCifIdentifiers() throws IOException, StructureException {
+		String noid = "/5pti_noid.cif";
+		String yesid = "/5pti.cif";
+
+		// No ID, from file
+		URL url = this.getClass().getResource(noid);
+		String file = url.getPath();
+		Structure s = CifStructureConverter.fromURL(url);
+		assertNull(s.getPdbId());
+		assertEquals("", s.getIdentifier());
+		assertEquals("", s.getName());
+		assertNull(s.getStructureIdentifier());
+
+		// No ID, from StructureIO
+		s = StructureIO.getStructure(file);
+		assertNull(s.getPdbId());
+		assertEquals(file, s.getIdentifier());
+		assertEquals("5PTI", s.getName());
+		StructureName sid = (StructureName) s.getStructureIdentifier();
+		assertEquals(file, sid.getIdentifier());
+
+		// No id, from stream
+		InputStream stream = this.getClass().getResourceAsStream(noid);
+		s = CifStructureConverter.fromInputStream(stream);
+		assertNull(s.getPdbId());
+		assertEquals("", s.getIdentifier());
+		assertEquals("", s.getName());
+		assertNull(s.getStructureIdentifier());
+
+		// With ID, from file
+		url = this.getClass().getResource(yesid);
+		file = url.getPath();
+		s = CifStructureConverter.fromURL(url);
+		assertEquals("5PTI", s.getPdbId().getId());
+		assertEquals("", s.getIdentifier());
+		assertEquals("", s.getName());
+		assertNull(s.getStructureIdentifier());
+
+		// With ID, from StructureIO
+		s = StructureIO.getStructure(file);
+		assertEquals("5PTI", s.getPdbId().getId());
+		assertEquals(file, s.getIdentifier());
+		assertEquals("5PTI", s.getName());
+		sid = (StructureName) s.getStructureIdentifier();
+		assertEquals(file, sid.getIdentifier());
+
+		// With id, from stream
+		stream = this.getClass().getResourceAsStream(yesid);
+		s = CifStructureConverter.fromInputStream(stream);
+		assertEquals("5PTI", s.getPdbId().getId());
+		assertEquals("", s.getIdentifier());
+		assertEquals("", s.getName());
+		assertNull(s.getStructureIdentifier());
+	}
+
+	@Test
+	public void testPDBIdentifiers() throws IOException, StructureException {
+		String yesid = "/5pti.pdb";
+		String noid = "/noid.pdb";
+
+		assumeNotNull(this.getClass().getResource(yesid));
+		assumeNotNull(this.getClass().getResource(noid));
+
+		PDBFileParser parser = new PDBFileParser();
+
+		// No id, from StructureIO
+		String file = this.getClass().getResource(noid).getPath();
+		// Structure s = parser.parsePDBFile(file);
+		Structure s = StructureIO.getStructure(file);
+		assertNull(s.getPdbId());
+		assertEquals(file, s.getIdentifier());
+		assertEquals("", s.getName()); // differs from CIF behavior
+		StructureName sid = (StructureName) s.getStructureIdentifier();
+		assertEquals(file, sid.getIdentifier());
+
+		// No id, from stream
+		InputStream stream = this.getClass().getResourceAsStream(noid);
+		s = parser.parsePDBFile(new BufferedReader(new InputStreamReader(stream)));
+		assertNull(s.getPdbId());
+		assertEquals("", s.getIdentifier());
+		assertEquals("", s.getName());
+		assertNull(s.getStructureIdentifier());
+		
+		// With id, from StructureIO
+		file = this.getClass().getResource(yesid).getPath();
+		s = StructureIO.getStructure(file);
+		assertEquals("5PTI", s.getPdbId().toString());
+		assertEquals(file, s.getIdentifier());
+		assertEquals("5PTI", s.getName());
+		sid = (StructureName) s.getStructureIdentifier();
+		assertEquals(file, sid.getIdentifier());
+
+
+		// With id, from stream
+		stream = this.getClass().getResourceAsStream(yesid);
+		s = parser.parsePDBFile(new BufferedReader(new InputStreamReader(stream)));
+		assertEquals("5PTI", s.getPdbId().toString());
+		assertEquals("", s.getIdentifier());
+		assertEquals("", s.getName());
+		assertNull(s.getStructureIdentifier());
+	}
+}
\ No newline at end of file
diff --git a/biojava-integrationtest/src/test/resources/5pti_noid.cif b/biojava-integrationtest/src/test/resources/5pti_noid.cif
new file mode 100644
index 0000000000..70dfa173af
--- /dev/null
+++ b/biojava-integrationtest/src/test/resources/5pti_noid.cif
@@ -0,0 +1,73 @@
+data_
+# 
+loop_
+_entity.id 
+_entity.type 
+_entity.src_method 
+_entity.pdbx_description 
+_entity.formula_weight 
+_entity.pdbx_number_of_molecules 
+_entity.details 
+1 polymer     man 'TRYPSIN INHIBITOR'   6527.598 1  ? 
+# 
+loop_
+_struct_asym.id 
+_struct_asym.pdbx_blank_PDB_chainid_flag 
+_struct_asym.pdbx_modified 
+_struct_asym.entity_id 
+_struct_asym.details 
+A N N 1 ? 
+# 
+loop_
+_atom_site.group_PDB 
+_atom_site.id 
+_atom_site.type_symbol 
+_atom_site.label_atom_id 
+_atom_site.label_alt_id 
+_atom_site.label_comp_id 
+_atom_site.label_asym_id 
+_atom_site.label_entity_id 
+_atom_site.label_seq_id 
+_atom_site.pdbx_PDB_ins_code 
+_atom_site.Cartn_x 
+_atom_site.Cartn_y 
+_atom_site.Cartn_z 
+_atom_site.occupancy 
+_atom_site.B_iso_or_equiv 
+_atom_site.Cartn_x_esd 
+_atom_site.Cartn_y_esd 
+_atom_site.Cartn_z_esd 
+_atom_site.occupancy_esd 
+_atom_site.B_iso_or_equiv_esd 
+_atom_site.pdbx_formal_charge 
+_atom_site.auth_seq_id 
+_atom_site.auth_comp_id 
+_atom_site.auth_asym_id 
+_atom_site.auth_atom_id 
+_atom_site.pdbx_PDB_model_num 
+ATOM   1    N N    . ARG A 1 1  ? 32.231 15.281 -13.143 1.00 28.28 ? ? ? ? ? ? 1   ARG A N    1 
+ATOM   2    C CA   . ARG A 1 1  ? 32.184 14.697 -11.772 1.00 27.90 ? ? ? ? ? ? 1   ARG A CA   1 
+ATOM   3    C C    . ARG A 1 1  ? 33.438 13.890 -11.387 1.00 24.90 ? ? ? ? ? ? 1   ARG A C    1 
+ATOM   4    O O    . ARG A 1 1  ? 34.102 13.070 -12.066 1.00 24.44 ? ? ? ? ? ? 1   ARG A O    1 
+ATOM   5    C CB   . ARG A 1 1  ? 30.797 14.065 -11.625 1.00 27.88 ? ? ? ? ? ? 1   ARG A CB   1 
+ATOM   6    C CG   . ARG A 1 1  ? 30.976 12.589 -11.819 1.00 29.61 ? ? ? ? ? ? 1   ARG A CG   1 
+ATOM   7    C CD   . ARG A 1 1  ? 29.608 12.016 -11.694 1.00 31.91 ? ? ? ? ? ? 1   ARG A CD   1 
+ATOM   8    N NE   . ARG A 1 1  ? 28.942 12.335 -12.945 1.00 33.51 ? ? ? ? ? ? 1   ARG A NE   1 
+ATOM   9    C CZ   . ARG A 1 1  ? 27.670 12.696 -13.050 1.00 34.29 ? ? ? ? ? ? 1   ARG A CZ   1 
+ATOM   10   N NH1  . ARG A 1 1  ? 26.901 12.777 -11.999 1.00 34.48 ? ? ? ? ? ? 1   ARG A NH1  1 
+ATOM   11   N NH2  . ARG A 1 1  ? 27.161 12.963 -14.255 1.00 35.44 ? ? ? ? ? ? 1   ARG A NH2  1 
+ATOM   12   D D1   . ARG A 1 1  ? 32.983 14.824 -13.703 1.00 27.71 ? ? ? ? ? ? 1   ARG A D1   1 
+ATOM   13   D D2   . ARG A 1 1  ? 31.275 15.112 -13.535 1.00 28.50 ? ? ? ? ? ? 1   ARG A D2   1 
+ATOM   14   D D3   . ARG A 1 1  ? 32.174 16.346 -13.050 1.00 28.23 ? ? ? ? ? ? 1   ARG A D3   1 
+ATOM   15   H HA   . ARG A 1 1  ? 32.192 15.563 -11.115 1.00 26.97 ? ? ? ? ? ? 1   ARG A HA   1 
+ATOM   16   H HB2  . ARG A 1 1  ? 30.392 14.428 -10.697 1.00 28.71 ? ? ? ? ? ? 1   ARG A HB2  1 
+ATOM   17   H HB3  . ARG A 1 1  ? 30.182 14.438 -12.437 1.00 28.97 ? ? ? ? ? ? 1   ARG A HB3  1 
+ATOM   18   H HG2  . ARG A 1 1  ? 31.369 12.359 -12.800 1.00 29.44 ? ? ? ? ? ? 1   ARG A HG2  1 
+ATOM   19   H HG3  . ARG A 1 1  ? 31.591 12.143 -11.105 1.00 29.52 ? ? ? ? ? ? 1   ARG A HG3  1 
+ATOM   20   H HD2  . ARG A 1 1  ? 29.656 10.965 -11.482 1.00 31.41 ? ? ? ? ? ? 1   ARG A HD2  1 
+ATOM   21   H HD3  . ARG A 1 1  ? 29.218 12.381 -10.794 1.00 31.29 ? ? ? ? ? ? 1   ARG A HD3  1 
+ATOM   22   D DE   . ARG A 1 1  ? 29.457 12.292 -13.843 1.00 34.62 ? ? ? ? ? ? 1   ARG A DE   1 
+ATOM   23   D DH11 . ARG A 1 1  ? 25.930 13.038 -12.118 1.00 34.80 ? ? ? ? ? ? 1   ARG A DH11 1 
+ATOM   24   D DH12 . ARG A 1 1  ? 27.324 12.549 -11.100 1.00 34.71 ? ? ? ? ? ? 1   ARG A DH12 1 
+ATOM   25   D DH21 . ARG A 1 1  ? 27.786 12.886 -15.076 1.00 33.93 ? ? ? ? ? ? 1   ARG A DH21 1 
+ATOM   26   D DH22 . ARG A 1 1  ? 26.154 13.214 -14.269 1.00 34.53 ? ? ? ? ? ? 1   ARG A DH22 1 
diff --git a/biojava-integrationtest/src/test/resources/5pti_noid.pdb b/biojava-integrationtest/src/test/resources/5pti_noid.pdb
new file mode 100644
index 0000000000..5752016f7d
--- /dev/null
+++ b/biojava-integrationtest/src/test/resources/5pti_noid.pdb
@@ -0,0 +1,9 @@
+HEADER                                            01-JUL-21                     
+ATOM      1  N   MET A   1      19.682  12.062  34.184  1.00 39.14           N  
+ATOM      2  CA  MET A   1      20.443  10.838  34.522  1.00 39.14           C  
+ATOM      3  C   MET A   1      20.073   9.731  33.538  1.00 39.14           C  
+ATOM      4  CB  MET A   1      20.138  10.405  35.966  1.00 39.14           C  
+ATOM      5  O   MET A   1      19.030   9.110  33.696  1.00 39.14           O  
+ATOM      6  CG  MET A   1      20.829  11.294  37.004  1.00 39.14           C  
+ATOM      7  SD  MET A   1      20.292  10.920  38.687  1.00 39.14           S  
+ATOM      8  CE  MET A   1      21.522  11.848  39.645  1.00 39.14           C  
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index db6669cc75..92bd9f2456 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -371,13 +371,16 @@ private void pdb_HEADER_Handler(String line) {
 
 			logger.debug("Parsing entry " + pdbId);
 
-
 			PdbId pdbIdToSet;
-			try {
-				pdbIdToSet = new PdbId(pdbCode);
-			} catch (IllegalArgumentException e) {
-				logger.info("Malformed (or null) PDB ID {}. setting PdbId to null", pdbCode);
+			if(pdbCode.isBlank()) {
 				pdbIdToSet = null;
+			} else {
+				try {
+					pdbIdToSet = new PdbId(pdbCode);
+				} catch (IllegalArgumentException e) {
+					logger.warn("Malformed PDB ID {}. setting PdbId to null", pdbCode);
+					pdbIdToSet = null;
+				}
 			}
 			structure.setPdbId(pdbIdToSet);
 			pdbHeader.setPdbId(pdbIdToSet);
@@ -2719,7 +2722,7 @@ else if ( params.isParseSecStruc()) {
 		}
 
 		makeCompounds(compndLines, sourceLines);
-		
+
 		handlePDBKeywords(keywordsLines);
 
 		triggerEndFileChecks();
@@ -2786,18 +2789,18 @@ private void makeCompounds(List<String> compoundList,
 	}
 
 	/**Parse KEYWODS record of the PDB file.<br>
-	 * A keyword may be split over two lines. whether a keyword ends by the end 
-	 * of a line or it is aplit over two lines, a <code>space</code> is added 
-	 * between the 2 lines's contents, unless the first line ends in 
+	 * A keyword may be split over two lines. whether a keyword ends by the end
+	 * of a line or it is aplit over two lines, a <code>space</code> is added
+	 * between the 2 lines's contents, unless the first line ends in
 	 * a '-' character.
 	 * <pre>
 	 * Record Format
-	 * COLUMNS       DATA  TYPE     FIELD         DEFINITION 
+	 * COLUMNS       DATA  TYPE     FIELD         DEFINITION
 	 *	---------------------------------------------------------------------------------
-	 *	 1 -  6       Record name    "KEYWDS" 
+	 *	 1 -  6       Record name    "KEYWDS"
 	 *	 9 - 10       Continuation   continuation  Allows concatenation of records if necessary.
 	 *	11 - 79       List           keywds        Comma-separated list of keywords relevant
-	 *	                                           to the entry.      
+	 *	                                           to the entry.
 	 * Example
 	 * 	         1         2         3         4         5         6         7         8
 	 *	12345678901234567890123456789012345678901234567890123456789012345678901234567890
@@ -2830,7 +2833,7 @@ private void handlePDBKeywords(List<String> lines) {
 		}
 		pdbHeader.setKeywords(lst);
 	}
-	
+
 	/**
 	 * Handles creation of all bonds. Looks at LINK records, SSBOND (Disulfide
 	 * bonds), peptide bonds, and intra-residue bonds.
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index a71f25b0df..8f6dfbc97e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -645,11 +645,11 @@ public void consumeDatabasePDBRevRecord(DatabasePDBRevRecord databasePDBrevRecor
             revRecords.add(new org.biojava.nbio.structure.DatabasePDBRevRecord(databasePDBrevRecord, i));
         }
     }
-    
+
     @Override
     public void consumeEm3dReconstruction(Em3dReconstruction em3dReconstruction) {
     	this.em3dReconstruction = em3dReconstruction;
-    	
+
         for (int rowIndex = 0; rowIndex < em3dReconstruction.getRowCount(); rowIndex++) { //can it have more than 1 value?
         	final FloatColumn resolution = em3dReconstruction.getResolution();
 			if (ValueKind.PRESENT.equals(resolution.getValueKind(rowIndex)))
@@ -895,12 +895,16 @@ public void consumeStruct(Struct struct) {
         if (struct.isDefined() && struct.getEntryId().isDefined()) {
             PdbId pdbId;
             String pdbCode = struct.getEntryId().get(0);
-			try {
-				pdbId = new PdbId(pdbCode);
-			} catch (IllegalArgumentException e) {
-				logger.info("Malformed (or null) PDB ID {}. setting PdbId to null", pdbCode);
-				pdbId = null;
-			}
+            if(pdbCode.isBlank()){
+                pdbId = null;
+            } else {
+                try {
+                    pdbId = new PdbId(pdbCode);
+                } catch (IllegalArgumentException e) {
+                    logger.warn("Malformed PDB ID {}. setting PdbId to null", pdbCode);
+                    pdbId = null;
+                }
+            }
             pdbHeader.setPdbId(pdbId);
             structure.setPdbId(pdbId);
         }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java
index f81bd25dda..641242a0bf 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java
@@ -242,8 +242,10 @@ protected static CeSymmResult align(Atom[] atoms, CESymmParameters params)
 		optimalAFP = selfAlignments.get(0);
 		StructureIdentifier id = atoms[0].getGroup().getChain().getStructure()
 				.getStructureIdentifier();
-		optimalAFP.setName1(id.getIdentifier());
-		optimalAFP.setName2(id.getIdentifier());
+		if(id != null) {
+			optimalAFP.setName1(id.getIdentifier());
+			optimalAFP.setName2(id.getIdentifier());
+		}
 
 		// Store the optimal self-alignment
 		result.setSelfAlignment(optimalAFP);
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/symmetry/internal/TestCeSymm.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/symmetry/internal/TestCeSymm.java
index f9d829b5c3..a21019711b 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/symmetry/internal/TestCeSymm.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/symmetry/internal/TestCeSymm.java
@@ -21,13 +21,18 @@
 package org.biojava.nbio.structure.symmetry.internal;
 
 import static org.junit.Assert.*;
+import static org.junit.Assume.assumeNotNull;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
 
 import org.biojava.nbio.structure.Atom;
 import org.biojava.nbio.structure.Structure;
 import org.biojava.nbio.structure.StructureException;
+import org.biojava.nbio.structure.StructureIO;
 import org.biojava.nbio.structure.StructureTools;
+import org.biojava.nbio.structure.io.PDBFileParser;
 import org.biojava.nbio.structure.symmetry.internal.CeSymm;
 import org.junit.Test;
 
@@ -58,4 +63,16 @@ public void testEasyCases() throws IOException, StructureException {
 			assertEquals(result.getNumRepeats(), orders[i]);
 		}
 	}
+
+	@Test
+	public void testAlphafold() throws IOException, StructureException {
+		URL url = this.getClass().getResource("/AF-A0A0R4IYF1-F1-model_v2.pdb");
+		assumeNotNull(url);
+		String file = url.getPath();
+		Structure s = StructureIO.getStructure(file);
+		assertNull(s.getPdbId());
+		Atom[] atoms = StructureTools.getRepresentativeAtomArray(s);
+		CeSymmResult result = CeSymm.analyze(atoms);
+		assertNotNull(result);
+	}
 }
diff --git a/biojava-structure/src/test/resources/AF-A0A0R4IYF1-F1-model_v2.pdb b/biojava-structure/src/test/resources/AF-A0A0R4IYF1-F1-model_v2.pdb
new file mode 100644
index 0000000000..5e72659458
--- /dev/null
+++ b/biojava-structure/src/test/resources/AF-A0A0R4IYF1-F1-model_v2.pdb
@@ -0,0 +1,86 @@
+HEADER                                            01-JUL-21                     
+TITLE     ALPHAFOLD MONOMER V2.0 PREDICTION FOR INTERLEUKIN-1 (A0A0R4IYF1)      
+COMPND    MOL_ID: 1;                                                            
+COMPND   2 MOLECULE: INTERLEUKIN-1;                                             
+COMPND   3 CHAIN: A                                                             
+SOURCE    MOL_ID: 1;                                                            
+SOURCE   2 ORGANISM_SCIENTIFIC: DANIO RERIO;                                    
+SOURCE   3 ORGANISM_TAXID: 7955                                                 
+REMARK   1                                                                      
+REMARK   1 REFERENCE 1                                                          
+REMARK   1  AUTH   JOHN JUMPER, RICHARD EVANS, ALEXANDER PRITZEL, TIM GREEN,    
+REMARK   1  AUTH 2 MICHAEL FIGURNOV, OLAF RONNEBERGER, KATHRYN TUNYASUVUNAKOOL, 
+REMARK   1  AUTH 3 RUSS BATES, AUGUSTIN ZIDEK, ANNA POTAPENKO, ALEX BRIDGLAND,  
+REMARK   1  AUTH 4 CLEMENS MEYER, SIMON A A KOHL, ANDREW J BALLARD,             
+REMARK   1  AUTH 5 ANDREW COWIE, BERNARDINO ROMERA-PAREDES, STANISLAV NIKOLOV,  
+REMARK   1  AUTH 6 RISHUB JAIN, JONAS ADLER, TREVOR BACK, STIG PETERSEN,        
+REMARK   1  AUTH 7 DAVID REIMAN, ELLEN CLANCY, MICHAL ZIELINSKI,                
+REMARK   1  AUTH 8 MARTIN STEINEGGER, MICHALINA PACHOLSKA, TAMAS BERGHAMMER,    
+REMARK   1  AUTH 9 DAVID SILVER, ORIOL VINYALS, ANDREW W SENIOR,                
+REMARK   1  AUTH10 KORAY KAVUKCUOGLU, PUSHMEET KOHLI, DEMIS HASSABIS            
+REMARK   1  TITL   HIGHLY ACCURATE PROTEIN STRUCTURE PREDICTION WITH ALPHAFOLD  
+REMARK   1  REF    NATURE                        V. 596   583 2021              
+REMARK   1  REFN                   ISSN 0028-0836                               
+REMARK   1  PMID   34265844                                                     
+REMARK   1  DOI    10.1038/s41586-021-03819-2                                   
+REMARK   1                                                                      
+REMARK   1 DISCLAIMERS                                                          
+REMARK   1 ALPHAFOLD DATA, COPYRIGHT (2021) DEEPMIND TECHNOLOGIES LIMITED. THE  
+REMARK   1 INFORMATION PROVIDED IS THEORETICAL MODELLING ONLY AND CAUTION SHOULD
+REMARK   1 BE EXERCISED IN ITS USE. IT IS PROVIDED "AS-IS" WITHOUT ANY WARRANTY 
+REMARK   1 OF ANY KIND, WHETHER EXPRESSED OR IMPLIED. NO WARRANTY IS GIVEN THAT 
+REMARK   1 USE OF THE INFORMATION SHALL NOT INFRINGE THE RIGHTS OF ANY THIRD    
+REMARK   1 PARTY. THE INFORMATION IS NOT INTENDED TO BE A SUBSTITUTE FOR        
+REMARK   1 PROFESSIONAL MEDICAL ADVICE, DIAGNOSIS, OR TREATMENT, AND DOES NOT   
+REMARK   1 CONSTITUTE MEDICAL OR OTHER PROFESSIONAL ADVICE. IT IS AVAILABLE FOR 
+REMARK   1 ACADEMIC AND COMMERCIAL PURPOSES, UNDER CC-BY 4.0 LICENCE.
+REMARK 111 NOTE this is a truncated file, added to BioJava for testing purposes
+DBREF  XXXX A    1   284  UNP    A0A0R4IYF1 A0A0R4IYF1_DANRE     1    284       
+SEQRES   1 A  4  MET ARG LYS GLN
+CRYST1    1.000    1.000    1.000  90.00  90.00  90.00 P 1           1          
+ORIGX1      1.000000  0.000000  0.000000        0.00000                         
+ORIGX2      0.000000  1.000000  0.000000        0.00000                         
+ORIGX3      0.000000  0.000000  1.000000        0.00000                         
+SCALE1      1.000000  0.000000  0.000000        0.00000                         
+SCALE2      0.000000  1.000000  0.000000        0.00000                         
+SCALE3      0.000000  0.000000  1.000000        0.00000                         
+MODEL        1                                                                  
+ATOM      1  N   MET A   1      19.682  12.062  34.184  1.00 39.14           N  
+ATOM      2  CA  MET A   1      20.443  10.838  34.522  1.00 39.14           C  
+ATOM      3  C   MET A   1      20.073   9.731  33.538  1.00 39.14           C  
+ATOM      4  CB  MET A   1      20.138  10.405  35.966  1.00 39.14           C  
+ATOM      5  O   MET A   1      19.030   9.110  33.696  1.00 39.14           O  
+ATOM      6  CG  MET A   1      20.829  11.294  37.004  1.00 39.14           C  
+ATOM      7  SD  MET A   1      20.292  10.920  38.687  1.00 39.14           S  
+ATOM      8  CE  MET A   1      21.522  11.848  39.645  1.00 39.14           C  
+ATOM      9  N   ARG A   2      20.850   9.531  32.464  1.00 38.04           N  
+ATOM     10  CA  ARG A   2      20.614   8.428  31.516  1.00 38.04           C  
+ATOM     11  C   ARG A   2      21.360   7.192  32.016  1.00 38.04           C  
+ATOM     12  CB  ARG A   2      21.010   8.815  30.077  1.00 38.04           C  
+ATOM     13  O   ARG A   2      22.578   7.197  32.112  1.00 38.04           O  
+ATOM     14  CG  ARG A   2      19.854   9.506  29.332  1.00 38.04           C  
+ATOM     15  CD  ARG A   2      20.250   9.851  27.888  1.00 38.04           C  
+ATOM     16  NE  ARG A   2      19.107  10.368  27.105  1.00 38.04           N  
+ATOM     17  NH1 ARG A   2      20.285  11.015  25.235  1.00 38.04           N  
+ATOM     18  NH2 ARG A   2      18.073  11.268  25.278  1.00 38.04           N  
+ATOM     19  CZ  ARG A   2      19.161  10.879  25.883  1.00 38.04           C  
+ATOM     20  N   LYS A   3      20.589   6.174  32.391  1.00 33.68           N  
+ATOM     21  CA  LYS A   3      21.032   4.888  32.935  1.00 33.68           C  
+ATOM     22  C   LYS A   3      21.760   4.115  31.825  1.00 33.68           C  
+ATOM     23  CB  LYS A   3      19.758   4.189  33.472  1.00 33.68           C  
+ATOM     24  O   LYS A   3      21.111   3.629  30.901  1.00 33.68           O  
+ATOM     25  CG  LYS A   3      19.960   3.207  34.636  1.00 33.68           C  
+ATOM     26  CD  LYS A   3      18.588   2.749  35.176  1.00 33.68           C  
+ATOM     27  CE  LYS A   3      18.733   1.906  36.451  1.00 33.68           C  
+ATOM     28  NZ  LYS A   3      17.418   1.494  37.015  1.00 33.68           N  
+ATOM     29  N   GLN A   4      23.091   4.048  31.878  1.00 37.59           N  
+ATOM     30  CA  GLN A   4      23.877   3.144  31.035  1.00 37.59           C  
+ATOM     31  C   GLN A   4      23.517   1.704  31.419  1.00 37.59           C  
+ATOM     32  CB  GLN A   4      25.384   3.446  31.184  1.00 37.59           C  
+ATOM     33  O   GLN A   4      23.656   1.303  32.573  1.00 37.59           O  
+ATOM     34  CG  GLN A   4      25.896   4.332  30.030  1.00 37.59           C  
+ATOM     35  CD  GLN A   4      27.116   5.178  30.386  1.00 37.59           C  
+ATOM     36  NE2 GLN A   4      28.052   5.368  29.481  1.00 37.59           N  
+ATOM     37  OE1 GLN A   4      27.214   5.742  31.460  1.00 37.59           O
+ENDMDL                                                                          
+END                                                                             
\ No newline at end of file

From b7fe72ce48bcabc28bc4e855c0c2baf570f492c3 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 31 Jan 2023 14:00:45 -0800
Subject: [PATCH 400/599] [maven-release-plugin] prepare release biojava-7.0.0

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 1f47f2aa7a..9561581952 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index b58719da88..e0ce7eee08 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index b40abe3fef..f510aba55d 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index c92d19c3e5..d018f547c8 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 7cdd79db46..9f1b636ad0 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>6.1.1-SNAPSHOT</version>
+    <version>7.0.0</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>6.1.1-SNAPSHOT</version>
+    	<version>7.0.0</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index dde1a147bb..a5bb5c7f84 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index af9d1fd3b9..6ed704a399 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>6.1.1-SNAPSHOT</version>
+    <version>7.0.0</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index a2d2c29b37..1cb18bd2d8 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index c146c80e4c..a866ec11cd 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index e343072410..6f5e8f3c88 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index ed19b36102..10709197d7 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index b71fb7f5b1..0515c7905b 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 61c118bf2b..160f177dcd 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>6.1.1-SNAPSHOT</version>
+			<version>7.0.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 9e7f821422..e63424cbc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>6.1.1-SNAPSHOT</version>
+	<version>7.0.0</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.0.0</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From a016539db152665aace6977c42ce10242ef3505e Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 31 Jan 2023 14:00:48 -0800
Subject: [PATCH 401/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 9561581952..c2ad62cd53 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.0</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index e0ce7eee08..c1f70da5f2 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.0</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index f510aba55d..64a492804d 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.0</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index d018f547c8..b83d078db1 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.0</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 9f1b636ad0..a85af07457 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.0.0</version>
+    <version>7.0.1-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.0.0</version>
+    	<version>7.0.1-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index a5bb5c7f84..41ec1dfcef 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.0</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 6ed704a399..fb3824459c 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 1cb18bd2d8..28abc2224d 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.0</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index a866ec11cd..c21f67111f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.0</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 6f5e8f3c88..17614830a7 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.0.0</version>
+		<version>7.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 10709197d7..a5a95625f3 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.0</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 0515c7905b..a273175412 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.0.0</version>
+        <version>7.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 160f177dcd..52862f59da 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.0</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index e63424cbc1..f753686d48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.0.0</version>
+	<version>7.0.1-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.0.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 53179add4d2320da85302a03f8c7f2c777f7d59e Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Tue, 31 Jan 2023 14:17:54 -0800
Subject: [PATCH 402/599] Updating docs after 7.0.0 release

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 README.md    |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d167900b1..a858083de5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,20 @@
 BioJava Changelog
 -----------------
 
+BioJava 7.0.0
+==============================
+### Breaking
+* BioJava is now compiled at JDK 11 compatibility level. It will not work anymore under older JREs (e.g. JRE 8). 
+This is the main reason for the major version bump.
+
+### Added
+* Better handling of downloads: file download validation #1024
+
+### Fixed
+* Upgrade to latest ciftools-java, fixes non-US locale issue #1049
+* Issue with some edge cases in CIF parsing #1054
+* Minor security issue #1046
+ 
 
 BioJava 6.1.0
 ==============================
@@ -130,6 +144,18 @@ BioJava 5.3.0
 * Bug fix in GenbankReader #800 #829 
 * Dependencies and maven plugin upgrades
 
+BioJava 7.0.0
+==============================
+### Breaking
+* BioJava is now compiled at JDK 11 level. It will not work anymore under older JREs (e.g. JRE 8). 
+This is the main reason for the major bump.
+
+### Added
+* Better handling of partial downloads 
+
+### Fixed
+* Issue with some edge cases in CIF parsing: #1054
+ 
 
 BioJava 5.2.1
 =============
diff --git a/README.md b/README.md
index dc8007b9d8..4b90936f98 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-6.1.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-6.1.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-7.0.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.0.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>6.1.0</version>
+        <version>7.0.0</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From 7e3e7388c477f2077d94da45a68616662e22e1be Mon Sep 17 00:00:00 2001
From: Sebastian Bittrich <sebastian.bittrich@rcsb.org>
Date: Mon, 3 Apr 2023 14:00:17 -0700
Subject: [PATCH 403/599] pom cleanup

---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index f753686d48..240e4c0035 100644
--- a/pom.xml
+++ b/pom.xml
@@ -359,7 +359,6 @@
 
 				<configuration>
 					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
 						<manifest>
 							<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
 							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
@@ -692,8 +691,4 @@
 		<system>Github</system>
 		<url>https://github.com/biojava/biojava/issues</url>
 	</issueManagement>
-	<ciManagement>
-			<system>Travis</system>
-			<url>https://travis-ci.org/biojava/biojava</url>
-	</ciManagement>
 </project>

From 5de016360f4e8650a55628bd4b3d1e691bf868cc Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 3 Apr 2023 15:43:54 -0700
Subject: [PATCH 404/599] Fixing test after PDB id obsoletion

---
 .../biojava/nbio/structure/align/util/AtomCacheTest.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
index 57fc673340..af56e67046 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
@@ -102,13 +102,14 @@ public void tearDown() {
 	 */
 	@Test
 	public void testGetStructureForDomain1() throws IOException, StructureException {
-		String ranges = "A:328-396,B:518-527";
-		Structure whole = cache.getStructure("1h6w");
+		// note that prior to Apr 2023, the example here was 1h6w, but it was obsoleted
+		String ranges = "A:246-262,B:263-345";
+		Structure whole = cache.getStructure("3bzy");
 		AtomPositionMap map = new AtomPositionMap(StructureTools.getAllAtomArray(whole), AtomPositionMap.ANYTHING_MATCHER);
 		List<ResidueRangeAndLength> rrs = ResidueRangeAndLength.parseMultiple(ranges, map);
 		int expectedLengthA = rrs.get(0).getLength();
 		int expectedLengthB = rrs.get(1).getLength();
-		Structure structure = cache.getStructureForDomain("d1h6w.2");
+		Structure structure = cache.getStructureForDomain("d3bzy.1");
 		assertEquals(2, structure.getPolyChains().size());
 		Chain a = structure.getPolyChainByPDB("A");
 		Chain b = structure.getPolyChainByPDB("B");

From b39fb5925607edff4c985d172007f4f643737670 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 3 Apr 2023 15:46:56 -0700
Subject: [PATCH 405/599] Less garbage in GW actions output

---
 .github/workflows/master.yml       | 2 +-
 .github/workflows/pull_request.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 5cbb2b390c..f10369d9ab 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -33,4 +33,4 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
         # The following builds the project, runs the tests with coverage (no integration tests) and then executes the SonarCloud analysis
-        run: mvn verify -pl '!biojava-integrationtest' org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=biojava_biojava -Dsonar.organization=biojava
+        run: mvn verify -pl '!biojava-integrationtest' org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=biojava_biojava -Dsonar.organization=biojava --no-transfer-progress
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 7a5e20608e..078430db7e 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -31,4 +31,4 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
       - name: Build, test and integration test
-        run: mvn verify
+        run: mvn verify --no-transfer-progress

From f64b73cba30281fdf312d061a1bb4efec257e84a Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 3 Apr 2023 16:07:41 -0700
Subject: [PATCH 406/599] Ignoring a test that broke after 4hhb remediation

---
 .../structure/symmetry/TestJmolSymmetryScriptGenerator.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/biojava-structure-gui/src/test/java/org/biojava/nbio/structure/symmetry/TestJmolSymmetryScriptGenerator.java b/biojava-structure-gui/src/test/java/org/biojava/nbio/structure/symmetry/TestJmolSymmetryScriptGenerator.java
index 164319e977..5f4c21f99e 100644
--- a/biojava-structure-gui/src/test/java/org/biojava/nbio/structure/symmetry/TestJmolSymmetryScriptGenerator.java
+++ b/biojava-structure-gui/src/test/java/org/biojava/nbio/structure/symmetry/TestJmolSymmetryScriptGenerator.java
@@ -39,6 +39,7 @@
 import org.biojava.nbio.structure.symmetry.core.SymmetryPerceptionMethod;
 import org.biojava.nbio.structure.symmetry.jmolScript.JmolSymmetryScriptGeneratorDn;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -50,6 +51,7 @@ public class TestJmolSymmetryScriptGenerator {
     public void setUp() {
     }
 
+    @Ignore("This test is broken since 4hhb remediation in early 2023. In any case, the comparison to the hard-coded polyhedron coordinates wasn't a very good way to test.")
     @Test
     public void testPolygon() throws IOException, StructureException {
         Structure struc = StructureIO.getStructure("4hhb");

From a83058a490fcc1f2b2e99f3884563a0de245dba6 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 3 Apr 2023 16:11:08 -0700
Subject: [PATCH 407/599] Test fixes after 4hhb remediation

---
 .../test/io/TestCrystallographicMetadata.java  |  4 ++--
 .../test/xtal/TestCrystalBuilder.java          | 18 ------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java
index 1c4db79571..58eb09fb42 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java
@@ -52,8 +52,8 @@ public void test4hhb() throws Exception {
 
 		Structure s = StructureIO.getStructure("4hhb");
 
-		// 4hhb is one of the few entries that aren't in the standard coordinate frame convention
-		assertTrue(s.getCrystallographicInfo().isNonStandardCoordFrameConvention());
+		// 4hhb was one of the few entries in a non-standard coordinate frame convention: but after a remediation in early 2023 it was finally fixed
+		assertFalse(s.getCrystallographicInfo().isNonStandardCoordFrameConvention());
 
 		// 4hhn has a standard SG
 		assertFalse(s.getCrystallographicInfo().isNonStandardSg());
diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/xtal/TestCrystalBuilder.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/xtal/TestCrystalBuilder.java
index d90241dbe0..d2d976d912 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/xtal/TestCrystalBuilder.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/xtal/TestCrystalBuilder.java
@@ -173,22 +173,4 @@ public void test2H2Z() throws IOException, StructureException {
 
 	}
 
-	@Test
-	public void test4HHB() throws IOException, StructureException {
-
-		// 4hhb is a very old entry with a non-standard coordinate frame convention, we should calculate only AU contacts
-
-		AtomCache cache = new AtomCache();
-
-		StructureIO.setAtomCache(cache);
-
-		cache.setFiletype(StructureFiletype.CIF);
-		Structure s1 = StructureIO.getStructure("4HHB");
-		CrystalBuilder cb = new CrystalBuilder(s1);
-		StructureInterfaceList interfaces = cb.getUniqueInterfaces(5.5);
-		// 5 interfaces in the AU: the 4 of the tetramer + 1 cross-interface
-		assertEquals(5, interfaces.size());
-
-	}
-
 }

From bf40264a472dc2fb7e8c36ff506db47ebbc841db Mon Sep 17 00:00:00 2001
From: Sreejith Nair <sr816885@dal.ca>
Date: Tue, 4 Apr 2023 21:38:15 -0300
Subject: [PATCH 408/599] Refactoring : Extract method changes to reduce the
 cyclomatic complexity of getBackboneAtomArray

---
 .../nbio/structure/StructureTools.java        | 68 ++++++-------------
 1 file changed, 21 insertions(+), 47 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
index 3dad14a2a0..51e8b880de 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
@@ -1128,65 +1128,39 @@ public static Atom[] getRepresentativeAtomArray(Structure s) {
 	 * @return an Atom[] array
 	 */
 	public static Atom[] getBackboneAtomArray(Structure s) {
-
 		List<Atom> atoms = new ArrayList<>();
+		Set<String> nucleotideAtomNames = new HashSet<>(Arrays.asList(C1_ATOM_NAME, C2_ATOM_NAME, C3_ATOM_NAME, C4_ATOM_NAME, O2_ATOM_NAME, O3_ATOM_NAME, O4_ATOM_NAME, O5_ATOM_NAME, OP1_ATOM_NAME, OP2_ATOM_NAME, P_ATOM_NAME));
+		Set<String> aminoAcidAtomNames = new HashSet<>(Arrays.asList(CA_ATOM_NAME, C_ATOM_NAME, N_ATOM_NAME, O_ATOM_NAME));
 
 		for (Chain c : s.getChains()) {
 			for (Group g : c.getAtomGroups()) {
 				if (g.hasAminoAtoms()) {
-					// this means we will only take atoms grom groups that have
-					// complete backbones
-					for (Atom a : g.getAtoms()) {
-						switch (g.getType()) {
-						case NUCLEOTIDE:
-							// Nucleotide backbone
-							if (a.getName().equals(C1_ATOM_NAME))
-								atoms.add(a);
-							if (a.getName().equals(C2_ATOM_NAME))
-								atoms.add(a);
-							if (a.getName().equals(C3_ATOM_NAME))
-								atoms.add(a);
-							if (a.getName().equals(C4_ATOM_NAME))
-								atoms.add(a);
-							if (a.getName().equals(O2_ATOM_NAME))
-								atoms.add(a);
-							if (a.getName().equals(O3_ATOM_NAME))
-								atoms.add(a);
-							if (a.getName().equals(O4_ATOM_NAME))
-								atoms.add(a);
-							if (a.getName().equals(O5_ATOM_NAME))
-								atoms.add(a);
-							if (a.getName().equals(OP1_ATOM_NAME))
-								atoms.add(a);
-							if (a.getName().equals(OP2_ATOM_NAME))
-								atoms.add(a);
-							if (a.getName().equals(P_ATOM_NAME))
-								atoms.add(a);
-							// TODO Allow C4* names as well as C4'? -SB 3/2015
-							break;
-						case AMINOACID:
-						default:
-							// we do it this way instead of with g.getAtom() to
-							// be sure we always use the same order as original
-							if (a.getName().equals(CA_ATOM_NAME))
-								atoms.add(a);
-							if (a.getName().equals(C_ATOM_NAME))
-								atoms.add(a);
-							if (a.getName().equals(N_ATOM_NAME))
-								atoms.add(a);
-							if (a.getName().equals(O_ATOM_NAME))
-								atoms.add(a);
-							break;
-						}
+					if (g.getType() == GroupType.NUCLEOTIDE) {
+						addNucleotideAndAminoAtoms(atoms, g, nucleotideAtomNames);
+					} else {
+						addNucleotideAndAminoAtoms(atoms, g, aminoAcidAtomNames);
 					}
 				}
 			}
-
 		}
-
 		return atoms.toArray(new Atom[0]);
 	}
 
+	/**
+	 * This method will be used to add the Nucleotide and Amino atoms to the backbone Atom arrays based on the pre-defined Atom names.
+	 * @param atoms
+	 * @param g
+	 * @param atomNames
+	 */
+	private static void addNucleotideAndAminoAtoms(List<Atom> atoms, Group g, Set<String> atomNames) {
+		for (Atom a : g.getAtoms()) {
+			if (atomNames.contains(a.getName())) {
+				atoms.add(a);
+			}
+		}
+	}
+
+
 	/**
 	 * Convert three character amino acid codes into single character e.g.
 	 * convert CYS to C. Valid 3-letter codes will be those of the standard 20

From 2ddf8b09c2b81bb799424a1f7c8cc215750f069a Mon Sep 17 00:00:00 2001
From: Sreejith Nair <sr816885@dal.ca>
Date: Wed, 5 Apr 2023 01:04:23 -0300
Subject: [PATCH 409/599] Refactoring Decompose conditional : Changes to
 refactor getContactOverlapScore method to eliminate complex conditional smell

---
 .../structure/contact/StructureInterface.java    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
index 44da65e31b..b26275cde8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
@@ -616,10 +616,7 @@ public double getContactOverlapScore(StructureInterface other, boolean invert) {
 		Pair<EntityInfo> thisCompounds = new Pair<EntityInfo>(thisChains.getFirst().getEntityInfo(), thisChains.getSecond().getEntityInfo());
 		Pair<EntityInfo> otherCompounds = new Pair<EntityInfo>(otherChains.getFirst().getEntityInfo(), otherChains.getSecond().getEntityInfo());
 
-		if ( (  (thisCompounds.getFirst().getMolId() == otherCompounds.getFirst().getMolId()) &&
-				(thisCompounds.getSecond().getMolId() == otherCompounds.getSecond().getMolId())   )  ||
-			 (  (thisCompounds.getFirst().getMolId() == otherCompounds.getSecond().getMolId()) &&
-				(thisCompounds.getSecond().getMolId() == otherCompounds.getFirst().getMolId())   )	) {
+		if (checkMolIdMatch(thisCompounds,otherCompounds)) {
 
 			int common = 0;
 			GroupContactSet thisContacts = getGroupContacts();
@@ -653,6 +650,17 @@ public double getContactOverlapScore(StructureInterface other, boolean invert) {
 		}
 	}
 
+	/**
+	 * This method check if two compounds have same MolIds or not.
+	 * @param thisCompounds
+	 * @param otherCompounds
+	 * @return
+	 */
+	private boolean checkMolIdMatch(Pair<EntityInfo> thisCompounds, Pair<EntityInfo> otherCompounds){
+		boolean firstMatch = thisCompounds.getFirst().getMolId() == otherCompounds.getFirst().getMolId() && thisCompounds.getSecond().getMolId() == otherCompounds.getSecond().getMolId();
+		boolean secondMatch = thisCompounds.getFirst().getMolId() == otherCompounds.getSecond().getMolId() && thisCompounds.getSecond().getMolId() == otherCompounds.getFirst().getMolId();
+		return firstMatch || secondMatch;
+	}
 	public GroupContactSet getGroupContacts() {
 		if (groupContacts==null) {
 			this.groupContacts  = new GroupContactSet(contacts);

From 4676fe7c7e28c8004b2739472594533739109c5f Mon Sep 17 00:00:00 2001
From: Sreejith Nair <sr816885@dal.ca>
Date: Wed, 5 Apr 2023 01:05:00 -0300
Subject: [PATCH 410/599] Refactoring : Changes to refactor isPureTranslation
 method to eliminate complex conditional smell

---
 .../nbio/structure/xtal/CrystalTransform.java | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalTransform.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalTransform.java
index 3926c9223a..06251cbb31 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalTransform.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalTransform.java
@@ -180,26 +180,29 @@ public boolean isIdentity() {
 	 */
 	public boolean isPureTranslation() {
 		if (isPureCrystalTranslation()) return true;
-		if (SpaceGroup.deltaComp(matTransform.m00,1,SpaceGroup.DELTA) &&
-			SpaceGroup.deltaComp(matTransform.m01,0,SpaceGroup.DELTA) &&
-			SpaceGroup.deltaComp(matTransform.m02,0,SpaceGroup.DELTA) &&
-
-			SpaceGroup.deltaComp(matTransform.m10,0,SpaceGroup.DELTA) &&
-			SpaceGroup.deltaComp(matTransform.m11,1,SpaceGroup.DELTA) &&
-			SpaceGroup.deltaComp(matTransform.m12,0,SpaceGroup.DELTA) &&
-
-			SpaceGroup.deltaComp(matTransform.m20,0,SpaceGroup.DELTA) &&
-			SpaceGroup.deltaComp(matTransform.m21,0,SpaceGroup.DELTA) &&
-			SpaceGroup.deltaComp(matTransform.m22,1,SpaceGroup.DELTA) &&
-			(	Math.abs(matTransform.m03-0.0)>SpaceGroup.DELTA ||
-				Math.abs(matTransform.m13-0.0)>SpaceGroup.DELTA ||
-				Math.abs(matTransform.m23-0.0)>SpaceGroup.DELTA)) {
-			return true;
-		}
-
+		if (isPureMatrixTranslation()) return true;
 		return false;
 	}
 
+	/**
+	 * This method will help check if the matrix translation is pure or not.
+	 * @return boolean
+	 */
+	private boolean isPureMatrixTranslation(){
+		return 	SpaceGroup.deltaComp(matTransform.m00,1,SpaceGroup.DELTA) &&
+				SpaceGroup.deltaComp(matTransform.m01,0,SpaceGroup.DELTA) &&
+				SpaceGroup.deltaComp(matTransform.m02,0,SpaceGroup.DELTA) &&
+
+				SpaceGroup.deltaComp(matTransform.m10,0,SpaceGroup.DELTA) &&
+				SpaceGroup.deltaComp(matTransform.m11,1,SpaceGroup.DELTA) &&
+				SpaceGroup.deltaComp(matTransform.m12,0,SpaceGroup.DELTA) &&
+
+				SpaceGroup.deltaComp(matTransform.m20,0,SpaceGroup.DELTA) &&
+				SpaceGroup.deltaComp(matTransform.m21,0,SpaceGroup.DELTA) &&
+				SpaceGroup.deltaComp(matTransform.m22,1,SpaceGroup.DELTA) &&
+				(Math.abs(matTransform.m03-0.0)>SpaceGroup.DELTA || Math.abs(matTransform.m13-0.0)>SpaceGroup.DELTA || Math.abs(matTransform.m23-0.0)>SpaceGroup.DELTA);
+	}
+
 	/**
 	 * Tells whether this transformation contains a fractional translational
 	 * component (whatever its rotational component). A fractional translation

From a135683257d0f709e19255cf44566fb67d12411d Mon Sep 17 00:00:00 2001
From: Sreejith Nair <sr816885@dal.ca>
Date: Thu, 6 Apr 2023 02:45:06 -0300
Subject: [PATCH 411/599] Refactoring : Adding Static constants for
 NUCLEOTIDE_BACKBONE_ATOMS and AMINOACID_BACKBONE_ATOMS

---
 .../org/biojava/nbio/structure/StructureTools.java  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
index 51e8b880de..af5f7ab80f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
@@ -167,6 +167,9 @@ public class StructureTools {
 
 	private static final Set<Element> hBondDonorAcceptors;
 
+	private static final Set<String> NUCLEOTIDE_BACKBONE_ATOMS;
+	private static final Set<String> AMINOACID_BACKBONE_ATOMS;
+
 	static {
 		nucleotides30 = new HashMap<String, Character>();
 		nucleotides30.put("DA", 'A');
@@ -256,6 +259,9 @@ public class StructureTools {
 		hBondDonorAcceptors.add(Element.O);
 		hBondDonorAcceptors.add(Element.S);
 
+		NUCLEOTIDE_BACKBONE_ATOMS = new HashSet<>(Arrays.asList(C1_ATOM_NAME, C2_ATOM_NAME, C3_ATOM_NAME, C4_ATOM_NAME, O2_ATOM_NAME, O3_ATOM_NAME, O4_ATOM_NAME, O5_ATOM_NAME, OP1_ATOM_NAME, OP2_ATOM_NAME, P_ATOM_NAME));
+		AMINOACID_BACKBONE_ATOMS = new HashSet<>(Arrays.asList(CA_ATOM_NAME, C_ATOM_NAME, N_ATOM_NAME, O_ATOM_NAME));
+
 	}
 
 	/**
@@ -1129,16 +1135,13 @@ public static Atom[] getRepresentativeAtomArray(Structure s) {
 	 */
 	public static Atom[] getBackboneAtomArray(Structure s) {
 		List<Atom> atoms = new ArrayList<>();
-		Set<String> nucleotideAtomNames = new HashSet<>(Arrays.asList(C1_ATOM_NAME, C2_ATOM_NAME, C3_ATOM_NAME, C4_ATOM_NAME, O2_ATOM_NAME, O3_ATOM_NAME, O4_ATOM_NAME, O5_ATOM_NAME, OP1_ATOM_NAME, OP2_ATOM_NAME, P_ATOM_NAME));
-		Set<String> aminoAcidAtomNames = new HashSet<>(Arrays.asList(CA_ATOM_NAME, C_ATOM_NAME, N_ATOM_NAME, O_ATOM_NAME));
-
 		for (Chain c : s.getChains()) {
 			for (Group g : c.getAtomGroups()) {
 				if (g.hasAminoAtoms()) {
 					if (g.getType() == GroupType.NUCLEOTIDE) {
-						addNucleotideAndAminoAtoms(atoms, g, nucleotideAtomNames);
+						addNucleotideAndAminoAtoms(atoms, g, NUCLEOTIDE_BACKBONE_ATOMS);
 					} else {
-						addNucleotideAndAminoAtoms(atoms, g, aminoAcidAtomNames);
+						addNucleotideAndAminoAtoms(atoms, g, AMINOACID_BACKBONE_ATOMS);
 					}
 				}
 			}

From a8ea2259babb1055ae3e5b717d8689c6e3cc41ff Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 6 Apr 2023 12:07:59 -0700
Subject: [PATCH 412/599] [maven-release-plugin] prepare release biojava-7.0.1

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index c2ad62cd53..f02da86ee6 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index c1f70da5f2..7b74703c24 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 64a492804d..a1f05a5747 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index b83d078db1..b1d269e323 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index a85af07457..f2fde44fd5 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.0.1-SNAPSHOT</version>
+    	<version>7.0.1</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 41ec1dfcef..e5ed482d54 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index fb3824459c..d438b0fd1f 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 28abc2224d..9f7b4002ce 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index c21f67111f..5c73207bdd 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 17614830a7..2bea41106d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index a5a95625f3..602acef028 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index a273175412..b7ca89598f 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.0.1-SNAPSHOT</version>
+        <version>7.0.1</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 52862f59da..5bd4ded634 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 240e4c0035..4d7fe6105c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.0.1-SNAPSHOT</version>
+	<version>7.0.1</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.0.1</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 30a24294a847bb5c8040989b1de516048fcfc028 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 6 Apr 2023 12:08:02 -0700
Subject: [PATCH 413/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  2 +-
 14 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index f02da86ee6..a7d1bc3202 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 7b74703c24..9177766483 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index a1f05a5747..22eba70833 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index b1d269e323..035260862e 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index f2fde44fd5..4aa642ac25 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.0.1</version>
+    <version>7.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.0.1</version>
+    	<version>7.0.2-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index e5ed482d54..f5058f2fc4 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index d438b0fd1f..cae218149c 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 9f7b4002ce..12dace81b2 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 5c73207bdd..a98b8dded8 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 2bea41106d..5de737f95c 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 602acef028..4f4efd9170 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index b7ca89598f..6c39d9ae8f 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 5bd4ded634..2c6c902e3b 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 4d7fe6105c..db0e297737 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.0.1</version>
+	<version>7.0.2-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the

From ea45217561218ed0699fff7e45a39649eecc24d4 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 6 Apr 2023 13:10:28 -0700
Subject: [PATCH 414/599] [maven-release-plugin] rollback the release of
 biojava-7.0.1

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index a7d1bc3202..c2ad62cd53 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 9177766483..c1f70da5f2 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 22eba70833..64a492804d 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 035260862e..b83d078db1 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 4aa642ac25..a85af07457 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>7.0.1-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.0.2-SNAPSHOT</version>
+    	<version>7.0.1-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index f5058f2fc4..41ec1dfcef 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index cae218149c..fb3824459c 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>7.0.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 12dace81b2..28abc2224d 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index a98b8dded8..c21f67111f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 5de737f95c..17614830a7 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 4f4efd9170..a5a95625f3 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 6c39d9ae8f..a273175412 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.0.2-SNAPSHOT</version>
+        <version>7.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 2c6c902e3b..52862f59da 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index db0e297737..240e4c0035 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.0.2-SNAPSHOT</version>
+	<version>7.0.1-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.0.1</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 9872ecb41e8b04199ed1193c331d0f5eb7c744f9 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 6 Apr 2023 13:12:29 -0700
Subject: [PATCH 415/599] Upgrading nexus staging plugin to avoid known issue
 happening at release. See
 https://stackoverflow.com/questions/70153962/nexus-staging-maven-plugin-maven-deploy-failed-an-api-incompatibility-was-enco

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 240e4c0035..aab058bc2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -552,7 +552,7 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.8</version>
+						<version>1.6.13</version>
 						<extensions>true</extensions>
 						<configuration>
 							<serverId>ossrh</serverId>

From 7b32a76a4578a3f1bf4fc32826d3e66d5e03dfbd Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 6 Apr 2023 13:24:28 -0700
Subject: [PATCH 416/599] [maven-release-plugin] prepare release biojava-7.0.1

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index c2ad62cd53..f02da86ee6 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index c1f70da5f2..7b74703c24 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 64a492804d..a1f05a5747 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index b83d078db1..b1d269e323 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index a85af07457..f2fde44fd5 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.0.1-SNAPSHOT</version>
+    	<version>7.0.1</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 41ec1dfcef..e5ed482d54 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index fb3824459c..d438b0fd1f 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.0.1</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 28abc2224d..9f7b4002ce 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index c21f67111f..5c73207bdd 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 17614830a7..2bea41106d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index a5a95625f3..602acef028 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index a273175412..b7ca89598f 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.0.1-SNAPSHOT</version>
+        <version>7.0.1</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 52862f59da..5bd4ded634 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1-SNAPSHOT</version>
+		<version>7.0.1</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1-SNAPSHOT</version>
+			<version>7.0.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index aab058bc2a..2bfd3eb121 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.0.1-SNAPSHOT</version>
+	<version>7.0.1</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.0.1</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 24bda437d3e85f2b17df2092a32acf78234f41ff Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 6 Apr 2023 13:24:31 -0700
Subject: [PATCH 417/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index f02da86ee6..a7d1bc3202 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 7b74703c24..9177766483 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index a1f05a5747..22eba70833 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index b1d269e323..035260862e 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index f2fde44fd5..4aa642ac25 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.0.1</version>
+    <version>7.0.2-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.0.1</version>
+    	<version>7.0.2-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index e5ed482d54..f5058f2fc4 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index d438b0fd1f..cae218149c 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 9f7b4002ce..12dace81b2 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 5c73207bdd..a98b8dded8 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 2bea41106d..5de737f95c 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 602acef028..4f4efd9170 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index b7ca89598f..6c39d9ae8f 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 5bd4ded634..2c6c902e3b 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.1</version>
+		<version>7.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.1</version>
+			<version>7.0.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 2bfd3eb121..cba8682e84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.0.1</version>
+	<version>7.0.2-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.0.1</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 9e4972d28687835899f0411c663912c61d3a8cd9 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 6 Apr 2023 13:45:29 -0700
Subject: [PATCH 418/599] Updating CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a858083de5..7ec6c02e7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 BioJava Changelog
 -----------------
 
+BioJava 7.0.1
+==============================
+### Fixed
+* The jar packages now contain pom.properties files #1057
+* Some minor improvements in a few biojava-structure methods #1058
+
 BioJava 7.0.0
 ==============================
 ### Breaking

From e0b86d012dec10018c7cbaeb97e44127f8b05902 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 6 Apr 2023 13:47:39 -0700
Subject: [PATCH 419/599] Updating README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4b90936f98..252092b9d6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-7.0.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.0.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-7.0.1-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.0.1) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>7.0.0</version>
+        <version>7.0.1</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From 963dc0125f188592c82699f49a519b9364e7a078 Mon Sep 17 00:00:00 2001
From: tmrpavan <128827629+tmrpavan@users.noreply.github.com>
Date: Sun, 16 Apr 2023 21:33:08 +0530
Subject: [PATCH 420/599] Sonar S4973 '==' and '!=' should not be used when
 'equals' is overridden #1052

---
 .../homology/GFF3FromUniprotBlastHits.java    |  2 +-
 .../nbio/structure/ecod/EcodInstallation.java |  2 +-
 .../biojava/nbio/structure/io/BondMaker.java  |  4 ++--
 .../structure/symmetry/core/HelixSolver.java  |  2 +-
 .../symmetry/core/RotationSolver.java         | 20 ++++++++-----------
 .../symmetry/core/SystematicSolver.java       |  7 ++-----
 6 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
index b9696f7aaf..2c322d1da0 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
@@ -140,7 +140,7 @@ PairwiseSequenceAlignerType.LOCAL, new SimpleGapPenalty(),
 						}
 
 						proteinIndex = proteinIndex + seq.length();
-						if (startIndex != null && endIndex != null && startIndex != endIndex) {
+						if (startIndex != null && endIndex != null && startIndex.equals(endIndex)) {
 							CDSSequence cdsSequence = cdsSequenceList.get(i);
 							String hitLabel = "";
 							if (transcriptSequence.getStrand() == Strand.POSITIVE) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
index 7a39423077..9dc3ec7f11 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
@@ -373,7 +373,7 @@ private boolean domainsAvailable() {
 				return false;
 
 			// Re-download old copies of "latest"
-			if(updateFrequency != null && requestedVersion == DEFAULT_VERSION ) {
+			if(updateFrequency != null && requestedVersion.equals(DEFAULT_VERSION)) {
 				long mod = f.lastModified();
 				// Time of last update
 				Date lastUpdate = new Date();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
index 7ead1726cc..2251511840 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
@@ -214,8 +214,8 @@ private void formBondAltlocAware(Group g1, String name1, Group g2, String name2,
 		for (Atom a1:a1s) {
 			for (Atom a2:a2s) {
 				if (a1.getAltLoc() != null && a2.getAltLoc()!=null &&
-						a1.getAltLoc()!=' ' && a2.getAltLoc()!=' ' &&
-						a1.getAltLoc() != a2.getAltLoc()) {
+						!a1.getAltLoc().equals(' ') && !a2.getAltLoc().equals(' ') &&
+						a1.getAltLoc().equals(a2.getAltLoc())) {
 					logger.debug("Skipping bond between atoms with differently named alt locs {} (altLoc '{}') -- {} (altLoc '{}')",
 							a1.toString(), a1.getAltLoc(), a2.toString(), a2.getAltLoc());
 					continue;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixSolver.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixSolver.java
index 9576c248f6..361522fbd4 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixSolver.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixSolver.java
@@ -366,7 +366,7 @@ private List<Integer> getPermutation(Matrix4d transformation) {
 			int permutation = -1;
 			double minDistSq = Double.MAX_VALUE;
 			for (int j = 0; j < centers.size(); j++) {
-				if (seqClusterId.get(i) == seqClusterId.get(j)) {
+				if (Objects.equals(seqClusterId.get(i), seqClusterId.get(j))) {
 					if (!used[j]) {
 						double dSq = tCenter.distanceSquared(centers.get(j));
 						if (dSq < minDistSq && dSq <= rmsdThresholdSq) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java
index d03c1d36da..9de173a09a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java
@@ -21,12 +21,7 @@
 
 package org.biojava.nbio.structure.symmetry.core;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import javax.vecmath.AxisAngle4d;
 import javax.vecmath.Matrix4d;
@@ -90,7 +85,7 @@ private void solve() {
 		// isSpherical check added 08-04-11
 		if (maxSymOps % 60 == 0 && isSpherical) {
 			maxSymOps = 60;
-		 }
+		}
 
 		AxisAngle4d sphereAngle = new AxisAngle4d();
 		Matrix4d transformation = new Matrix4d();
@@ -122,7 +117,7 @@ private void solve() {
 
 				// get permutation of subunits and check validity/uniqueness
 				List<Integer> permutation = getPermutation();
-	//              System.out.println("Rotation Solver: permutation: " + i + ": " + permutation);
+				//              System.out.println("Rotation Solver: permutation: " + i + ": " + permutation);
 
 				// check if novel
 				if ( evaluatedPermutations.containsKey(permutation)) {
@@ -277,7 +272,7 @@ private List<Double> getAngles() {
 		int n = subunits.getSubunitCount();
 		// for spherical symmetric cases, n cannot be higher than 60
 		if (n % 60 == 0 && isSpherical()) {
-			 n = 60;
+			n = 60;
 		}
 		List<Integer> folds = subunits.getFolds();
 		List<Double> angles = new ArrayList<Double>(folds.size()-1);
@@ -334,7 +329,7 @@ private boolean isAllowedPermutation(List<Integer> permutation) {
 		int selfaligned = 0;
 		for (int i = 0; i < permutation.size(); i++) {
 			int j = permutation.get(i);
-			if ( seqClusterId.get(i) != seqClusterId.get(j)) {
+			if (!Objects.equals(seqClusterId.get(i), seqClusterId.get(j))) {
 				return false;
 			}
 			if(i == j ) {
@@ -344,6 +339,7 @@ private boolean isAllowedPermutation(List<Integer> permutation) {
 		// either identity (all self aligned) or all unique
 		return selfaligned == 0 || selfaligned == permutation.size();
 	}
+
 	/**
 	 * Adds translational component to rotation matrix
 	 * @param rotation
@@ -407,7 +403,7 @@ private List<Integer> getPermutation() {
 			int closest = -1;
 			double minDist = Double.MAX_VALUE;
 
-			 for (int j : neighbors) {
+			for (int j : neighbors) {
 				double dist = t.distanceSquared(originalCoords[j]);
 				if (dist < minDist) {
 					closest = j;
@@ -417,7 +413,7 @@ private List<Integer> getPermutation() {
 
 			sum += minDist;
 			if (closest == -1) {
-				 break;
+				break;
 			}
 			permutation.add(closest);
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java
index 04c53c00ce..69a6282e99 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java
@@ -31,10 +31,7 @@
 import javax.vecmath.Quat4d;
 import javax.vecmath.Vector3d;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 
 /**
@@ -176,7 +173,7 @@ private boolean isAllowedPermuation(List<Integer> permutation) {
 		List<Integer> seqClusterId = subunits.getClusterIds();
 		for (int i = 0; i < permutation.size(); i++) {
 			int j = permutation.get(i);
-			if (seqClusterId.get(i) != seqClusterId.get(j)) {
+			if (!Objects.equals(seqClusterId.get(i), seqClusterId.get(j))) {
 				return false;
 			}
 		}

From caa57898c1da3ebe6e1710d00d3050502a013933 Mon Sep 17 00:00:00 2001
From: "Pavan Kumar, Thummuru"
 <thummuru.pavan.kumar@continental-corporation.com>
Date: Sun, 7 May 2023 20:52:14 +0530
Subject: [PATCH 421/599] Sonar S4973 '==' and '!=' should not be used when
 'equals' is overridden #1052

---
 .../nbio/genome/homology/GFF3FromUniprotBlastHits.java   | 2 +-
 .../java/org/biojava/nbio/structure/io/BondMaker.java    | 2 +-
 .../nbio/structure/symmetry/core/RotationSolver.java     | 9 ++++++++-
 .../nbio/structure/symmetry/core/SystematicSolver.java   | 7 +++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
index 2c322d1da0..0b11ddb992 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
@@ -140,7 +140,7 @@ PairwiseSequenceAlignerType.LOCAL, new SimpleGapPenalty(),
 						}
 
 						proteinIndex = proteinIndex + seq.length();
-						if (startIndex != null && endIndex != null && startIndex.equals(endIndex)) {
+						if (startIndex != null && endIndex != null && !startIndex.equals(endIndex)) {
 							CDSSequence cdsSequence = cdsSequenceList.get(i);
 							String hitLabel = "";
 							if (transcriptSequence.getStrand() == Strand.POSITIVE) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
index 2251511840..e7568de2fb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
@@ -215,7 +215,7 @@ private void formBondAltlocAware(Group g1, String name1, Group g2, String name2,
 			for (Atom a2:a2s) {
 				if (a1.getAltLoc() != null && a2.getAltLoc()!=null &&
 						!a1.getAltLoc().equals(' ') && !a2.getAltLoc().equals(' ') &&
-						a1.getAltLoc().equals(a2.getAltLoc())) {
+						!a1.getAltLoc().equals(a2.getAltLoc())) {
 					logger.debug("Skipping bond between atoms with differently named alt locs {} (altLoc '{}') -- {} (altLoc '{}')",
 							a1.toString(), a1.getAltLoc(), a2.toString(), a2.getAltLoc());
 					continue;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java
index 9de173a09a..95c73cb540 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java
@@ -21,7 +21,6 @@
 
 package org.biojava.nbio.structure.symmetry.core;
 
-import java.util.*;
 
 import javax.vecmath.AxisAngle4d;
 import javax.vecmath.Matrix4d;
@@ -35,6 +34,14 @@
 import org.biojava.nbio.structure.symmetry.geometry.DistanceBox;
 import org.biojava.nbio.structure.symmetry.geometry.SphereSampler;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
 
 /**
  *
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java
index 69a6282e99..4ad0494c28 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java
@@ -30,8 +30,11 @@
 import javax.vecmath.Point3d;
 import javax.vecmath.Quat4d;
 import javax.vecmath.Vector3d;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 
 
 /**

From 615a57045c25269bf892426d5ca77b074d2c7d3a Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 10 May 2023 16:57:21 -0700
Subject: [PATCH 422/599] Writing out entity info in CIF

---
 .../cif/CifFileSupplierIntegrationTest.java   | 14 +++++
 .../io/cif/AbstractCifFileSupplier.java       | 57 ++++++++++++++++---
 2 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
index 1a66090ccd..ce12306acb 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/cif/CifFileSupplierIntegrationTest.java
@@ -59,6 +59,12 @@ public void test6ELW() throws IOException {
     	// a structure with insertion codes
     	testRoundTrip("6ELW");
     }
+
+    @Test
+    public void test4HHB() throws IOException {
+        // a structure with multiple poly entities
+        testRoundTrip("4HHB");
+    }
     
     private static void testRoundTrip(String pdbId) throws IOException {
         URL url = new URL("https://files.rcsb.org/download/" + pdbId + ".cif");
@@ -121,6 +127,14 @@ private static void testRoundTrip(String pdbId) throws IOException {
         // Test cell and symmetry
         assertEquals(originalStruct.getCrystallographicInfo().getSpaceGroup(),
                 readStruct.getCrystallographicInfo().getSpaceGroup());
+
+        // entity
+        assertEquals(originalStruct.getEntityInfos().size(), readStruct.getEntityInfos().size());
+        for (int i=0; i<originalStruct.getEntityInfos().size(); i++) {
+            assertEquals(originalStruct.getEntityInfos().get(i).getMolId(), readStruct.getEntityInfos().get(i).getMolId());
+            assertEquals(originalStruct.getEntityInfos().get(i).getType(), readStruct.getEntityInfos().get(i).getType());
+        }
+
     }
 
     /**
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
index 7b10b4c88f..3e26f09bd2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
@@ -1,12 +1,6 @@
 package org.biojava.nbio.structure.io.cif;
 
-import org.biojava.nbio.structure.Atom;
-import org.biojava.nbio.structure.Chain;
-import org.biojava.nbio.structure.Element;
-import org.biojava.nbio.structure.EntityType;
-import org.biojava.nbio.structure.Group;
-import org.biojava.nbio.structure.GroupType;
-import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.*;
 import org.biojava.nbio.structure.xtal.CrystalCell;
 import org.biojava.nbio.structure.xtal.SpaceGroup;
 import org.rcsb.cif.CifBuilder;
@@ -23,8 +17,10 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 /**
  * Convert a BioJava object to a CifFile.
@@ -41,9 +37,11 @@ protected CifFile getInternal(Structure structure, List<WrappedAtom> wrappedAtom
         SpaceGroup spaceGroup = structure.getPDBHeader().getCrystallographicInfo().getSpaceGroup();
         // atom_site
         Category atomSite = wrappedAtoms.stream().collect(toAtomSite());
+        // entity information
+        List<EntityInfo> entityInfos = structure.getEntityInfos();
 
         MmCifBlockBuilder blockBuilder = CifBuilder.enterFile(StandardSchemata.MMCIF)
-                .enterBlock(structure.getPDBCode());
+                .enterBlock(structure.getPdbId() == null? "" : structure.getPdbId().getId());
 
         blockBuilder.enterStructKeywords().enterText()
         .add(String.join(", ", structure.getPDBHeader().getKeywords()))
@@ -92,6 +90,49 @@ protected CifFile getInternal(Structure structure, List<WrappedAtom> wrappedAtom
                     .leaveCategory();
         }
 
+        if (entityInfos != null) {
+
+            String[] entityIds = new String[entityInfos.size()];
+            String[] entityTypes = new String[entityInfos.size()];
+            String[] entityDescriptions = new String[entityInfos.size()];
+
+            for (int i=0; i<entityInfos.size(); i++) {
+                EntityInfo e = entityInfos.get(i);
+                entityIds[i] = Integer.toString(e.getMolId());
+                entityTypes[i] = e.getType().getEntityType();
+                entityDescriptions[i] = e.getDescription();
+            }
+
+            String[] polyEntityIds = entityInfos.stream().filter(e -> e.getType() == EntityType.POLYMER).map(e -> Integer.toString(e.getMolId())).collect(Collectors.toList()).toArray(new String[]{});
+            String[] entitySeqs = entityInfos.stream().filter(e -> e.getType() == EntityType.POLYMER).map(e -> e.getChains().get(0).getSeqResSequence()).collect(Collectors.toList()).toArray(new String[]{});
+
+            blockBuilder.enterEntity()
+                    .enterId()
+                    .add(entityIds)
+                    .leaveColumn()
+
+                    .enterType()
+                    .add(entityTypes)
+                    .leaveColumn()
+
+                    .enterPdbxDescription()
+                    .add(entityDescriptions)
+                    .leaveColumn()
+
+                    .leaveCategory();
+
+            blockBuilder.enterEntityPoly()
+                    .enterEntityId()
+                    .add(polyEntityIds)
+                    .leaveColumn()
+
+                    .enterPdbxSeqOneLetterCodeCan()
+                    .add(entitySeqs)
+                    .leaveColumn()
+
+                    .leaveCategory();
+        }
+
         return blockBuilder.leaveBlock().leaveFile();
     }
 

From 3543eb92c472b2d1ebfedd92e9dd84323369ebca Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 10 May 2023 17:13:58 -0700
Subject: [PATCH 423/599] New test

---
 .../io/cif/CifFileSupplierImplTest.java       | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImplTest.java

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImplTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImplTest.java
new file mode 100644
index 0000000000..b4bab26b8f
--- /dev/null
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImplTest.java
@@ -0,0 +1,43 @@
+package org.biojava.nbio.structure.io.cif;
+
+import org.biojava.nbio.structure.Structure;
+import org.biojava.nbio.structure.io.FileParsingParameters;
+import org.biojava.nbio.structure.io.PDBFileParser;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class CifFileSupplierImplTest {
+
+    @Test
+    public void shouldReadRawPdbOutputtingCifWithEntity() throws IOException {
+        InputStream inStream = new GZIPInputStream(this.getClass().getResourceAsStream("/org/biojava/nbio/structure/io/4lup_phaser_output.pdb.gz"));
+
+        PDBFileParser pdbpars = new PDBFileParser();
+        FileParsingParameters params = new FileParsingParameters();
+        params.setAlignSeqRes(true);
+        pdbpars.setFileParsingParameters(params);
+
+        Structure s = pdbpars.parsePDBFile(inStream);
+
+        String cifText = CifStructureConverter.toText(s);
+        assertTrue(cifText.contains("_entity.type"));
+        assertTrue(cifText.contains("_entity_poly.pdbx_seq_one_letter_code_can"));
+
+        InputStream inputStream = new ByteArrayInputStream(cifText.getBytes());
+        Structure readStruct = CifStructureConverter.fromInputStream(inputStream);
+
+        assertEquals(s.getEntityInfos().size(), readStruct.getEntityInfos().size());
+        for (int i=0; i<s.getEntityInfos().size(); i++) {
+            assertEquals(s.getEntityInfos().get(i).getMolId(), readStruct.getEntityInfos().get(i).getMolId());
+            assertEquals(s.getEntityInfos().get(i).getType(), readStruct.getEntityInfos().get(i).getType());
+        }
+
+    }
+}

From a8a96ec122133b10cf5b4faf0cd6d79d65b7dbbe Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 11 May 2023 14:11:58 -0700
Subject: [PATCH 424/599] Handling nulls in descriptions

---
 .../nbio/structure/io/cif/AbstractCifFileSupplier.java      | 6 +++---
 .../nbio/structure/io/cif/CifFileSupplierImplTest.java      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
index 3e26f09bd2..de6affec0b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
@@ -100,11 +100,11 @@ protected CifFile getInternal(Structure structure, List<WrappedAtom> wrappedAtom
                 EntityInfo e = entityInfos.get(i);
                 entityIds[i] = Integer.toString(e.getMolId());
                 entityTypes[i] = e.getType().getEntityType();
-                entityDescriptions[i] = e.getDescription();
+                entityDescriptions[i] = e.getDescription() == null? "?" : e.getDescription();
             }
 
             String[] polyEntityIds = entityInfos.stream().filter(e -> e.getType() == EntityType.POLYMER).map(e -> Integer.toString(e.getMolId())).collect(Collectors.toList()).toArray(new String[]{});
-            String[] entitySeqs = entityInfos.stream().filter(e -> e.getType() == EntityType.POLYMER).map(e -> e.getChains().get(0).getSeqResSequence()).collect(Collectors.toList()).toArray(new String[]{});
+            String[] polyEntitySeqs = entityInfos.stream().filter(e -> e.getType() == EntityType.POLYMER).map(e -> e.getChains().get(0).getSeqResSequence()).collect(Collectors.toList()).toArray(new String[]{});
 
             blockBuilder.enterEntity()
                     .enterId()
@@ -127,7 +127,7 @@ protected CifFile getInternal(Structure structure, List<WrappedAtom> wrappedAtom
                     .leaveColumn()
 
                     .enterPdbxSeqOneLetterCodeCan()
-                    .add(entitySeqs)
+                    .add(polyEntitySeqs)
                     .leaveColumn()
 
                     .leaveCategory();
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImplTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImplTest.java
index b4bab26b8f..867143ebf6 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImplTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImplTest.java
@@ -10,8 +10,7 @@
 import java.io.InputStream;
 import java.util.zip.GZIPInputStream;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class CifFileSupplierImplTest {
 
@@ -29,6 +28,7 @@ public void shouldReadRawPdbOutputtingCifWithEntity() throws IOException {
         String cifText = CifStructureConverter.toText(s);
         assertTrue(cifText.contains("_entity.type"));
         assertTrue(cifText.contains("_entity_poly.pdbx_seq_one_letter_code_can"));
+        assertFalse(cifText.contains("null"));
 
         InputStream inputStream = new ByteArrayInputStream(cifText.getBytes());
         Structure readStruct = CifStructureConverter.fromInputStream(inputStream);

From 12137bfd79f8b2bbd6d27dd85a1a0fd3256a0519 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 11 May 2023 17:05:54 -0700
Subject: [PATCH 425/599] Fixing empty seqres groups for pdb files with not
 seqres

---
 .../nbio/structure/io/SeqRes2AtomAligner.java | 15 ++++--------
 .../structure/io/TestNonDepositedFiles.java   | 24 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
index 0d677a4161..53e38c3463 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
@@ -819,18 +819,14 @@ private boolean mapDNAChains(List<Group> seqResGroups, List<Group> atomRes,
 	 */
 	public static void storeUnAlignedSeqRes(Structure structure, List<Chain> seqResChains, boolean headerOnly) {
 
-
 		if (headerOnly) {
-
 			List<Chain> atomChains = new ArrayList<>();
 			for (Chain seqRes: seqResChains) {
 				// In header-only mode skip ATOM records.
 				// Here we store chains with SEQRES instead of AtomGroups.
 				seqRes.setSeqResGroups(seqRes.getAtomGroups());
 				seqRes.setAtomGroups(new ArrayList<>()); // clear out the atom groups.
-
 				atomChains.add(seqRes);
-
 			}
 			structure.setChains(0, atomChains);
 
@@ -838,21 +834,20 @@ public static void storeUnAlignedSeqRes(Structure structure, List<Chain> seqResC
 
 			for (int i = 0; i < structure.nrModels(); i++) {
 				List<Chain> atomChains   = structure.getModel(i);
-
+				if (seqResChains.isEmpty()) {
+					// in files without SEQRES, seqResChains object is empty: we replace by atomChains resulting below in a trivial alignment and a copy of atom groups to seqres groups
+					seqResChains = atomChains;
+				}
 				for (Chain seqRes: seqResChains){
-					Chain atomRes;
-
 					// Otherwise, we find a chain with AtomGroups
 					// and set this as SEQRES groups.
 					// TODO no idea if new parameter useChainId should be false or true here, used true as a guess - JD 2016-05-09
-					atomRes = SeqRes2AtomAligner.getMatchingAtomRes(seqRes,atomChains,true);
+					Chain atomRes = SeqRes2AtomAligner.getMatchingAtomRes(seqRes,atomChains,true);
 					if ( atomRes != null)
 						atomRes.setSeqResGroups(seqRes.getAtomGroups());
 					else
 						logger.warn("Could not find atom records for chain " + seqRes.getId());
 				}
-
-
 			}
 		}
 	}
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
index 26bf9c3ac8..e2bd13bea5 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
@@ -99,7 +99,8 @@ public void test1B8GnoSeqresPdb() throws IOException, StructureException {
 		//System.out.println("Chains from incomplete header file: ");
 		//checkChains(s);
 
-
+		// we should have seqres groups (testing getSeqResSequence() is equivalent)
+		assertFalse(s.getPolyChains().get(0).getSeqResSequence().isEmpty());
 
 		// trying without seqAlignSeqRes
 		params.setAlignSeqRes(false);
@@ -145,6 +146,9 @@ public void test3C5F() throws IOException, StructureException {
 		assertTrue(s.nrModels()>1);
 		assertNull(s.getPDBHeader().getExperimentalTechniques());
 
+		// we should have seqres groups (testing getSeqResSequence() is equivalent)
+		assertFalse(s.getPolyChains().get(0).getSeqResSequence().isEmpty());
+
 	}
 
 	@Test
@@ -165,6 +169,8 @@ public void test4B19() throws IOException, StructureException {
 		assertTrue(s.nrModels()>1);
 		assertNull(s.getPDBHeader().getExperimentalTechniques());
 
+		// we should have seqres groups (testing getSeqResSequence() is equivalent)
+		assertFalse(s.getPolyChains().get(0).getSeqResSequence().isEmpty());
 	}
 
 	@Test
@@ -187,6 +193,9 @@ public void test2M7Y() throws IOException {
 
 		// testing that on single chain pdb files we assign an entity type, issue #767
 		assertEquals(EntityType.POLYMER, s.getEntityById(1).getType());
+
+		// we should have seqres groups (testing getSeqResSequence() is equivalent)
+		assertFalse(s.getPolyChains().get(0).getSeqResSequence().isEmpty());
 	}
 
 	private void checkChains(Structure s) {
@@ -227,6 +236,8 @@ public void testPhenixCifFile() throws IOException {
 		assertEquals(1, counts[1]);
 		assertEquals(1, counts[2]);
 
+		// we should have seqres groups (testing getSeqResSequence() is equivalent)
+		assertFalse(s.getPolyChains().get(0).getSeqResSequence().isEmpty());
 
 	}
 
@@ -255,6 +266,8 @@ public void testPhenixPdbFile() throws IOException {
 		assertEquals(1, counts[1]);
 		assertEquals(1, counts[2]);
 
+		// we should have seqres groups (testing getSeqResSequence() is equivalent)
+		assertFalse(s.getPolyChains().get(0).getSeqResSequence().isEmpty());
 	}
 
 	@Test
@@ -275,6 +288,9 @@ public void testPhaserPdbFile() throws IOException {
 		assertEquals(2, s.getChains().size());
 
 		assertEquals(1, s.getEntityInfos().size());
+
+		// we should have seqres groups (testing getSeqResSequence() is equivalent)
+		assertFalse(s.getPolyChains().get(0).getSeqResSequence().isEmpty());
 	}
 
 
@@ -303,6 +319,9 @@ public void testRefmacPdbFile() throws IOException {
 		assertEquals(1, counts[1]);
 		assertEquals(1, counts[2]);
 
+		// we should have seqres groups (testing getSeqResSequence() is equivalent)
+		assertFalse(s.getPolyChains().get(0).getSeqResSequence().isEmpty());
+
 	}
 
 	/**
@@ -329,6 +348,9 @@ public void testIssue931() throws IOException {
 		assertSame(s.getEntityById(2), s.getPolyChains().get(4).getEntityInfo());
 		assertSame(s.getEntityById(2), s.getPolyChains().get(5).getEntityInfo());
 		assertSame(s.getEntityById(2), s.getPolyChains().get(6).getEntityInfo());
+
+		// we should have seqres groups (testing getSeqResSequence() is equivalent)
+		assertFalse(s.getPolyChains().get(0).getSeqResSequence().isEmpty());
 	}
 
 	/**

From 6431114fb8ac02d67f7957137194386c2b9c5561 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 11 May 2023 17:11:53 -0700
Subject: [PATCH 426/599] Fixing empty seqres groups for cif files with no
 _entity

---
 .../nbio/structure/io/cif/CifStructureConsumerImpl.java    | 7 ++++++-
 .../nbio/structure/io/cif/CifFileSupplierImplTest.java     | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 8f6dfbc97e..fb3214be96 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -1612,7 +1612,12 @@ private void alignSeqRes() {
         // fix SEQRES residue numbering for all models
 
         for (int model = 0; model < structure.nrModels(); model++) {
-            List<Chain> atomList   = structure.getModel(model);
+            List<Chain> atomList   = structure.getPolyChains(model);
+
+            if (seqResChains.isEmpty()) {
+                // in files without _entity, seqResChains object is empty: we replace by atomChains resulting below in a trivial alignment and a copy of atom groups to seqres groups
+                seqResChains = atomList;
+            }
 
             for (Chain seqResChain : seqResChains){
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImplTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImplTest.java
index 867143ebf6..df227a8669 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImplTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileSupplierImplTest.java
@@ -29,6 +29,7 @@ public void shouldReadRawPdbOutputtingCifWithEntity() throws IOException {
         assertTrue(cifText.contains("_entity.type"));
         assertTrue(cifText.contains("_entity_poly.pdbx_seq_one_letter_code_can"));
         assertFalse(cifText.contains("null"));
+        assertTrue(cifText.contains("MSEQLTDQVLVERVQKGDQKAFNLLVVRYQHKVASLVSRYVPSGDVPDVVQEAFIKA"));
 
         InputStream inputStream = new ByteArrayInputStream(cifText.getBytes());
         Structure readStruct = CifStructureConverter.fromInputStream(inputStream);

From a06ac885a543063ea9668ed8678390b2783aecb8 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Thu, 18 May 2023 15:59:50 -0700
Subject: [PATCH 427/599] Latest ciftools

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cba8682e84..bb0fce3303 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 		<log4j.version>2.17.2</log4j.version>
 		<junit-jupiter.version>5.7.2</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java</ciftools.artifact>
-		<ciftools.version>5.0.0</ciftools.version>
+		<ciftools.version>5.0.1</ciftools.version>
 	</properties>
 	<scm>
 		<connection>scm:git:git://github.com/biojava/biojava.git</connection>

From 86307e962b30dc805cf3b1476133985120600037 Mon Sep 17 00:00:00 2001
From: jlerbsc <jean-pierre.lerbscher@jperf.com>
Date: Sun, 21 May 2023 17:40:41 +0200
Subject: [PATCH 428/599] Fix Sonar S1130 throws declarations should not be
 superfluous

---
 .../xml/AminoAcidCompositionTable.java        |  2 +-
 .../alignment/io/StockholmFileParser.java     | 10 ++--
 .../io/GenericGenbankHeaderParser.java        | 12 ++--
 .../nbio/core/sequence/io/IUPACParser.java    |  2 +-
 .../nbio/core/sequence/io/util/IOUtils.java   |  6 +-
 .../loader/UniprotProxySequenceReader.java    |  2 +-
 .../core/sequence/location/InsdcParser.java   |  4 +-
 .../sequence/storage/BitSequenceReader.java   |  2 +-
 .../storage/JoiningSequenceReader.java        |  4 +-
 .../nbio/ontology/IntegerOntology.java        | 22 +++----
 .../org/biojava/nbio/ontology/Ontology.java   | 60 +++++++++----------
 .../ontology/utils/AbstractAnnotation.java    |  6 +-
 .../nbio/ontology/utils/Annotation.java       |  6 +-
 .../nbio/ontology/utils/EmptyAnnotation.java  |  2 +-
 .../java/org/biojava/nbio/ronn/Jronn.java     |  2 +-
 .../org/biojava/nbio/ronn/ModelLoader.java    |  6 +-
 .../java/org/biojava/nbio/ronn/ORonn.java     | 10 ++--
 .../src/main/java/demo/AFPFromFasta.java      |  2 +-
 .../biojava/nbio/structure/AtomIterator.java  |  2 +-
 .../org/biojava/nbio/structure/Element.java   |  2 +-
 .../biojava/nbio/structure/GroupIterator.java |  4 +-
 .../org/biojava/nbio/structure/PdbId.java     |  2 +-
 .../align/pairwise/AlignmentResult.java       |  4 +-
 .../quaternary/BioAssemblyTools.java          | 10 ++--
 .../quaternary/OperatorResolver.java          |  2 +-
 .../nbio/structure/scop/ScopInstallation.java |  8 +--
 26 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidCompositionTable.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidCompositionTable.java
index 4731e90453..6c90355296 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidCompositionTable.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidCompositionTable.java
@@ -132,7 +132,7 @@ public void computeMolecularWeight(ElementTable eTable){
 	 * @throws NullPointerException
 	 * 	thrown if AminoAcidCompositionTable.computeMolecularWeight(ElementTable) is not called before this method
 	 */
-	public double getMolecularWeight(Character aaSymbol) throws NullPointerException{
+	public double getMolecularWeight(Character aaSymbol) {
 		if(this.aaSymbol2MolecularWeight == null){
 			throw new NullPointerException("Please call AminoAcidCompositionTable.computeMolecularWeight(ElementTable) before this method");
 		}
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java
index 7e3d36099e..9af9731c28 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java
@@ -283,7 +283,7 @@ public class StockholmFileParser {
 	 * @throws ParserException
 	 *             if unexpected format is encountered
 	 */
-	public StockholmStructure parse(String filename) throws IOException, ParserException {
+	public StockholmStructure parse(String filename) throws IOException {
 		InputStream inStream = new InputStreamProvider().getInputStream(filename);
 		StockholmStructure structure = parse(inStream);
 		inStream.close();
@@ -307,7 +307,7 @@ public StockholmStructure parse(String filename) throws IOException, ParserExcep
 	 * @throws ParserException
 	 *             if unexpected format is encountered
 	 */
-	public List<StockholmStructure> parse(String filename, int max) throws IOException, ParserException {
+	public List<StockholmStructure> parse(String filename, int max) throws IOException {
 		InputStreamProvider isp = new InputStreamProvider();
 		InputStream inStream = isp.getInputStream(filename);
 		return parse(inStream, max);
@@ -325,7 +325,7 @@ public List<StockholmStructure> parse(String filename, int max) throws IOExcepti
 	 * @throws IOException
 	 * @throws ParserException
 	 */
-	public StockholmStructure parse(InputStream inStream) throws ParserException, IOException {
+	public StockholmStructure parse(InputStream inStream) throws IOException {
 		return parse(inStream, 1).get(0);
 	}
 
@@ -391,7 +391,7 @@ public List<StockholmStructure> parseNext(int max) throws IOException {
 	 * @throws IOException
 	 * @throws Exception
 	 */
-	StockholmStructure parse(Scanner scanner) throws ParserException, IOException {
+	StockholmStructure parse(Scanner scanner) throws IOException {
 		if (scanner == null) {
 			if (internalScanner != null) {
 				scanner = internalScanner;
@@ -528,7 +528,7 @@ StockholmStructure parse(Scanner scanner) throws ParserException, IOException {
 	 *            the line to be parsed
 	 * @throws Exception
 	 */
-	private void handleSequenceLine(String line) throws ParserException {
+	private void handleSequenceLine(String line) {
 		String[] lineContent = line.split("\\s+");
 		if (lineContent.length != 2) {
 			throw new ParserException("Could not split sequence line into sequence name and sequence:\n" + line);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
index bf8338dc47..bc196c9150 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
@@ -165,7 +165,7 @@ private void reset() {
 	 * {@inheritDoc}
 	 * The last accession passed to this routine will always be the one used.
 	 */
-	public void setVersion(int version) throws ParserException {
+	public void setVersion(int version) {
 		if (this.versionSeen) throw new ParserException("Current BioEntry already has a version");
 		else {
 			try {
@@ -182,7 +182,7 @@ public void setVersion(int version) throws ParserException {
 	 * {@inheritDoc}
 	 * The last accession passed to this routine will always be the one used.
 	 */
-	public void setAccession(String accession) throws ParserException {
+	public void setAccession(String accession) {
 		if (accession==null) throw new ParserException("Accession cannot be null");
 		this.accession = accession;
 	}
@@ -190,7 +190,7 @@ public void setAccession(String accession) throws ParserException {
 	/**
 	 * {@inheritDoc}
 	 */
-	public void setDescription(String description) throws ParserException {
+	public void setDescription(String description) {
 		if (this.description!=null) throw new ParserException("Current BioEntry already has a description");
 		this.description = description;
 	}
@@ -198,7 +198,7 @@ public void setDescription(String description) throws ParserException {
 	/**
 	 * {@inheritDoc}
 	 */
-	public void setIdentifier(String identifier) throws ParserException {
+	public void setIdentifier(String identifier) {
 		if (identifier==null) throw new ParserException("Identifier cannot be null");
 		if (this.identifier!=null) throw new ParserException("Current BioEntry already has a identifier");
 		this.identifier = identifier;
@@ -207,7 +207,7 @@ public void setIdentifier(String identifier) throws ParserException {
 	/**
 	 * {@inheritDoc}
 	 */
-	public void setName(String name) throws ParserException {
+	public void setName(String name) {
 		if (name==null) throw new ParserException("Name cannot be null");
 		if (this.name!=null) throw new ParserException("Current BioEntry already has a name");
 		this.name = name;
@@ -216,7 +216,7 @@ public void setName(String name) throws ParserException {
 	/**
 	 * {@inheritDoc}
 	 */
-	public void setComment(String comment) throws ParserException {
+	public void setComment(String comment) {
 		if (comment==null) throw new ParserException("Comment cannot be null");
 		this.comments.add(comment);
 	}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java
index 8f1b449283..d6c1b76ada 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java
@@ -242,7 +242,7 @@ public String getName() {
 		 * {@link #getCodons(CompoundSet, CompoundSet)} was not called first.
 		 */
 				@Override
-		public boolean isStart(AminoAcidCompound compound) throws IllegalStateException {
+		public boolean isStart(AminoAcidCompound compound) {
 			if(this.codons.isEmpty()) {
 				throw new IllegalStateException("Codons are empty; please request getCodons() fist before asking this");
 			}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/util/IOUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/util/IOUtils.java
index a798fcc6c3..4f807c5799 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/util/IOUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/util/IOUtils.java
@@ -87,7 +87,7 @@ public static void copy(InputStream input, OutputStream output)
 	 * @param processor The processor to invoke on all lines
 	 * @throws ParserException Can throw this if we cannot parse the given reader
 	 */
-	public static void processReader(BufferedReader br, ReaderProcessor processor) throws ParserException {
+	public static void processReader(BufferedReader br, ReaderProcessor processor) {
 		String line;
 		try {
 			while( (line = br.readLine()) != null ) {
@@ -109,7 +109,7 @@ public static void processReader(BufferedReader br, ReaderProcessor processor) t
 	 * @return List of Strings
 	 * @throws ParserException Can throw this if we cannot parse the given reader
 	 */
-	public static List<String> getList(BufferedReader br) throws ParserException {
+	public static List<String> getList(BufferedReader br) {
 		final List<String> list = new ArrayList<String>();
 		processReader(br, new ReaderProcessor() {
 			@Override
@@ -130,7 +130,7 @@ public void process(String line) {
 	 * @throws ParserException Can throw this if the file is not a file or we
 	 * cannot parse it
 	 */
-	public static List<String> getList(InputStream is) throws ParserException {
+	public static List<String> getList(InputStream is) {
 		return getList(new BufferedReader(new InputStreamReader(is)));
 	}
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
index 820bb03e1a..4ca7204bbd 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
@@ -638,7 +638,7 @@ private StringBuilder fetchUniprotXML(String uniprotURL)
 	 * @throws IOException
 	 */
 	private StringBuilder fetchFromCache(String key)
-			throws FileNotFoundException, IOException {
+			throws IOException {
 		int index;
 		File f = new File(uniprotDirectoryCache + File.separatorChar + key + ".xml");
 		StringBuilder sb = new StringBuilder();
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
index 648f84fe77..17a1bdefc7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
@@ -131,7 +131,7 @@ public void setSequenceLength(long sequenceLength) {
 	 * @return The parsed location
 	 * @throws ParserException thrown in the event of any error during parsing
 	 */
-	public Location parse(String locationString) throws ParserException {
+	public Location parse(String locationString) {
 		featureGlobalStart = Integer.MAX_VALUE;
 		featureGlobalEnd = 1;
 
@@ -151,7 +151,7 @@ public Location parse(String locationString) throws ParserException {
 		return l;
 	}
 
-	private List<Location> parseLocationString(String string, int versus) throws ParserException {
+	private List<Location> parseLocationString(String string, int versus) {
 		Matcher m;
 		List<Location> boundedLocationsCollection = new ArrayList<Location>();
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/BitSequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/BitSequenceReader.java
index 326c8589c8..4c1f064ea6 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/BitSequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/BitSequenceReader.java
@@ -368,7 +368,7 @@ public C getCompoundAt(int position) {
 		 * @return Byte representation of the compound
 		 * @throws IllegalStateException Done whenever this method is invoked
 		 */
-		protected byte processUnknownCompound(C compound, int position) throws IllegalStateException {
+		protected byte processUnknownCompound(C compound, int position) {
 			throw new IllegalStateException("Do not know how to translate the compound " + compound + " to a " + bitsPerCompound() + "bit representation");
 		}
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/JoiningSequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/JoiningSequenceReader.java
index 5c5a3999d9..a18d406d73 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/JoiningSequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/JoiningSequenceReader.java
@@ -263,7 +263,7 @@ public C next() {
 
 
 			@Override
-			public void remove() throws UnsupportedOperationException {
+			public void remove() {
 				throw new UnsupportedOperationException("Cannot remove from this Sequence");
 			}
 		};
@@ -289,7 +289,7 @@ public int countCompounds(C... compounds) {
 
 
 	@Override
-	public AccessionID getAccession() throws UnsupportedOperationException {
+	public AccessionID getAccession() {
 		throw new UnsupportedOperationException();
 	}
 
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/IntegerOntology.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/IntegerOntology.java
index c8ee792a5b..25fdf85c30 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/IntegerOntology.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/IntegerOntology.java
@@ -96,7 +96,7 @@ public void remove() {
 	}
 
 	@Override
-	public Term getTerm(String s) throws NoSuchElementException {
+	public Term getTerm(String s) {
 		int val = Integer.parseInt(s);
 		return resolveInt(val);
 	}
@@ -117,37 +117,37 @@ public Set getRemoteTerms() {
 	}
 
 	@Override
-	public Term createTerm(String name) throws AlreadyExistsException,  IllegalArgumentException {
+	public Term createTerm(String name) throws AlreadyExistsException  {
 		throw new IllegalArgumentException(getName() + " is immutable");
 	}
 
 	@Override
 	public Term createTerm(String name, String description)
 			throws
-			AlreadyExistsException,
+			AlreadyExistsException
 
-			IllegalArgumentException
-			{
+	
+		{
 		throw new IllegalArgumentException(getName() + " is immutable");
 			}
 
 	@Override
 	public Term createTerm(String name, String description, Object[] synonyms)
 			throws
-			AlreadyExistsException,
+			AlreadyExistsException
 
-			IllegalArgumentException
-			{
+	
+		{
 		throw new IllegalArgumentException(getName() + " is immutable");
 			}
 
 	@Override
 	public Variable createVariable(String name, String description)
 			throws
-			AlreadyExistsException,
+			AlreadyExistsException
 
-			IllegalArgumentException
-			{
+	
+		{
 		throw new IllegalArgumentException(getName() + " is immutable");
 			}
 
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Ontology.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Ontology.java
index 365aab4251..2e1f26cf50 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Ontology.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Ontology.java
@@ -91,7 +91,7 @@ public interface Ontology  {
 	 * @throws NoSuchElementException if no term exists with that name
 	 */
 
-	public Term getTerm(String name) throws NoSuchElementException;
+	public Term getTerm(String name);
 
 	/**
 	 * Return all triples from this ontology which match the supplied
@@ -134,9 +134,9 @@ public interface Ontology  {
 
 	public Term createTerm(String name)
 			throws
-			AlreadyExistsException,
+			AlreadyExistsException
 
-			IllegalArgumentException;
+	;
 
 	/**
 	 * Create a new term in this ontology.
@@ -153,9 +153,9 @@ public Term createTerm(String name)
 
 	public Term createTerm(String name, String description)
 			throws
-			AlreadyExistsException,
+			AlreadyExistsException
 
-			IllegalArgumentException;
+	;
 
 	/**
 	 * Create a new term in this ontology.
@@ -173,9 +173,9 @@ public Term createTerm(String name, String description)
 
 	public Term createTerm(String name, String description, Object[] synonyms)
 			throws
-			AlreadyExistsException,
+			AlreadyExistsException
 
-			IllegalArgumentException;
+	;
 
 	/**
 	 * Create a new term in this ontology that is used as a variable.
@@ -192,9 +192,9 @@ public Term createTerm(String name, String description, Object[] synonyms)
 
 	public Variable createVariable(String name, String description)
 			throws
-			AlreadyExistsException,
+			AlreadyExistsException
 
-			IllegalArgumentException;
+	;
 
 	/**
 	 * Create a view of a term from another ontology.  If the requested term
@@ -213,9 +213,9 @@ public Variable createVariable(String name, String description)
 	 */
 
 	public Term importTerm(Term t, String localName)
-			throws
+		
 
-			IllegalArgumentException;
+	;
 
 	/**
 	 * Creates a new Triple.
@@ -342,8 +342,8 @@ public Set<Term> getTerms() {
 
 		@Override
 		public Term getTerm(String name)
-				throws NoSuchElementException
-				{
+		
+			{
 			Term t = terms.get(name);
 			if (t == null) {
 				throw new NoSuchElementException("No term named '" + name + "'");
@@ -402,8 +402,8 @@ private Set<Triple> filterTriples(Set<Triple> base, Term subject, Term object, T
 		}
 
 		private void addTerm(Term t)
-				throws AlreadyExistsException, IllegalArgumentException
-				{
+				throws AlreadyExistsException 
+			{
 			if (terms.containsKey(t.getName())) {
 				throw new AlreadyExistsException("Ontology " + getName() + " already contains " + t.toString());
 			}
@@ -415,8 +415,8 @@ private void addTerm(Term t)
 
 		@Override
 		public Term createTerm(String name)
-				throws AlreadyExistsException, IllegalArgumentException
-				{
+				throws AlreadyExistsException 
+			{
 			Term t = new Term.Impl(this, name);
 			addTerm(t);
 			return t;
@@ -424,8 +424,8 @@ public Term createTerm(String name)
 
 		@Override
 		public Term createTerm(String name, String description)
-				throws AlreadyExistsException, IllegalArgumentException
-				{
+				throws AlreadyExistsException 
+			{
 			Term t = new Term.Impl(this, name, description);
 			addTerm(t);
 			return t;
@@ -433,8 +433,8 @@ public Term createTerm(String name, String description)
 
 		@Override
 		public Term createTerm(String name, String description, Object[] synonyms)
-				throws AlreadyExistsException, IllegalArgumentException
-				{
+				throws AlreadyExistsException 
+			{
 			Term t = new Term.Impl(this, name, description, synonyms);
 			addTerm(t);
 			return t;
@@ -443,9 +443,9 @@ public Term createTerm(String name, String description, Object[] synonyms)
 		@Override
 		public Variable createVariable(String name, String description)
 				throws
-				AlreadyExistsException,
+				AlreadyExistsException
 
-				IllegalArgumentException {
+	 {
 			Variable var = new Variable.Impl(this, name, description);
 			addTerm(var);
 			return var;
@@ -462,8 +462,8 @@ public OntologyTerm createOntologyTerm(Ontology o)
 
 		@Override
 		public Term importTerm(Term t, String name)
-				throws IllegalArgumentException
-				{
+		
+			{
 			// unpack any potential indirection - belt & braces
 			while(t instanceof RemoteTerm) {
 				t = ((RemoteTerm) t).getRemoteTerm();
@@ -530,11 +530,11 @@ public Triple createTriple(Term subject,
 				String name,
 				String description)
 						throws
-						AlreadyExistsException,
-						IllegalArgumentException,
-						NullPointerException,
-						IllegalArgumentException
-						{
+						AlreadyExistsException
+		
+		
+		
+					{
 			Triple t = new Triple.Impl(subject, object, predicate, name, description);
 			if (!containsTerm(subject)) {
 				throw new IllegalArgumentException("Ontology " + getName() + " doesn't contain " + subject);
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/AbstractAnnotation.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/AbstractAnnotation.java
index d6f9374328..bbd160ae92 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/AbstractAnnotation.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/AbstractAnnotation.java
@@ -84,7 +84,7 @@ public abstract class AbstractAnnotation
 
 
 	@Override
-	public Object getProperty(Object key) throws NoSuchElementException {
+	public Object getProperty(Object key) {
 		if(propertiesAllocated()) {
 			Map prop = getProperties();
 			if(prop.containsKey(key)) {
@@ -104,8 +104,8 @@ public void setProperty(Object key, Object value)
 
 	@Override
 	public void removeProperty(Object key)
-		throws  NoSuchElementException
-	{
+ 
+{
 		if (!getProperties().containsKey(key)) {
 				throw new NoSuchElementException("Can't remove key " + key.toString());
 		}
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/Annotation.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/Annotation.java
index fccf023371..a0cf3ce65a 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/Annotation.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/Annotation.java
@@ -78,7 +78,7 @@ public interface Annotation  {
 	 *
 	 *
 	 */
-	Object getProperty(Object key) throws NoSuchElementException;
+	Object getProperty(Object key);
 
 	/**
 	 * <p>
@@ -100,7 +100,7 @@ public interface Annotation  {
 	 *         if the change was vetoed.
 	 */
 	void setProperty(Object key, Object value)
-			throws IllegalArgumentException;
+	;
 
 	/**
 	 * Delete a property. Normal raw access to the property. For cleverer access, use
@@ -114,7 +114,7 @@ void setProperty(Object key, Object value)
 	 */
 
 	public void removeProperty(Object key)
-			throws NoSuchElementException;
+	;
 
 	/**
 	 * Returns whether there the property is defined. Normal raw access to the property. For cleverer access, use
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/EmptyAnnotation.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/EmptyAnnotation.java
index 006feeb329..99a48861ea 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/EmptyAnnotation.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/EmptyAnnotation.java
@@ -41,7 +41,7 @@ class EmptyAnnotation
 
 implements Annotation, Serializable {
 	@Override
-	public Object getProperty(Object key) throws NoSuchElementException {
+	public Object getProperty(Object key) {
 		throw new NoSuchElementException(
 			"There are no keys in the Empty Annotation object: " +
 			key
diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java
index a91d7e9876..058e47546d 100644
--- a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java
+++ b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java
@@ -272,7 +272,7 @@ public static Map<FastaSequence,Range[]> getDisorder(List<FastaSequence> sequenc
 	 * @see #getDisorder(FastaSequence)
 	 * @see #Jronn.Range
 	 */
-	public static Map<FastaSequence,Range[]> getDisorder(String fastaFile) throws FileNotFoundException, IOException {
+	public static Map<FastaSequence,Range[]> getDisorder(String fastaFile) throws IOException {
 		final List<FastaSequence> sequences = SequenceUtil.readFasta(new FileInputStream(fastaFile));
 		return getDisorder(sequences);
 	}
diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ModelLoader.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ModelLoader.java
index f6eb3aac47..e9db4ebdde 100644
--- a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ModelLoader.java
+++ b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ModelLoader.java
@@ -161,7 +161,7 @@ public Model getModel(final int modelNum) {
 	return ModelLoader.models.get(modelNum);
 	}
 
-	void loadModels() throws NumberFormatException, IOException {
+	void loadModels() throws IOException {
 
 		for (int i = 0; i < 10; i++) {
 			final BufferedReader bfr = new BufferedReader(
@@ -191,8 +191,8 @@ void loadModels() throws NumberFormatException, IOException {
 		}
 	}
 
-	public static void main(final String[] args) throws NumberFormatException,
-		IOException {
+	public static void main(final String[] args) throws 
+	IOException {
 	final ModelLoader loader = new ModelLoader();
 	loader.loadModels();
 	logger.info("{}", ModelLoader.models.get(0));
diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java
index c93170cb31..7b5b5e7d1a 100644
--- a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java
+++ b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java
@@ -138,7 +138,7 @@ static boolean isValidSequence(final FastaSequence fsequence) {
 	}
 
 	@Override
-	public ORonn call() throws NumberFormatException, IOException {
+	public ORonn call() throws IOException {
 		final String seq = sequence.getSequence();
 		// Calculate for each model
 		Stream.iterate(0, n -> n +1).limit(NUMBER_OF_MODELS).map(modelNumber -> mloader.getModel(modelNumber))
@@ -277,8 +277,8 @@ private static InputParameters parseArguments(final String[] args)
 		return prms;
 	}
 
-	public static void main(final String[] args) throws NumberFormatException,
-	IOException {
+	public static void main(final String[] args) throws 
+IOException {
 
 		if ((args.length == 0) || (args.length > 5)) {
 			ORonn.printUsage();
@@ -332,7 +332,7 @@ public static void main(final String[] args) throws NumberFormatException,
 
 	static void predictSerial(final List<FastaSequence> fsequences,
 			final InputParameters prms, final ModelLoader mloader)
-					throws NumberFormatException, IOException {
+					throws IOException {
 		for (final FastaSequence sequence : fsequences) {
 			if (!ORonn.isValidSequenceForRonn(sequence, prms.getStatWriter())) {
 				continue;
@@ -345,7 +345,7 @@ static void predictSerial(final List<FastaSequence> fsequences,
 
 	static void predictParallel(final List<FastaSequence> fsequences,
 			final InputParameters prms, final ModelLoader mloader)
-					throws NumberFormatException, IOException {
+					throws IOException {
 		final PrintWriter stat = prms.getStatWriter();
 
 		// Do parallel execution
diff --git a/biojava-structure-gui/src/main/java/demo/AFPFromFasta.java b/biojava-structure-gui/src/main/java/demo/AFPFromFasta.java
index 5327b18e2f..97f32828be 100644
--- a/biojava-structure-gui/src/main/java/demo/AFPFromFasta.java
+++ b/biojava-structure-gui/src/main/java/demo/AFPFromFasta.java
@@ -48,7 +48,7 @@
  */
 public class AFPFromFasta {
 
-	public static void main(String[] args) throws IOException, StructureException, Exception {
+	public static void main(String[] args) throws Exception {
 		Structure structure1 = StructureTools.getStructure("1w0p");
 		Structure structure2 = StructureTools.getStructure("1w0p");
 		String first = "alfdynatgdtefdspakqgwmqdntnngsgvltnadgmpawlvqgiggraqwtyslstnqhaqassfgwrmttemkvlsggmitnyyangtqrvlpiisldssgnlvvefegqtgrtvlatgtaateyhkfelvflpgsnpsasfyfdgklirdniqptaskQNMIVWGNGSSntdgvaayrdikfei------------------------------------------------------------------------------------------------------------------QGDVIf------------RGPDRIPSIVASsvTPGVVTAFAEKRVGGgdpgalsntNDIITRTSRDGGITWDTELNLTEQinvsdeFDFSDPRPIYDPs---SNTVLVSYARWPtdaaqngdrikpwmpNGIFYSVYDVASgnWQAPIDVTdqvkersfqiagwggselyrrntslnsqqdwqsnakirivdgaanqiqvadgsrkyvvtlsidesgglvanlngvsapiilqsehakvhsfhdyelqysalnhtttlfvdgqqittwagevsqenniqfgnadaqidgrlhvqkivltqqghnlvefdafylaqqtpevekdleklgwtkiktgntmslygNASVNPGpgHGITLtrqqnisgsqNGRLIYPAIVLdrfFLNVMSIYSDDGgsnwq-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------TGSTLpipfrwksssileTLEPSEADMVELQN--GDLLLTARLDFNQivngvny--SPRQQFLSKDGGITWSLLEANNANvfsnistgTVDASITRFEqsdgSHFLLFTNPQGnpagTNgr------------QNLGLWFSFDEG--VTWKGPIQ--LVNGasaysdiyqldsenaivivetdnsnmrilrmpitllkqklt";
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomIterator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomIterator.java
index 20c0bde011..6f23795a95 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomIterator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomIterator.java
@@ -146,7 +146,7 @@ public boolean hasNext() {
 	 */
 	@Override
 	public Atom next()
-	throws NoSuchElementException
+
 	{
 		current_atom_pos++ ;
 		if ( current_atom_pos >= group.size() ) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Element.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Element.java
index 6afeb2a9b8..510230ccf6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Element.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Element.java
@@ -385,7 +385,7 @@ public ElementType getElementType() {
 	 * @param elementSymbol element symbol to specify Element.
 	 * @return the Element specified by the element symbol.
 	 */
-	public static Element valueOfIgnoreCase(String elementSymbol) throws IllegalArgumentException {
+	public static Element valueOfIgnoreCase(String elementSymbol) {
 
 		Element e = allElements.get(elementSymbol.toLowerCase());
 		if ( e != null)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/GroupIterator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/GroupIterator.java
index a0e3c5be8b..275e94cf3e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/GroupIterator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/GroupIterator.java
@@ -159,7 +159,7 @@ public Chain getCurrentChain(){
 	 */
 	@Override
 	public Group next()
-	throws NoSuchElementException
+
 	{
 
 		return getNextGroup(current_model_pos,current_chain_pos,current_group_pos+1);
@@ -170,7 +170,7 @@ public Group next()
 	 * @see #next
 	 */
 	private Group getNextGroup(int tmp_model,int tmp_chain,int tmp_group)
-	throws NoSuchElementException
+
 	{
 
 		if ( tmp_model >= structure.nrModels()){
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PdbId.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PdbId.java
index d601d2a4e8..db765972a2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PdbId.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PdbId.java
@@ -218,7 +218,7 @@ private static boolean isInternalShortCompatible(String intId) {
 		return intId.substring(0, 4).equals(STRING_0000);
 	}
 	
-	private static String toInternalFormat(String id) throws IllegalArgumentException {
+	private static String toInternalFormat(String id) {
 		if (isValidShortPdbId(id)) {
 			return STRING_0000  + id.toUpperCase();
 		}else if (isValidExtendedPdbId(id)) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AlignmentResult.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AlignmentResult.java
index bfa720e183..c60ddd1dd6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AlignmentResult.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AlignmentResult.java
@@ -166,7 +166,7 @@ public void setIoTime(long ioTime)
 		this.ioTime = ioTime;
 	}
 	public void serialize (File output)
-	throws FileNotFoundException, IOException{
+	throws IOException{
 		// save alignment result:
 
 		FileOutputStream outStream = new FileOutputStream(output);
@@ -177,7 +177,7 @@ public void serialize (File output)
 	}
 
 	public static AlignmentResult deserialize(File output)
-	throws FileNotFoundException, IOException, ClassNotFoundException{
+	throws IOException, ClassNotFoundException{
 		FileInputStream fin = new FileInputStream(output);
 		ObjectInputStream objIn = new ObjectInputStream(fin);
 		AlignmentResult result = (AlignmentResult) objIn.readObject();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
index 9cd5d72d10..92bdc89ead 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
@@ -58,11 +58,11 @@ public static boolean isUnaryExpression(String expression) {
 		return ! (first == 0 && last > first);
 	}
 
-	public static List<String> parseUnaryOperatorExpression(String operatorExpression) throws IllegalArgumentException {
+	public static List<String> parseUnaryOperatorExpression(String operatorExpression) {
 		return parseSubExpression(operatorExpression);
 	}
 
-	private static List<String> parseSubExpression(String expression) throws IllegalArgumentException {
+	private static List<String> parseSubExpression(String expression) {
 		// remove parenthesis, if any
 		String tmp = expression.replace("(", "");
 		tmp = tmp.replace(")", "");
@@ -93,7 +93,7 @@ private static List<String> parseSubExpression(String expression) throws Illegal
 	 * @return list of items in range
 	 * @throws IllegalArgumentException
 	 */
-	private static List<String> expandRange(String expression) throws IllegalArgumentException {
+	private static List<String> expandRange(String expression) {
 		int first = 0;
 		int last = 0;
 		try {
@@ -112,7 +112,7 @@ private static List<String> expandRange(String expression) throws IllegalArgumen
 	}
 
 	public static List<OrderedPair<String>> parseBinaryOperatorExpression(String expression)
-			throws IllegalArgumentException {
+ {
 		// split operator expression, i.e. (1,2,3)(4,5) into two subexpressions
 		String[] subExpressions = null;
 		try {
@@ -267,7 +267,7 @@ public static double getBiologicalMoleculeMaximumExtend( final Structure structu
 	 * @throws IllegalArgumentException if structure is null
 	 */
 
-	public static double[] getBiologicalMoleculeCentroid( final Structure asymUnit,List<BiologicalAssemblyTransformation> transformations ) throws IllegalArgumentException {
+	public static double[] getBiologicalMoleculeCentroid( final Structure asymUnit,List<BiologicalAssemblyTransformation> transformations ) {
 		if ( asymUnit == null ) {
 			throw new IllegalArgumentException( "null structure" );
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/OperatorResolver.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/OperatorResolver.java
index b9b11a2f61..6380460924 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/OperatorResolver.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/OperatorResolver.java
@@ -60,7 +60,7 @@ public class OperatorResolver {
 	 *
 	 * @param operatorExpression the operator expression to be parsed
 	 */
-	public  void parseOperatorExpressionString(String operatorExpression) throws IllegalArgumentException {
+	public  void parseOperatorExpressionString(String operatorExpression) {
 		String expression = operatorExpression.trim();
 
 		// remove single quotes, i.e. '(1-49)' in 1CGM
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
index 3a54bce234..b7ee585279 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
@@ -284,7 +284,7 @@ public List<ScopDomain> filterByDomainName(String query) {
 	 * @see org.biojava.nbio.structure.scop.ScopDatabase#filterByDescription(java.lang.String)
 	 */
 	@Override
-	public List<ScopDescription> filterByDescription(String query) throws ScopIOException {
+	public List<ScopDescription> filterByDescription(String query) {
 		try {
 			ensureDesInstalled();
 		} catch (IOException e) {
@@ -654,7 +654,7 @@ private List<String> extractRanges(String range) {
 		return ranges;
 	}
 
-	protected void downloadClaFile() throws FileNotFoundException, IOException{
+	protected void downloadClaFile() throws IOException{
 		if(mirrors.size()<1) {
 			initScopURLs();
 		}
@@ -675,7 +675,7 @@ protected void downloadClaFile() throws FileNotFoundException, IOException{
 		throw new IOException("Unable to download SCOP .cla file",exception);
 	}
 
-	protected void downloadDesFile() throws FileNotFoundException, IOException{
+	protected void downloadDesFile() throws IOException{
 		if(mirrors.size()<1) {
 			initScopURLs();
 		}
@@ -718,7 +718,7 @@ protected void downloadHieFile() throws IOException{
 
 	}
 
-	protected void downloadComFile() throws FileNotFoundException, IOException{
+	protected void downloadComFile() throws IOException{
 		if(mirrors.size()<1) {
 			initScopURLs();
 		}

From 4d146e12b06586da3fddead0a3c16035f4732a4a Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 24 May 2023 16:21:11 -0700
Subject: [PATCH 429/599] Improvements from review comments

---
 .../nbio/structure/io/cif/AbstractCifFileSupplier.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
index de6affec0b..826d9588ef 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
@@ -103,8 +103,8 @@ protected CifFile getInternal(Structure structure, List<WrappedAtom> wrappedAtom
                 entityDescriptions[i] = e.getDescription() == null? "?" : e.getDescription();
             }
 
-            String[] polyEntityIds = entityInfos.stream().filter(e -> e.getType() == EntityType.POLYMER).map(e -> Integer.toString(e.getMolId())).collect(Collectors.toList()).toArray(new String[]{});
-            String[] polyEntitySeqs = entityInfos.stream().filter(e -> e.getType() == EntityType.POLYMER).map(e -> e.getChains().get(0).getSeqResSequence()).collect(Collectors.toList()).toArray(new String[]{});
+            String[] polyEntityIds = entityInfos.stream().filter(e -> e.getType() == EntityType.POLYMER).map(e -> Integer.toString(e.getMolId())).toArray(String[]::new);
+            String[] polyEntitySeqs = entityInfos.stream().filter(e -> e.getType() == EntityType.POLYMER).map(e -> e.getChains().get(0).getSeqResSequence()).toArray(String[]::new);
 
             blockBuilder.enterEntity()
                     .enterId()

From fc07139bcba8fb2bcd9ccc5250a61e18d8b3fd20 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 2 Jun 2023 13:48:47 -0700
Subject: [PATCH 430/599] Cleanup

---
 .../structure/align/quaternary/QsAlign.java   | 25 ++++++++-----------
 .../align/quaternary/QsAlignResult.java       |  8 +++---
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlign.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlign.java
index 355c76ea15..d7dcade047 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlign.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlign.java
@@ -98,9 +98,9 @@ public static QsAlignResult align(List<Subunit> s1, List<Subunit> s2,
 		for (int i = 0; i < c1.size(); i++) {
 			for (int j = 0; j < c2.size(); j++) {
 
-				if (clusterMap.keySet().contains(i))
+				if (clusterMap.containsKey(i))
 					break;
-				if (clusterMap.values().contains(j))
+				if (clusterMap.containsValue(j))
 					continue;
 
 				// Use structural alignment to match the subunit clusters
@@ -154,9 +154,9 @@ public static QsAlignResult align(List<Subunit> s1, List<Subunit> s2,
 				for (int i = 0; i < index2; i++) {
 					for (int j = index2; j < clust1.size(); j++) {
 
-						if (subunitMap.keySet().contains(i))
+						if (subunitMap.containsKey(i))
 							break;
-						if (subunitMap.values().contains(j))
+						if (subunitMap.containsValue(j))
 							continue;
 
 						// Obtain cumulative transformation matrix
@@ -294,8 +294,7 @@ public static QsAlignResult align(List<Subunit> s1, List<Subunit> s2,
 				if (result.getAlignment() == null) {
 					result.setSubunitMap(subunitMap);
 					result.setAlignment(msa);
-				} else if (msa.getScore(MultipleAlignmentScorer.RMSD) < result
-						.getRmsd()) {
+				} else if (msa.getScore(MultipleAlignmentScorer.RMSD) < result.getRmsd()) {
 					result.setSubunitMap(subunitMap);
 					result.setAlignment(msa);
 					logger.info("Better result found: " + result.toString());
@@ -324,8 +323,8 @@ private static Pair<Atom[]> getAlignedAtomsForClusterSubunitMap(
 			List<SubunitCluster> clusters,
 			Map<Integer, Map<Integer, Integer>> clusterSubunitMap) {
 
-		List<Atom> atomArray1 = new ArrayList<Atom>();
-		List<Atom> atomArray2 = new ArrayList<Atom>();
+		List<Atom> atomArray1 = new ArrayList<>();
+		List<Atom> atomArray2 = new ArrayList<>();
 
 		// For each cluster of subunits
 		for (int key : clusterSubunitMap.keySet()) {
@@ -348,9 +347,9 @@ private static Pair<Atom[]> getAlignedAtomsForClusterSubunitMap(
 			}
 
 		}
-		return new Pair<Atom[]>(
-				atomArray1.toArray(new Atom[atomArray1.size()]),
-				atomArray2.toArray(new Atom[atomArray2.size()]));
+		return new Pair<>(
+				atomArray1.toArray(new Atom[0]),
+				atomArray2.toArray(new Atom[0]));
 	}
 
 	/**
@@ -364,12 +363,10 @@ private static Pair<Atom[]> getAlignedAtomsForClusterSubunitMap(
 	 * @param clusterSubunitMap
 	 *            map from cluster id to subunit matching
 	 * @return transformation matrix
-	 * @throws StructureException
 	 */
 	private static Matrix4d getTransformForClusterSubunitMap(
 			List<SubunitCluster> clusters,
-			Map<Integer, Map<Integer, Integer>> clusterSubunitMap)
-			throws StructureException {
+			Map<Integer, Map<Integer, Integer>> clusterSubunitMap) {
 
 		Pair<Atom[]> pair = getAlignedAtomsForClusterSubunitMap(clusters,
 				clusterSubunitMap);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlignResult.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlignResult.java
index 68b0b4a4da..7ac77a602e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlignResult.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlignResult.java
@@ -47,8 +47,8 @@ public class QsAlignResult {
 
 	private List<SubunitCluster> clusters;
 
-	private List<Subunit> subunits1;
-	private List<Subunit> subunits2;
+	private final List<Subunit> subunits1;
+	private final List<Subunit> subunits2;
 
 	private Map<Integer, Integer> subunitMap;
 	private MultipleAlignment alignment;
@@ -234,7 +234,7 @@ public void setAlignment(MultipleAlignment alignment) {
 	 */
 	public List<Subunit> getAlignedSubunits1() {
 
-		List<Subunit> aligned = new ArrayList<Subunit>(subunitMap.size());
+		List<Subunit> aligned = new ArrayList<>(subunitMap.size());
 
 		for (Integer key : subunitMap.keySet())
 			aligned.add(subunits1.get(key));
@@ -250,7 +250,7 @@ public List<Subunit> getAlignedSubunits1() {
 	 */
 	public List<Subunit> getAlignedSubunits2() {
 
-		List<Subunit> aligned = new ArrayList<Subunit>(subunitMap.size());
+		List<Subunit> aligned = new ArrayList<>(subunitMap.size());
 
 		for (Integer key : subunitMap.keySet())
 			aligned.add(subunits2.get(subunitMap.get(key)));

From a5170b02180d6724bf9bb8ffcda411cf2eb2ea20 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 2 Jun 2023 14:04:05 -0700
Subject: [PATCH 431/599] [maven-release-plugin] prepare release biojava-7.0.2

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index a7d1bc3202..fdc7d4e474 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 9177766483..31e26df45f 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.2</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 22eba70833..c37bcbc944 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 035260862e..8ea5df4daa 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 4aa642ac25..d0547c39dd 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>7.0.2</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.0.2-SNAPSHOT</version>
+    	<version>7.0.2</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index f5058f2fc4..fe58956dab 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.2</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index cae218149c..4fb967fe78 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.0.2-SNAPSHOT</version>
+    <version>7.0.2</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 12dace81b2..e8f19b8b5f 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.2</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index a98b8dded8..631a1cae44 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.2</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 5de737f95c..49c792f1ee 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 4f4efd9170..ce8ede5022 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.2</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 6c39d9ae8f..0bd02169bd 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.0.2-SNAPSHOT</version>
+        <version>7.0.2</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 2c6c902e3b..1d5930bc03 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2-SNAPSHOT</version>
+		<version>7.0.2</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2-SNAPSHOT</version>
+			<version>7.0.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index bb0fce3303..32ada40b12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.0.2-SNAPSHOT</version>
+	<version>7.0.2</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.0.2</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 6d01b691f769258e1e73bda6b841e3d46b4120c5 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 2 Jun 2023 14:04:08 -0700
Subject: [PATCH 432/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index fdc7d4e474..70ab1fa759 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 31e26df45f..002fbb6b0b 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index c37bcbc944..0fe122bf49 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 8ea5df4daa..718efa3733 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index d0547c39dd..d02011571c 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.0.2</version>
+    <version>7.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.0.2</version>
+    	<version>7.0.3-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index fe58956dab..a87767f8a9 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 4fb967fe78..1fb8967489 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index e8f19b8b5f..36d3ec3b2b 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 631a1cae44..51053cc428 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 49c792f1ee..8b3522352b 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.0.2</version>
+		<version>7.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index ce8ede5022..ecb43920a0 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 0bd02169bd..61bcb2369f 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.0.2</version>
+        <version>7.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 1d5930bc03..86cf1004f9 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.2</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.2</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 32ada40b12..c897c9238a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.0.2</version>
+	<version>7.0.3-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.0.2</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From a9119fc0313572ee83ece486c6dc351185979dad Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 2 Jun 2023 14:39:13 -0700
Subject: [PATCH 433/599] Updating readme and changelog

---
 CHANGELOG.md | 8 ++++++++
 README.md    | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ec6c02e7c..47ae621112 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 BioJava Changelog
 -----------------
 
+BioJava 7.0.2
+==============================
+### Added
+* Some more categories related to entity are now written in mmCIF writer #1063
+
+### Fixed
+* Not declaring anymore unchecked exceptions in signatures #1062
+
 BioJava 7.0.1
 ==============================
 ### Fixed
diff --git a/README.md b/README.md
index 252092b9d6..7f39c65623 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-7.0.1-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.0.1) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-7.0.2-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.0.2) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From 4cb89f83fc0d2e4e94c8e5f58bb263258fc81531 Mon Sep 17 00:00:00 2001
From: Michael L Heuer <heuermh@acm.org>
Date: Tue, 20 Jun 2023 10:25:41 -0500
Subject: [PATCH 434/599] Update guava dependency version to 32.0.1-jre.

---
 biojava-genome/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 718efa3733..2b213d7de5 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -61,7 +61,7 @@
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<scope>compile</scope>
-			<version>31.1-jre</version>
+			<version>32.0.1-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

From 08198196464eba4953814905a6f7f9913f6f4192 Mon Sep 17 00:00:00 2001
From: jlerbsc <jean-pierre.lerbscher@jperf.com>
Date: Wed, 21 Jun 2023 08:44:12 +0200
Subject: [PATCH 435/599] Second fix for sonar rule 's1130' throws declarations
 should not be superfluous. This fix is specific to constructor declarations.

---
 .../src/main/java/org/biojava/nbio/ronn/ORonn.java        | 8 ++++----
 .../src/main/java/org/biojava/nbio/ronn/ORonnModel.java   | 2 +-
 .../nbio/structure/align/util/SynchronizedOutFile.java    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java
index 7b5b5e7d1a..4d4245cfaf 100644
--- a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java
+++ b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonn.java
@@ -81,8 +81,8 @@ public final class ORonn implements Callable<ORonn> {
 
 
 	ORonn(final FastaSequence sequence, final ModelLoader mloader,
-			final InputParameters params) throws NumberFormatException,
-			IOException {
+			final InputParameters params) throws 
+		IOException {
 		this.sequence = sequence;
 		this.mloader = mloader;
 		out = params.getOutputWriter();
@@ -93,8 +93,8 @@ public final class ORonn implements Callable<ORonn> {
 		timer = new Timer(TimeUnit.MILLISECONDS);
 	}
 	//This constructor is for API calls where the caller collects the results directly
-	ORonn(final FastaSequence sequence, final ModelLoader mloader) throws NumberFormatException,
-	IOException {
+	ORonn(final FastaSequence sequence, final ModelLoader mloader) throws 
+IOException {
 		this.sequence = sequence;
 		this.mloader = mloader;
 		out = new PrintWriter(new NullOutputStream());
diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonnModel.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonnModel.java
index a78e66f728..f3a5c187cb 100644
--- a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonnModel.java
+++ b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ORonnModel.java
@@ -169,7 +169,7 @@ private final float[] align(final int sResidue, final int dIndex) {
 	}
 
 	public ORonnModel(final String sequence, final Model model,
-		final float disorder) throws NumberFormatException {
+		final float disorder) {
 	this.disorder_weight = disorder;
 	this.model = model;
 	query = sequence.toCharArray();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/SynchronizedOutFile.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/SynchronizedOutFile.java
index 9d05773c25..2442807d11 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/SynchronizedOutFile.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/SynchronizedOutFile.java
@@ -43,7 +43,7 @@ public class SynchronizedOutFile {
 	 * @throws FileNotFoundException
 	 * @throws IOException
 	 */
-	public SynchronizedOutFile(File f, boolean gzipCompress) throws FileNotFoundException, IOException{
+	public SynchronizedOutFile(File f, boolean gzipCompress) throws IOException{
 		if ( f.isDirectory())
 			throw new FileNotFoundException("please provide a file and not a directory");
 
@@ -62,7 +62,7 @@ public SynchronizedOutFile(File f, boolean gzipCompress) throws FileNotFoundExce
 	 *
 	 * @param f
 	 */
-	public SynchronizedOutFile(File f) throws FileNotFoundException, IOException{
+	public SynchronizedOutFile(File f) throws IOException{
 
 		this(f,false);
 

From 4a1863d66121687b67229ed1ca1fd7466267663d Mon Sep 17 00:00:00 2001
From: jlerbsc <jean-pierre.lerbscher@jperf.com>
Date: Tue, 27 Jun 2023 11:30:25 +0200
Subject: [PATCH 436/599] Sonar S2129 Constructors should not be used to
 instantiate 'String', 'BigInteger', 'BigDecimal' and primitive-wrapper
 classes (Issue #1066)

---
 .../nbio/alignment/io/StockholmStructure.java |  5 ++-
 .../search/io/blast/BlastTabularParser.java   | 22 ++++++------
 .../core/search/io/blast/BlastXMLParser.java  | 36 +++++++++----------
 .../nbio/core/sequence/io/ABITrace.java       |  2 +-
 .../genome/parsers/gff/GeneIDGFF2Reader.java  |  4 +--
 .../genome/parsers/gff/GeneMarkGTFReader.java |  4 +--
 .../nbio/genome/parsers/gff/Location.java     |  2 +-
 .../genome/parsers/twobit/TwoBitParser.java   |  2 +-
 .../nbio/ontology/IntegerOntology.java        |  2 +-
 .../nbio/ontology/obo/OboFileParser.java      | 34 +++++++++---------
 .../gui/jmol/StructureAlignmentJmol.java      | 12 +++----
 .../gui/util/AlternativeAlignmentFrame.java   | 12 +++----
 .../structure/align/StrucAligParameters.java  | 20 +++++------
 .../nbio/structure/align/model/AFPChain.java  |  4 +--
 .../structure/align/model/AfpChainWriter.java | 10 +++---
 .../nbio/structure/align/util/CliTools.java   |  4 +--
 .../align/xml/MultipleAlignmentXMLParser.java | 10 +++---
 .../structure/domain/pdp/ClusterDomains.java  |  8 ++---
 .../nbio/structure/io/PDBFileParser.java      |  8 ++---
 19 files changed, 100 insertions(+), 101 deletions(-)

diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
index 97261433b7..22783b43c2 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
@@ -256,9 +256,8 @@ else if (forcedSequenceType.equals(PFAM))
 			}
 			String[] seqDetails = splitSeqName(sequencename);
 			seq.setDescription(seqDetails[0]);
-			seq.setBioBegin((seqDetails[1] == null || seqDetails[1].trim().equals("") ? null : new Integer(
-					seqDetails[1])));
-			seq.setBioEnd((seqDetails[2] == null || seqDetails[2].trim().equals("") ? null : new Integer(seqDetails[2])));
+			seq.setBioBegin((seqDetails[1] == null || seqDetails[1].trim().equals("") ? null : Integer.valueOf(seqDetails[1])));
+			seq.setBioEnd((seqDetails[2] == null || seqDetails[2].trim().equals("") ? null : Integer.valueOf(seqDetails[2])));
 
 			seqs.add(seq);
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastTabularParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastTabularParser.java
index 410fad0fce..b4593e8135 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastTabularParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastTabularParser.java
@@ -136,23 +136,23 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 
 					String currentSubjectId=subjectId;
 					while (currentSubjectId.equals(subjectId) && lineNumber < fileLinesCount){
-						if (new Double(evalue) > maxEScore) {
+						if (Double.valueOf(evalue) > maxEScore) {
 							line = fetchData(scanner);
 							lineNumber++;
 							continue;
 						}
 						BlastHspBuilder hspBuilder = new BlastHspBuilder();
 						hspBuilder
-							.setHspAlignLen(new Integer(alnLength))
-							.setHspGaps(new Integer(gapOpenCount))
-							.setHspQueryFrom(new Integer(queryStart))
-							.setHspQueryTo(new Integer(queryEnd))
-							.setHspHitFrom(new Integer(subjectStart))
-							.setHspHitTo(new Integer(subjectEnd))
-							.setHspEvalue(new Double(evalue))
-							.setHspBitScore(new Double(bitScore))
-							.setPercentageIdentity(new Double(percIdentity)/100)
-							.setMismatchCount(new Integer(mismatchCount));
+							.setHspAlignLen(Integer.valueOf(alnLength))
+							.setHspGaps(Integer.valueOf(gapOpenCount))
+							.setHspQueryFrom(Integer.valueOf(queryStart))
+							.setHspQueryTo(Integer.valueOf(queryEnd))
+							.setHspHitFrom(Integer.valueOf(subjectStart))
+							.setHspHitTo(Integer.valueOf(subjectEnd))
+							.setHspEvalue(Double.valueOf(evalue))
+							.setHspBitScore(Double.valueOf(bitScore))
+							.setPercentageIdentity(Double.valueOf(percIdentity)/100)
+							.setMismatchCount(Integer.valueOf(mismatchCount));
 						hsps.add(hspBuilder.createBlastHsp());
 						if (scanner.hasNext()) line = fetchData(scanner);
 						lineNumber++;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java
index 1b30639b80..9d93f5b325 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java
@@ -117,10 +117,10 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 
 				// Iteration* section keys:
 				resultBuilder
-					.setIterationNumber(new Integer(XMLHelper.selectSingleElement(element,"Iteration_iter-num").getTextContent()))
+					.setIterationNumber(Integer.valueOf(XMLHelper.selectSingleElement(element,"Iteration_iter-num").getTextContent()))
 					.setQueryID(XMLHelper.selectSingleElement(element,"Iteration_query-ID").getTextContent())
 					.setQueryDef(XMLHelper.selectSingleElement(element, "Iteration_query-def").getTextContent())
-					.setQueryLength(new Integer(XMLHelper.selectSingleElement(element,"Iteration_query-len").getTextContent()));
+					.setQueryLength(Integer.valueOf(XMLHelper.selectSingleElement(element,"Iteration_query-len").getTextContent()));
 
 				if (queryReferences != null) resultBuilder.setQuerySequence(queryReferencesMap.get(
 						XMLHelper.selectSingleElement(element,"Iteration_query-ID").getTextContent()
@@ -135,11 +135,11 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 				for (Element hitElement : hitList) {
 					BlastHitBuilder blastHitBuilder = new BlastHitBuilder();
 					blastHitBuilder
-						.setHitNum(new Integer(XMLHelper.selectSingleElement(hitElement, "Hit_num").getTextContent()))
+						.setHitNum(Integer.valueOf(XMLHelper.selectSingleElement(hitElement, "Hit_num").getTextContent()))
 						.setHitId(XMLHelper.selectSingleElement(hitElement, "Hit_id").getTextContent())
 						.setHitDef(XMLHelper.selectSingleElement(hitElement, "Hit_def").getTextContent())
 						.setHitAccession(XMLHelper.selectSingleElement(hitElement, "Hit_accession").getTextContent())
-						.setHitLen(new Integer(XMLHelper.selectSingleElement(hitElement, "Hit_len").getTextContent()));
+						.setHitLen(Integer.valueOf(XMLHelper.selectSingleElement(hitElement, "Hit_len").getTextContent()));
 
 					if (databaseReferences != null) blastHitBuilder.setHitSequence(databaseReferencesMap.get(
 						XMLHelper.selectSingleElement(hitElement, "Hit_id").getTextContent()
@@ -150,26 +150,26 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 
 					hspsCollection = new ArrayList<Hsp>();
 					for (Element hspElement : hspList) {
-						Double evalue = new Double(XMLHelper.selectSingleElement(hspElement, "Hsp_evalue").getTextContent());
+						Double evalue = Double.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_evalue").getTextContent());
 
 						// add the new hsp only if it pass the specified threshold. It can save lot of memory and some parsing time
 						if (evalue <= maxEScore) {
 							BlastHspBuilder blastHspBuilder = new BlastHspBuilder();
 							blastHspBuilder
-								.setHspNum(new Integer(XMLHelper.selectSingleElement(hspElement, "Hsp_num").getTextContent()))
-								.setHspBitScore(new Double(XMLHelper.selectSingleElement(hspElement, "Hsp_bit-score").getTextContent()))
-								.setHspScore(new Integer(XMLHelper.selectSingleElement(hspElement, "Hsp_score").getTextContent()))
+								.setHspNum(Integer.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_num").getTextContent()))
+								.setHspBitScore(Double.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_bit-score").getTextContent()))
+								.setHspScore(Integer.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_score").getTextContent()))
 								.setHspEvalue(evalue)
-								.setHspQueryFrom(new Integer(XMLHelper.selectSingleElement(hspElement, "Hsp_query-from").getTextContent()))
-								.setHspQueryTo(new Integer(XMLHelper.selectSingleElement(hspElement, "Hsp_query-to").getTextContent()))
-								.setHspHitFrom(new Integer(XMLHelper.selectSingleElement(hspElement, "Hsp_hit-from").getTextContent()))
-								.setHspHitTo(new Integer(XMLHelper.selectSingleElement(hspElement, "Hsp_hit-to").getTextContent()))
-								.setHspQueryFrame(new Integer(XMLHelper.selectSingleElement(hspElement, "Hsp_query-frame").getTextContent()))
-								.setHspHitFrame(new Integer(XMLHelper.selectSingleElement(hspElement, "Hsp_hit-frame").getTextContent()))
-								.setHspIdentity(new Integer(XMLHelper.selectSingleElement(hspElement, "Hsp_identity").getTextContent()))
-								.setHspPositive(new Integer(XMLHelper.selectSingleElement(hspElement, "Hsp_positive").getTextContent()))
-								.setHspGaps(new Integer(XMLHelper.selectSingleElement(hspElement, "Hsp_gaps").getTextContent()))
-								.setHspAlignLen(new Integer(XMLHelper.selectSingleElement(hspElement, "Hsp_align-len").getTextContent()))
+								.setHspQueryFrom(Integer.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_query-from").getTextContent()))
+								.setHspQueryTo(Integer.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_query-to").getTextContent()))
+								.setHspHitFrom(Integer.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_hit-from").getTextContent()))
+								.setHspHitTo(Integer.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_hit-to").getTextContent()))
+								.setHspQueryFrame(Integer.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_query-frame").getTextContent()))
+								.setHspHitFrame(Integer.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_hit-frame").getTextContent()))
+								.setHspIdentity(Integer.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_identity").getTextContent()))
+								.setHspPositive(Integer.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_positive").getTextContent()))
+								.setHspGaps(Integer.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_gaps").getTextContent()))
+								.setHspAlignLen(Integer.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_align-len").getTextContent()))
 								.setHspQseq(XMLHelper.selectSingleElement(hspElement, "Hsp_qseq").getTextContent())
 								.setHspHseq(XMLHelper.selectSingleElement(hspElement, "Hsp_hseq").getTextContent())
 								.setHspIdentityString(XMLHelper.selectSingleElement(hspElement, "Hsp_midline").getTextContent());
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ABITrace.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ABITrace.java
index d2cebd7cd1..552661bbda 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ABITrace.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ABITrace.java
@@ -434,7 +434,7 @@ private void setSeq() {
 		for (int x = 0; x <= seqLength - 1; ++x) {
 			tempseq[x] = (char) traceData[PBAS2 + x];
 		}
-		sequence = new String(tempseq);
+		sequence = String.valueOf(tempseq);
 	}
 
 	/**
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneIDGFF2Reader.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneIDGFF2Reader.java
index c7f59de102..e5aa01432b 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneIDGFF2Reader.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneIDGFF2Reader.java
@@ -147,9 +147,9 @@ private static Feature parseLine(String s) {
 		end = s.indexOf('#', start);
 		String attributes = null;
 		if (end < 0) {
-			attributes = new String(s.substring(start));
+			attributes = s.substring(start);
 		} else {
-			attributes = new String(s.substring(start, end));
+			attributes = s.substring(start, end);
 		}
 		//need to add in attribute assignment for geneid where it just provides a gene name and will make it gtf like
 		attributes = "gene_id " + '"' + attributes + '"' + ";";
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneMarkGTFReader.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneMarkGTFReader.java
index 8f0f53b026..1ef3eb59dc 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneMarkGTFReader.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneMarkGTFReader.java
@@ -147,9 +147,9 @@ private static Feature parseLine(String s) {
 		end = s.indexOf('#', start);
 		String attributes = null;
 		if (end < 0) {
-			attributes = new String(s.substring(start));
+			attributes = s.substring(start);
 		} else {
-			attributes = new String(s.substring(start, end));
+			attributes = s.substring(start, end);
 		}
 
 		return new Feature(seqname, source, type, location, score, frame, attributes);
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Location.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Location.java
index 91e71463f8..d0b2fc8f97 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Location.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Location.java
@@ -843,7 +843,7 @@ public boolean isSameStrand( Location other )
 	@Override
 	public String toString()
 	{
-		return new String( "[L=" + (mEnd - mStart) + "; S=" + mStart + "; E=" + mEnd +"]" );
+		return "[L=" + (mEnd - mStart) + "; S=" + mStart + "; E=" + mEnd +"]";
 	}
 
 	/* (non-Javadoc)
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitParser.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitParser.java
index 4f5733037d..a43a43d113 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitParser.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitParser.java
@@ -91,7 +91,7 @@ else if(sign==0x4327411A) {
 			int name_len = raf.read();
 			char[] chars = new char[name_len];
 			for(int j=0;j<name_len;j++) chars[j] = (char)raf.read();
-			seq_names[i] = new String(chars);
+			seq_names[i] = String.valueOf(chars);
 			long pos = readFourBytes();
 			seq2pos.put(seq_names[i],pos);
 			logger.debug("2bit: Sequence name=[{}], pos={}", seq_names[i], pos);
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/IntegerOntology.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/IntegerOntology.java
index 25fdf85c30..1bdddb300d 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/IntegerOntology.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/IntegerOntology.java
@@ -190,7 +190,7 @@ public boolean containsTerm(String name) {
 	}
 
 	public IntTerm resolveInt(int val) {
-		Integer i = new Integer(val);
+		Integer i = val;
 		IntTerm term = (IntTerm) termCache.get(i);
 
 		if(term == null) {
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java
index 76b7d673c2..e9c296c0a9 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java
@@ -67,21 +67,21 @@ public class OboFileParser {
 		new HashMap<Character, Character>();
 
 	static {
-		escapeChars.put(new Character('n'), new Character('\n'));
-		escapeChars.put(new Character('W'), new Character(' '));
-		escapeChars.put(new Character('t'), new Character('\t'));
-		escapeChars.put(new Character(':'), new Character(':'));
-		escapeChars.put(new Character(','), new Character(','));
-		escapeChars.put(new Character('"'), new Character('"'));
-		escapeChars.put(new Character('\''), new Character('\''));
-		escapeChars.put(new Character('\\'), new Character('\\'));
-		escapeChars.put(new Character('{'), new Character('{'));
-		escapeChars.put(new Character('}'), new Character('}'));
-		escapeChars.put(new Character('('), new Character('('));
-		escapeChars.put(new Character(')'), new Character(')'));
-		escapeChars.put(new Character('['), new Character('['));
-		escapeChars.put(new Character(']'), new Character(']'));
-		escapeChars.put(new Character('!'), new Character('!'));
+		escapeChars.put('n', '\n');
+		escapeChars.put('W', ' ');
+		escapeChars.put('t', '\t');
+		escapeChars.put(':', ':');
+		escapeChars.put(',', ',');
+		escapeChars.put('"', '"');
+		escapeChars.put('\'', '\'');
+		escapeChars.put('\\', '\\');
+		escapeChars.put('{', '{');
+		escapeChars.put('}', '}');
+		escapeChars.put('(', '(');
+		escapeChars.put(')', ')');
+		escapeChars.put('[', '[');
+		escapeChars.put(']', ']');
+		escapeChars.put('!', '!');
 		Iterator <Character> it = escapeChars.keySet().iterator();
 		while (it.hasNext()) {
 			Character key = it.next();
@@ -417,7 +417,7 @@ public static String escape(String str, boolean escapespaces) {
 		StringBuffer out = new StringBuffer();
 		for (int i = 0; i < str.length(); i++) {
 			char c = str.charAt(i);
-			Object o = unescapeChars.get(new Character(c));
+			Object o = unescapeChars.get(c);
 			if (o == null)
 				out.append(c);
 			else {
@@ -449,7 +449,7 @@ public SOPair unescape(String str, char toChar, int startindex,
 				i++;
 				c = str.charAt(i);
 				Character mapchar = escapeChars
-				.get(new Character(c));
+				.get(c);
 				if (mapchar == null)
 					throw new IOException("Unrecognized escape"
 							+ " character " + c + " found.");
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/StructureAlignmentJmol.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/StructureAlignmentJmol.java
index 1b0ee9a6f8..c25336ab71 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/StructureAlignmentJmol.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/StructureAlignmentJmol.java
@@ -257,12 +257,12 @@ public void itemStateChanged(ItemEvent e) {
 		zoomSlider.setPaintTicks(true);
 
 		Hashtable<Integer, JLabel> labelTable = new Hashtable<Integer, JLabel>();
-		labelTable.put(new Integer(0),new JLabel("0%"));
-		labelTable.put(new Integer(100),new JLabel("100%"));
-		labelTable.put(new Integer(200),new JLabel("200%"));
-		labelTable.put(new Integer(300),new JLabel("300%"));
-		labelTable.put(new Integer(400),new JLabel("400%"));
-		labelTable.put(new Integer(500),new JLabel("500%"));
+		labelTable.put(0,new JLabel("0%"));
+		labelTable.put(100,new JLabel("100%"));
+		labelTable.put(200,new JLabel("200%"));
+		labelTable.put(300,new JLabel("300%"));
+		labelTable.put(400,new JLabel("400%"));
+		labelTable.put(500,new JLabel("500%"));
 
 		zoomSlider.setLabelTable(labelTable);
 		zoomSlider.setPaintLabels(true);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/AlternativeAlignmentFrame.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/AlternativeAlignmentFrame.java
index 8dc672ed36..f80f087baf 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/AlternativeAlignmentFrame.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/AlternativeAlignmentFrame.java
@@ -126,12 +126,12 @@ private Object[][] getDataFromAligs(AlternativeAlignment[] aligs){
 		for ( int i=0;i< aligs.length;i++){
 			AlternativeAlignment alig = aligs[i];
 
-			data[i][0] = new Integer(i+1);
-			data[i][1] = new Integer(alig.getEqr());
-			data[i][2] = new Double(alig.getScore());
-			data[i][3] = new Double(alig.getRmsd());
-			data[i][4] = new Integer(alig.getGaps());
-			data[i][5] = new Integer(alig.getCluster());
+			data[i][0] = Integer.valueOf(i+1);
+			data[i][1] = Integer.valueOf(alig.getEqr());
+			data[i][2] = Double.valueOf(alig.getScore());
+			data[i][3] = Double.valueOf(alig.getRmsd());
+			data[i][4] = Integer.valueOf(alig.getGaps());
+			data[i][5] = Integer.valueOf(alig.getCluster());
 			JButton maxb = new JButton("Distance Matrix");
 			maxb.addMouseListener(new MatrixMouseListener(this,i));
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StrucAligParameters.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StrucAligParameters.java
index c871e46a0f..791233d465 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StrucAligParameters.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StrucAligParameters.java
@@ -125,16 +125,16 @@ public String toString() {
 		StringBuffer buf = new StringBuffer();
 		String t = " ";
 
-		Object[] params = new Object[]{new Integer(initialK) ,new Integer(seedFragmentLength),
-				new Float(seedRmsdCutoff),
-				new Integer(fragmentLength),
-				new Integer(diagonalDistance), new Integer(diagonalDistance2), new Float(fragmentMiniDistance),
-				new Integer(angleDiff),
-				new Float(fragCompat), new Integer(maxrefine),
-				new Boolean(reduceInitialFragments), new Double(joinRMSCutoff), new Boolean(joinPlo),
-				new Boolean(doAngleCheck), new Boolean(doDistanceCheck), new Boolean(doRMSCheck),
-				new Boolean(doDensityCheck), new Float(densityCutoff), new Float(create_co), new Integer(maxIter),
-				new Float(gapOpen), new Float(gapExtension), new Integer(permutationSize), new Float(evalCutoff)};
+		Object[] params = new Object[]{Integer.valueOf(initialK) ,Integer.valueOf(seedFragmentLength),
+				Float.valueOf(seedRmsdCutoff),
+				Integer.valueOf(fragmentLength),
+				Integer.valueOf(diagonalDistance), Integer.valueOf(diagonalDistance2), Float.valueOf(fragmentMiniDistance),
+				Integer.valueOf(angleDiff),
+				Float.valueOf(fragCompat), Integer.valueOf(maxrefine),
+				Boolean.valueOf(reduceInitialFragments), Double.valueOf(joinRMSCutoff), Boolean.valueOf(joinPlo),
+				Boolean.valueOf(doAngleCheck), Boolean.valueOf(doDistanceCheck), Boolean.valueOf(doRMSCheck),
+				Boolean.valueOf(doDensityCheck), Float.valueOf(densityCutoff), Float.valueOf(create_co), Integer.valueOf(maxIter),
+				Float.valueOf(gapOpen), Float.valueOf(gapExtension), Integer.valueOf(permutationSize), Float.valueOf(evalCutoff)};
 
 		for (int i=0 ; i< params.length ; i++){
 			buf.append(params[i]);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
index bd4013ada3..d06f91e7d9 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
@@ -447,8 +447,8 @@ private void init(){
 		afpChainTwiNum = 0;
 		alignScore = 0;
 		alignScoreUpdate = 0;
-		conn = new Double(0);
-		dvar = new Double(0);
+		conn = Double.valueOf(0);
+		dvar = Double.valueOf(0);
 		calculationTime = 0;
 
 		similarity = -1;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AfpChainWriter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AfpChainWriter.java
index 76fa8748ac..472741cb90 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AfpChainWriter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AfpChainWriter.java
@@ -263,9 +263,9 @@ public static String toFatCatCore(
 
 
 			//System.err.println("t,len:"+t+":"+len);
-			String lseq1 = new String(alnseq1).substring(t,t+len);
-			String lseq2 = new String(alnseq2).substring(t,t+len);
-			String lsymb = new String(alnsymb).substring(t,t+len);
+			String lseq1 = String.valueOf(alnseq1).substring(t,t+len);
+			String lseq2 = String.valueOf(alnseq2).substring(t,t+len);
+			String lsymb = String.valueOf(alnsymb).substring(t,t+len);
 
 			//System.err.println("B:" + b);
 
@@ -1197,8 +1197,8 @@ public static String toCE(AFPChain afpChain, Atom[] ca1, Atom[] ca2)
 
 
 			//System.err.println("t,len:"+t+":"+len);
-			a = new String(alnseq1).substring(t,t+len);
-			b = new String(alnseq2).substring(t,t+len);
+			a = String.valueOf(alnseq1).substring(t,t+len);
+			b = String.valueOf(alnseq2).substring(t,t+len);
 
 			//System.err.println("B:" + b);
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/CliTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/CliTools.java
index 97566c86b3..2356304c95 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/CliTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/CliTools.java
@@ -153,13 +153,13 @@ public static String[] configureBean(Object bean, String[] args)
 
 					if (propType == Integer.TYPE) {
 						try {
-							propVal = new Integer(args[++i]);
+							propVal = Integer.valueOf(args[++i]);
 						} catch (Exception ex) {
 							throw new ConfigurationException("Option " + arg + " requires an integer parameter");
 						}
 					} else if (propType == Double.TYPE || propType == Double.class ) {
 						try {
-							propVal = new Double(args[++i]);
+							propVal = Double.valueOf(args[++i]);
 						} catch (Exception ex) {
 							throw new ConfigurationException("Option " + arg + " requires a numerical parameter");
 						}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java
index 51c2f3c3b9..cf8b2b0f54 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java
@@ -202,7 +202,7 @@ private static Block parseBlock(Node root, BlockSet blockSet) {
 					if (residue.equals("null")){
 						alignRes.get(str-1).add(null);
 					} else {
-						alignRes.get(str-1).add(new Integer(residue));
+						alignRes.get(str-1).add(Integer.valueOf(residue));
 					}
 
 					str++;
@@ -225,7 +225,7 @@ private static Matrix4d parseMatrix4d(Node node) {
 			for (int y=0; y<4; y++){
 				String key = "mat"+(x+1)+(y+1);
 				String value = atts.getNamedItem(key).getTextContent();
-				m.setElement(x, y, new Double(value));
+				m.setElement(x, y, Double.valueOf(value));
 			}
 		}
 		return m;
@@ -241,7 +241,7 @@ private static void parseScoresCache(Node root, ScoresCache cache) {
 			NamedNodeMap atts = child.getAttributes();
 			if (atts != null) {
 				Node score = atts.getNamedItem("value");
-				Double value = new Double(score.getTextContent());
+				Double value = Double.valueOf(score.getTextContent());
 				cache.putScore(child.getNodeName(), value);
 			}
 		}
@@ -264,12 +264,12 @@ private static void parseHeader(Node node,
 
 		String ioTime = atts.getNamedItem("IOTime").getTextContent();
 		if (!ioTime.equals("null")){
-			ensemble.setIoTime(new Long(ioTime));
+			ensemble.setIoTime(Long.valueOf(ioTime));
 		}
 
 		String time = atts.getNamedItem("CalculationTime").getTextContent();
 		if (!time.equals("null")){
-			ensemble.setCalculationTime(new Long(time));
+			ensemble.setCalculationTime(Long.valueOf(time));
 		}
 	}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java
index 29fd0b6d21..b771e0f09a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java
@@ -77,8 +77,8 @@ public static List<Domain> cluster(List<Domain> domains, PDPDistanceMatrix pdpDi
 					if(minDomSize>150&&maxDomSize>1.5*minDomSize) maxDomSize=1.5*minDomSize;
 					else if(maxDomSize>2*minDomSize) maxDomSize=2*minDomSize;
 
-					long size1= new Double(Math.min(PDPParameters.MAXSIZE,minDomSize)).longValue();
-					long size2= new Double(Math.min(PDPParameters.MAXSIZE,maxDomSize)).longValue();
+					long size1= Double.valueOf(Math.min(PDPParameters.MAXSIZE,minDomSize)).longValue();
+					long size2= Double.valueOf(Math.min(PDPParameters.MAXSIZE,maxDomSize)).longValue();
 					minDomSize=Math.min(Math.pow(minDomSize,1.6/3)+PDPParameters.RG1,Math.pow(minDomSize,1.4/3)+Math.pow(PDPParameters.TD1,1.6/3)+PDPParameters.RG1);
 					maxDomSize=Math.min(Math.pow(maxDomSize,1.6/3)+PDPParameters.RG1,Math.pow(maxDomSize,1.4/3)+Math.pow(PDPParameters.TD1,1.6/3)+PDPParameters.RG1);
 
@@ -90,8 +90,8 @@ public static List<Domain> cluster(List<Domain> domains, PDPDistanceMatrix pdpDi
 					/*
 				total_max_contacts = min(x*y,MAXCONT);
 					 */
-					total_max_contacts=new Double(minDomSize*maxDomSize*10).longValue();
-					if(size1>130) total_max_contacts=new Double(minDomSize*maxDomSize*9).longValue();
+					total_max_contacts=Double.valueOf(minDomSize*maxDomSize*10).longValue();
+					if(size1>130) total_max_contacts=Double.valueOf(minDomSize*maxDomSize*9).longValue();
 					/*
 	avd=(domains.get(i).avd+domains.get(j).avd)/2;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index 92bd9f2456..190fe42cd8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -2034,7 +2034,7 @@ private Integer conect_helper (String line,int start,int end) {
 
 		if ( ! sbond.equals("")) {
 			bond = Integer.parseInt(sbond);
-			b = new Integer(bond);
+			b = bond;
 		}
 
 		return b ;
@@ -2091,7 +2091,7 @@ private void pdb_CONECT_Handler(String line) {
 			//System.out.println(atomserial+ " "+ bond1 +" "+bond2+ " " +bond3+" "+bond4+" "+
 			//		   hyd1+" "+hyd2 +" "+salt1+" "+hyd3+" "+hyd4+" "+salt2);
 			HashMap<String, Integer> cons = new HashMap<String, Integer>();
-			cons.put("atomserial",new Integer(atomserial));
+			cons.put("atomserial",atomserial);
 
 			if ( bond1 != null) cons.put("bond1",bond1);
 			if ( bond2 != null) cons.put("bond2",bond2);
@@ -3164,7 +3164,7 @@ private String getNextAsymId(String asymId) {
 			if (c[0]=='A') {
 				c[1] = getNextChar(c[1]);
 			}
-			return new String(c);
+			return String.valueOf(c);
 		} else if (asymId.length()==3) {
 			char[] c = new char[3];
 			asymId.getChars(0, 3, c, 0);
@@ -3175,7 +3175,7 @@ private String getNextAsymId(String asymId) {
 					c[2] = getNextChar(c[2]);
 				}
 			}
-			return new String(c);
+			return String.valueOf(c);
 		}
 		return null;
 	}

From 5f5b0369f286f762eedf944f01aa70ff97132ee5 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 29 Jun 2023 13:43:48 -0700
Subject: [PATCH 437/599] Fixing #1069

---
 .../nbio/core/sequence/io/GenericGenbankHeaderFormat.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
index 5732561718..18f58ee7c5 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
@@ -37,7 +37,7 @@ public class GenericGenbankHeaderFormat<S extends AbstractSequence<C>, C extends
 		extends GenericInsdcHeaderFormat<S, C> implements
 		GenbankHeaderFormatInterface<S, C> {
 	private static final int HEADER_WIDTH = 12;
-	private static final String lineSep = "%n";
+	private static final String lineSep = System.lineSeparator();
 	private String seqType = null;
 	private boolean useOriginalHeader = false;
 

From 9a5c2a977b6b5bd4864fea775d7c4e3688f24d56 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 29 Jun 2023 15:39:42 -0700
Subject: [PATCH 438/599] Review comment

---
 .../biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
index 973403a2b5..9542710488 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
@@ -49,7 +49,7 @@ public class GenericInsdcHeaderFormat<S extends AbstractSequence<C>, C extends C
 	protected static final int QUALIFIER_INDENT = 21;
 	protected static final String QUALIFIER_INDENT_STR = "                     ";
 	protected static final String QUALIFIER_INDENT_TMP = "     %s                ";
-	private static final String lineSep = "%n";
+	private static final String lineSep = System.lineSeparator();
 
 	/**
 	 * Format a feature qualifier using the MAX_WIDTH (default 80)

From 2f118bc16f7e5494599960df932742244dc33c97 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 30 Jun 2023 13:29:02 -0700
Subject: [PATCH 439/599] Regex fix from sonar

---
 .../biojava/nbio/core/sequence/MultipleSequenceAlignment.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignment.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignment.java
index 6633cd717a..a0fb3a37bc 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignment.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignment.java
@@ -304,7 +304,7 @@ private void printConservation(StringBuilder s, String idFormat, int start, int
 		if (idFormat != null) {
 			AccessionID ac1 = sequences.get(0).getAccession();
 			String id1 = (ac1 == null) ? "null" : ac1.getID();
-			id1 = id1.replaceAll(".", " ");
+			id1 = id1.replaceAll("\\.", " ");
 			s.append(String.format(idFormat, id1));
 		}
 

From 4f9cd2a6067263772bfb316c97b20833476c2b3e Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 30 Jun 2023 13:33:01 -0700
Subject: [PATCH 440/599] Cast fix from sonar

---
 .../nbio/core/sequence/io/BufferedReaderBytesRead.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/BufferedReaderBytesRead.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/BufferedReaderBytesRead.java
index e8b56ba29b..998bbada13 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/BufferedReaderBytesRead.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/BufferedReaderBytesRead.java
@@ -76,8 +76,8 @@ public class BufferedReaderBytesRead extends Reader {
 	private boolean skipLF = false;
 	/** The skipLF flag when the mark was set */
 	private boolean markedSkipLF = false;
-	private static int defaultCharBufferSize = 8192;
-	private static int defaultExpectedLineLength = 80;
+	private static final int defaultCharBufferSize = 8192;
+	private static final int defaultExpectedLineLength = 80;
 	long bytesRead = 0;
 
 	/**
@@ -451,7 +451,7 @@ public long skip(long n) throws IOException {
 						nextChar++;
 					}
 				}
-				long d = nChars - nextChar;
+				long d = (long)nChars - nextChar;
 				if (r <= d) {
 					nextChar += r;
 					r = 0;

From 96140a311873231dbda6c52424d00a35801f4600 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 30 Jun 2023 13:43:36 -0700
Subject: [PATCH 441/599] Init fix from sonar

---
 .../storage/TwoBitSequenceReader.java         | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/TwoBitSequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/TwoBitSequenceReader.java
index c73482d04b..1d739905d0 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/TwoBitSequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/TwoBitSequenceReader.java
@@ -114,22 +114,17 @@ protected int compoundsPerDatatype() {
 		 * Returns a Map which encodes TCAG into positions 0,1,2,3.
 		 */
 		@Override
-		@SuppressWarnings("serial")
 		protected Map<C, Integer> generateCompoundsToIndex() {
 			final CompoundSet<C> cs = getCompoundSet();
-			return new HashMap<C, Integer>() {
-
-				{
-					put(cs.getCompoundForString("T"), 0);
-					put(cs.getCompoundForString("C"), 1);
-					put(cs.getCompoundForString("A"), 2);
-					put(cs.getCompoundForString("G"), 3);
-					put(cs.getCompoundForString("t"), 0);
-					put(cs.getCompoundForString("c"), 1);
-					put(cs.getCompoundForString("a"), 2);
-					put(cs.getCompoundForString("g"), 3);
-				}
-			};
+			return Map.of(
+					cs.getCompoundForString("T"), 0,
+					cs.getCompoundForString("C"), 1,
+					cs.getCompoundForString("A"), 2,
+					cs.getCompoundForString("G"), 3,
+					cs.getCompoundForString("t"), 0,
+					cs.getCompoundForString("c"), 1,
+					cs.getCompoundForString("a"), 2,
+					cs.getCompoundForString("g"), 3);
 		}
 
 		/**
@@ -141,7 +136,6 @@ protected List<C> generateIndexToCompounds() {
 			List<C> result = new ArrayList<C>();
 			result.add( cs.getCompoundForString("T"));
 
-
 			result.add( cs.getCompoundForString("C"));
 			result.add( cs.getCompoundForString("A"));
 			result.add( cs.getCompoundForString("G"));

From 6820ce690402f3544fb6cbfbf3961c0ac6ac72cb Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 30 Jun 2023 13:49:15 -0700
Subject: [PATCH 442/599] Try-with from sonar and main cleanup

---
 .../nbio/genome/parsers/gff/GFF3Reader.java   | 30 ++++++-------
 .../nbio/genome/parsers/gff/GFF3Writer.java   | 43 +------------------
 2 files changed, 17 insertions(+), 56 deletions(-)

diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Reader.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Reader.java
index e1a5f03417..f6e256baa4 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Reader.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Reader.java
@@ -83,30 +83,30 @@ public static FeatureList read(Path path, List<String> indexes) throws IOExcepti
 
 		FeatureList features = new FeatureList();
 		features.addIndexes(indexes);
-		BufferedReader br = Files.newBufferedReader(path);
+		try (BufferedReader br = Files.newBufferedReader(path)) {
 
-		String s;
-		for (s = br.readLine(); null != s; s = br.readLine()) {
-			s = s.trim();
+			String s;
+			for (s = br.readLine(); null != s; s = br.readLine()) {
+				s = s.trim();
 
-			if (s.length() > 0) {
-				if (s.charAt(0) == '#') {
-					//ignore comment lines
-					if(s.startsWith("##fasta"))
-						break;
-				} else {
+				if (s.length() > 0) {
+					if (s.charAt(0) == '#') {
+						//ignore comment lines
+						if (s.startsWith("##fasta"))
+							break;
+					} else {
 
-					FeatureI f = parseLine(s);
-					if (f != null) {
-						features.add(f);
+						FeatureI f = parseLine(s);
+						if (f != null) {
+							features.add(f);
 
+						}
 					}
 				}
+
 			}
 
 		}
-
-		br.close();
 		return features;
 	}
 
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java
index c4bc070f21..6378a846c5 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java
@@ -20,11 +20,8 @@
  */
 package org.biojava.nbio.genome.parsers.gff;
 
-import org.biojava.nbio.genome.GeneFeatureHelper;
 import org.biojava.nbio.core.sequence.*;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -38,8 +35,8 @@ public class GFF3Writer {
 
 	/**
 	 * Output gff3 format for a DNA Sequence
-	 * @param fileName
-	 * @param chromosomeSequence
+	 * @param outputStream
+	 * @param chromosomeSequenceList
 	 * @throws Exception
 	 */
 	public void write(OutputStream outputStream, LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList) throws Exception {
@@ -118,7 +115,6 @@ public void write(OutputStream outputStream, LinkedHashMap<String, ChromosomeSeq
 
 		}
 
-
 	}
 
 	private String getGFF3Note(ArrayList<String> notesList) {
@@ -138,39 +134,4 @@ private String getGFF3Note(ArrayList<String> notesList) {
 		return notes;
 	}
 
-	public static void main(String[] args) throws Exception {
-
-		if (true) {
-			FileOutputStream fo = new FileOutputStream("/Users/Scooter/scripps/dyadic/geneid/geneid/c1-geneid.gff3");//-16
-			LinkedHashMap<String, ChromosomeSequence> dnaSequenceList = GeneFeatureHelper.loadFastaAddGeneFeaturesFromGeneIDGFF2(new File("/Users/Scooter/scripps/dyadic/analysis/454Scaffolds/454Scaffolds.fna"), new File("/Users/Scooter/scripps/dyadic/geneid/geneid/c1_geneid.gff"));
-			GFF3Writer gff3Writer = new GFF3Writer();
-			gff3Writer.write(fo, dnaSequenceList);
-
-
-	 //       LinkedHashMap<String, ProteinSequence> proteinSequenceList = GeneFeatureHelper.getProteinSequences(chromosomeSequenceList.values());
-	 //       for(String id : proteinSequenceList.keySet()){
-	 //           ProteinSequence sequence = proteinSequenceList.get(id);
-	 //           System.out.println(id + " " + sequence.getSequenceAsString());
-
-	 //       }
-			fo.close();
-		}
-/*
-		if (false) {
-			FileOutputStream fo = new FileOutputStream("/Users/Scooter/scripps/dyadic/analysis/454Scaffolds/genemark_hmm.gff3");//-16
-			LinkedHashMap<String, ChromosomeSequence> dnaSequenceList = GeneFeatureHelper.loadFastaAddGeneFeaturesFromGeneMarkGTF(new File("/Users/Scooter/scripps/dyadic/analysis/454Scaffolds/454Scaffolds.fna"), new File("/Users/Scooter/scripps/dyadic/analysis/454Scaffolds/genemark_hmm.gtf"));
-			GFF3Writer gff3Writer = new GFF3Writer();
-			gff3Writer.write(fo, dnaSequenceList);
-			fo.close();
-		}
-
-		if (false) {
-			LinkedHashMap<String, ChromosomeSequence> dnaSequenceList = GeneFeatureHelper.loadFastaAddGeneFeaturesFromGlimmerGFF3(new File("/Users/Scooter/scripps/dyadic/analysis/454Scaffolds/454Scaffolds-16.fna"), new File("/Users/Scooter/scripps/dyadic/GlimmerHMM/c1_glimmerhmm-16.gff"));
-			GFF3Writer gff3Writer = new GFF3Writer();
-			gff3Writer.write(System.out, dnaSequenceList);
-		}
-		*/
-//        System.out.println(listGenes);
-		//	GeneMarkGTF.write( list, args[1] );
-	}
 }

From d0fa3136e8a8750c7200ecbbdef44e002fe5ad52 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 30 Jun 2023 13:53:32 -0700
Subject: [PATCH 443/599] Try-with from sonar

---
 .../genome/parsers/gff/GeneIDGFF2Reader.java  | 26 +++++------
 .../genome/parsers/gff/GeneMarkGTFReader.java | 26 +++++------
 .../genome/parsers/twobit/TwoBitParser.java   | 45 +++++++++----------
 3 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneIDGFF2Reader.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneIDGFF2Reader.java
index c7f59de102..47acae30f2 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneIDGFF2Reader.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneIDGFF2Reader.java
@@ -62,27 +62,27 @@ public static FeatureList read(String filename) throws IOException {
 		logger.info("Reading: {}", filename);
 
 		FeatureList features = new FeatureList();
-		BufferedReader br = new BufferedReader(new FileReader(filename));
+		try (BufferedReader br = new BufferedReader(new FileReader(filename))) {
 
-		String s;
-		for (s = br.readLine(); null != s; s = br.readLine()) {
-			s = s.trim();
+			String s;
+			for (s = br.readLine(); null != s; s = br.readLine()) {
+				s = s.trim();
 
-			if (s.length() > 0) {
-				if (s.charAt(0) == '#') {
-					//ignore comment lines
-				} else {
+				if (s.length() > 0) {
+					if (s.charAt(0) == '#') {
+						//ignore comment lines
+					} else {
 
-					FeatureI f = parseLine(s);
-					if (f != null) {
-						features.add(f);
+						FeatureI f = parseLine(s);
+						if (f != null) {
+							features.add(f);
+						}
 					}
 				}
+
 			}
 
 		}
-
-		br.close();
 		return features;
 	}
 
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneMarkGTFReader.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneMarkGTFReader.java
index 8f0f53b026..b2820e5126 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneMarkGTFReader.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GeneMarkGTFReader.java
@@ -63,27 +63,27 @@ public static FeatureList read(String filename) throws IOException {
 		logger.info("Reading: {}", filename);
 
 		FeatureList features = new FeatureList();
-		BufferedReader br = new BufferedReader(new FileReader(filename));
+		try (BufferedReader br = new BufferedReader(new FileReader(filename))) {
 
-		String s;
-		for (s = br.readLine(); null != s; s = br.readLine()) {
-			s = s.trim();
+			String s;
+			for (s = br.readLine(); null != s; s = br.readLine()) {
+				s = s.trim();
 
-			if (s.length() > 0) {
-				if (s.charAt(0) == '#') {
-					//ignore comment lines
-				} else {
+				if (s.length() > 0) {
+					if (s.charAt(0) == '#') {
+						//ignore comment lines
+					} else {
 
-					FeatureI f = parseLine(s);
-					if (f != null) {
-						features.add(f);
+						FeatureI f = parseLine(s);
+						if (f != null) {
+							features.add(f);
+						}
 					}
 				}
+
 			}
 
 		}
-
-		br.close();
 		return features;
 	}
 
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitParser.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitParser.java
index 4f5733037d..fd359587dd 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitParser.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitParser.java
@@ -371,32 +371,31 @@ public static void main(String[] args) throws Exception {
 			logger.info("Resulting fasta data will be written in stdout.");
 			return;
 		}
-		TwoBitParser p = new TwoBitParser(new File(args[0]));
-		if(args.length==1) {
-			String[] names = p.getSequenceNames();
-			for(int i=0;i<names.length;i++) {
-				p.setCurrentSequence(names[i]);
-				p.printFastaSequence();
+		try (TwoBitParser p = new TwoBitParser(new File(args[0]))) {
+			if (args.length == 1) {
+				String[] names = p.getSequenceNames();
+				for (int i = 0; i < names.length; i++) {
+					p.setCurrentSequence(names[i]);
+					p.printFastaSequence();
+					p.close();
+				}
+			} else {
+				String name = args[1];
+				p.setCurrentSequence(name);
+				if (args.length > 2) {
+					long start = Long.parseLong(args[2]);
+					p.skip(start);
+				}
+				if (args.length > 3) {
+					long len = Long.parseLong(args[3]);
+					p.printFastaSequence(len);
+				} else {
+					p.printFastaSequence();
+				}
 				p.close();
 			}
+			p.closeParser();
 		}
-		else {
-			String name = args[1];
-			p.setCurrentSequence(name);
-			if(args.length>2) {
-				long start = Long.parseLong(args[2]);
-				p.skip(start);
-			}
-			if(args.length>3) {
-				long len = Long.parseLong(args[3]);
-				p.printFastaSequence(len);
-			}
-			else {
-				p.printFastaSequence();
-			}
-			p.close();
-		}
-		p.closeParser();
 	}
 }
 

From 167895869126adfccdb4bc713dcbdba4d91307c8 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 30 Jun 2023 13:56:31 -0700
Subject: [PATCH 444/599] Try-with from sonar

---
 .../main/java/org/biojava/nbio/phosphosite/Site.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Site.java b/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Site.java
index ca5e4a5f2f..5970b1f332 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Site.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Site.java
@@ -42,15 +42,17 @@ public Site(){
 
 	public static List<Site> parseSites(File f) throws IOException {
 
-		InputStream inStream = new FileInputStream(f);
-		InputStream gzipStream = new GZIPInputStream(inStream);
+		InputStream gzipStream;
+		try (InputStream inStream = new FileInputStream(f)) {
+			gzipStream = new GZIPInputStream(inStream);
+		}
 
 		Reader decoder = new InputStreamReader(gzipStream);
 		BufferedReader buf = new BufferedReader(decoder);
 
 		String line = null;
 
-		List<Site > data = new ArrayList<Site>();
+		List<Site > data = new ArrayList<>();
 
 		List<String> headerFields = null;
 
@@ -131,7 +133,7 @@ public static List<Site> parseSites(File f) throws IOException {
 	private static List<String> parseHeaderFields(String line) {
 		String[] spl = line.split("\t");
 
-		List<String> h = new ArrayList<String>();
+		List<String> h = new ArrayList<>();
 		for (String s: spl){
 			h.add(s);
 

From 9105226efc173a0d081bbb7a721605ea62613a9d Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 30 Jun 2023 14:07:08 -0700
Subject: [PATCH 445/599] Try-with from sonar

---
 .../nbio/structure/align/CallableStructureAlignment.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/CallableStructureAlignment.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/CallableStructureAlignment.java
index f22e2a31f5..3429a3c950 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/CallableStructureAlignment.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/CallableStructureAlignment.java
@@ -177,12 +177,9 @@ private void writeXML(File outFileF, String name1, String name2, String xml)
 			// Create file
 			File newF = new File(outFileF, "dbsearch_" +name1+"_" + name2+".xml.gz");
 
-			FileOutputStream fstream = new FileOutputStream(newF);
-
-			GZIPOutputStream gz = new GZIPOutputStream(fstream);
-			OutputStreamWriter writer = new OutputStreamWriter(gz);
-			writer.write(xml);
-			writer.close();
+			try (OutputStreamWriter writer = new OutputStreamWriter(new GZIPOutputStream(new FileOutputStream(newF)))) {
+				writer.write(xml);
+			}
 		} catch (Exception e){//Catch exception if any
 			logger.error("Exception: ", e);
 		}

From 457b6d833618b0bb69362276d852a34587e7b61f Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 28 Aug 2023 09:42:10 -0700
Subject: [PATCH 446/599] Fixing test after remediation

---
 .../structure/test/io/TestCrystallographicMetadata.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java
index 58eb09fb42..054d217b2f 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/io/TestCrystallographicMetadata.java
@@ -88,9 +88,9 @@ public void test1zna() throws Exception {
 
 		Structure s = StructureIO.getStructure("1zna");
 
-		// 1zna is one of the few entries that has a non-standard SG
-		assertTrue(s.getCrystallographicInfo().isNonStandardSg());
-		assertNull(s.getCrystallographicInfo().getSpaceGroup());
+		// 1zna was one of the few entries in a non-standard coordinate frame convention: but after a remediation in July 2023 it was finally fixed
+		assertFalse(s.getCrystallographicInfo().isNonStandardSg());
+		assertNotNull(s.getCrystallographicInfo().getSpaceGroup());
 	}
 
 

From 0b09987deaa409625577a118cdbdd5b9596e5efa Mon Sep 17 00:00:00 2001
From: Sebastian Jaenicke <sjaenick@CeBiTec.Uni-Bielefeld.DE>
Date: Sun, 3 Dec 2023 17:44:37 +0100
Subject: [PATCH 447/599] dependency updates

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index c897c9238a..a418dfea5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,9 +40,9 @@
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maxmem>512M</maxmem>
 		<mmtf.version>1.0.11</mmtf.version>
-		<slf4j.version>1.7.30</slf4j.version>
-		<log4j.version>2.17.2</log4j.version>
-		<junit-jupiter.version>5.7.2</junit-jupiter.version>
+		<slf4j.version>1.7.36</slf4j.version>
+		<log4j.version>2.22.0</log4j.version>
+		<junit-jupiter.version>5.10.1</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java</ciftools.artifact>
 		<ciftools.version>5.0.1</ciftools.version>
 	</properties>

From 6d23660fc767b80bb57ccd28b6a39348c6a82e86 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Dec 2023 09:26:13 -0800
Subject: [PATCH 448/599] Fixing gh workflow warning and failing test

---
 .github/workflows/master.yml                                    | 2 +-
 .github/workflows/pull_request.yml                              | 2 +-
 .../java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index f10369d9ab..cea448be55 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
       - name: Build, test (no integration) and Sonarqube analyse
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 078430db7e..c72d84a158 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -27,7 +27,7 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
       - name: Build, test and integration test
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
index 33825e19a5..987ef6be8e 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
@@ -199,7 +199,7 @@ class CreateValidationFiles{
     	
     	@Test
     	void testValidationFiles() throws IOException{
-    		URL sourceUrl = new URL("https://ftp.wwpdb.org/pub/pdb/data/structures/divided/mmCIF/45/145d.cif.gz");
+    		URL sourceUrl = new URL("https://files.wwpdb.org/pub/pdb/data/structures/divided/mmCIF/45/145d.cif.gz");
     		File destFile = new File(System.getProperty("java.io.tmpdir"), "145d.cif.gz");
     		File sizeFile = new File(destFile.getParentFile(), destFile.getName()+".size");
     		File hashFile = new File(destFile.getParentFile(), destFile.getName()+".hash_MD5");

From 928e0dde6cbb9fa7423d19b9cd438f7c5575f074 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Dec 2023 09:41:28 -0800
Subject: [PATCH 449/599] Fixing gh workflow issue after upgrading setup-java

---
 .github/workflows/master.yml       | 1 +
 .github/workflows/pull_request.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index cea448be55..69d16c970f 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
+          distribution: 'oracle'
           java-version: ${{ matrix.java }}
       - name: Build, test (no integration) and Sonarqube analyse
         env:
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index c72d84a158..8d8371d342 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -29,6 +29,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
+          distribution: 'oracle'
           java-version: ${{ matrix.java }}
       - name: Build, test and integration test
         run: mvn verify --no-transfer-progress

From d276c1a95b9b9722e50bef75093316fe2d7ffc5d Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Dec 2023 09:43:21 -0800
Subject: [PATCH 450/599] Another gh workflow issue

---
 .github/workflows/master.yml       | 2 +-
 .github/workflows/pull_request.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 69d16c970f..01acc4f88d 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -16,7 +16,7 @@ jobs:
         # We do one OS only to reduce resource utilization. To do macOS to this would be needed:
         #os: [ubuntu-20.04, macOS-latest]
         os: [ubuntu-latest]
-        java: [11]
+        java: [17]
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 8d8371d342..ff9c7dbbdf 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -19,7 +19,7 @@ jobs:
         # We do one OS only to reduce resource utilization. To do macOS to this would be needed:
         #os: [ubuntu-20.04, macOS-latest]
         os: [ubuntu-latest]
-        java: [11]
+        java: [17]
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}

From d5ea96c94eff06c6f797f41b1724a7b67e898e75 Mon Sep 17 00:00:00 2001
From: Gary Murphy <glm@hilbertinc.com>
Date: Fri, 29 Dec 2023 10:30:02 -0600
Subject: [PATCH 451/599] Updated to Jakarta JAXB and Java 17

---
 biojava-aa-prop/pom.xml                           | 13 ++++++++-----
 .../nbio/aaproperties/IPeptideProperties.java     |  2 +-
 .../nbio/aaproperties/PeptideProperties.java      |  3 +--
 .../nbio/aaproperties/PeptidePropertiesImpl.java  |  6 +++---
 .../aaproperties/xml/AminoAcidComposition.java    |  2 +-
 .../xml/AminoAcidCompositionTable.java            |  8 ++++----
 .../biojava/nbio/aaproperties/xml/Element.java    |  8 ++++----
 .../nbio/aaproperties/xml/ElementTable.java       |  2 +-
 .../biojava/nbio/aaproperties/xml/Isotope.java    |  8 ++++----
 .../xml/MyValidationEventHandler.java             |  6 +++---
 .../biojava/nbio/aaproperties/xml/Name2Count.java |  6 +++---
 .../nbio/aaproperties/xml/SchemaGenerator.java    |  2 +-
 .../biojava/nbio/aaproperties/CookBookTest.java   |  3 +--
 .../aaproperties/PeptidePropertiesImplTest.java   |  4 +---
 .../nbio/aaproperties/xml/AminoAcidTest.java      |  8 ++++----
 .../nbio/aaproperties/xml/ElementTest.java        | 12 ++++--------
 biojava-alignment/pom.xml                         |  4 ++--
 biojava-core/pom.xml                              |  9 ++++++---
 biojava-genome/pom.xml                            |  6 +++---
 biojava-integrationtest/pom.xml                   |  4 ++--
 biojava-modfinder/pom.xml                         | 11 +++++++----
 biojava-ontology/pom.xml                          |  2 +-
 biojava-protein-comparison-tool/pom.xml           | 10 +++++-----
 biojava-protein-disorder/pom.xml                  | 11 +++++++----
 .../biojava/nbio/data/sequence/FastaSequence.java |  4 ++--
 biojava-structure-gui/pom.xml                     |  6 +++---
 biojava-structure/pom.xml                         | 15 ++++++++-------
 .../biojava/nbio/structure/domain/pdp/Domain.java |  6 +++---
 .../nbio/structure/scop/ScopDescription.java      |  6 +++---
 .../biojava/nbio/structure/scop/ScopDomain.java   |  6 +++---
 .../org/biojava/nbio/structure/scop/ScopNode.java |  6 +++---
 .../biojava/nbio/structure/xtal/SpaceGroup.java   | 14 +++++++-------
 .../nbio/structure/xtal/SymoplibParser.java       |  2 +-
 .../structure/xtal/io/SpaceGroupMapAdapter.java   |  2 +-
 .../structure/xtal/io/SpaceGroupMapElements.java  |  2 +-
 .../nbio/structure/xtal/io/SpaceGroupMapRoot.java | 12 ++++++------
 .../structure/xtal/io/TransfAlgebraicAdapter.java |  2 +-
 .../xtal/io/TreeMapSpaceGroupWrapper.java         | 14 +++++++-------
 biojava-survival/pom.xml                          |  2 +-
 biojava-ws/pom.xml                                |  4 ++--
 pom.xml                                           | 12 ++++++------
 41 files changed, 135 insertions(+), 130 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 70ab1fa759..6a92d1146b 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>8.0.0.JAXB-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
@@ -105,12 +105,15 @@
 		</dependency>
 
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
+			<version>4.0.3</version>
+			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
index 5499509820..e90e7bd568 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
@@ -26,7 +26,7 @@
 import org.biojava.nbio.core.sequence.ProteinSequence;
 import org.biojava.nbio.core.sequence.compound.AminoAcidCompound;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Map;
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java
index edf76339d9..da0cef9997 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java
@@ -28,7 +28,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Arrays;
@@ -37,7 +37,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * This is an adaptor class which enable the ease of generating protein properties.
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java
index c75554f9e6..fc31b9510b 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java
@@ -29,9 +29,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidComposition.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidComposition.java
index 9004426ff5..034df5fb12 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidComposition.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidComposition.java
@@ -20,7 +20,7 @@
  */
 package org.biojava.nbio.aaproperties.xml;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 import java.util.List;
 
 @XmlRootElement(name = "compoundcomposition", namespace ="http://biojava.org")
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidCompositionTable.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidCompositionTable.java
index 6c90355296..c0b2e1489d 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidCompositionTable.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidCompositionTable.java
@@ -20,10 +20,10 @@
  */
 package org.biojava.nbio.aaproperties.xml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Element.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Element.java
index b03d15d1ac..4fc5f5ad66 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Element.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Element.java
@@ -20,10 +20,10 @@
  */
 package org.biojava.nbio.aaproperties.xml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/ElementTable.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/ElementTable.java
index efac678f23..acdcee25d9 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/ElementTable.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/ElementTable.java
@@ -20,7 +20,7 @@
  */
 package org.biojava.nbio.aaproperties.xml;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Isotope.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Isotope.java
index 493bf938a3..cc0682f084 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Isotope.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Isotope.java
@@ -20,10 +20,10 @@
  */
 package org.biojava.nbio.aaproperties.xml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 @XmlType(name = "Iostope", propOrder = {"name","neutronsNum","mass"})
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/MyValidationEventHandler.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/MyValidationEventHandler.java
index 2f49bb5c18..9430090436 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/MyValidationEventHandler.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/MyValidationEventHandler.java
@@ -23,9 +23,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.ValidationEvent;
-import javax.xml.bind.ValidationEventHandler;
-import javax.xml.bind.ValidationEventLocator;
+import jakarta.xml.bind.ValidationEvent;
+import jakarta.xml.bind.ValidationEventHandler;
+import jakarta.xml.bind.ValidationEventLocator;
 
 public class MyValidationEventHandler implements ValidationEventHandler{
 
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Name2Count.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Name2Count.java
index 431cc3e48c..b30e4c6dd2 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Name2Count.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Name2Count.java
@@ -20,9 +20,9 @@
  */
 package org.biojava.nbio.aaproperties.xml;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Name2Count{
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/SchemaGenerator.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/SchemaGenerator.java
index 8005bf3bac..5ca2b550ed 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/SchemaGenerator.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/SchemaGenerator.java
@@ -20,7 +20,7 @@
  */
 package org.biojava.nbio.aaproperties.xml;
 
-import javax.xml.bind.SchemaOutputResolver;
+import jakarta.xml.bind.SchemaOutputResolver;
 import javax.xml.transform.Result;
 import javax.xml.transform.stream.StreamResult;
 import java.io.File;
diff --git a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/CookBookTest.java b/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/CookBookTest.java
index 25ebf3abed..bbde2c1e30 100644
--- a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/CookBookTest.java
+++ b/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/CookBookTest.java
@@ -20,13 +20,12 @@
  */
 package org.biojava.nbio.aaproperties;
 
-import org.biojava.nbio.aaproperties.PeptideProperties;
 import org.biojava.nbio.aaproperties.xml.AminoAcidCompositionTable;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Map;
diff --git a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/PeptidePropertiesImplTest.java b/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/PeptidePropertiesImplTest.java
index 4f0439a5d4..8c79e3b078 100644
--- a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/PeptidePropertiesImplTest.java
+++ b/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/PeptidePropertiesImplTest.java
@@ -20,14 +20,12 @@
  */
 package org.biojava.nbio.aaproperties;
 
-import org.biojava.nbio.aaproperties.PeptideProperties;
-import org.biojava.nbio.aaproperties.Utils;
 import org.biojava.nbio.aaproperties.xml.AminoAcidCompositionTable;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Map;
diff --git a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/xml/AminoAcidTest.java b/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/xml/AminoAcidTest.java
index 528192dcb4..49947c1f50 100644
--- a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/xml/AminoAcidTest.java
+++ b/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/xml/AminoAcidTest.java
@@ -23,10 +23,10 @@
 import org.biojava.nbio.aaproperties.PeptideProperties;
 import org.junit.Test;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/xml/ElementTest.java b/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/xml/ElementTest.java
index 37376b6bd0..26de47bf03 100644
--- a/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/xml/ElementTest.java
+++ b/biojava-aa-prop/src/test/java/org/biojava/nbio/aaproperties/xml/ElementTest.java
@@ -20,18 +20,14 @@
  */
 package org.biojava.nbio.aaproperties.xml;
 
-import org.biojava.nbio.aaproperties.xml.Element;
-import org.biojava.nbio.aaproperties.xml.ElementTable;
-import org.biojava.nbio.aaproperties.xml.Isotope;
-import org.biojava.nbio.aaproperties.xml.SchemaGenerator;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 002fbb6b0b..d4af196852 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>8.0.0.JAXB-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 0fe122bf49..a2d1f7156f 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>8.0.0.JAXB-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
@@ -74,12 +74,15 @@
 			<artifactId>log4j-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
+			<version>4.0.3</version>
+			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 2b213d7de5..c43b84a4b6 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>8.0.0.JAXB-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index d02011571c..c7a1975b13 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.0.3-SNAPSHOT</version>
+    <version>8.0.0.JAXB-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.0.3-SNAPSHOT</version>
+    	<version>8.0.0.JAXB-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index a87767f8a9..c228cf38d4 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>8.0.0.JAXB-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -54,12 +54,15 @@
 			<artifactId>log4j-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
+			<version>4.0.3</version>
+			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 1fb8967489..393ec45be1 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.0.3-SNAPSHOT</version>
+    <version>8.0.0.JAXB-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 36d3ec3b2b..a0ed12f6bd 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>8.0.0.JAXB-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 51053cc428..6b1de229a0 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>8.0.0.JAXB-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
@@ -85,12 +85,15 @@
 			<artifactId>log4j-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
+			<version>4.0.3</version>
+			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
 
diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/data/sequence/FastaSequence.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/data/sequence/FastaSequence.java
index 6af6f13712..f53d236b89 100644
--- a/biojava-protein-disorder/src/main/java/org/biojava/nbio/data/sequence/FastaSequence.java
+++ b/biojava-protein-disorder/src/main/java/org/biojava/nbio/data/sequence/FastaSequence.java
@@ -24,8 +24,8 @@
 
 package org.biojava.nbio.data.sequence;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 8b3522352b..bf6f64246e 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>8.0.0.JAXB-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index ecb43920a0..21f5b5ec84 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>8.0.0.JAXB-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -67,15 +67,16 @@
 			<version>1.4.0</version>
 		</dependency>
 
-		<!-- JAXb explicit dependency is needed since Java 9. See https://stackoverflow.com/questions/43574426/how-to-resolve-java-lang-noclassdeffounderror-javax-xml-bind-jaxbexception-in-j
-		  Note versions are set in parent pom in dependency management section -->
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
+			<version>4.0.3</version>
+			<scope>runtime</scope>
 		</dependency>
 
 		<!-- Used for json deserialization in PDBStatus -->
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/Domain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/Domain.java
index 878ec29686..635f8bad94 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/Domain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/Domain.java
@@ -23,9 +23,9 @@
  */
 package org.biojava.nbio.structure.domain.pdp;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDescription.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDescription.java
index b85845ce2c..b7ef2881f7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDescription.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDescription.java
@@ -20,9 +20,9 @@
  */
 package org.biojava.nbio.structure.scop;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 
 /** Contains data from
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java
index 7d1446cb9d..34e7702e23 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java
@@ -26,9 +26,9 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.biojava.nbio.structure.PdbId;
 import org.biojava.nbio.structure.ResidueRange;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopNode.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopNode.java
index 8faf5dd6c7..40012d8d52 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopNode.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopNode.java
@@ -24,9 +24,9 @@
 
 package org.biojava.nbio.structure.scop;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
index b7be721a87..caeaf6c9ee 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
@@ -30,13 +30,13 @@
 import javax.vecmath.Matrix3d;
 import javax.vecmath.Matrix4d;
 import javax.vecmath.Vector3d;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
index 93896000b1..d0ff2cf4eb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
@@ -24,7 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapAdapter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapAdapter.java
index 6c068f51e3..aab18d3ff0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapAdapter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapAdapter.java
@@ -25,7 +25,7 @@
 
 import org.biojava.nbio.structure.xtal.SpaceGroup;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import java.util.Map;
 import java.util.TreeMap;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapElements.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapElements.java
index 6572570964..49170edf16 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapElements.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapElements.java
@@ -25,7 +25,7 @@
 
 import org.biojava.nbio.structure.xtal.SpaceGroup;
 
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElement;
 
 public class SpaceGroupMapElements {
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapRoot.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapRoot.java
index e7998ee8dd..eaf23f6d6e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapRoot.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapRoot.java
@@ -25,12 +25,12 @@
 
 import org.biojava.nbio.structure.xtal.SpaceGroup;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TransfAlgebraicAdapter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TransfAlgebraicAdapter.java
index 7e707002d8..c1416b7fad 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TransfAlgebraicAdapter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TransfAlgebraicAdapter.java
@@ -24,7 +24,7 @@
 
 package org.biojava.nbio.structure.xtal.io;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TreeMapSpaceGroupWrapper.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TreeMapSpaceGroupWrapper.java
index 8aabe9b2f1..5a438b55d7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TreeMapSpaceGroupWrapper.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TreeMapSpaceGroupWrapper.java
@@ -26,13 +26,13 @@
 
 import org.biojava.nbio.structure.xtal.SpaceGroup;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 61bcb2369f..e28fae4370 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.0.3-SNAPSHOT</version>
+        <version>8.0.0.JAXB-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 86cf1004f9..8dd7dd399d 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>8.0.0.JAXB-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>8.0.0.JAXB-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index a418dfea5a..8e4b8ae2a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.0.3-SNAPSHOT</version>
+	<version>8.0.0.JAXB-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -33,7 +33,7 @@
 	</licenses>
 	<properties>
 		<!-- Notice: if using java 9 or 10 jres, it is possible to simply use here "8", "9" or "10". But if using java 8 jre, "8" is not an allowed value but only "1.8"-->
-		<jdk.version>11</jdk.version>
+		<jdk.version>17</jdk.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
 		<!-- needed for failsafe plugin in integrationtest module - JD 2018-03-08 -->
@@ -462,14 +462,14 @@
 				<version>1.039</version>
 			</dependency>
 			<dependency>
-				<groupId>javax.xml.bind</groupId>
-				<artifactId>jaxb-api</artifactId>
-				<version>2.3.1</version>
+				<groupId>jakarta.xml.bind</groupId>
+				<artifactId>jakarta.xml.bind-api</artifactId>
+				<version>4.0.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.glassfish.jaxb</groupId>
 				<artifactId>jaxb-runtime</artifactId>
-				<version>2.3.5</version>
+				<version>4.0.3</version>
 				<scope>runtime</scope>
 			</dependency>
 		</dependencies>

From 171aef0a5512e1cb63f552fd5e04fe66c1226e93 Mon Sep 17 00:00:00 2001
From: Gary Murphy <glm@hilbertinc.com>
Date: Mon, 1 Jan 2024 10:36:52 -0600
Subject: [PATCH 452/599] Changed the JDK back to Java 11 and reran tests

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 6a92d1146b..48c9e35962 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>8.0.0.JAXB-SNAPSHOT</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index d4af196852..002fbb6b0b 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>8.0.0.JAXB-SNAPSHOT</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index a2d1f7156f..c0b3c2ca47 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>8.0.0.JAXB-SNAPSHOT</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index c43b84a4b6..2b213d7de5 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>8.0.0.JAXB-SNAPSHOT</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index c7a1975b13..d02011571c 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>8.0.0.JAXB-SNAPSHOT</version>
+    <version>7.0.3-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>8.0.0.JAXB-SNAPSHOT</version>
+    	<version>7.0.3-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index c228cf38d4..44e2e50e4a 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>8.0.0.JAXB-SNAPSHOT</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 393ec45be1..1fb8967489 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>8.0.0.JAXB-SNAPSHOT</version>
+    <version>7.0.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index a0ed12f6bd..36d3ec3b2b 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>8.0.0.JAXB-SNAPSHOT</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 6b1de229a0..a86a7fb13b 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>8.0.0.JAXB-SNAPSHOT</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index bf6f64246e..8b3522352b 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>8.0.0.JAXB-SNAPSHOT</version>
+		<version>7.0.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 21f5b5ec84..4ee0ee2e3f 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>8.0.0.JAXB-SNAPSHOT</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index e28fae4370..61bcb2369f 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>8.0.0.JAXB-SNAPSHOT</version>
+        <version>7.0.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 8dd7dd399d..86cf1004f9 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>8.0.0.JAXB-SNAPSHOT</version>
+		<version>7.0.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>8.0.0.JAXB-SNAPSHOT</version>
+			<version>7.0.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 8e4b8ae2a1..1b079ca711 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>8.0.0.JAXB-SNAPSHOT</version>
+	<version>7.0.3-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -33,7 +33,7 @@
 	</licenses>
 	<properties>
 		<!-- Notice: if using java 9 or 10 jres, it is possible to simply use here "8", "9" or "10". But if using java 8 jre, "8" is not an allowed value but only "1.8"-->
-		<jdk.version>17</jdk.version>
+		<jdk.version>11</jdk.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
 		<!-- needed for failsafe plugin in integrationtest module - JD 2018-03-08 -->

From f0320f5b024b7aedb0ddca1f9aa32080e4c28d36 Mon Sep 17 00:00:00 2001
From: Gary Murphy <glm@hilbertinc.com>
Date: Thu, 4 Jan 2024 07:45:22 -0600
Subject: [PATCH 453/599] Removed explicit versioning for JAX-B API and
 runtime, except for the dependencyManagement section in the POM.  Reran unit
 tests with no errors.

---
 biojava-aa-prop/pom.xml          | 3 ---
 biojava-core/pom.xml             | 3 ---
 biojava-modfinder/pom.xml        | 3 ---
 biojava-protein-disorder/pom.xml | 3 ---
 biojava-structure/pom.xml        | 3 ---
 5 files changed, 15 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 48c9e35962..908f2d28c2 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -107,13 +107,10 @@
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
 			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
-			<version>4.0.3</version>
-			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index c0b3c2ca47..fb44bbadd3 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -76,13 +76,10 @@
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
 			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
-			<version>4.0.3</version>
-			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 44e2e50e4a..ff8771babc 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -56,13 +56,10 @@
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
 			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
-			<version>4.0.3</version>
-			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index a86a7fb13b..c86173990f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -87,13 +87,10 @@
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
 			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
-			<version>4.0.3</version>
-			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 4ee0ee2e3f..bd779d4ba0 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -70,13 +70,10 @@
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
 			<artifactId>jakarta.xml.bind-api</artifactId>
-			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
-			<version>4.0.3</version>
-			<scope>runtime</scope>
 		</dependency>
 
 		<!-- Used for json deserialization in PDBStatus -->

From a3d943783b1d6e1958331b64cd33e3c6009d028a Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 5 Jan 2024 09:58:26 -0800
Subject: [PATCH 454/599] Updating test

---
 .../biojava/nbio/structure/io/TestNonDepositedFiles.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
index e2bd13bea5..afe4fa8e65 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestNonDepositedFiles.java
@@ -478,12 +478,12 @@ private static int[] countEntityTypes(List<EntityInfo> entities) {
 	@Test
 	public void testStructureWithBranchedEntities() throws IOException {
 		// Example carbohydrate remediation file to be released in July 2020
-		URL url = new URL("https://raw.githubusercontent.com/pdbxmmcifwg/carbohydrate-extension/master/examples/models/1B5F-carb.cif");
-		InputStream inStream = url.openStream();
+		URL url = new URL("https://models.rcsb.org/1B5F.bcif.gz");
+		InputStream inStream = new GZIPInputStream(url.openStream());
 
 		Structure structure = CifStructureConverter.fromInputStream(inStream);
 
-		assertEquals(7, structure.getEntityInfos().size());
+		assertEquals(6, structure.getEntityInfos().size());
 
 		assertEquals(2, structure.getEntityById(1).getChains().size());
 		assertEquals(2, structure.getEntityById(2).getChains().size());

From f45e01876a1179983d96b9fde840614a0adf5915 Mon Sep 17 00:00:00 2001
From: Gary Murphy <glm@hilbertinc.com>
Date: Mon, 8 Jan 2024 12:04:02 -0600
Subject: [PATCH 455/599] Changed the URLs to the mirrors from http to https. 
 Changed the name of the URL path to reflect a change in the v2 naming.

---
 .../nbio/structure/scop/ScopInstallation.java | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
index b7ee585279..019e084a5d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
@@ -85,8 +85,8 @@ public class ScopInstallation implements LocalScopDatabase {
 	public static final String comFileName = "dir.com.scop.txt_";
 
 	// Download locations
-	public static final String SCOP_DOWNLOAD = "http://scop.berkeley.edu/downloads/parse/";
-	public static final String SCOP_DOWNLOAD_ALTERNATE = "http://scop.berkeley.edu/downloads/parse/";
+	public static final String SCOP_DOWNLOAD = "https://scop.berkeley.edu/downloads/parse/";
+	public static final String SCOP_DOWNLOAD_ALTERNATE = "https://scop.berkeley.edu/downloads/parse/";
 
 	//public static final String NEWLINE = System.getProperty("line.separator");
 	public static final String FILESPLIT = System.getProperty("file.separator");
@@ -913,10 +913,19 @@ private void initScopURLs() {
 		// first, try default scop
 		ScopMirror primary = new ScopMirror();
 		// If unreachable, try alternate Berkeley location
-		ScopMirror alt = new ScopMirror(
-				SCOP_DOWNLOAD_ALTERNATE,
-				"dir.cla.scop.%s.txt","dir.des.scop.%s.txt",
-				"dir.hie.scop.%s.txt","dir.com.scop.%s.txt");
+		ScopMirror alt;
+		if (scopVersion.startsWith("2.")) {
+			alt = new ScopMirror(
+					SCOP_DOWNLOAD_ALTERNATE,
+					"dir.cla.scope.%s.txt","dir.des.scope.%s.txt",
+					"dir.hie.scope.%s.txt","dir.com.scope.%s.txt");
+		}
+		else {
+			alt = new ScopMirror(
+					SCOP_DOWNLOAD_ALTERNATE,
+					"dir.cla.scop.%s.txt","dir.des.scop.%s.txt",
+					"dir.hie.scop.%s.txt","dir.com.scop.%s.txt");
+		}
 		mirrors.add(primary);
 		mirrors.add(alt);
 	}

From 96c81269b33a2e2c2ac0b09c055a81ccfb5c5303 Mon Sep 17 00:00:00 2001
From: Gary Murphy <glm@hilbertinc.com>
Date: Sat, 13 Jan 2024 10:31:04 -0600
Subject: [PATCH 456/599] Before finding the InputStreamProvider

---
 .../nbio/core/sequence/io/FastaStreamer.java  | 155 ++++++++++++++++++
 .../biojava/nbio/core/util/MagicNumber.java   |  39 +++++
 .../core/sequence/io/FastaStreamerTest.java   |  39 +++++
 .../nbio/core/util/MagicNumberTest.java       |  22 +++
 .../org/biojava/nbio/core/util/example.gz     | Bin 0 -> 54 bytes
 5 files changed, 255 insertions(+)
 create mode 100644 biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
 create mode 100644 biojava-core/src/main/java/org/biojava/nbio/core/util/MagicNumber.java
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaStreamerTest.java
 create mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/util/MagicNumberTest.java
 create mode 100644 biojava-core/src/test/resources/org/biojava/nbio/core/util/example.gz

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
new file mode 100644
index 0000000000..febf747a36
--- /dev/null
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
@@ -0,0 +1,155 @@
+package org.biojava.nbio.core.sequence.io;
+
+import org.biojava.nbio.core.sequence.ProteinSequence;
+import org.biojava.nbio.core.sequence.compound.AminoAcidCompound;
+import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
+import org.biojava.nbio.core.sequence.io.template.SequenceCreatorInterface;
+import org.biojava.nbio.core.sequence.io.template.SequenceHeaderParserInterface;
+import org.biojava.nbio.core.util.MagicNumber;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+import java.util.zip.GZIPInputStream;
+
+public class FastaStreamer {
+
+	private final Path path;
+	private int batchSize = 1_000;
+	private SequenceHeaderParserInterface<ProteinSequence, AminoAcidCompound> headerParser;
+	private SequenceCreatorInterface<AminoAcidCompound> sequenceCreator;
+	private LinkedHashMap<String, ProteinSequence> chunk = new LinkedHashMap<>();
+	private Iterator<Map.Entry<String, ProteinSequence>> iterator = Collections.emptyIterator();
+	private boolean closed = false;
+
+	/**
+	 * The constructor is private.  Created via the <tt>from(...)</tt> static factory method
+	 *
+	 * @param path the path to the file containing the FASTA content (possibly GZipped)
+	 */
+	private FastaStreamer(final Path path) {
+		this.path = path;
+	}
+
+	public static FastaStreamer from(final Path path) {
+		return new FastaStreamer(path);
+	}
+
+	public static FastaStreamer from(File file) {
+		return from(file.toPath());
+	}
+
+	public FastaStreamer withHeaderParser(SequenceHeaderParserInterface<ProteinSequence, AminoAcidCompound> headerParser) {
+		this.headerParser = headerParser;
+		return this;
+	}
+
+	public FastaStreamer withSequenceCreator(SequenceCreatorInterface<AminoAcidCompound> sequenceCreator) {
+		this.sequenceCreator = sequenceCreator;
+		return this;
+	}
+
+	public FastaStreamer batchSize(int size) {
+		this.batchSize = size;
+		return this;
+	}
+
+	/**
+	 * Create a stream of protein sequences from the contents of the path
+	 * @return the stream
+	 * @throws IOException if there is an error opening the file
+	 */
+	public Stream<ProteinSequence> stream() throws IOException {
+		InputStream rawInput = Files.newInputStream(getPath(), StandardOpenOption.READ);
+		InputStream input = MagicNumber.isGZIP(getPath()) ? new GZIPInputStream(rawInput) : rawInput;
+		FastaReader<ProteinSequence, AminoAcidCompound> reader = new FastaReader<>(input, getHeaderParser(), getSequenceCreator());
+		Spliterator<ProteinSequence> source = new Spliterators.AbstractSpliterator<>(Integer.MAX_VALUE, Spliterator.IMMUTABLE | Spliterator.NONNULL) {
+			@Override
+			public boolean tryAdvance(Consumer<? super ProteinSequence> action) {
+				if (closed) {
+					return false;
+				}
+				ProteinSequence protein = next(reader);
+				if (null == protein) {
+					return false;
+				}
+				action.accept(protein);
+				return true;
+			}
+
+			/**
+			 * Fetch the next header/protein tuple from the cache.  If the cache is empty, fetch another
+			 * batch from the source file
+			 *
+			 * @param reader
+			 * 		the input stream from which the FASTA content is read
+			 * @return the protein sequence
+			 */
+			private ProteinSequence next(FastaReader<ProteinSequence, AminoAcidCompound> reader) {
+				try {
+					if (!iterator.hasNext()) {
+						chunk = reader.process(getBatchSize());
+						if (null == chunk) {
+							closed = true;
+							reader.close();
+							return null;
+						}
+						iterator = chunk.entrySet().iterator();
+					}
+					if (iterator.hasNext()) {
+						Map.Entry<String, ProteinSequence> entry = iterator.next();
+						return createSequence(entry.getKey(), entry.getValue());
+					}
+					closed = true;
+					reader.close();
+				} catch (IOException exception) {
+					throw new RuntimeException(String.format("I/O error reading the FASTA file from '%s'", getPath()));
+				}
+				return null;
+			}
+		}; // Spliterator
+		return StreamSupport.stream(source, false);
+	}
+
+	/**
+	 * Create the sequence with the information from the header.  This implementation return the sequence as-is, but
+	 * this is an opportunity for the implementer to build specifc information into the user collection space
+	 * of the sequence
+	 *
+	 * @param header the original header
+	 * @param sequence the protein sequence
+	 * @return the sequence
+	 */
+	protected ProteinSequence createSequence(String header, ProteinSequence sequence) {
+		return sequence;
+	}
+
+	protected Path getPath() {
+		return path;
+	}
+
+	protected int getBatchSize() {
+		return batchSize;
+	}
+
+	protected SequenceHeaderParserInterface<ProteinSequence, AminoAcidCompound> getHeaderParser() {
+		return Optional.ofNullable(headerParser).orElse(new GenericFastaHeaderParser<>());
+	}
+
+	public SequenceCreatorInterface<AminoAcidCompound> getSequenceCreator() {
+		return Optional.ofNullable(sequenceCreator).orElse(new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
+	}
+}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/MagicNumber.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/MagicNumber.java
new file mode 100644
index 0000000000..9c6765b354
--- /dev/null
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/MagicNumber.java
@@ -0,0 +1,39 @@
+package org.biojava.nbio.core.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+
+/**
+ * The 'magic number' is a sequence of bytes that the beginning of a file that can be used to determine the
+ * file type
+ *
+ * @since 7.0.3
+ * @author Gary Murphy
+ */
+public class MagicNumber {
+
+	/**
+	 * The magic number of a gzip file is 0x1F8B. (ref: https://en.wikipedia.org/wiki/Gzip#:~:text=%22gzip%22%20is%20often%20also%20used,and%20the%20operating%20system%20ID.)
+	 * @param path the path to the file
+	 * @return <code>true</code> if the file has the gzip magic number
+	 * @throws IOException if there is an error reading the start of the file
+	 */
+	public static boolean isGZIP(Path path) throws IOException {
+		try (
+				InputStream input = Files.newInputStream(path, StandardOpenOption.READ)
+		) {
+			byte[] magic = new byte[2];
+			int count = input.read(magic);
+			if (count != 2) {
+				return false;
+			}
+			int id = (int)magic[0] & 0x00ff;
+			id <<= 8;
+			id += (int)magic[1] & 0x00ff;
+			return (id == 0x1f8b);
+		}
+	}
+}
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaStreamerTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaStreamerTest.java
new file mode 100644
index 0000000000..f17ba93de1
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaStreamerTest.java
@@ -0,0 +1,39 @@
+package org.biojava.nbio.core.sequence.io;
+
+import org.biojava.nbio.core.sequence.ProteinSequence;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Test the functionality of the {@link FastaStreamer} code
+ */
+public class FastaStreamerTest {
+
+	@Test
+	public void stream() throws IOException {
+		String file = this.getClass().getResource("PF00104_small.fasta.gz").getFile();
+		Path path = Paths.get(file);
+		List<ProteinSequence> sequences;
+
+		sequences = FastaStreamer.from(path).stream().collect(Collectors.toList());
+		Assert.assertEquals("Count", 283, sequences.size());
+
+		ProteinSequence sequence;
+		sequence = sequences.get(0);
+		Assert.assertEquals("A2D504_ATEGE/1-46", sequence.getOriginalHeader());
+		sequence = sequences.get(sequences.size()-1);
+		Assert.assertEquals("Q98SJ1_CHICK/15-61", sequence.getOriginalHeader());
+
+		sequences = FastaStreamer.from(path)
+				.batchSize(2) // Ensure there isn't an edge condition loading the next buffer
+				.stream()
+				.collect(Collectors.toList());
+		Assert.assertEquals("Count", 283, sequences.size());
+	}
+}
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/MagicNumberTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/MagicNumberTest.java
new file mode 100644
index 0000000000..eed6ae7611
--- /dev/null
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/MagicNumberTest.java
@@ -0,0 +1,22 @@
+package org.biojava.nbio.core.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class MagicNumberTest {
+
+	@Test
+	public void gzip() throws IOException {
+		String file = this.getClass().getResource("example.gz").getFile();
+		Path path = Paths.get(file);
+		Assert.assertTrue("GZIP file", MagicNumber.isGZIP(path));
+
+		file = this.getClass().getResource("build.xml").getFile();
+		path = Paths.get(file);
+		Assert.assertFalse("Not a GZIP file", MagicNumber.isGZIP(path));
+	}
+}
diff --git a/biojava-core/src/test/resources/org/biojava/nbio/core/util/example.gz b/biojava-core/src/test/resources/org/biojava/nbio/core/util/example.gz
new file mode 100644
index 0000000000000000000000000000000000000000..0864558ee236c78ac01f1334a951d44fae728c9a
GIT binary patch
literal 54
zcmb2|=HQsLV^Jytb81CmZb42e1GlHH-pMoG;RXGlcmh87`keO(`=EW+*Gu;i6N7*m
K+gm9H1_l5iOA`wK

literal 0
HcmV?d00001


From fd3be7e9f1e3c177fbef509bfd3e795bf8969de8 Mon Sep 17 00:00:00 2001
From: Gary Murphy <glm@hilbertinc.com>
Date: Sat, 13 Jan 2024 10:50:10 -0600
Subject: [PATCH 457/599] Removed the MagicNumber class after finding
 InputStreamProvider

---
 .../nbio/core/sequence/io/FastaStreamer.java  |   9 ++--
 .../biojava/nbio/core/util/MagicNumber.java   |  39 ------------------
 .../nbio/core/util/MagicNumberTest.java       |  22 ----------
 .../core/sequence/io/PF00104_small.fasta.gz   | Bin 0 -> 31036 bytes
 4 files changed, 3 insertions(+), 67 deletions(-)
 delete mode 100644 biojava-core/src/main/java/org/biojava/nbio/core/util/MagicNumber.java
 delete mode 100644 biojava-core/src/test/java/org/biojava/nbio/core/util/MagicNumberTest.java
 create mode 100644 biojava-core/src/test/resources/org/biojava/nbio/core/sequence/io/PF00104_small.fasta.gz

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
index febf747a36..f0c15c7a9e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
@@ -5,14 +5,12 @@
 import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
 import org.biojava.nbio.core.sequence.io.template.SequenceCreatorInterface;
 import org.biojava.nbio.core.sequence.io.template.SequenceHeaderParserInterface;
-import org.biojava.nbio.core.util.MagicNumber;
+import org.biojava.nbio.core.util.InputStreamProvider;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -23,7 +21,6 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-import java.util.zip.GZIPInputStream;
 
 public class FastaStreamer {
 
@@ -73,8 +70,8 @@ public FastaStreamer batchSize(int size) {
 	 * @throws IOException if there is an error opening the file
 	 */
 	public Stream<ProteinSequence> stream() throws IOException {
-		InputStream rawInput = Files.newInputStream(getPath(), StandardOpenOption.READ);
-		InputStream input = MagicNumber.isGZIP(getPath()) ? new GZIPInputStream(rawInput) : rawInput;
+		InputStreamProvider provider = new InputStreamProvider();
+		InputStream input = provider.getInputStream(getPath().toFile());
 		FastaReader<ProteinSequence, AminoAcidCompound> reader = new FastaReader<>(input, getHeaderParser(), getSequenceCreator());
 		Spliterator<ProteinSequence> source = new Spliterators.AbstractSpliterator<>(Integer.MAX_VALUE, Spliterator.IMMUTABLE | Spliterator.NONNULL) {
 			@Override
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/MagicNumber.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/MagicNumber.java
deleted file mode 100644
index 9c6765b354..0000000000
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/MagicNumber.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.biojava.nbio.core.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-
-/**
- * The 'magic number' is a sequence of bytes that the beginning of a file that can be used to determine the
- * file type
- *
- * @since 7.0.3
- * @author Gary Murphy
- */
-public class MagicNumber {
-
-	/**
-	 * The magic number of a gzip file is 0x1F8B. (ref: https://en.wikipedia.org/wiki/Gzip#:~:text=%22gzip%22%20is%20often%20also%20used,and%20the%20operating%20system%20ID.)
-	 * @param path the path to the file
-	 * @return <code>true</code> if the file has the gzip magic number
-	 * @throws IOException if there is an error reading the start of the file
-	 */
-	public static boolean isGZIP(Path path) throws IOException {
-		try (
-				InputStream input = Files.newInputStream(path, StandardOpenOption.READ)
-		) {
-			byte[] magic = new byte[2];
-			int count = input.read(magic);
-			if (count != 2) {
-				return false;
-			}
-			int id = (int)magic[0] & 0x00ff;
-			id <<= 8;
-			id += (int)magic[1] & 0x00ff;
-			return (id == 0x1f8b);
-		}
-	}
-}
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/MagicNumberTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/MagicNumberTest.java
deleted file mode 100644
index eed6ae7611..0000000000
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/MagicNumberTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.biojava.nbio.core.util;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-public class MagicNumberTest {
-
-	@Test
-	public void gzip() throws IOException {
-		String file = this.getClass().getResource("example.gz").getFile();
-		Path path = Paths.get(file);
-		Assert.assertTrue("GZIP file", MagicNumber.isGZIP(path));
-
-		file = this.getClass().getResource("build.xml").getFile();
-		path = Paths.get(file);
-		Assert.assertFalse("Not a GZIP file", MagicNumber.isGZIP(path));
-	}
-}
diff --git a/biojava-core/src/test/resources/org/biojava/nbio/core/sequence/io/PF00104_small.fasta.gz b/biojava-core/src/test/resources/org/biojava/nbio/core/sequence/io/PF00104_small.fasta.gz
new file mode 100644
index 0000000000000000000000000000000000000000..d4a340c73d7c9684bb281e06ca52bc6228403414
GIT binary patch
literal 31036
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
HRiFX@f9c@5

literal 0
HcmV?d00001


From ef665e26ce560ac2c14af46535e250f61336d84b Mon Sep 17 00:00:00 2001
From: Gary Murphy <glm@hilbertinc.com>
Date: Sun, 14 Jan 2024 07:37:34 -0600
Subject: [PATCH 458/599] Added comments

---
 .../org/biojava/nbio/core/sequence/io/FastaStreamer.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
index f0c15c7a9e..0311bddc2b 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
@@ -22,6 +22,13 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+/**
+ * Read from a FASTA file (or gzipped FASTA file) and create a Java stream of {@link ProteinSequence} objects
+ * for use in a functional programming paradigm.
+ *
+ * @author Gary Murphy
+ * @since 7.0.3
+ */
 public class FastaStreamer {
 
 	private final Path path;
@@ -123,7 +130,7 @@ private ProteinSequence next(FastaReader<ProteinSequence, AminoAcidCompound> rea
 
 	/**
 	 * Create the sequence with the information from the header.  This implementation return the sequence as-is, but
-	 * this is an opportunity for the implementer to build specifc information into the user collection space
+	 * this is an opportunity for the implementer to build specific information into the user collection space
 	 * of the sequence
 	 *
 	 * @param header the original header

From 26b21d7c4c47f6020fa0a6950778b1046e301336 Mon Sep 17 00:00:00 2001
From: Gary Murphy <glm@hilbertinc.com>
Date: Sun, 14 Jan 2024 09:40:58 -0600
Subject: [PATCH 459/599] Added access to the iterable

---
 .../nbio/core/sequence/io/FastaStreamer.java  | 26 ++++++++++++++++---
 .../core/sequence/io/FastaStreamerTest.java   | 11 ++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
index 0311bddc2b..803287cb90 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
@@ -71,14 +71,34 @@ public FastaStreamer batchSize(int size) {
 		return this;
 	}
 
+	/**
+	 * Enable iteration through the proteins in the file using syntax such as:
+	 * <pre>
+	 *     for(ProteinSequence sequence : FastaStreamer.from(path).each()) {
+	 *         .
+	 *         .
+	 *         .
+	 *     }
+	 * </pre>
+	 *
+	 * @return an iterable suitable for an iteration loop
+	 */
+	public Iterable<ProteinSequence> each() {
+		return () -> stream().iterator();
+	}
+
 	/**
 	 * Create a stream of protein sequences from the contents of the path
 	 * @return the stream
-	 * @throws IOException if there is an error opening the file
 	 */
-	public Stream<ProteinSequence> stream() throws IOException {
+	public Stream<ProteinSequence> stream() {
 		InputStreamProvider provider = new InputStreamProvider();
-		InputStream input = provider.getInputStream(getPath().toFile());
+		InputStream input;
+		try {
+			input = provider.getInputStream(getPath().toFile());
+		} catch (IOException exception) {
+			throw new RuntimeException(exception);
+		}
 		FastaReader<ProteinSequence, AminoAcidCompound> reader = new FastaReader<>(input, getHeaderParser(), getSequenceCreator());
 		Spliterator<ProteinSequence> source = new Spliterators.AbstractSpliterator<>(Integer.MAX_VALUE, Spliterator.IMMUTABLE | Spliterator.NONNULL) {
 			@Override
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaStreamerTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaStreamerTest.java
index f17ba93de1..614c6f06c8 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaStreamerTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaStreamerTest.java
@@ -36,4 +36,15 @@ public void stream() throws IOException {
 				.collect(Collectors.toList());
 		Assert.assertEquals("Count", 283, sequences.size());
 	}
+
+	@Test
+	public void iterate() {
+		String file = this.getClass().getResource("PF00104_small.fasta.gz").getFile();
+		Path path = Paths.get(file);
+		int count = 0;
+		for (ProteinSequence sequence : FastaStreamer.from(path).each()) {
+			count++;
+		}
+		Assert.assertEquals("Count", 283, count);
+	}
 }

From 21751a7d32c6687f196cb7384c2c74022e9aae97 Mon Sep 17 00:00:00 2001
From: Michael L Heuer <heuermh@acm.org>
Date: Tue, 16 Jan 2024 11:13:44 -0600
Subject: [PATCH 460/599] Update guava dependency version to 33.0.0-jre.

---
 biojava-genome/pom.xml | 1 -
 pom.xml                | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 2b213d7de5..61599d5a55 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -61,7 +61,6 @@
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<scope>compile</scope>
-			<version>32.0.1-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index 1b079ca711..eba9fbff44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -472,6 +472,11 @@
 				<version>4.0.3</version>
 				<scope>runtime</scope>
 			</dependency>
+			<dependency>
+				<groupId>com.google.guava</groupId>
+				<artifactId>guava</artifactId>
+				<version>33.0.0-jre</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

From d081b125792b8d07c4eb37f3dfc8d4575aef2335 Mon Sep 17 00:00:00 2001
From: Gary Murphy <glm@hilbertinc.com>
Date: Fri, 26 Jan 2024 07:14:06 -0600
Subject: [PATCH 461/599] Changed the version to 7.1.0-SNAPSHOT. Made changes
 per review.

---
 biojava-aa-prop/pom.xml                                |  6 +++---
 biojava-alignment/pom.xml                              |  4 ++--
 biojava-core/pom.xml                                   |  2 +-
 .../biojava/nbio/core/sequence/io/FastaStreamer.java   | 10 +++++-----
 biojava-genome/pom.xml                                 |  6 +++---
 biojava-integrationtest/pom.xml                        |  4 ++--
 biojava-modfinder/pom.xml                              |  4 ++--
 biojava-ontology/pom.xml                               |  2 +-
 biojava-protein-comparison-tool/pom.xml                | 10 +++++-----
 biojava-protein-disorder/pom.xml                       |  4 ++--
 biojava-structure-gui/pom.xml                          |  6 +++---
 biojava-structure/pom.xml                              |  6 +++---
 biojava-survival/pom.xml                               |  2 +-
 biojava-ws/pom.xml                                     |  4 ++--
 pom.xml                                                |  2 +-
 15 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 908f2d28c2..84fdbf3a7e 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>7.1.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 002fbb6b0b..6ce294e7e3 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>7.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index fb44bbadd3..b0e4fa55c0 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>7.1.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
index 803287cb90..601c1226ec 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
@@ -10,6 +10,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.Iterator;
@@ -27,7 +28,7 @@
  * for use in a functional programming paradigm.
  *
  * @author Gary Murphy
- * @since 7.0.3
+ * @since 7.1.0
  */
 public class FastaStreamer {
 
@@ -135,12 +136,12 @@ private ProteinSequence next(FastaReader<ProteinSequence, AminoAcidCompound> rea
 					}
 					if (iterator.hasNext()) {
 						Map.Entry<String, ProteinSequence> entry = iterator.next();
-						return createSequence(entry.getKey(), entry.getValue());
+						return createSequence(entry.getValue());
 					}
 					closed = true;
 					reader.close();
 				} catch (IOException exception) {
-					throw new RuntimeException(String.format("I/O error reading the FASTA file from '%s'", getPath()));
+					throw new UncheckedIOException(String.format("I/O error reading the FASTA file from '%s'", getPath()), exception);
 				}
 				return null;
 			}
@@ -153,11 +154,10 @@ private ProteinSequence next(FastaReader<ProteinSequence, AminoAcidCompound> rea
 	 * this is an opportunity for the implementer to build specific information into the user collection space
 	 * of the sequence
 	 *
-	 * @param header the original header
 	 * @param sequence the protein sequence
 	 * @return the sequence
 	 */
-	protected ProteinSequence createSequence(String header, ProteinSequence sequence) {
+	protected ProteinSequence createSequence(ProteinSequence sequence) {
 		return sequence;
 	}
 
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 2b213d7de5..f0d8e13c2f 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>7.1.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -71,13 +71,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index d02011571c..cee137b4c1 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.0.3-SNAPSHOT</version>
+    <version>7.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.0.3-SNAPSHOT</version>
+    	<version>7.1.0-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index ff8771babc..a7e07100c4 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>7.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 1fb8967489..e4b3c3cdf2 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.0.3-SNAPSHOT</version>
+    <version>7.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 36d3ec3b2b..dd4b460858 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>7.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index c86173990f..67548aca4a 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>7.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 8b3522352b..3cc7cbe005 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>7.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index bd779d4ba0..8afe66b114 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>7.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 61bcb2369f..c9c0c60a55 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.0.3-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 86cf1004f9..258814c27d 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.0.3-SNAPSHOT</version>
+		<version>7.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.0.3-SNAPSHOT</version>
+			<version>7.1.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 1b079ca711..efcddb8feb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.0.3-SNAPSHOT</version>
+	<version>7.1.0-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the

From 2d1f32ea7a04ca92ca6b26a2e1381d0d44e61a01 Mon Sep 17 00:00:00 2001
From: Gary Murphy <glm@hilbertinc.com>
Date: Fri, 26 Jan 2024 07:16:51 -0600
Subject: [PATCH 462/599] Missed a RuntimeException.  Changed to
 UncheckedIOException

---
 .../java/org/biojava/nbio/core/sequence/io/FastaStreamer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
index 601c1226ec..c9184dfd13 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
@@ -98,7 +98,7 @@ public Stream<ProteinSequence> stream() {
 		try {
 			input = provider.getInputStream(getPath().toFile());
 		} catch (IOException exception) {
-			throw new RuntimeException(exception);
+			throw new UncheckedIOException(exception);
 		}
 		FastaReader<ProteinSequence, AminoAcidCompound> reader = new FastaReader<>(input, getHeaderParser(), getSequenceCreator());
 		Spliterator<ProteinSequence> source = new Spliterators.AbstractSpliterator<>(Integer.MAX_VALUE, Spliterator.IMMUTABLE | Spliterator.NONNULL) {

From 84998b92ab0ba0b57a378d47d93e1451d5827d2e Mon Sep 17 00:00:00 2001
From: Gary Murphy <glm@hilbertinc.com>
Date: Tue, 30 Jan 2024 07:19:52 -0600
Subject: [PATCH 463/599] Added an entry to the changelog for FastaStreamer

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47ae621112..c615c97558 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 BioJava Changelog
 -----------------
 
+BioJava 7.1.0 - future release
+==============================
+### Added
+* Class `FastaStreamer` to read FASTA-formatted files using Java streams
+
+
 BioJava 7.0.2
 ==============================
 ### Added

From 41a6e4b7617598f0a9c32555de1fbb0c34bee66d Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 23 Feb 2024 11:22:47 -0800
Subject: [PATCH 464/599] Updating changelog in preparation for release

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c615c97558..b624dcc06c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,17 @@
 BioJava Changelog
 -----------------
 
-BioJava 7.1.0 - future release
+BioJava 7.1.0
 ==============================
 ### Added
 * Class `FastaStreamer` to read FASTA-formatted files using Java streams
 
+### Fixed
+* Various minor fixes for code smells
+* Some dependency upgrades
+* Now using Jakarta as the JAXB implementation #1076 
+* Fixed SCOP URL #1077
+
 
 BioJava 7.0.2
 ==============================

From 1b6159d36a0e239dee45e0ee7ad52c6c490d3760 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 23 Feb 2024 11:32:49 -0800
Subject: [PATCH 465/599] [maven-release-plugin] prepare release biojava-7.1.0

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 84fdbf3a7e..1fe02a561c 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>7.1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 6ce294e7e3..3da45a62ea 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>7.1.0</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index b0e4fa55c0..ac4ac5948e 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>7.1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index d699a13479..8f12e9a9d5 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>7.1.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index cee137b4c1..2e17402192 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.0-SNAPSHOT</version>
+    	<version>7.1.0</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index a7e07100c4..eb5da669d0 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>7.1.0</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index e4b3c3cdf2..3f806dda6a 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index dd4b460858..ff6d7ab74f 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>7.1.0</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 67548aca4a..47e2ad4a8a 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>7.1.0</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 3cc7cbe005..2ee6613e41 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>7.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 8afe66b114..8a898b15bb 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>7.1.0</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index c9c0c60a55..4566456b19 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.1.0</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 258814c27d..a5c5659eaf 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0-SNAPSHOT</version>
+		<version>7.1.0</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0-SNAPSHOT</version>
+			<version>7.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 78302d2ef4..c7ad298bf1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.0-SNAPSHOT</version>
+	<version>7.1.0</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.1.0</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From bf0cfe68574af8debc897b63c35a1b3d9ae375d3 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 23 Feb 2024 11:32:53 -0800
Subject: [PATCH 466/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 1fe02a561c..b6ef35131f 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0</version>
+		<version>7.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 3da45a62ea..fe34a3dd31 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0</version>
+		<version>7.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index ac4ac5948e..d824f778f5 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0</version>
+		<version>7.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 8f12e9a9d5..0dfc13e4bb 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0</version>
+		<version>7.1.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 2e17402192..f0933aeab4 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.0</version>
+    <version>7.1.1-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.0</version>
+    	<version>7.1.1-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index eb5da669d0..302a5f7c4c 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0</version>
+		<version>7.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 3f806dda6a..f80a56524d 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.0</version>
+    <version>7.1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index ff6d7ab74f..94e8aa7267 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0</version>
+		<version>7.1.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 47e2ad4a8a..b67201a13a 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0</version>
+		<version>7.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 2ee6613e41..50b5d7b714 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.0</version>
+		<version>7.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 8a898b15bb..0afe0b933d 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0</version>
+		<version>7.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 4566456b19..0ca51bcba3 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.0</version>
+        <version>7.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index a5c5659eaf..8bd8d61ea1 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.0</version>
+		<version>7.1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.0</version>
+			<version>7.1.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index c7ad298bf1..3f94bfbecb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.0</version>
+	<version>7.1.1-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.1.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From ab17e62725ba842e404db0dd2a451cacbcdcb980 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 23 Feb 2024 11:48:16 -0800
Subject: [PATCH 467/599] Updating after release

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7f39c65623..c7ab3d0e12 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-7.0.2-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.0.2) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-7.1.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.1.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>7.0.2</version>
+        <version>7.1.0</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From ac75f31259e94a6d9d417e7faa2eaf2598c56f1a Mon Sep 17 00:00:00 2001
From: jlerbsc <jean-pierre.lerbscher@jperf.com>
Date: Mon, 26 Feb 2024 16:42:40 +0100
Subject: [PATCH 468/599] fix: issue #1081 Sonar S1132 Strings literals should
 be placed on the left side when checking for equality

---
 .../nbio/aaproperties/CommandPrompt.java      |   4 +-
 .../alignment/io/StockholmFileParser.java     |   2 +-
 .../nbio/alignment/io/StockholmStructure.java |   4 +-
 .../alignment/matrices/AAIndexFileParser.java |   2 +-
 .../nbio/core/sequence/io/ABITrace.java       |  18 +-
 .../sequence/io/GenbankSequenceParser.java    |  22 +-
 .../sequence/io/GenericFastaHeaderParser.java |  30 +--
 .../nbio/core/sequence/io/IUPACParser.java    |  12 +-
 .../core/sequence/io/embl/EmblReader.java     |  58 ++---
 .../core/sequence/location/InsdcParser.java   |  14 +-
 .../nbio/core/util/InputStreamProvider.java   |   4 +-
 .../homology/GFF3FromUniprotBlastHits.java    |   6 +-
 .../GeneChromosomePositionParser.java         |   2 +-
 .../parsers/genename/GeneNamesParser.java     |   2 +-
 .../org/biojava/nbio/phosphosite/Dataset.java |   2 +-
 .../protmod/io/ComponentXMLConverter.java     |   4 +-
 .../io/ModifiedCompoundXMLConverter.java      |   6 +-
 .../io/ProteinModificationXmlReader.java      |  12 +-
 .../protmod/io/StructureAtomXMLConverter.java |   4 +-
 .../io/StructureGroupXMLConverter.java        |   2 +-
 .../ProteinModificationIdentifier.java        |   4 +-
 .../nbio/protmod/structure/StructureUtil.java |   4 +-
 .../biojava/nbio/ontology/io/GOParser.java    |   8 +-
 .../nbio/ontology/obo/OboFileParser.java      |  10 +-
 .../nbio/structure/align/gui/MenuCreator.java |   6 +-
 .../align/gui/MyOpenPdbFileListener.java      |   2 +-
 .../structure/align/gui/ParameterGUI.java     |   4 +-
 .../align/gui/ShowPDBIDListener.java          |   2 +-
 .../align/gui/aligpanel/AligPanel.java        |   2 +-
 .../align/gui/autosuggest/JAutoSuggest.java   |   8 +-
 .../structure/align/gui/jmol/AtomInfo.java    |   8 +-
 .../structure/align/gui/jmol/JmolPanel.java   |  28 +--
 .../structure/align/gui/jmol/JmolTools.java   |   8 +-
 .../align/gui/jmol/RasmolCommandListener.java |   2 +-
 .../align/webstart/ConfigXMLHandler.java      |   4 +-
 .../align/webstart/WebStartMain.java          |  32 +--
 .../events/JmolAlignedPositionListener.java   |   4 +-
 .../nbio/structure/gui/util/MenuCreator.java  |   8 +-
 .../structure/gui/util/PDBUploadPanel.java    |   2 +-
 .../structure/gui/util/ScopSelectPanel.java   |   2 +-
 .../symmetry/gui/SymmetryListener.java        |  12 +-
 .../JmolSymmetryScriptGenerator.java          |  10 +-
 .../JmolSymmetryScriptGeneratorCn.java        |   6 +-
 .../JmolSymmetryScriptGeneratorDn.java        |   4 +-
 ...JmolSymmetryScriptGeneratorPointGroup.java |  14 +-
 .../java/demo/DemoChangeChemCompProvider.java |   2 +-
 .../org/biojava/nbio/structure/ChainImpl.java |   4 +-
 .../org/biojava/nbio/structure/DBRef.java     |   4 +-
 .../biojava/nbio/structure/HetatomImpl.java   |   2 +-
 .../nbio/structure/JournalArticle.java        |   8 +-
 .../org/biojava/nbio/structure/PDBHeader.java |  10 +-
 .../org/biojava/nbio/structure/PDBStatus.java |   6 +-
 .../nbio/structure/ResidueRangeAndLength.java |   2 +-
 .../structure/SubstructureIdentifier.java     |   2 +-
 .../ce/AbstractUserArgumentProcessor.java     |  10 +-
 .../structure/align/client/StructureName.java |   8 +-
 .../align/pairwise/AlternativeAlignment.java  |   4 +-
 .../nbio/structure/align/util/CliTools.java   |   4 +-
 .../align/xml/AFPChainXMLParser.java          |  10 +-
 .../align/xml/MultipleAlignmentXMLParser.java |  28 +--
 .../nbio/structure/asa/AsaCalculator.java     |  20 +-
 .../nbio/structure/cath/CathCategory.java     |  16 +-
 .../nbio/structure/cath/CathDomain.java       |   2 +-
 .../nbio/structure/cath/CathInstallation.java |   8 +-
 .../biojava/nbio/structure/chem/ChemComp.java |   4 +-
 .../structure/chem/ChemCompGroupFactory.java  |   6 +-
 .../nbio/structure/chem/ChemCompTools.java    |   4 +-
 .../chem/ChemicalComponentDictionary.java     |   4 +-
 .../chem/DownloadChemCompProvider.java        |   2 +-
 .../structure/chem/ZipChemCompProvider.java   |   2 +-
 .../nbio/structure/ecod/EcodInstallation.java |   4 +-
 .../biojava/nbio/structure/io/BondMaker.java  |   8 +-
 .../nbio/structure/io/EntityFinder.java       |   4 +-
 .../nbio/structure/io/PDBFileParser.java      | 222 +++++++++---------
 .../biojava/nbio/structure/io/SSBondImpl.java |   4 +-
 .../nbio/structure/io/SeqRes2AtomAligner.java |   2 +-
 .../io/cif/CifStructureConsumerImpl.java      |   8 +-
 .../structure/io/sifts/SiftsXMLParser.java    |   4 +-
 .../BiologicalAssemblyTransformation.java     |   4 +-
 .../nbio/structure/scop/ScopCategory.java     |  12 +-
 .../nbio/structure/scop/ScopInstallation.java |   2 +-
 .../nbio/structure/secstruc/DSSPParser.java   |  14 +-
 .../nbio/structure/secstruc/SecStrucCalc.java |   4 +-
 .../structure/symmetry/axis/AxisAligner.java  |   2 +-
 .../symmetry/axis/RotationAxisAligner.java    |  18 +-
 .../symmetry/core/QuatSymmetryDetector.java   |  10 +-
 .../symmetry/internal/CeSymmResult.java       |   2 +-
 .../nbio/structure/xtal/SpaceGroup.java       |   8 +-
 .../nbio/structure/xtal/SymoplibParser.java   |   2 +-
 .../biojava/nbio/survival/data/WorkSheet.java |   8 +-
 .../kaplanmeier/figure/CensorStatus.java      |   2 +-
 .../figure/NumbersAtRiskPanel.java            |   2 +-
 .../qblast/NCBIQBlastAlignmentProperties.java |   2 +-
 93 files changed, 462 insertions(+), 462 deletions(-)

diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/CommandPrompt.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/CommandPrompt.java
index 7db641ade9..aa3c5cdd5b 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/CommandPrompt.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/CommandPrompt.java
@@ -116,8 +116,8 @@ public static void run(String[] args) throws Exception{
 				case 'o': outputLocation = args[++i]; break;
 				case 'f':
 					i++;
-					if(args[i].equalsIgnoreCase("csv")) delimiter = ",";
-					else if(args[i].equalsIgnoreCase("tsv")) delimiter = "\t";
+					if("csv".equalsIgnoreCase(args[i])) delimiter = ",";
+					else if("tsv".equalsIgnoreCase(args[i])) delimiter = "\t";
 					else throw new Error("Invalid value for -f: " + args[i] + ". Please choose either csv or tsv only.");
 					break;
 				case 'x': aminoAcidCompositionLocation = args[++i]; break;
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java
index 9af9731c28..2d19a5e8df 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java
@@ -471,7 +471,7 @@ StockholmStructure parse(Scanner scanner) throws IOException {
 					this.stockholmStructure = new StockholmStructure();
 					this.stockholmStructure.getFileAnnotation().setFormat(header[1]);
 					this.stockholmStructure.getFileAnnotation().setVersion(header[2]);
-				} else if (line.trim().equals("//")) {
+				} else if ("//".equals(line.trim())) {
 					// status = STATUS_OUTSIDE_FILE;
 					break;// should we just break immediately or jump next empty lines?
 				} else /* if (!line.startsWith("#")) */{
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
index 22783b43c2..8e9380ec06 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
@@ -256,8 +256,8 @@ else if (forcedSequenceType.equals(PFAM))
 			}
 			String[] seqDetails = splitSeqName(sequencename);
 			seq.setDescription(seqDetails[0]);
-			seq.setBioBegin((seqDetails[1] == null || seqDetails[1].trim().equals("") ? null : Integer.valueOf(seqDetails[1])));
-			seq.setBioEnd((seqDetails[2] == null || seqDetails[2].trim().equals("") ? null : Integer.valueOf(seqDetails[2])));
+			seq.setBioBegin((seqDetails[1] == null || "".equals(seqDetails[1].trim()) ? null : Integer.valueOf(seqDetails[1])));
+			seq.setBioEnd((seqDetails[2] == null || "".equals(seqDetails[2].trim()) ? null : Integer.valueOf(seqDetails[2])));
 
 			seqs.add(seq);
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexFileParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexFileParser.java
index 843014c685..82c8abe914 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexFileParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexFileParser.java
@@ -107,7 +107,7 @@ private void processScores(String line) {
 			}
 
 			// special case: MEHP950101
-			if (values[i].equals("-")) {
+			if ("-".equals(values[i])) {
 				values[i] = "0";
 			}
 			if ( scale == -1 ) {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ABITrace.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ABITrace.java
index 552661bbda..ea6f9abe1c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ABITrace.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ABITrace.java
@@ -191,13 +191,13 @@ public AbstractSequence<NucleotideCompound> getSequence() throws CompoundNotFoun
 	 * @throws CompoundNotFoundException if the base is not valid
 	 */
 	public int[] getTrace (String base) throws CompoundNotFoundException {
-		if (base.equals("A")) {
+		if ("A".equals(base)) {
 			return A;
-		} else if (base.equals("C")) {
+		} else if ("C".equals(base)) {
 			return C;
-		} else if (base.equals("G")) {
+		} else if ("G".equals(base)) {
 			return G;
-		} else if (base.equals("T")) {
+		} else if ("T".equals(base)) {
 			return T;
 		} else {
 			throw new CompoundNotFoundException("Don't know base: " + base);
@@ -492,9 +492,9 @@ private void setIndex() {
 		for (int record = 0; record <= NumRecords - 1; record++) {
 			getSubArray(RecNameArray, (indexBase + (record * 28)));
 			RecName = new String(RecNameArray);
-			if (RecName.equals("FWO_"))
+			if ("FWO_".equals(RecName))
 				FWO = indexBase + (record * 28) + 20;
-			if (RecName.equals("DATA")) {
+			if ("DATA".equals(RecName)) {
 				++DataCounter;
 				if (DataCounter == 9)
 					DATA9 = indexBase + (record * 28) + 20;
@@ -505,17 +505,17 @@ private void setIndex() {
 				if (DataCounter == 12)
 					DATA12 = indexBase + (record * 28) + 20;
 			}
-			if (RecName.equals("PBAS")) {
+			if ("PBAS".equals(RecName)) {
 				++PBASCounter;
 				if (PBASCounter == 2)
 					PBAS2 = indexBase + (record * 28) + 20;
 			}
-			if (RecName.equals("PLOC")) {
+			if ("PLOC".equals(RecName)) {
 				++PLOCCounter;
 				if (PLOCCounter == 2)
 					PLOC = indexBase + (record * 28) + 20;
 			}
-			if (RecName.equals("PCON")) {
+			if ("PCON".equals(RecName)) {
 				++PCONCounter;
 				if (PCONCounter == 2)
 					PCON = indexBase + (record * 28) + 20;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
index 2673d9af75..62847e7456 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
@@ -145,7 +145,7 @@ private String parse(BufferedReader bufferedReader) {
 			sectionKey = section.get(0)[0];
 			if (sectionKey == null) {
 				//if we reach the end of the file, section contains empty strings
-				if(section.get(0)[1]==null || section.get(0)[1].equals("") ||
+				if(section.get(0)[1]==null || "".equals(section.get(0)[1]) ||
 						section.get(0)[1].length()==0) {
 					throw new ParserException(Messages.ENDOFFILE);
 				}
@@ -208,7 +208,7 @@ private void parseFeatureTag(List<String[]> section) {
 					needsQuotes = true; // as the value has quotes then set that it needs quotes when written back out
 				}
 				// parameter on old feature
-				if (key.equals("db_xref")) {
+				if ("db_xref".equals(key)) {
 					Matcher m = dbxp.matcher(val);
 					if (m.matches()) {
 						String dbname = m.group(1);
@@ -223,12 +223,12 @@ private void parseFeatureTag(List<String[]> section) {
 					} else {
 						throw new ParserException("Bad dbxref");
 					}
-				} else if (key.equalsIgnoreCase("organism")) {
+				} else if ("organism".equalsIgnoreCase(key)) {
 					Qualifier q = new Qualifier(key, val.replace('\n', ' '), needsQuotes);
 					gbFeature.addQualifier(key, q);
 				} else {
-					if (key.equalsIgnoreCase("translation") || key.equals("anticodon")
-							|| key.equals("transl_except")) {
+					if ("translation".equalsIgnoreCase(key) || "anticodon".equals(key)
+							|| "transl_except".equals(key)) {
 						// strip spaces from sequence
 						val = val.replaceAll("\\s+", "");
 						Qualifier q = new Qualifier(key, val, needsQuotes);
@@ -319,9 +319,9 @@ private void parseLocusTag(List<String[]> section) {
 			String lengthUnits = m.group(3);
 			String type = m.group(6);
 
-			if (lengthUnits.equalsIgnoreCase("aa")) {
+			if ("aa".equalsIgnoreCase(lengthUnits)) {
 				compoundType = AminoAcidCompoundSet.getAminoAcidCompoundSet();
-			} else if (lengthUnits.equalsIgnoreCase("bp")) {
+			} else if ("bp".equalsIgnoreCase(lengthUnits)) {
 				if (type != null) {
 					if (type.contains("RNA")) {
 						compoundType = RNACompoundSet.getRNACompoundSet();
@@ -333,7 +333,7 @@ private void parseLocusTag(List<String[]> section) {
 				}
 			}
 
-			if (m.group(7) != null) isCircularSequence = m.group(7).equalsIgnoreCase("circular");
+			if (m.group(7) != null) isCircularSequence = "circular".equalsIgnoreCase(m.group(7));
 
 			// configure location parser with needed information
 			locationParser.setSequenceLength(sequenceLength);
@@ -349,9 +349,9 @@ private void parseLocusTag(List<String[]> section) {
 			String lengthUnits = m2.group(2);
 			String type = m2.group(5);
 
-			if (lengthUnits.equalsIgnoreCase("aa")) {
+			if ("aa".equalsIgnoreCase(lengthUnits)) {
 				compoundType = AminoAcidCompoundSet.getAminoAcidCompoundSet();
-			} else if (lengthUnits.equalsIgnoreCase("bp")) {
+			} else if ("bp".equalsIgnoreCase(lengthUnits)) {
 				if (type != null) {
 					if (type.contains("RNA")) {
 						compoundType = RNACompoundSet.getRNACompoundSet();
@@ -363,7 +363,7 @@ private void parseLocusTag(List<String[]> section) {
 				}
 			}
 
-			if (m2.group(6) != null) isCircularSequence = m2.group(6).equalsIgnoreCase("circular");
+			if (m2.group(6) != null) isCircularSequence = "circular".equalsIgnoreCase(m2.group(6));
 
 			// configure location parser with needed information
 			locationParser.setSequenceLength(sequenceLength);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
index aa7c17bbd7..9acaf1d25c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
@@ -116,8 +116,8 @@ public void parseHeader(String header, S sequence) {
 
 		if (data.length == 1) {
 			sequence.setAccession(new AccessionID(data[0]));
-		} else  if (data[0].equalsIgnoreCase("sp") || data[0].equalsIgnoreCase("tr")) {
-			if (data[0].equalsIgnoreCase("sp")) {
+		} else  if ("sp".equalsIgnoreCase(data[0]) || "tr".equalsIgnoreCase(data[0])) {
+			if ("sp".equalsIgnoreCase(data[0])) {
 				sequence.setAnnotationType(AnnotationType.CURATED);
 			} else {
 				sequence.setAnnotationType(AnnotationType.PREDICTED);
@@ -128,41 +128,41 @@ public void parseHeader(String header, S sequence) {
 				sequence.setDescription(data[2]);
 			}
 
-		} else if (data[0].equalsIgnoreCase("gi")) {
+		} else if ("gi".equalsIgnoreCase(data[0])) {
 			DataSource giSource = DataSource.UNKNOWN;
 			if (data.length >= 3) {
-				if (data[2].equalsIgnoreCase("gb")) {
+				if ("gb".equalsIgnoreCase(data[2])) {
 					giSource = DataSource.GENBANK;
-				} else if (data[2].equalsIgnoreCase("emb")) {
+				} else if ("emb".equalsIgnoreCase(data[2])) {
 					giSource = DataSource.ENA;
-				} else if (data[2].equalsIgnoreCase("dbj")) {
+				} else if ("dbj".equalsIgnoreCase(data[2])) {
 					giSource = DataSource.DDBJ;
 				}
 				sequence.setAccession(new AccessionID(data[3], giSource));
 			} else {
 				sequence.setAccession(new AccessionID(header, giSource));
 			}
-		} else if (data[0].equalsIgnoreCase("pir")) {
+		} else if ("pir".equalsIgnoreCase(data[0])) {
 			sequence.setAccession(new AccessionID(data[2], DataSource.NBRF));
-		} else if (data[0].equalsIgnoreCase("prf")) {
+		} else if ("prf".equalsIgnoreCase(data[0])) {
 			sequence.setAccession(new AccessionID(data[2], DataSource.PRF));
-		} else if (data[0].equalsIgnoreCase("pdb")) {
+		} else if ("pdb".equalsIgnoreCase(data[0])) {
 			sequence.setAccession(new AccessionID(data[1] + ":" + data[2], DataSource.PDB1));
 		} else if (data[0].startsWith("PDB")) {
 			String[] pdbe = data[0].split(" ");
 			String[] pdbaccession = pdbe[0].split(":");
 			sequence.setAccession(new AccessionID(pdbaccession[1], DataSource.PDBe));
-		} else if (data[0].indexOf(":") != -1 && data.length > 1 && data[1].equals("PDBID")) {
+		} else if (data[0].indexOf(":") != -1 && data.length > 1 && "PDBID".equals(data[1])) {
 			sequence.setAccession(new AccessionID(data[0], DataSource.PDB2));
-		} else if (data[0].equalsIgnoreCase("pat")) {
+		} else if ("pat".equalsIgnoreCase(data[0])) {
 			sequence.setAccession(new AccessionID(data[2], DataSource.PATENTS));
-		} else if (data[0].equalsIgnoreCase("bbs")) {
+		} else if ("bbs".equalsIgnoreCase(data[0])) {
 			sequence.setAccession(new AccessionID(data[1], DataSource.GENINFO));
-		} else if (data[0].equalsIgnoreCase("gnl")) {
+		} else if ("gnl".equalsIgnoreCase(data[0])) {
 			sequence.setAccession(new AccessionID(data[2], DataSource.GENERAL));
-		} else if (data[0].equalsIgnoreCase("ref")) {
+		} else if ("ref".equalsIgnoreCase(data[0])) {
 			sequence.setAccession(new AccessionID(data[1], DataSource.NCBI));
-		} else if (data[0].equalsIgnoreCase("lcl")) {
+		} else if ("lcl".equalsIgnoreCase(data[0])) {
 			sequence.setAccession(new AccessionID(data[1], DataSource.LOCAL));
 		} else {
 			sequence.setAccession(new AccessionID(data[0])); // avoid the common problem of picking up all the comments original header in getOriginalHeader
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java
index d6c1b76ada..96ff94ebfd 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java
@@ -150,7 +150,7 @@ private List<IUPACTable> parseTables() {
 		String name, aa, starts, baseone, basetwo, basethree;
 		name = aa = starts = baseone = basetwo = basethree = null;
 		for (String line : lines) {
-			if (line.equalsIgnoreCase("//")) {
+			if ("//".equalsIgnoreCase(line)) {
 				localTables.add(new IUPACTable(name, id, aa, starts, baseone, basetwo,
 						basethree));
 				name = aa = starts = baseone = basetwo = basethree = null;
@@ -158,19 +158,19 @@ private List<IUPACTable> parseTables() {
 			}
 			else {
 				String[] keyValue = line.split("\\s*=\\s*");
-				if (keyValue[0].equals("AAs")) {
+				if ("AAs".equals(keyValue[0])) {
 					aa = keyValue[1];
 				}
-				else if (keyValue[0].equals("Starts")) {
+				else if ("Starts".equals(keyValue[0])) {
 					starts = keyValue[1];
 				}
-				else if (keyValue[0].equals("Base1")) {
+				else if ("Base1".equals(keyValue[0])) {
 					baseone = keyValue[1];
 				}
-				else if (keyValue[0].equals("Base2")) {
+				else if ("Base2".equals(keyValue[0])) {
 					basetwo = keyValue[1];
 				}
-				else if (keyValue[0].equals("Base3")) {
+				else if ("Base3".equals(keyValue[0])) {
 					basethree = keyValue[1];
 				}
 				else {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/embl/EmblReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/embl/EmblReader.java
index 45e50cd9ea..7c818c0e51 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/embl/EmblReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/embl/EmblReader.java
@@ -67,46 +67,46 @@ public static EmblRecord process(File file) throws IOException {
 					if (line.length() > 1) {
 						lineInfo = line.substring(2, line.length()).trim();
 						lineIdentifier = line.substring(0, 2);
-						if (lineIdentifier.equals("ID"))
+						if ("ID".equals(lineIdentifier))
 							emblRecord.setEmblId(populateID(lineInfo));
-						else if (lineIdentifier.equals("AC"))
+						else if ("AC".equals(lineIdentifier))
 							populateAccessionNumber(line, accessionNumber);
-						else if (lineIdentifier.equals("DT") && line.contains("Created"))
+						else if ("DT".equals(lineIdentifier) && line.contains("Created"))
 							emblRecord.setCreatedDate(lineInfo);
-						else if (lineIdentifier.equals("DT") && line.contains("updated"))
+						else if ("DT".equals(lineIdentifier) && line.contains("updated"))
 							emblRecord.setLastUpdatedDate(lineInfo);
-						else if (lineIdentifier.equals("DE"))
+						else if ("DE".equals(lineIdentifier))
 							emblRecord.setSequenceDescription(lineInfo);
-						else if (lineIdentifier.equals("KW"))
+						else if ("KW".equals(lineIdentifier))
 							keyword.add(lineInfo);
-						else if (lineIdentifier.equals("OS"))
+						else if ("OS".equals(lineIdentifier))
 							emblRecord.setOrganismSpecies(lineInfo);
-						else if (lineIdentifier.equals("OC"))
+						else if ("OC".equals(lineIdentifier))
 							emblRecord.setOrganismClassification(lineInfo);
-						else if (lineIdentifier.equals("OG"))
+						else if ("OG".equals(lineIdentifier))
 							emblRecord.setOrGanelle(lineInfo);
-						else if (lineIdentifier.equals("RN") || lineIdentifier.equals("RP")
-								|| lineIdentifier.equals("RX") || lineIdentifier.equals("RG")
-								|| lineIdentifier.equals("RA") || lineIdentifier.equals("RT")
-								|| lineIdentifier.equals("RL"))
+						else if ("RN".equals(lineIdentifier) || "RP".equals(lineIdentifier)
+								|| "RX".equals(lineIdentifier) || "RG".equals(lineIdentifier)
+								|| "RA".equals(lineIdentifier) || "RT".equals(lineIdentifier)
+								|| "RL".equals(lineIdentifier))
 							populateEmblReferences(lineIdentifier, lineInfo, emblReference, emblReferences);
-						else if (lineIdentifier.equals("DR"))
+						else if ("DR".equals(lineIdentifier))
 							emblRecord.setDatabaseCrossReference(lineInfo);
-						else if (lineIdentifier.equals("AH"))
+						else if ("AH".equals(lineIdentifier))
 							emblRecord.setAssemblyHeader(lineInfo);
-						else if (lineIdentifier.equals("AS"))
+						else if ("AS".equals(lineIdentifier))
 							emblRecord.setAssemblyInformation(lineInfo);
-						else if (lineIdentifier.equals("CO"))
+						else if ("CO".equals(lineIdentifier))
 							emblRecord.setConstructedSequence(lineInfo);
-						else if (lineIdentifier.equals("FH"))
+						else if ("FH".equals(lineIdentifier))
 							emblRecord.setFeatureHeader(lineInfo);
-						else if (lineIdentifier.equals("FT"))
+						else if ("FT".equals(lineIdentifier))
 							emblRecord.setFeatureTable(lineInfo);
-						else if (lineIdentifier.equals("SQ"))
+						else if ("SQ".equals(lineIdentifier))
 							emblRecord.setSequenceHeader(lineInfo);
-						else if (lineIdentifier.equals("  ") && !lineIdentifier.equals("//"))
+						else if ("  ".equals(lineIdentifier) && !"//".equals(lineIdentifier))
 							populateSequence(line, sequence);
-						else if (lineIdentifier.equals("//")) {
+						else if ("//".equals(lineIdentifier)) {
 							emblRecord.setKeyword(keyword);
 							emblRecord.setEmblReference(emblReferences);
 							emblRecord.setAccessionNumber(accessionNumber);
@@ -129,19 +129,19 @@ private static void populateSequence(String line, StringBuilder sequence) {
 
 	private static void populateEmblReferences(String lineIdentifier, String lineInfo, EmblReference emblReference
 			, LinkedList<EmblReference> emblReferences) {
-		if (lineIdentifier.equals("RN"))
+		if ("RN".equals(lineIdentifier))
 			emblReference.setReferenceNumber(lineInfo);
-		else if (lineIdentifier.equals("RP"))
+		else if ("RP".equals(lineIdentifier))
 			emblReference.setReferencePosition(lineInfo);
-		else if (lineIdentifier.equals("RX"))
+		else if ("RX".equals(lineIdentifier))
 			emblReference.setReferenceCrossReference(lineInfo);
-		else if (lineIdentifier.equals("RG"))
+		else if ("RG".equals(lineIdentifier))
 			emblReference.setReferenceGroup(lineInfo);
-		else if (lineIdentifier.equals("RA"))
+		else if ("RA".equals(lineIdentifier))
 			emblReference.setReferenceAuthor(lineInfo);
-		else if (lineIdentifier.equals("RT"))
+		else if ("RT".equals(lineIdentifier))
 			emblReference.setReferenceTitle(lineInfo);
-		else if (lineIdentifier.equals("RL")) {
+		else if ("RL".equals(lineIdentifier)) {
 			emblReference.setReferenceLocation(lineInfo);
 			emblReferences.add(emblReference.copyEmblReference(emblReference));
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
index 17a1bdefc7..f670783a0c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
@@ -167,7 +167,7 @@ private List<Location> parseLocationString(String string, int versus) {
 
 			if (!splitQualifier.isEmpty()) {
 				//recursive case
-				int localVersus = splitQualifier.equalsIgnoreCase("complement") ? -1 : 1;
+				int localVersus = "complement".equalsIgnoreCase(splitQualifier) ? -1 : 1;
 				List<Location> subLocations = parseLocationString(
 						splitString, versus * localVersus);
 
@@ -187,13 +187,13 @@ private List<Location> parseLocationString(String string, int versus) {
 											max
 									);
 
-							if (splitQualifier.equalsIgnoreCase("join")) {
+							if ("join".equalsIgnoreCase(splitQualifier)) {
 								motherLocation = new InsdcLocations.GroupLocation(subLocations);
 							}
-							if (splitQualifier.equalsIgnoreCase("order")) {
+							if ("order".equalsIgnoreCase(splitQualifier)) {
 								motherLocation = new InsdcLocations.OrderLocation(subLocations);
 							}
-							if (splitQualifier.equalsIgnoreCase("bond")) {
+							if ("bond".equalsIgnoreCase(splitQualifier)) {
 								motherLocation = new InsdcLocations.BondLocation(subLocations);
 							}
 							motherLocation.setStrand(getGroupLocationStrand(subLocations));
@@ -251,12 +251,12 @@ private List<Location> parseLocationString(String string, int versus) {
 
 				}
 
-				if(m.group(4) != null && m.group(4).equals("^")) l.setBetweenCompounds(true);
+				if("^".equals(m.group(4))) l.setBetweenCompounds(true);
 
-				if (m.group(2).equals("<")) {
+				if ("<".equals(m.group(2))) {
 					l.setPartialOn5prime(true);
 				}
-				if (m.group(5) != null && (m.group(5).equals(">") || m.group(7).equals(">"))) {
+				if (m.group(5) != null && (">".equals(m.group(5)) || ">".equals(m.group(7)))) {
 					l.setPartialOn3prime(true);
 				}
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java
index f5977407e4..f9b9941286 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/InputStreamProvider.java
@@ -71,7 +71,7 @@ public InputStreamProvider() {
 		cacheRawFiles = false;
 
 		String prop = System.getProperty(CACHE_PROPERTY);
-		if ( prop != null && prop.equals("true")) {
+		if ( "true".equals(prop)) {
 			cacheRawFiles = true;
 
 		}
@@ -119,7 +119,7 @@ private int getMagicNumber(InputStream in)
 	public InputStream getInputStream(URL u)
 	throws IOException{
 		
-		if (u.getProtocol().equals("file")) {
+		if ("file".equals(u.getProtocol())) {
 			try {
 				return getInputStream(new File(u.toURI().getPath()));
 			} catch (URISyntaxException e) {
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
index 0b11ddb992..7b7111c6a6 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
@@ -166,10 +166,10 @@ PairwiseSequenceAlignerType.LOCAL, new SimpleGapPenalty(),
 									if (keyWords.size() > 0) {
 										notes = ";Note=";
 										for (String note : keyWords) {
-											if (note.equals("Complete proteome")) {
+											if ("Complete proteome".equals(note)) {
 												continue;
 											}
-											if (note.equals("Direct protein sequencing")) {
+											if ("Direct protein sequencing".equals(note)) {
 												continue;
 											}
 
@@ -230,7 +230,7 @@ PairwiseSequenceAlignerType.LOCAL, new SimpleGapPenalty(),
 											geneSequence.addNote(note.getId()); // add note/keyword which can be output in fasta header if needed
 											LinkedHashMap<String, String> properties = note.getProperties();
 											for (String propertytype : properties.keySet()) {
-												if (propertytype.equals("evidence")) {
+												if ("evidence".equals(propertytype)) {
 													continue;
 												}
 												String property = properties.get(propertytype);
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneChromosomePositionParser.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneChromosomePositionParser.java
index df6a1a4373..d7a06070c7 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneChromosomePositionParser.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneChromosomePositionParser.java
@@ -54,7 +54,7 @@ public static void main(String[] args){
 			logger.info("got {} gene positions", genePositions.size());
 
 			for (GeneChromosomePosition pos : genePositions){
-				if ( pos.getGeneName().equals("FOLH1")) {
+				if ( "FOLH1".equals(pos.getGeneName())) {
 					logger.info("Gene Position: {}", pos);
 					break;
 				}
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneNamesParser.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneNamesParser.java
index e9158c015a..e39a34fd92 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneNamesParser.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneNamesParser.java
@@ -61,7 +61,7 @@ public static void main(String[] args) {
 			logger.info("got {} gene names", geneNames.size());
 
 			for ( GeneName g : geneNames){
-				if ( g.getApprovedSymbol().equals("FOLH1"))
+				if ( "FOLH1".equals(g.getApprovedSymbol()))
 					logger.info("Gene Name: {}", g);
 			}
 			// and returns a list of beans that contains key-value pairs for each gene name
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Dataset.java b/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Dataset.java
index 2ad301d112..82a4f46933 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Dataset.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/phosphosite/Dataset.java
@@ -200,7 +200,7 @@ public static void main(String[] args) {
 
 				logger.info("Got " + sites.size() + " sites");
 				for (Site s : sites) {
-					if (s.getUniprot().equals("P50225") || s.getUniprot().equals("P48025")) {
+					if ("P50225".equals(s.getUniprot()) || "P48025".equals(s.getUniprot())) {
 						logger.info(s.toString());
 					}
 				}
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ComponentXMLConverter.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ComponentXMLConverter.java
index 138488b650..67f1ce5eee 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ComponentXMLConverter.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ComponentXMLConverter.java
@@ -64,7 +64,7 @@ public static Component fromXML(String xml){
 	public static Component fromXML(Node componentN) {
 
 		String name = componentN.getNodeName();
-		if ( ! name.equals("component"))
+		if ( ! "component".equals(name))
 			throw new RuntimeException("did not get component element, but " + name);
 
 		//String type = getAttribute(componentN, "type");
@@ -86,7 +86,7 @@ public static Component fromXML(Node componentN) {
 			if(!pdbccN.hasAttributes()) continue;
 
 
-			if ( pdbccN.getNodeName().equals("pdbccID")) {
+			if ( "pdbccID".equals(pdbccN.getNodeName())) {
 				String id = getAttribute(pdbccN, "id");
 				pdbccIds.add(id);
 			}
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ModifiedCompoundXMLConverter.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ModifiedCompoundXMLConverter.java
index fb76e02340..b408c3cc9a 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ModifiedCompoundXMLConverter.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ModifiedCompoundXMLConverter.java
@@ -142,14 +142,14 @@ public static ModifiedCompound fromXML(String xml){
 					if(!listOfConditions.hasAttributes()) continue;
 
 
-					if ( listOfConditions.getNodeName().equals("proteinModification")) {
+					if ( "proteinModification".equals(listOfConditions.getNodeName())) {
 						//modification = ProteinModificationXMLConverter.fromXML(listOfConditions);
 						String modId = getAttribute(listOfConditions, "id");
 						modification = ProteinModificationRegistry.getById(modId);
 						if (modification==null) {
 							logger.warn("Error: no modification information.");
 						}
-					} else if ( listOfConditions.getNodeName().equals("linkage")) {
+					} else if ( "linkage".equals(listOfConditions.getNodeName())) {
 						double dist = Double.parseDouble(getAttribute(listOfConditions, "distance"));
 						int pos = Integer.parseInt(getAttribute(listOfConditions,"pos"));
 						int total = Integer.parseInt(getAttribute(listOfConditions,"total"));
@@ -161,7 +161,7 @@ public static ModifiedCompound fromXML(String xml){
 						StructureAtomLinkage linkage = new StructureAtomLinkage(atom1, atom2, dist);
 						//linkages.add(linkage);
 						linkages[pos] = linkage;
-					} else if (listOfConditions.getNodeName().equals("structureGroup")) {
+					} else if ("structureGroup".equals(listOfConditions.getNodeName())) {
 						StructureGroup group = StructureGroupXMLConverter.fromXML(listOfConditions);
 						structureGroups.add(group);
 //						logger.info("structureGroups size:" + structureGroups.size());
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ProteinModificationXmlReader.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ProteinModificationXmlReader.java
index 0a1c5f36e9..f1769b816d 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ProteinModificationXmlReader.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ProteinModificationXmlReader.java
@@ -152,7 +152,7 @@ public static void registerProteinModificationFromXml(InputStream isXml)
 						for (Node compIdNode : compIdNodes) {
 							NamedNodeMap compIdNodeAttr = compIdNode.getAttributes();
 							Node compIdSource = compIdNodeAttr.getNamedItem("source");
-							if (compIdSource!=null && compIdSource.getTextContent().equals("PDBCC")) {
+							if (compIdSource!=null && "PDBCC".equals(compIdSource.getTextContent())) {
 								String strComps = compIdNode.getTextContent();
 								if (strComps.isEmpty()) {
 									throw new RuntimeException("Empty component." +
@@ -178,9 +178,9 @@ public static void registerProteinModificationFromXml(InputStream isXml)
 									"each component. See Modification "+id+".");
 						}
 						String nc = compTermNode.get(0).getTextContent();
-						if (nc.equals("N")) {
+						if ("N".equals(nc)) {
 							nTerminal = true;
-						} else if (nc.equals("C")) {
+						} else if ("C".equals(nc)) {
 							cTerminal = true;
 						} else {
 							throw new RuntimeException("Only N or C is allowed for <Terminal>." +
@@ -305,11 +305,11 @@ public static void registerProteinModificationFromXml(InputStream isXml)
 						xrefName = xrefNode.get(0).getTextContent();
 					}
 
-					if (xrefDb.equals("PDBCC")) {
+					if ("PDBCC".equals(xrefDb)) {
 						modBuilder.setPdbccId(xrefId).setPdbccName(xrefName);
-					} else if (xrefDb.equals("RESID")) {
+					} else if ("RESID".equals(xrefDb)) {
 						modBuilder.setResidId(xrefId).setResidName(xrefName);
-					} else if (xrefDb.equals("PSI-MOD")) {
+					} else if ("PSI-MOD".equals(xrefDb)) {
 						modBuilder.setPsimodId(xrefId).setPsimodName(xrefName);
 					}
 				}
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/StructureAtomXMLConverter.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/StructureAtomXMLConverter.java
index 08f69725bf..75e88d5c3a 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/StructureAtomXMLConverter.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/StructureAtomXMLConverter.java
@@ -55,7 +55,7 @@ public static void toXML(StructureAtom atom, PrettyXMLWriter xml) throws IOExcep
 	public static StructureAtom fromXML(Node structureAtomElement){
 
 		String name = structureAtomElement.getNodeName();
-		if ( ! name.equals("structureAtom"))
+		if ( ! "structureAtom".equals(name))
 			throw new RuntimeException("Node is not a structureAtom, but " +name);
 
 		String atomName = getAttribute( structureAtomElement,"name");
@@ -70,7 +70,7 @@ public static StructureAtom fromXML(Node structureAtomElement){
 			if(!nodes.hasAttributes()) continue;
 
 
-			if ( nodes.getNodeName().equals("structureGroup")) {
+			if ( "structureGroup".equals(nodes.getNodeName())) {
 				group = StructureGroupXMLConverter.fromXML(nodes);
 			}
 		}
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/StructureGroupXMLConverter.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/StructureGroupXMLConverter.java
index 61a56e3b6b..f81ea6ddf2 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/StructureGroupXMLConverter.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/StructureGroupXMLConverter.java
@@ -53,7 +53,7 @@ public static StructureGroup fromXML(Node n) {
 
 		ResidueNumber resNum = new ResidueNumber();
 		resNum.setChainName(chainID);
-		if ( ( insCode != null) && (! insCode.equals("null")) && insCode.length() == 1)
+		if ( ( insCode != null) && (! "null".equals(insCode)) && insCode.length() == 1)
 		resNum.setInsCode(insCode.charAt(0));
 		resNum.setSeqNum(Integer.parseInt(resN));
 
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ProteinModificationIdentifier.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ProteinModificationIdentifier.java
index fdfd8cf312..f4a0a693a8 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ProteinModificationIdentifier.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ProteinModificationIdentifier.java
@@ -745,7 +745,7 @@ private List<List<Atom[]>> getMatchedAtomsOfLinkages(
 
 			List<String> potentialNamesOfAtomOnGroup1 = linkage.getPDBNameOfPotentialAtomsOnComponent1();
 			for (String name : potentialNamesOfAtomOnGroup1) {
-				if (name.equals("*")) {
+				if ("*".equals(name)) {
 					// wildcard
 					potentialNamesOfAtomOnGroup1 = null; // search all atoms
 					break;
@@ -754,7 +754,7 @@ private List<List<Atom[]>> getMatchedAtomsOfLinkages(
 
 			List<String> potentialNamesOfAtomOnGroup2 = linkage.getPDBNameOfPotentialAtomsOnComponent2();
 			for (String name : potentialNamesOfAtomOnGroup2) {
-				if (name.equals("*")) {
+				if ("*".equals(name)) {
 					// wildcard
 					potentialNamesOfAtomOnGroup2 = null; // search all atoms
 					break;
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/StructureUtil.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/StructureUtil.java
index 4842864b2d..23d220e4cd 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/StructureUtil.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/StructureUtil.java
@@ -198,8 +198,8 @@ public static List<Atom[]> findAtomLinkages(final Group group1,
 						namesOfAtomOnGroup2, bondLengthTolerance);
 				if (atoms != null) {
 					if (ignoreNCLinkage &&
-							((atoms[0].getName().equals("N") && atoms[1].getName().equals("C"))
-									|| (atoms[0].getName().equals("C") && atoms[1].getName().equals("N")))
+							(("N".equals(atoms[0].getName()) && "C".equals(atoms[1].getName()))
+									|| ("C".equals(atoms[0].getName()) && "N".equals(atoms[1].getName())))
 							) {
 						continue;
 					}
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/GOParser.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/GOParser.java
index 7754ec130a..d314b907ba 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/GOParser.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/GOParser.java
@@ -63,17 +63,17 @@ public Ontology parseGO(BufferedReader goFile,
 				StringTokenizer toke = new StringTokenizer(line, "%<$", true);
 				String parentRel = toke.nextToken();
 				Term term = parseTerm(onto, toke.nextToken());
-				if (parentRel.equals("%")) {
+				if ("%".equals(parentRel)) {
 					safeAddTriple(onto, term, termStack.get(leadSpaces - 1), isa);
-				} else if (parentRel.equals("<")) {
+				} else if ("<".equals(parentRel)) {
 					safeAddTriple(onto, term, termStack.get(leadSpaces - 1), partof);
 				}
 				while (toke.hasMoreTokens()) {
 					String altRel = toke.nextToken();
 					Term altTerm = parseTerm(onto, toke.nextToken());
-					if (altRel.equals("%")) {
+					if ("%".equals(altRel)) {
 						safeAddTriple(onto, term, altTerm, isa);
-					} else if (altRel.equals("<")) {
+					} else if ("<".equals(altRel)) {
 						safeAddTriple(onto, term, altTerm, partof);
 					}
 				}
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java
index e9c296c0a9..57b36bc600 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java
@@ -271,15 +271,15 @@ else if ( key.equals(OboFileHandler.NARROW_SYNONYM))
 			String token = tokenizer.nextToken();
 			//logger.info("TOKEN:" +token);
 			if (i == 0) {
-				if (token.equals("RELATED"))
+				if ("RELATED".equals(token))
 					scope = Synonym.RELATED_SYNONYM;
-				else if (token.equals("UNSPECIFIED"))
+				else if ("UNSPECIFIED".equals(token))
 					scope = Synonym.RELATED_SYNONYM;
-				else if (token.equals("EXACT"))
+				else if ("EXACT".equals(token))
 					scope = Synonym.EXACT_SYNONYM;
-				else if (token.equals("BROAD"))
+				else if ("BROAD".equals(token))
 					scope = Synonym.BROAD_SYNONYM;
-				else if (token.equals("NARROW"))
+				else if ("NARROW".equals(token))
 					scope = Synonym.NARROW_SYNONYM;
 				else
 					throw new IOException("Found unexpected scope "
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MenuCreator.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MenuCreator.java
index c5cac56b49..a481d00b91 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MenuCreator.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MenuCreator.java
@@ -548,7 +548,7 @@ public static JMenuItem getExitMenuItem(){
 			public void actionPerformed(ActionEvent e) {
 				String cmd = e.getActionCommand();
 
-				if ( cmd.equals("Quit")){
+				if ( "Quit".equals(cmd)){
 					System.exit(0);
 				}
 			}
@@ -606,7 +606,7 @@ class MyCloseListener implements ActionListener{
 			public void actionPerformed(ActionEvent e) {
 				String cmd = e.getActionCommand();
 
-				if ( cmd.equals("Close Frame")){
+				if ( "Close Frame".equals(cmd)){
 					f.dispose();
 				}
 			}
@@ -885,7 +885,7 @@ private static JMenuItem getConfigMenuItem() {
 			public void actionPerformed(ActionEvent e) {
 				String cmd = e.getActionCommand();
 
-				if ( cmd.equals("Settings")){
+				if ( "Settings".equals(cmd)){
 					ConfigPDBInstallPanel.showDialog();
 				}
 			}
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MyOpenPdbFileListener.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MyOpenPdbFileListener.java
index 23de201682..25fb83ee82 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MyOpenPdbFileListener.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MyOpenPdbFileListener.java
@@ -34,7 +34,7 @@ public class MyOpenPdbFileListener
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		String cmd = e.getActionCommand();
-		if ( cmd.equals("Open PDB file")){
+		if ( "Open PDB file".equals(cmd)){
 			final JFileChooser fc = new JFileChooser();
 
 			//					In response to a button click:
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ParameterGUI.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ParameterGUI.java
index 836e386ab4..fe43530bed 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ParameterGUI.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ParameterGUI.java
@@ -108,7 +108,7 @@ public ParameterGUI(ConfigStrucAligParams params, String algorithm) {
 
 				String[] values = new String[]{"true","false"};
 				JComboBox jcbox = new JComboBox(values);
-				if ( data.equalsIgnoreCase("false"))
+				if ( "false".equalsIgnoreCase(data))
 					jcbox.setSelectedIndex(1);
 				else
 					jcbox.setSelectedIndex(0);
@@ -203,7 +203,7 @@ protected void setDefault() {
 				field.updateUI();
 			}  else if ( type == Boolean.class){
 				JComboBox field = (JComboBox)  textFields.get(i);
-				if ( data.toString().equalsIgnoreCase("false"))
+				if ( "false".equalsIgnoreCase(data.toString()))
 					field.setSelectedIndex(1);
 				else
 					field.setSelectedIndex(0);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ShowPDBIDListener.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ShowPDBIDListener.java
index fdc16c217f..2c992d1965 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ShowPDBIDListener.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ShowPDBIDListener.java
@@ -37,7 +37,7 @@ public class ShowPDBIDListener
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		String cmd = e.getActionCommand();
-		if ( cmd.equals("Show By ID")){
+		if ( "Show By ID".equals(cmd)){
 
 			JCheckBox useBioAssembly = new JCheckBox("Show Biological Assembly");
 
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/AligPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/AligPanel.java
index 6eadd48dcd..509dafefaf 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/AligPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/AligPanel.java
@@ -450,7 +450,7 @@ private void updateJmolDisplay() {
 						select2 = JmolTools.getPdbInfo(a2);
 
 					// nothing to display
-					if ( select1.equals("") && select2.equals(""))
+					if ( "".equals(select1) && "".equals(select2))
 						continue;
 
 					if ( nrSelected > 0)
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/JAutoSuggest.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/JAutoSuggest.java
index 128ee39149..ff1e31b2d8 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/JAutoSuggest.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/JAutoSuggest.java
@@ -135,11 +135,11 @@ public void focusLost(FocusEvent e) {
 				System.out.println("Lost Focus");
 				dialog.setVisible(false);
 
-				if (getText().trim().equals("") && e.getOppositeComponent() != null && e.getOppositeComponent().getName() != null) {
-					if (!e.getOppositeComponent().getName().equals("suggestFieldDropdownButton")) {
+				if ("".equals(getText().trim()) && e.getOppositeComponent() != null && e.getOppositeComponent().getName() != null) {
+					if (!"suggestFieldDropdownButton".equals(e.getOppositeComponent().getName())) {
 						setText(defaultText);
 					}
-				} else if (getText().trim().equals("")) {
+				} else if ("".equals(getText().trim())) {
 					setText(defaultText);
 				}
 			}
@@ -352,7 +352,7 @@ public String doInBackground() {
 			try {
 				setFont(busy);
 				String userInput = getText().trim();
-				if ( userInput == null || userInput.equals(""))
+				if ( userInput == null || "".equals(userInput))
 					return "";
 
 				if ( previousWord != null){
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/AtomInfo.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/AtomInfo.java
index e90fafcf43..61379a9a52 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/AtomInfo.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/AtomInfo.java
@@ -118,13 +118,13 @@ public String toString() {
 
 		StringBuffer buf = new StringBuffer();
 		if ( printResName) {
-			if ( !aa3.equals("")){
+			if ( !"".equals(aa3)){
 				buf.append("[");
 				buf.append(aa3);
 				buf.append("]");
 			}
 		}
-		if ( ! res1.equals("")) {
+		if ( ! "".equals(res1)) {
 
 			// let's check if there is an insertion code...
 			Matcher matcher = inscodePatter.matcher(res1);
@@ -137,7 +137,7 @@ public String toString() {
 				String residueNumber = matcher.group(1);
 				String insCode = matcher.group(2);
 				buf.append(residueNumber);
-				if ( insCode != null && ! ( insCode.equals(""))) {
+				if ( insCode != null && ! "".equals(insCode)) {
 					buf.append("^");
 					buf.append(insCode);
 				}
@@ -145,7 +145,7 @@ public String toString() {
 
 		}
 
-		if ( ! chain1.equals("")){
+		if ( ! "".equals(chain1)){
 			buf.append(":");
 			buf.append(chain1);
 		}
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/JmolPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/JmolPanel.java
index b8b37c6251..23361e62ed 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/JmolPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/JmolPanel.java
@@ -229,7 +229,7 @@ public void actionPerformed(ActionEvent event) {
 
 		String selectLigand = "select ligand;wireframe 0.16;spacefill 0.5; color cpk ;";
 
-		if ( value.equals("Cartoon")){
+		if ( "Cartoon".equals(value)){
 			String script = "hide null; select all;  spacefill off; wireframe off; backbone off;" +
 					" cartoon on; " +
 					" select ligand; wireframe 0.16;spacefill 0.5; color cpk; " +
@@ -238,7 +238,7 @@ public void actionPerformed(ActionEvent event) {
 					" select *.ZN; spacefill 0.7; color cpk ; " +
 					" select all; ";
 			this.executeCmd(script);
-		} else if (value.equals("Backbone")){
+		} else if ("Backbone".equals(value)){
 			String script = "hide null; select all; spacefill off; wireframe off; backbone 0.4;" +
 					" cartoon off; " +
 					" select ligand; wireframe 0.16;spacefill 0.5; color cpk; " +
@@ -247,7 +247,7 @@ public void actionPerformed(ActionEvent event) {
 					" select *.ZN; spacefill 0.7; color cpk ; " +
 					" select all; ";
 			this.executeCmd(script);
-		} else if (value.equals("CPK")){
+		} else if ("CPK".equals(value)){
 			String script = "hide null; select all; spacefill off; wireframe off; backbone off;" +
 					" cartoon off; cpk on;" +
 					" select ligand; wireframe 0.16;spacefill 0.5; color cpk; " +
@@ -257,11 +257,11 @@ public void actionPerformed(ActionEvent event) {
 					" select all; ";
 			this.executeCmd(script);
 
-		} else if (value.equals("Ligands")){
+		} else if ("Ligands".equals(value)){
 			this.executeCmd("restrict ligand; cartoon off; wireframe on;  display selected;");
-		} else if (value.equals("Ligands and Pocket")){
+		} else if ("Ligands and Pocket".equals(value)){
 			this.executeCmd(" select within (6.0,ligand); cartoon off; wireframe on; backbone off; display selected; ");
-		} else if ( value.equals("Ball and Stick")){
+		} else if ( "Ball and Stick".equals(value)){
 			String script = "hide null; restrict not water;  wireframe 0.2; spacefill 25%;" +
 					" cartoon off; backbone off; " +
 					" select ligand; wireframe 0.16; spacefill 0.5; color cpk; " +
@@ -270,24 +270,24 @@ public void actionPerformed(ActionEvent event) {
 					" select *.ZN; spacefill 0.7; color cpk ; " +
 					" select all; ";
 			this.executeCmd(script);
-		} else if ( value.equals("By Chain")){
+		} else if ( "By Chain".equals(value)){
 			jmolColorByChain();
 			String script = "hide null; select all;set defaultColors Jmol; color_by_chain(\"cartoon\"); color_by_chain(\"\"); " + selectLigand + "; select all; ";
 			this.executeCmd(script);
-		} else if ( value.equals("Rainbow")) {
+		} else if ( "Rainbow".equals(value)) {
 			this.executeCmd("hide null; select all; set defaultColors Jmol; color group; color cartoon group; " + selectLigand + "; select all; " );
-		} else if ( value.equals("Secondary Structure")){
+		} else if ( "Secondary Structure".equals(value)){
 			this.executeCmd("hide null; select all; set defaultColors Jmol; color structure; color cartoon structure;" + selectLigand + "; select all; " );
 
-		} else if ( value.equals("By Element")){
+		} else if ( "By Element".equals(value)){
 			this.executeCmd("hide null; select all; set defaultColors Jmol; color cpk; color cartoon cpk; " + selectLigand + "; select all; ");
-		} else if ( value.equals("By Amino Acid")){
+		} else if ( "By Amino Acid".equals(value)){
 			this.executeCmd("hide null; select all; set defaultColors Jmol; color amino; color cartoon amino; " + selectLigand + "; select all; " );
-		} else if ( value.equals("Hydrophobicity") ){
+		} else if ( "Hydrophobicity".equals(value) ){
 			this.executeCmd("hide null; set defaultColors Jmol; select hydrophobic; color red; color cartoon red; select not hydrophobic ; color blue ; color cartoon blue; "+ selectLigand+"; select all; ");
-		} else if ( value.equals("Suggest Domains")){
+		} else if ( "Suggest Domains".equals(value)){
 			colorByPDP();
-		} else if ( value.equals("Show SCOP Domains")){
+		} else if ( "Show SCOP Domains".equals(value)){
 			colorBySCOP();
 		}
 		evalString("restore selection; ");
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/JmolTools.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/JmolTools.java
index 5a42f37cad..5a3b4ed463 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/JmolTools.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/JmolTools.java
@@ -82,13 +82,13 @@ public static final String getPdbInfo(Atom a, boolean printResName){
 
 		StringBuffer buf = new StringBuffer();
 		if ( printResName) {
-			if ( !aa3.equals("")){
+			if ( !"".equals(aa3)){
 				buf.append("[");
 				buf.append(aa3);
 				buf.append("]");
 			}
 		}
-		if ( ! res1.equals("")) {
+		if ( ! "".equals(res1)) {
 
 			// let's check if there is an insertion code...
 			Matcher matcher = inscodePatter.matcher(res1);
@@ -101,7 +101,7 @@ public static final String getPdbInfo(Atom a, boolean printResName){
 				String residueNumber = matcher.group(1);
 				String insCode = matcher.group(2);
 				buf.append(residueNumber);
-				if ( insCode != null && ! ( insCode.equals(""))) {
+				if ( insCode != null && ! "".equals(insCode)) {
 					buf.append("^");
 					buf.append(insCode);
 				}
@@ -112,7 +112,7 @@ public static final String getPdbInfo(Atom a, boolean printResName){
 
 
 
-		if ( ! chain1.equals("")){
+		if ( ! "".equals(chain1)){
 			buf.append(":");
 			buf.append(chain1);
 		}
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/RasmolCommandListener.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/RasmolCommandListener.java
index 6c47f80276..6a81491f82 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/RasmolCommandListener.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/RasmolCommandListener.java
@@ -69,7 +69,7 @@ public void actionPerformed(ActionEvent event) {
 		// now comes history part:
 
 		// no need for history:
-		if ( cmd.equals("")) return;
+		if ( "".equals(cmd)) return;
 
 		// check last command in history
 		// if equivalent, don't add,
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/webstart/ConfigXMLHandler.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/webstart/ConfigXMLHandler.java
index 78d43fe862..f25ea0171d 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/webstart/ConfigXMLHandler.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/webstart/ConfigXMLHandler.java
@@ -49,7 +49,7 @@ public ConfigXMLHandler() {
 	@Override
 	public void startElement (String uri, String name, String qName, Attributes atts){
 		//System.out.println("new element >" + name + "< >" + qName+"<" + uri);
-		if ( qName.equals("PDBFILEPATH")){
+		if ( "PDBFILEPATH".equals(qName)){
 
 			String path = atts.getValue("path");
 			// default path is system tmp...
@@ -58,7 +58,7 @@ public void startElement (String uri, String name, String qName, Attributes atts
 
 			//Deprecated property; supported for backwards compatibility
 			String autoFetch = atts.getValue("autoFetch");
-			if(autoFetch == null || !autoFetch.equals("false")) {
+			if(autoFetch == null || !"false".equals(autoFetch)) {
 				config.setFetchBehavior(FetchBehavior.DEFAULT);
 			} else {
 				config.setFetchBehavior(FetchBehavior.LOCAL_ONLY);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/webstart/WebStartMain.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/webstart/WebStartMain.java
index e589f56140..dbb65c5eee 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/webstart/WebStartMain.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/webstart/WebStartMain.java
@@ -99,12 +99,12 @@ public void run() {
 
 		String arg0 = args[0];
 
-		if (! (arg0.equals("fatcat") ||
-				arg0.equals("biojava") ||
-				arg0.equals("fatcat_flexible") ||
-				arg0.equals("ce") ||
-				arg0.equals("ce_cp") ||
-				arg0.equals("sw")
+		if (! ("fatcat".equals(arg0) ||
+				"biojava".equals(arg0) ||
+				"fatcat_flexible".equals(arg0) ||
+				"ce".equals(arg0) ||
+				"ce_cp".equals(arg0) ||
+				"sw".equals(arg0)
 		)){
 			JOptionPane.showMessageDialog(null,
 					"Wrong arguments. First argument has to be \"fatcat\", \"ce\", \"ce_cp\", \"sw\", \"fatcat_flexible\", or \"biojava\", but got " + arg0);
@@ -139,21 +139,21 @@ public void run() {
 			System.out.println("done reading structures");
 
 
-			if (arg0.equalsIgnoreCase("ce") ||
-					arg0.equalsIgnoreCase("ce_cp") ||
-					arg0.equalsIgnoreCase("sw") ||
-					arg0.equalsIgnoreCase("fatcat") ||
-					arg0.equalsIgnoreCase("fatcat_flexible")){
+			if ("ce".equalsIgnoreCase(arg0) ||
+					"ce_cp".equalsIgnoreCase(arg0) ||
+					"sw".equalsIgnoreCase(arg0) ||
+					"fatcat".equalsIgnoreCase(arg0) ||
+					"fatcat_flexible".equalsIgnoreCase(arg0)){
 				try {
 
 					StructureAlignment algorithm ;
-					if ( arg0.equalsIgnoreCase("ce"))
+					if ( "ce".equalsIgnoreCase(arg0))
 						algorithm = StructureAlignmentFactory.getAlgorithm(CeMain.algorithmName);
-					else if ( arg0.equalsIgnoreCase("ce_cp"))
+					else if ( "ce_cp".equalsIgnoreCase(arg0))
 						algorithm = StructureAlignmentFactory.getAlgorithm(CeCPMain.algorithmName);
-					else if ( arg0.equalsIgnoreCase("fatcat"))
+					else if ( "fatcat".equalsIgnoreCase(arg0))
 						algorithm = StructureAlignmentFactory.getAlgorithm(FatCatRigid.algorithmName);
-					else if ( arg0.equalsIgnoreCase("fatcat_flexible"))
+					else if ( "fatcat_flexible".equalsIgnoreCase(arg0))
 						algorithm = StructureAlignmentFactory.getAlgorithm(FatCatFlexible.algorithmName);
 					else
 						algorithm = new SmithWaterman3Daligner();
@@ -167,7 +167,7 @@ else if ( arg0.equalsIgnoreCase("fatcat_flexible"))
 				}
 
 
-			} else if ( arg0.equalsIgnoreCase("biojava")){
+			} else if ( "biojava".equalsIgnoreCase(arg0)){
 				try {
 					//showBiojava(ca1,ca2);
 				} catch (Exception e){
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/events/JmolAlignedPositionListener.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/events/JmolAlignedPositionListener.java
index 7fe43819de..18e8d3afc3 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/events/JmolAlignedPositionListener.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/events/JmolAlignedPositionListener.java
@@ -80,7 +80,7 @@ public void mouseOverPosition(AlignedPosition p) {
 			Chain c = parent.getChain();
 			pdbpos1 = parent.getResidueNumber().toString();
 			//System.out.printlng"chainid 1 is >"+c.getName()+"<");
-			if (! c.getId().equals( " ")) {
+			if (! " ".equals(c.getId())) {
 				pdbpos1 += ":" + c.getId();
 			}
 
@@ -96,7 +96,7 @@ public void mouseOverPosition(AlignedPosition p) {
 			pdbpos2 = parent.getResidueNumber().toString();
 			//System.out.println("2:" + parent);
 			//System.out.println("chainid 2 is >"+c.getName()+"<");
-			if (! c.getId().equals( " ")) {
+			if (! " ".equals(c.getId())) {
 				pdbpos2 += ":" + c.getId();
 			}
 			if ( p1 > -1)
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/MenuCreator.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/MenuCreator.java
index ef945c5263..97570e7d2a 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/MenuCreator.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/MenuCreator.java
@@ -60,7 +60,7 @@ public static JMenuBar initMenu(){
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				String cmd = e.getActionCommand();
-				if ( cmd.equals("Open")){
+				if ( "Open".equals(cmd)){
 					final JFileChooser fc = new JFileChooser();
 
 //					In response to a button click:
@@ -95,7 +95,7 @@ public void actionPerformed(ActionEvent e) {
 			public void actionPerformed(ActionEvent e) {
 				String cmd = e.getActionCommand();
 
-				if ( cmd.equals("Exit")){
+				if ( "Exit".equals(cmd)){
 					System.exit(0);
 				}
 			}
@@ -111,7 +111,7 @@ public void actionPerformed(ActionEvent e) {
 			public void actionPerformed(ActionEvent e) {
 				String cmd = e.getActionCommand();
 
-				if ( cmd.equals("2 protein structures")){
+				if ( "2 protein structures".equals(cmd)){
 					MenuCreator.showPairDialog();
 				}
 			}
@@ -129,7 +129,7 @@ public void actionPerformed(ActionEvent e) {
 			public void actionPerformed(ActionEvent e) {
 				String cmd = e.getActionCommand();
 
-				if ( cmd.equals("PDBview")){
+				if ( "PDBview".equals(cmd)){
 					MenuCreator.showAboutDialog();
 				}
 			}
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
index 785727cbcd..7805df236a 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
@@ -171,7 +171,7 @@ private Structure getStructure(JTextField filePath,JTextField chainId) throws St
 
 			URL u ;
 
-			if ( chainId.getText() == null || chainId.getText().equals("")){
+			if ( chainId.getText() == null || "".equals(chainId.getText())){
 
 				u = f.toURI().toURL();
 			} else {
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/ScopSelectPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/ScopSelectPanel.java
index a6571483a6..db63e2d206 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/ScopSelectPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/ScopSelectPanel.java
@@ -128,7 +128,7 @@ public Structure getStructure2() throws StructureException
 	private Structure getStructure(String domainID) throws StructureException{
 		//PDBFileReader reader = new PDBFileReader();
 
-		if ( domainID == null || domainID.equals(""))
+		if ( domainID == null || "".equals(domainID))
 			return null;
 
 
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/gui/SymmetryListener.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/gui/SymmetryListener.java
index 1fdb882f7c..0b4198b3e6 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/gui/SymmetryListener.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/gui/SymmetryListener.java
@@ -57,27 +57,27 @@ public SymmetryListener(MultipleAlignmentJmol jmol, CeSymmResult symm) {
 	@Override
 	public void actionPerformed(ActionEvent ae) {
 		String cmd = ae.getActionCommand();
-		if (cmd.equals("New Symmetry Analysis"))
+		if ("New Symmetry Analysis".equals(cmd))
 			SymmetryGui.getInstance();
 
 		if (symm == null)
 			logger.error("Currently not displaying a symmetry!");
 
 		try {
-			if (cmd.equals("Repeats Superposition")) {
+			if ("Repeats Superposition".equals(cmd)) {
 				MultipleAlignmentJmol j = SymmetryDisplay.displayRepeats(symm);
 				String s = SymmetryDisplay.printSymmetryAxes(symm, false);
 				j.evalString(s);
 				j.evalString("save STATE state_1");
 
 
-			} else if (cmd.equals("Multiple Structure Alignment")) {
+			} else if ("Multiple Structure Alignment".equals(cmd)) {
 				MultipleAlignmentJmol j = SymmetryDisplay.displayFull(symm);
 				String s = SymmetryDisplay.printSymmetryAxes(symm);
 				j.evalString(s);
 				j.evalString("save STATE state_1");
 
-			} else if (cmd.equals("Optimal Self Alignment")) {
+			} else if ("Optimal Self Alignment".equals(cmd)) {
 				Atom[] cloned = StructureTools.cloneAtomArray(symm.getAtoms());
 				AbstractAlignmentJmol jmol = StructureAlignmentDisplay.display(
 						symm.getSelfAlignment(), symm.getAtoms(), cloned);
@@ -85,11 +85,11 @@ public void actionPerformed(ActionEvent ae) {
 				jmol.evalString(axis.getJmolScript(symm.getAtoms()));
 				jmol.setTitle(SymmetryDisplay.getSymmTitle(symm));
 
-			} else if (cmd.equals("Show Symmetry Group")) {
+			} else if ("Show Symmetry Group".equals(cmd)) {
 				String script = SymmetryDisplay.printSymmetryGroup(symm);
 				jmol.evalString(script);
 
-			} else if (cmd.equals("Show Symmetry Axes")) {
+			} else if ("Show Symmetry Axes".equals(cmd)) {
 				String s = SymmetryDisplay.printSymmetryAxes(symm);
 				jmol.evalString(s);
 			}
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java
index 8d3e89b4bf..8a5764e1bb 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java
@@ -44,19 +44,19 @@ public abstract class JmolSymmetryScriptGenerator {
 	public static JmolSymmetryScriptGenerator getInstance(AxisAligner axisAligner, String name) {
 		String symmetry = axisAligner.getSymmetry();
 
-		if (symmetry.equals("C1")) {
+		if ("C1".equals(symmetry)) {
 			return new JmolSymmetryScriptGeneratorC1((RotationAxisAligner)axisAligner, name);
 		} else if (symmetry.startsWith("C")) {
 			return new JmolSymmetryScriptGeneratorCn((RotationAxisAligner)axisAligner, name);
 		} else if (symmetry.startsWith("D")) {
 			return new JmolSymmetryScriptGeneratorDn((RotationAxisAligner)axisAligner, name);
-		} else if (symmetry.equals("T")) {
+		} else if ("T".equals(symmetry)) {
 			return new JmolSymmetryScriptGeneratorT((RotationAxisAligner)axisAligner, name);
-		} else if (symmetry.equals("O")) {
+		} else if ("O".equals(symmetry)) {
 			return new JmolSymmetryScriptGeneratorO((RotationAxisAligner)axisAligner, name);
-		} else if (symmetry.equals("I")) {
+		} else if ("I".equals(symmetry)) {
 			return new JmolSymmetryScriptGeneratorI((RotationAxisAligner)axisAligner, name);
-		} else if (symmetry.equals("H")) {
+		} else if ("H".equals(symmetry)) {
 			return new JmolSymmetryScriptGeneratorH((HelixAxisAligner)axisAligner, name);
 		}
 
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorCn.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorCn.java
index a4e8024ef7..34cc7292e3 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorCn.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorCn.java
@@ -36,7 +36,7 @@ public class JmolSymmetryScriptGeneratorCn extends JmolSymmetryScriptGeneratorPo
 
 	public JmolSymmetryScriptGeneratorCn(RotationAxisAligner axisTransformation, String name) {
 		super(axisTransformation, name);
-		if (axisTransformation.getRotationGroup().getPointGroup().equals("C2")) {
+		if ("C2".equals(axisTransformation.getRotationGroup().getPointGroup())) {
 			setPolyhedron(new RectangularPrism(axisTransformation.getDimension().z*2, axisTransformation.getDimension().x*2, axisTransformation.getDimension().y*2));
 		} else {
 			Prism p = new Prism(axisTransformation.getRotationGroup().getRotation(0).getFold());
@@ -64,7 +64,7 @@ public int getZoom() {
 	@Override
 	public int getOrientationCount() {
 		//  the last two views (top, bottom) are not that interesting.
-		if (getAxisTransformation().getRotationGroup().getPointGroup().equals("C2")) {
+		if ("C2".equals(getAxisTransformation().getRotationGroup().getPointGroup())) {
 		    return getPolyhedron().getViewCount()-2;
 		}
 		return getPolyhedron().getViewCount();
@@ -77,7 +77,7 @@ public int getOrientationCount() {
 	 */
 	@Override
 	public String getOrientationName(int index) {
-		if (getAxisTransformation().getRotationGroup().getPointGroup().equals("C2")) {
+		if ("C2".equals(getAxisTransformation().getRotationGroup().getPointGroup())) {
 			if (index == 0) {
 				return "Front C2 axis";
 			} else if (index == 2) {
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorDn.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorDn.java
index 2ad5f0c91a..8b0d76a0e3 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorDn.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorDn.java
@@ -39,7 +39,7 @@ public JmolSymmetryScriptGeneratorDn(RotationAxisAligner axisTransformation, Str
 
 		// special case for D2. Since there is no 2-fold prism, draw a 4-fold
 		// prism that encases the D2 structure
-		if (axisTransformation.getRotationGroup().getPointGroup().equals("D2")) {
+		if ("D2".equals(axisTransformation.getRotationGroup().getPointGroup())) {
 			fold = 4;
 		}
 
@@ -76,7 +76,7 @@ public int getOrientationCount() {
 	 */
 	@Override
 	public String getOrientationName(int index) {
-		if (index == 0 && getAxisTransformation().getRotationGroup().getPointGroup().equals("D2")) {
+		if (index == 0 && "D2".equals(getAxisTransformation().getRotationGroup().getPointGroup())) {
 			return "Front C2 axis";
 		} else {
 			return getPolyhedron().getViewName(index);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorPointGroup.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorPointGroup.java
index 1a4f8a7301..3ee6734d75 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorPointGroup.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorPointGroup.java
@@ -225,7 +225,7 @@ public String showPolyhedron() {
 	 */
 	@Override
 	public String drawAxes() {
-		if (rotationGroup.getPointGroup().equals("C1")) {
+		if ("C1".equals(rotationGroup.getPointGroup())) {
 			return drawInertiaAxes();
 		} else {
 			return drawSymmetryAxes();
@@ -257,7 +257,7 @@ public String playOrientations() {
 
 		// draw point group
 
-		if ( rotationGroup.getPointGroup().equals("C1")) {
+		if ( "C1".equals(rotationGroup.getPointGroup())) {
 			s.append(drawFooter("Asymmetric", "white"));
 		} else {
 			s.append(drawFooter("Point group " + rotationGroup.getPointGroup(), "white"));
@@ -395,7 +395,7 @@ public String colorBySymmetry() {
 			colorMap = getCnColorMap();
 			// complex cases
 		} else if ((pointGroup.startsWith("D") && orbits.size() > 2) ||
-				pointGroup.equals("T")|| pointGroup.equals("O") || pointGroup.equals("I")) {
+				"T".equals(pointGroup)|| "O".equals(pointGroup) || "I".equals(pointGroup)) {
 			int nColor = 0;
 			if (orbits.size() % 2 == 0) {
 				nColor = orbits.size()/2;
@@ -582,7 +582,7 @@ private Color4f[] getSymmetryColors(int nColors) {
 		String pointGroup = rotationGroup.getPointGroup();
 		Color[] col = null;
 		Color4f[] colors = null;
-		if (pointGroup.equals("C1")) {
+		if ("C1".equals(pointGroup)) {
 			col = ColorBrewer.Greys.getColorPalette(nColors);
 			colors = ColorConverter.convertColor4f(col);
 		} else if (pointGroup.startsWith("C")) {
@@ -591,13 +591,13 @@ private Color4f[] getSymmetryColors(int nColors) {
 		} else if (pointGroup.startsWith("D")) {
 			col = ColorBrewer.YlOrRd.getColorPalette(nColors);
 			colors = ColorConverter.convertColor4f(col);
-		} else if (pointGroup.equals("T")) {
+		} else if ("T".equals(pointGroup)) {
 			col = ColorBrewer.Greens.getColorPalette(nColors);
 			colors = ColorConverter.convertColor4f(col);
-		} else if (pointGroup.equals("O")) {
+		} else if ("O".equals(pointGroup)) {
 			col = ColorBrewer.Blues.getColorPalette(nColors);
 			colors = ColorConverter.convertColor4f(col);
-		} else if (pointGroup.equals("I")) {
+		} else if ("I".equals(pointGroup)) {
 			col = ColorBrewer.BuPu.getColorPalette(nColors);
 			colors = ColorConverter.convertColor4f(col);
 		} else {
diff --git a/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java b/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
index b8e4eb5430..b198aeb46a 100644
--- a/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
+++ b/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
@@ -104,7 +104,7 @@ private void printStructure(Structure struc) {
 		for (int i = 0; i < struc.nrModels(); i++) {
 			// loop chain
 			for (Chain ch : struc.getModel(i)) {
-				if (!ch.getName().equals("A")) {
+				if (!"A".equals(ch.getName())) {
 					continue;
 				}
 				System.out.println(pdbid + ">>>" + ch.getName() + ">>>" + ch.getAtomSequence());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
index 4808ef0afb..f0e1f02c61 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
@@ -421,7 +421,7 @@ public String getSeqResSequence(){
 				// an amino acid residue.. use for alignment
 				String oneLetter= ChemCompGroupFactory.getOneLetterCode(cc);
 				// AB oneLetter.length() should be one. e.g. in 1EMA it is 3 and this makes mapping residue to sequence impossible.
-				if ( oneLetter == null || oneLetter.isEmpty() || oneLetter.equals("?")) {
+				if ( oneLetter == null || oneLetter.isEmpty() || "?".equals(oneLetter)) {
 					oneLetter = Character.toString(StructureTools.UNKNOWN_GROUP_LABEL);
 				}
 				str.append(oneLetter);
@@ -452,7 +452,7 @@ public String getSeqResOneLetterSeq(){
 				// an amino acid residue.. use for alignment
 				String oneLetter= ChemCompGroupFactory.getOneLetterCode(cc);
 				// AB oneLetter.length() should be one. e.g. in 1EMA it is 3 and this makes mapping residue to sequence impossible.
-				if ( oneLetter == null || oneLetter.isEmpty() || oneLetter.equals("?") || oneLetter.length()!=1) {
+				if ( oneLetter == null || oneLetter.isEmpty() || "?".equals(oneLetter) || oneLetter.length()!=1) {
 					oneLetter = Character.toString(StructureTools.UNKNOWN_GROUP_LABEL);
 				}
 				str.append(oneLetter);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/DBRef.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/DBRef.java
index b4c397c544..99ede802bf 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/DBRef.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/DBRef.java
@@ -156,8 +156,8 @@ public String toString(){
 			for (Method m : methods) {
 				String name = m.getName();
 
-				if (name.substring(0, 3).equals("get")) {
-					if (name.equals("getClass")) {
+				if ("get".equals(name.substring(0, 3))) {
+					if ("getClass".equals(name)) {
 						continue;
 					}
 					Object o = m.invoke(this);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
index cf9dfcbeb9..face75517e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/HetatomImpl.java
@@ -137,7 +137,7 @@ public void setPDBName(String s) {
 		//if (s.length() != 3) {
 		//throw new PDBParseException("amino acid name is not of length 3!");
 		//}
-		if (s != null && s.equals("?")) logger.info("invalid pdbname: ?");
+		if ("?".equals(s)) logger.info("invalid pdbname: ?");
 		pdb_name =s ;
 
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/JournalArticle.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/JournalArticle.java
index ff92f608f6..a4c77badd2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/JournalArticle.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/JournalArticle.java
@@ -258,19 +258,19 @@ public String toString() {
 		}
 		refString.append(ref);
 		jrnlString.append(refString).append(eol);
-		if (!publisher.equals("")) {
+		if (!"".equals(publisher)) {
 			publString.append(publisher);
 			jrnlString.append(publString).append(eol);
 		}
-		if (!refn.equals("")) {
+		if (!"".equals(refn)) {
 			refnString.append(refn);
 			jrnlString.append(refnString).append(eol);
 		}
-		if (!pmid.equals("")) {
+		if (!"".equals(pmid)) {
 			pmidString.append(pmid);
 			jrnlString.append(pmidString).append(eol);
 		}
-		if (!doi.equals("")) {
+		if (!"".equals(doi)) {
 			doiString.append(doi);
 			jrnlString.append(doiString).append(eol);
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
index a948e3281a..216f0b2476 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
@@ -127,8 +127,8 @@ public String toString(){
 			for (Method m : methods) {
 				String name = m.getName();
 
-				if (name.substring(0, 3).equals("get")) {
-					if (name.equals("getClass")) {
+				if ("get".equals(name.substring(0, 3))) {
+					if ("getClass".equals(name)) {
 						continue;
 					}
 					Object o = m.invoke(this);
@@ -232,7 +232,7 @@ private void printAuthors(StringBuffer buf){
 		String authors = getAuthors();
 		if ( authors == null)
 			return;
-		if ( authors.equals("")){
+		if ( "".equals(authors)){
 			return;
 		}
 
@@ -424,8 +424,8 @@ public boolean equals(PDBHeader other){
 			for (Method m : methods) {
 				String name = m.getName();
 
-				if (name.substring(0, 3).equals("get")) {
-					if (name.equals("getClass")) {
+				if ("get".equals(name.substring(0, 3))) {
+					if ("getClass".equals(name)) {
 						continue;
 					}
 					Object a = m.invoke(this);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
index b09b65020c..2211b5b4d2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBStatus.java
@@ -71,11 +71,11 @@ public enum Status {
 		 */
 		public static Status fromString(String statusStr) {
 			if (statusStr == null) throw new IllegalArgumentException("Status string can't be null");
-			if(statusStr.equalsIgnoreCase("REMOVED"))
+			if("REMOVED".equalsIgnoreCase(statusStr))
 				return Status.REMOVED;
-			else if(statusStr.equalsIgnoreCase("CURRENT"))
+			else if("CURRENT".equalsIgnoreCase(statusStr))
 				return Status.CURRENT;
-			else if(statusStr.equalsIgnoreCase("UNRELEASED"))
+			else if("UNRELEASED".equalsIgnoreCase(statusStr))
 				return Status.UNRELEASED;
 			else {
 				throw new IllegalArgumentException("Unable to parse status '"+statusStr+"'.");
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ResidueRangeAndLength.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ResidueRangeAndLength.java
index a8988aada4..fbf9cb07bf 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ResidueRangeAndLength.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ResidueRangeAndLength.java
@@ -100,7 +100,7 @@ public static ResidueRangeAndLength parse(String s, AtomPositionMap map) {
 		String chain = rr.getChainName();
 
 		// handle special "_" chain
-		if(chain == null || chain.equals("_")) {
+		if(chain == null || "_".equals(chain)) {
 			ResidueNumber first = map.getNavMap().firstKey();
 			chain = first.getChainName();
 			// Quick check for additional chains. Not guaranteed if the atoms are out of order.
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
index 44f799cac0..49789d2fc9 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
@@ -245,7 +245,7 @@ public Structure reduce(Structure s) throws StructureException {
 
 //					StructureTools.addGroupsToStructure(newS, groups, modelNr, false);
 					Chain polyChain; //polymer
-					if(chainName.equals("_") ) {
+					if("_".equals(chainName) ) {
 						// Handle special case of "_" chain for single-chain proteins
 						polyChain = s.getPolyChains(modelNr).get(0);
 						chainName = polyChain.getName();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java
index 85e2c100ab..fb7382cf71 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java
@@ -118,14 +118,14 @@ public void process(String[] argv){
 			String arg   = argv[i];
 
 			// help string
-			if(arg.equalsIgnoreCase("-h") || arg.equalsIgnoreCase("-help")
-					|| arg.equalsIgnoreCase("--help") )
+			if("-h".equalsIgnoreCase(arg) || "-help".equalsIgnoreCase(arg)
+					|| "--help".equalsIgnoreCase(arg) )
 			{
 				System.out.println(printHelp());
 				return;
 			}
 			// version
-			if(arg.equalsIgnoreCase("-version") || arg.equalsIgnoreCase("--version")) {
+			if("-version".equalsIgnoreCase(arg) || "--version".equalsIgnoreCase(arg)) {
 				StructureAlignment alg = getAlgorithm();
 				System.out.println(alg.getAlgorithmName() + " v." + alg.getVersion() );
 				return;
@@ -591,12 +591,12 @@ private Structure getStructure(AtomCache cache, String name1, String file)
 	 */
 	private Structure fixStructureName(Structure s, String file) {
 
-		if ( s.getName() != null && (! s.getName().equals("")))
+		if ( s.getName() != null && (! "".equals(s.getName())))
 			return s;
 
 		s.setName(s.getPDBCode());
 
-		if ( s.getName() == null || s.getName().equals("")){
+		if ( s.getName() == null || "".equals(s.getName())){
 			File f = new File(file);
 			s.setName(f.getName());
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/StructureName.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/StructureName.java
index 123987531b..0d9428a6b7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/StructureName.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/StructureName.java
@@ -457,7 +457,7 @@ public StructureIdentifier getBaseIdentifier() throws StructureException {
 				if(base == null) {
 					// Guessing didn't work, so just use the PDBID and Chain from name
 					// Guess that '_' means 'whole structure'
-					if (chainName.equals("_")) {
+					if ("_".equals(chainName)) {
 						base = new SubstructureIdentifier(pdbId.getId());
 					} else {
 						base = new SubstructureIdentifier(pdbId, ResidueRange.parseMultiple(chainName));
@@ -624,9 +624,9 @@ public static ScopDomain guessScopDomain(String name, ScopDatabase scopDB) {
 			for (ScopDomain potentialSCOP : scopDB.getDomainsForPDB(pdbID)) {
 				Matcher potMatch = scopPattern.matcher(potentialSCOP.getScopId());
 				if (potMatch.matches()) {
-					if (chainName.equals(potMatch.group(2)) || chainName.equals("_") || chainName.equals(".")
-							|| potMatch.group(2).equals("_") || potMatch.group(2).equals(".")) {
-						if (domainID.equals(potMatch.group(3)) || domainID.equals("_") || potMatch.group(3).equals("_")) {
+					if (chainName.equals(potMatch.group(2)) || "_".equals(chainName) || ".".equals(chainName)
+							|| "_".equals(potMatch.group(2)) || ".".equals(potMatch.group(2))) {
+						if (domainID.equals(potMatch.group(3)) || "_".equals(domainID) || "_".equals(potMatch.group(3))) {
 							// Match, or near match
 							matches.add(potentialSCOP);
 						}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AlternativeAlignment.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AlternativeAlignment.java
index 2af3894f5e..731ed2cfe4 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AlternativeAlignment.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/AlternativeAlignment.java
@@ -677,11 +677,11 @@ private void getPdbRegions(Atom[] ca1, Atom[] ca2){
 			String pdb2 = p2.getResidueNumber().toString();
 
 
-			if ( ! cid1.equals(" "))
+			if ( ! " ".equals(cid1))
 				pdb1 += ":" + cid1;
 
 
-			if ( ! cid2.equals(" "))
+			if ( ! " ".equals(cid2))
 				pdb2 += ":" + cid2;
 
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/CliTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/CliTools.java
index 2356304c95..513b2bdf5d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/CliTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/CliTools.java
@@ -171,9 +171,9 @@ public static String[] configureBean(Object bean, String[] args)
 						if ( val == null )
 							propVal = Boolean.TRUE;
 						else {
-							if ( val.equalsIgnoreCase("true") || val.equalsIgnoreCase("t"))
+							if ( "true".equalsIgnoreCase(val) || "t".equalsIgnoreCase(val))
 								propVal = Boolean.TRUE;
-							else if( val.equalsIgnoreCase("false") || val.equalsIgnoreCase("f"))
+							else if( "false".equalsIgnoreCase(val) || "f".equalsIgnoreCase(val))
 								propVal = Boolean.FALSE;
 							else
 								throw new ConfigurationException("Option "+arg+" requires a boolean parameter");
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLParser.java
index 0827134bbe..d803ad1a80 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLParser.java
@@ -339,7 +339,7 @@ public static AFPChain[] parseMultiXML(String xml) throws IOException {
 					Node block       = listOfBlocks.item(i);
 
 					// we only look at blocks.
-					if (! block.getNodeName().equals("block"))
+					if (! "block".equals(block.getNodeName()))
 						continue;
 
 					processBlock(block, a, minLength);
@@ -421,7 +421,7 @@ private static  void processBlock(Node block, AFPChain a, int minLength){
 			if(!eqr.hasAttributes()) continue;
 
 
-			if ( eqr.getNodeName().equals("eqr")) {
+			if ( "eqr".equals(eqr.getNodeName())) {
 				nrEqr++;
 				NamedNodeMap atts = eqr.getAttributes();
 
@@ -445,7 +445,7 @@ private static  void processBlock(Node block, AFPChain a, int minLength){
 				optAln[blockNr][0][eqrNr] = pos1;
 				optAln[blockNr][1][eqrNr] = pos2;
 				 */
-			} else if ( eqr.getNodeName().equals("matrix")){
+			} else if ( "matrix".equals(eqr.getNodeName())){
 				// process Matrix
 				Matrix m = new Matrix(3,3);
 
@@ -459,7 +459,7 @@ private static  void processBlock(Node block, AFPChain a, int minLength){
 				}
 				ms[blockNr] = m;
 
-			} else if ( eqr.getNodeName().equals("shift")){
+			} else if ( "shift".equals(eqr.getNodeName())){
 				Atom shift = new AtomImpl();
 				double x = Double.parseDouble(getAttribute(eqr, "x"));
 				double y = Double.parseDouble(getAttribute(eqr, "y"));
@@ -520,7 +520,7 @@ private static int getPositionForPDBresunm(String pdbresnum, String authId , Ato
 		ResidueNumber residueNumber =  ResidueNumber.fromString(pdbresnum);
 		residueNumber.setChainName(authId);
 
-		boolean blankChain = authId == null || authId.equalsIgnoreCase("null") || authId.equals("_");
+		boolean blankChain = authId == null || "null".equalsIgnoreCase(authId) || "_".equals(authId);
 
 		for ( int i =0; i< atoms.length ;i++){
 			Group g = atoms[i].getGroup();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java
index cf8b2b0f54..d43ba8db56 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java
@@ -113,13 +113,13 @@ private static MultipleAlignmentEnsemble parseEnsemble(Node root){
 		for (int i=0; i<children.getLength(); i++) {
 
 			Node child = children.item(i);
-			if (child.getNodeName().equals("MultipleAlignment")){
+			if ("MultipleAlignment".equals(child.getNodeName())){
 				parseMultipleAlignment(child, ensemble);
 			}
-			else if (child.getNodeName().equals("Structures")){
+			else if ("Structures".equals(child.getNodeName())){
 				parseStructures(child, ensemble);
 			}
-			else if (child.getNodeName().equals("ScoresCache")){
+			else if ("ScoresCache".equals(child.getNodeName())){
 				parseScoresCache(child, ensemble);
 			}
 		}
@@ -137,10 +137,10 @@ private static MultipleAlignment parseMultipleAlignment(Node root,
 
 			Node child = children.item(i);
 
-			if (child.getNodeName().equals("BlockSet")){
+			if ("BlockSet".equals(child.getNodeName())){
 				parseBlockSet(child, msa);
 			}
-			else if (child.getNodeName().equals("ScoresCache")){
+			else if ("ScoresCache".equals(child.getNodeName())){
 				parseScoresCache(child, msa);
 			}
 		}
@@ -157,14 +157,14 @@ private static BlockSet parseBlockSet(Node root, MultipleAlignment msa) {
 
 			Node child = children.item(i);
 
-			if (child.getNodeName().equals("Block")){
+			if ("Block".equals(child.getNodeName())){
 				parseBlock(child, bs);
 			}
-			else if (child.getNodeName().equals("Matrix4d")){
+			else if ("Matrix4d".equals(child.getNodeName())){
 				Matrix4d t = parseMatrix4d(child);
 				transforms.add(t);
 			}
-			else if (child.getNodeName().equals("ScoresCache")){
+			else if ("ScoresCache".equals(child.getNodeName())){
 				parseScoresCache(child, bs);
 			}
 		}
@@ -199,7 +199,7 @@ private static Block parseBlock(Node root, BlockSet blockSet) {
 					}
 
 					String residue = node.getTextContent();
-					if (residue.equals("null")){
+					if ("null".equals(residue)){
 						alignRes.get(str-1).add(null);
 					} else {
 						alignRes.get(str-1).add(Integer.valueOf(residue));
@@ -209,7 +209,7 @@ private static Block parseBlock(Node root, BlockSet blockSet) {
 					node = atts.getNamedItem("str"+str);
 				}
 			}
-			else if (child.getNodeName().equals("ScoresCache")){
+			else if ("ScoresCache".equals(child.getNodeName())){
 				parseScoresCache(child, b);
 			}
 		}
@@ -253,22 +253,22 @@ private static void parseHeader(Node node,
 		NamedNodeMap atts = node.getAttributes();
 
 		String algo = atts.getNamedItem("Algorithm").getTextContent();
-		if (!algo.equals("null")){
+		if (!"null".equals(algo)){
 			ensemble.setAlgorithmName(algo);
 		}
 
 		String version = atts.getNamedItem("Version").getTextContent();
-		if (!version.equals("null")){
+		if (!"null".equals(version)){
 			ensemble.setVersion(version);
 		}
 
 		String ioTime = atts.getNamedItem("IOTime").getTextContent();
-		if (!ioTime.equals("null")){
+		if (!"null".equals(ioTime)){
 			ensemble.setIoTime(Long.valueOf(ioTime));
 		}
 
 		String time = atts.getNamedItem("CalculationTime").getTextContent();
-		if (!time.equals("null")){
+		if (!"null".equals(time)){
 			ensemble.setCalculationTime(Long.valueOf(time));
 		}
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
index 144bcd1209..956bbe90a4 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
@@ -531,19 +531,19 @@ else if (atom.getElement()==Element.S) {
 			return SULFUR_VDW;
 		}
 		else if (atom.getElement()==Element.N) {
-			if (atomCode.equals("NZ")) return TETRAHEDRAL_NITROGEN_VDW; // tetrahedral Nitrogen
+			if ("NZ".equals(atomCode)) return TETRAHEDRAL_NITROGEN_VDW; // tetrahedral Nitrogen
 			return TRIGONAL_NITROGEN_VDW;								// trigonal Nitrogen
 		}
 		else if (atom.getElement()==Element.C) { // it must be a carbon
-			if (atomCode.equals("C") ||
-					atomCode.equals("CE1") || atomCode.equals("CE2") || atomCode.equals("CE3") ||
-					atomCode.equals("CH2") ||
-					atomCode.equals("CZ") || atomCode.equals("CZ2") || atomCode.equals("CZ3")) {
+			if ("C".equals(atomCode) ||
+					"CE1".equals(atomCode) || "CE2".equals(atomCode) || "CE3".equals(atomCode) ||
+					"CH2".equals(atomCode) ||
+					"CZ".equals(atomCode) || "CZ2".equals(atomCode) || "CZ3".equals(atomCode)) {
 				return TRIGONAL_CARBON_VDW; 							// trigonal Carbon
 			}
-			else if (atomCode.equals("CA") || atomCode.equals("CB") ||
-					atomCode.equals("CE") ||
-					atomCode.equals("CG1") || atomCode.equals("CG2")) {
+			else if ("CA".equals(atomCode) || "CB".equals(atomCode) ||
+					"CE".equals(atomCode) ||
+					"CG1".equals(atomCode) || "CG2".equals(atomCode)) {
 				return TETRAHEDRAL_CARBON_VDW;							// tetrahedral Carbon
 			}
 			// the rest of the cases (CD, CD1, CD2, CG) depend on amino acid
@@ -567,8 +567,8 @@ else if (atomCode.equals("CA") || atomCode.equals("CB") ||
 
 				case 'Q':
 				case 'E':
-					if (atomCode.equals("CD")) return TRIGONAL_CARBON_VDW;
-					else if (atomCode.equals("CG")) return TETRAHEDRAL_CARBON_VDW;
+					if ("CD".equals(atomCode)) return TRIGONAL_CARBON_VDW;
+					else if ("CG".equals(atomCode)) return TETRAHEDRAL_CARBON_VDW;
 
 				default:
 					logger.info("Unexpected carbon atom {} for aminoacid {}, assigning its standard vdw radius", atomCode, aa);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathCategory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathCategory.java
index 4aabdc04b7..88202a591f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathCategory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathCategory.java
@@ -47,21 +47,21 @@ public enum CathCategory {
 	static final String lut = "CATHSOLID";
 
 	public static CathCategory fromString(String type) {
-		if ( type.equals("C") ) {
+		if ( "C".equals(type) ) {
 			return Class;
-		} else if ( type.equals("A") ) {
+		} else if ( "A".equals(type) ) {
 			return Architecture;
-		} else if ( type.equals("T") ) {
+		} else if ( "T".equals(type) ) {
 			return Topolgy;
-		} else if ( type.equals("H") ) {
+		} else if ( "H".equals(type) ) {
 			return Homology;
-		} else if ( type.equals("S") ) {
+		} else if ( "S".equals(type) ) {
 			return SequenceFamily;
-		} else if ( type.equals("O") ) {
+		} else if ( "O".equals(type) ) {
 			return OrthologousSequenceFamily;
-		} else if ( type.equals("L") ) {
+		} else if ( "L".equals(type) ) {
 			return LikeSequenceFamily;
-		} else if ( type.equals("I") ) {
+		} else if ( "I".equals(type) ) {
 			return IdenticalSequenceFamily;
 //        } else if ( type.equals("D") ) {
 		} else {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathDomain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathDomain.java
index 4f96fae196..56d41aba05 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathDomain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathDomain.java
@@ -176,7 +176,7 @@ public String getThePdbId() {
 	 */
 	public String getPdbIdAndChain() {
 		return domainName.substring(0, 4) +
-				(!domainName.substring(4, 5).equals("0") ? "." + domainName.substring(4, 5) : "");
+				(!"0".equals(domainName.substring(4, 5)) ? "." + domainName.substring(4, 5) : "");
 	}
 
 	public Integer getDomainId() {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java
index 3b7f94981a..7c7d2163ef 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java
@@ -591,13 +591,13 @@ private void parseCathDomall(BufferedReader bufferedReader) throws IOException{
 //                    String chainLetter = token[domIdx+segIdx]; // Redundant unless some domains cross chain boundaries.
 					sstart = Integer.parseInt( token[domIdx + segIdx + 1] );
 					String sstartInsertion = token[domIdx + segIdx + 2];
-					sstartInsertion = sstartInsertion.equals("-") ? "" : sstartInsertion;
+					sstartInsertion = "-".equals(sstartInsertion) ? "" : sstartInsertion;
 //                    String chainLetter = token[domIdx+segIdx+4]; // Redundant unless some segments cross chain boundaries.
 					segment.setStart(sstart + sstartInsertion);
 
 					sstop = Integer.parseInt( token[domIdx + segIdx + 4] );
 					String sstopInsertion = token[domIdx + segIdx + 5];
-					sstopInsertion = sstopInsertion.equals("-") ? "" : sstopInsertion;
+					sstopInsertion = "-".equals(sstopInsertion) ? "" : sstopInsertion;
 
 					segment.setStart(sstart + sstartInsertion);
 					segment.setStop(sstop + sstopInsertion);
@@ -617,12 +617,12 @@ private void parseCathDomall(BufferedReader bufferedReader) throws IOException{
 //                    String chainLetter = token[domIdx]; // Redundant unless some fragments cross chain boundaries.
 					fstart = Integer.parseInt( token[domIdx+1] );
 					String fstartInsertion = token[domIdx + 2];
-					fstartInsertion = fstartInsertion.equals("-") ? "" : fstartInsertion;
+					fstartInsertion = "-".equals(fstartInsertion) ? "" : fstartInsertion;
 					fragment.setStart(fstart + fstartInsertion);
 //                    String chainLetter = token[domIdx+3]; // Redundant unless some fragments cross chain boundaries.
 					fstop = Integer.parseInt( token[domIdx+4] );
 					String fstopInsertion = token[domIdx + 5];
-					fstopInsertion = fstopInsertion.equals("-") ? "" : fstopInsertion;
+					fstopInsertion = "-".equals(fstopInsertion) ? "" : fstopInsertion;
 					fragment.setStop(fstop + fstopInsertion);
 					flength = Integer.parseInt( token[domIdx + 6].replaceAll("[^0-9]","") );
 					fragment.setLength(flength);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
index cb33e369b3..794fe2cb82 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemComp.java
@@ -73,7 +73,7 @@ public String toString(){
 
     public boolean hasParent(){
         String pid = monNstdParentCompId;
-        return (pid != null) && (!pid.equals("?"));
+        return (pid != null) && (!"?".equals(pid));
     }
 
     public boolean isStandard(){
@@ -401,6 +401,6 @@ public static ChemComp getEmptyChemComp() {
      */
     public boolean isEmpty() {
         // Is this the best flag for it being empty?
-        return id == null || getThreeLetterCode() == null || getThreeLetterCode().equals("???");
+        return id == null || getThreeLetterCode() == null || "???".equals(getThreeLetterCode());
     }
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java
index a7aa84a138..d69247e8c7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompGroupFactory.java
@@ -78,7 +78,7 @@ public static Group getGroupFromChemCompDictionary(String recordName) {
             AminoAcid aa = new AminoAcidImpl();
 
             String one_letter = cc.getOneLetterCode();
-            if (one_letter == null || one_letter.equals("X") || one_letter.equals("?") || one_letter.length() == 0) {
+            if (one_letter == null || "X".equals(one_letter) || "?".equals(one_letter) || one_letter.length() == 0) {
                 String parent = cc.getMonNstdParentCompId();
                 if (parent != null && parent.length() == 3) {
                     String parentid = cc.getMonNstdParentCompId();
@@ -87,7 +87,7 @@ public static Group getGroupFromChemCompDictionary(String recordName) {
                 }
             }
 
-            if (one_letter == null || one_letter.length() == 0 || one_letter.equals("?")) {
+            if (one_letter == null || one_letter.length() == 0 || "?".equals(one_letter)) {
                 // e.g. problem with PRR, which probably should have a parent of ALA, but as of 20110127 does not.
                 logger.warn("Problem with chemical component: {} Did not find one letter code! Setting it to 'X'",
                         recordName);
@@ -109,7 +109,7 @@ public static Group getGroupFromChemCompDictionary(String recordName) {
 
     public static String getOneLetterCode(ChemComp cc) {
         String oneLetter = cc.getOneLetterCode();
-        if (oneLetter == null || oneLetter.equals("X") || oneLetter.equals("?")) {
+        if (oneLetter == null || "X".equals(oneLetter) || "?".equals(oneLetter)) {
             String parentId = cc.getMonNstdParentCompId();
             if (parentId == null) {
                 return oneLetter;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java
index 929223040a..f34da29373 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemCompTools.java
@@ -127,9 +127,9 @@ public static boolean isStandardChemComp(ChemComp cc) {
         PolymerType polymerType = getPolymerType(residueType);
 
         // standard residues have no parent
-        if (pid == null || pid.equals("?")) {
+        if (pid == null || "?".equals(pid)) {
             // and they have a one letter code
-            if (one != null && !one.equals("?")) {
+            if (one != null && !"?".equals(one)) {
                 // peptides and dpeptides must not have X
                 if (polymerType == PolymerType.peptide || polymerType == PolymerType.dpeptide) {
                     return performPeptideCheck(cc, one);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java
index c191e67118..371e00669e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ChemicalComponentDictionary.java
@@ -88,12 +88,12 @@ public ChemComp getParent(ChemComp c) {
     public void addChemComp(ChemComp comp) {
         dictionary.put(comp.getId(),comp);
         String rep = comp.getPdbxReplaces();
-        if (rep != null && !rep.equals("?")) {
+        if (rep != null && !"?".equals(rep)) {
             replaces.put(comp.getId(),rep);
         }
 
         String isrep = comp.getPdbxReplacedBy();
-        if (isrep != null && !isrep.equals("?")) {
+        if (isrep != null && !"?".equals(isrep)) {
             isReplacedBy.put(comp.getId(), isrep);
         }
     }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
index f2180dba03..5e0a055a39 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -233,7 +233,7 @@ public ChemComp getChemComp(String recordName) {
         recordName = recordName.toUpperCase().trim();
 
         boolean haveFile = true;
-        if (recordName.equals("?")) {
+        if ("?".equals(recordName)) {
             return null;
         }
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java
index 5888213c5b..4fe19aca58 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java
@@ -58,7 +58,7 @@ public ZipChemCompProvider(String chemicalComponentDictionaryFile, String tempDi
         this.m_zipFile = Paths.get(chemicalComponentDictionaryFile);
 
         // Use a default temporary directory if not passed a value.
-        if (tempDir == null || tempDir.equals("")) {
+        if (tempDir == null || "".equals(tempDir)) {
             this.m_tempDir = Paths.get(System.getProperty("java.io.tmpdir"));
         } else {
             this.m_tempDir = Paths.get(tempDir);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
index 9dc3ec7f11..efa042edcf 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
@@ -686,7 +686,7 @@ private void parse(BufferedReader in) throws IOException {
 									String assemblyStr = fields[i++];
 									if(assemblyStr.equals(NOT_DOMAIN_ASSEMBLY)) {
 										assemblyId = uid;
-									} else if(assemblyStr.equals("IS_DOMAIN_ASSEMBLY") ) {
+									} else if("IS_DOMAIN_ASSEMBLY".equals(assemblyStr) ) {
 										if(warnIsDomainAssembly > 1) {
 											logger.info("Deprecated 'IS_DOMAIN_ASSEMBLY' value ignored in line {}.",lineNum);
 											warnIsDomainAssembly--;
@@ -701,7 +701,7 @@ private void parse(BufferedReader in) throws IOException {
 
 									String ligandStr = fields[i++];
 									Set<String> ligands = null;
-									if( ligandStr.equals("NO_LIGANDS_4A") || ligandStr.isEmpty() ) {
+									if( "NO_LIGANDS_4A".equals(ligandStr) || ligandStr.isEmpty() ) {
 										ligands = Collections.emptySet();
 									} else {
 										String[] ligSplit = ligandStr.split(",");
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
index e7568de2fb..a582f922d2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
@@ -340,8 +340,8 @@ private void formDisulfideBond(SSBondImpl disulfideBond) {
 	 */
 	public void formLinkRecordBond(LinkRecord linkRecord) {
 		// only work with atoms that aren't alternate locations
-		if (linkRecord.getAltLoc1().equals(" ")
-				|| linkRecord.getAltLoc2().equals(" "))
+		if (" ".equals(linkRecord.getAltLoc1())
+				|| " ".equals(linkRecord.getAltLoc2()))
 			return;
 
 		try {
@@ -361,8 +361,8 @@ public void formLinkRecordBond(LinkRecord linkRecord) {
 			if (polyChain2!=null) allChainIds2.add(polyChain2.getId());
 			if (nonpolyChains1!=null) nonpolyChains1.forEach(npc -> allChainIds1.add(npc.getId()));
 			if (nonpolyChains2!=null) nonpolyChains2.forEach(npc -> allChainIds2.add(npc.getId()));
-			if (waterChain1!=null && linkRecord.getResName1().equals("HOH")) allChainIds1.add(waterChain1.getId());
-			if (waterChain2!=null && linkRecord.getResName2().equals("HOH")) allChainIds2.add(waterChain2.getId());
+			if (waterChain1!=null && "HOH".equals(linkRecord.getResName1())) allChainIds1.add(waterChain1.getId());
+			if (waterChain2!=null && "HOH".equals(linkRecord.getResName2())) allChainIds2.add(waterChain2.getId());
 
 			Map<Integer, Atom> a = getAtomFromRecordTryMultipleChainIds(linkRecord.getName1(), linkRecord.getAltLoc1(), linkRecord.getResSeq1(), linkRecord.getiCode1(), allChainIds1);
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java
index 96d52edee1..1fc2b185c2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java
@@ -422,7 +422,7 @@ private static int getNumGaps(SequencePair<?, ?> pair) {
 	private static int getNumGapsQuery(SequencePair<?, ?> pair) {
 		int numGaps = 0;
 		for (int alignmentIndex=1;alignmentIndex<=pair.getLength();alignmentIndex++) {
-			if (pair.getCompoundInQueryAt(alignmentIndex).getShortName().equals("-")) {
+			if ("-".equals(pair.getCompoundInQueryAt(alignmentIndex).getShortName())) {
 				numGaps++;
 			}
 		}
@@ -432,7 +432,7 @@ private static int getNumGapsQuery(SequencePair<?, ?> pair) {
 	private static int getNumGapsTarget(SequencePair<?, ?> pair) {
 		int numGaps = 0;
 		for (int alignmentIndex=1;alignmentIndex<=pair.getLength();alignmentIndex++) {
-			if (pair.getCompoundInTargetAt(alignmentIndex).getShortName().equals("-")) {
+			if ("-".equals(pair.getCompoundInTargetAt(alignmentIndex).getShortName())) {
 				numGaps++;
 			}
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index 190fe42cd8..2097369466 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -862,7 +862,7 @@ private void pdb_TITLE_Handler(String line) {
 			title = line.substring(10,line.length()).trim();
 
 		String t = pdbHeader.getTitle();
-		if ( (t != null) && (! t.equals("")) ){
+		if ( (t != null) && (! "".equals(t)) ){
 			if (t.endsWith("-"))
 				t += ""; // if last line ends with a hyphen then we don't add space
 			else
@@ -947,7 +947,7 @@ private void pdb_COMPND_Handler(String line) {
 			String field0 = fieldList[0];
 			if (compndFieldValues.contains(field0)) {
 				continuationField = field0;
-				if (previousContinuationField.equals("")) {
+				if ("".equals(previousContinuationField)) {
 					previousContinuationField = continuationField;
 				}
 			} else if (field0.endsWith(";") && compndFieldValues.contains(field0.substring(0, field0.length()-1)) ) {
@@ -972,7 +972,7 @@ private void pdb_COMPND_Handler(String line) {
 		while (compndTokens.hasMoreTokens()) {
 			String token = compndTokens.nextToken();
 
-			if (previousContinuationField.equals("")) {
+			if ("".equals(previousContinuationField)) {
 				previousContinuationField = continuationField;
 			}
 
@@ -990,7 +990,7 @@ private void pdb_COMPND_Handler(String line) {
 			}
 			if (!continuationField.equals(previousContinuationField)) {
 
-				if (continuationString.equals("")) {
+				if ("".equals(continuationString)) {
 					continuationString = token;
 
 				} else {
@@ -1022,7 +1022,7 @@ private void pdb_COMPND_Handler(String line) {
 	private void compndValueSetter(String field, String value) {
 
 		value = value.trim().replace(";", "");
-		if (field.equals("MOL_ID:")) {
+		if ("MOL_ID:".equals(field)) {
 
 			int i = -1;
 			try {
@@ -1053,11 +1053,11 @@ private void compndValueSetter(String field, String value) {
 			return;
 		}
 
-		if (field.equals("MOLECULE:")) {
+		if ("MOLECULE:".equals(field)) {
 			current_compound.setDescription(value);
 
 		}
-		if (field.equals("CHAIN:")) {
+		if ("CHAIN:".equals(field)) {
 			//System.out.println(value);
 			StringTokenizer chainTokens = new StringTokenizer(value, ",");
 			List<String> chains = new ArrayList<String>();
@@ -1065,14 +1065,14 @@ private void compndValueSetter(String field, String value) {
 			while (chainTokens.hasMoreTokens()) {
 				String chainID = chainTokens.nextToken().trim();
 				// NULL is used in old PDB files to represent empty chain DI
-				if (chainID.equals("NULL"))
+				if ("NULL".equals(chainID))
 					chainID = " ";
 				chains.add(chainID);
 			}
 			compoundMolIds2chainIds.put(current_compound.getMolId(),chains);
 
 		}
-		if (field.equals("SYNONYM:")) {
+		if ("SYNONYM:".equals(field)) {
 
 			StringTokenizer synonyms = new StringTokenizer(value, ",");
 			List<String> names = new ArrayList<String>();
@@ -1085,7 +1085,7 @@ private void compndValueSetter(String field, String value) {
 
 		}
 
-		if (field.equals("EC:")) {
+		if ("EC:".equals(field)) {
 
 			StringTokenizer ecNumTokens = new StringTokenizer(value, ",");
 			List<String> ecNums = new ArrayList<String>();
@@ -1097,27 +1097,27 @@ private void compndValueSetter(String field, String value) {
 			}
 
 		}
-		if (field.equals("FRAGMENT:")) {
+		if ("FRAGMENT:".equals(field)) {
 
 			current_compound.setFragment(value);
 
 		}
-		if (field.equals("ENGINEERED:")) {
+		if ("ENGINEERED:".equals(field)) {
 
 			current_compound.setEngineered(value);
 
 		}
-		if (field.equals("MUTATION:")) {
+		if ("MUTATION:".equals(field)) {
 
 			current_compound.setMutation(value);
 
 		}
-		if (field.equals("BIOLOGICAL_UNIT:")) {
+		if ("BIOLOGICAL_UNIT:".equals(field)) {
 
 			current_compound.setBiologicalUnit(value);
 
 		}
-		if (field.equals("OTHER_DETAILS:")) {
+		if ("OTHER_DETAILS:".equals(field)) {
 
 			current_compound.setDetails(value);
 
@@ -1171,28 +1171,28 @@ private void pdb_SOURCE_Handler(String line) {
 
 		String[] fieldList = line.split("\\s+");
 
-		if (!fieldList[0].equals("")
+		if (!"".equals(fieldList[0])
 				&& sourceFieldValues.contains(fieldList[0])) {
 			//			System.out.println("[PDBFileParser.pdb_COMPND_Handler] Setting continuationField to '" + fieldList[0] + "'");
 			continuationField = fieldList[0];
-			if (previousContinuationField.equals("")) {
+			if ("".equals(previousContinuationField)) {
 				previousContinuationField = continuationField;
 			}
 
 		} else if ((fieldList.length > 1) && ( sourceFieldValues.contains(fieldList[1]))) {
 			//			System.out.println("[PDBFileParser.pdb_COMPND_Handler] Setting continuationField to '" + fieldList[1] + "'");
 			continuationField = fieldList[1];
-			if (previousContinuationField.equals("")) {
+			if ("".equals(previousContinuationField)) {
 				previousContinuationField = continuationField;
 			}
 
 		} else {
-			if (continuationNr.equals("")) {
+			if ("".equals(continuationNr)) {
 
 				logger.debug("looks like an old PDB file");
 
 				continuationField = "MOLECULE:";
-				if (previousContinuationField.equals("")) {
+				if ("".equals(previousContinuationField)) {
 					previousContinuationField = continuationField;
 				}
 			}
@@ -1208,7 +1208,7 @@ private void pdb_SOURCE_Handler(String line) {
 		while (compndTokens.hasMoreTokens()) {
 			String token = compndTokens.nextToken();
 
-			if (previousContinuationField.equals("")) {
+			if ("".equals(previousContinuationField)) {
 				//				System.out.println("previousContinuationField is empty. Setting to : " + continuationField);
 				previousContinuationField = continuationField;
 			}
@@ -1225,7 +1225,7 @@ private void pdb_SOURCE_Handler(String line) {
 			}
 			if (!continuationField.equals(previousContinuationField)) {
 
-				if (continuationString.equals("")) {
+				if ("".equals(continuationString)) {
 					continuationString = token;
 
 				} else {
@@ -1261,7 +1261,7 @@ private void sourceValueSetter(String field, String value) {
 
 		value = value.trim().replace(";", "");
 		//		System.out.println("[sourceValueSetter] " + field);
-		if (field.equals("MOL_ID:")) {
+		if ("MOL_ID:".equals(field)) {
 
 			try {
 				current_compound = entities.get(Integer.valueOf(value) - 1);
@@ -1274,69 +1274,69 @@ private void sourceValueSetter(String field, String value) {
 			//			System.out.println("[sourceValueSetter] Fetching compound " + value + " " + current_compound.getMolId());
 
 		}
-		if (field.equals("SYNTHETIC:")) {
+		if ("SYNTHETIC:".equals(field)) {
 			current_compound.setSynthetic(value);
-		} else if (field.equals("FRAGMENT:")) {
+		} else if ("FRAGMENT:".equals(field)) {
 			current_compound.setFragment(value);
-		} else if (field.equals("ORGANISM_SCIENTIFIC:")) {
+		} else if ("ORGANISM_SCIENTIFIC:".equals(field)) {
 			current_compound.setOrganismScientific(value);
-		} else if (field.equals("ORGANISM_TAXID:")) {
+		} else if ("ORGANISM_TAXID:".equals(field)) {
 			current_compound.setOrganismTaxId(value);
-		} else if (field.equals("ORGANISM_COMMON:")) {
+		} else if ("ORGANISM_COMMON:".equals(field)) {
 			current_compound.setOrganismCommon(value);
-		} else if (field.equals("STRAIN:")) {
+		} else if ("STRAIN:".equals(field)) {
 			current_compound.setStrain(value);
-		} else if (field.equals("VARIANT:")) {
+		} else if ("VARIANT:".equals(field)) {
 			current_compound.setVariant(value);
-		} else if (field.equals("CELL_LINE:")) {
+		} else if ("CELL_LINE:".equals(field)) {
 			current_compound.setCellLine(value);
-		} else if (field.equals("ATCC:")) {
+		} else if ("ATCC:".equals(field)) {
 			current_compound.setAtcc(value);
-		} else if (field.equals("ORGAN:")) {
+		} else if ("ORGAN:".equals(field)) {
 			current_compound.setOrgan(value);
-		} else if (field.equals("TISSUE:")) {
+		} else if ("TISSUE:".equals(field)) {
 			current_compound.setTissue(value);
-		} else if (field.equals("CELL:")) {
+		} else if ("CELL:".equals(field)) {
 			current_compound.setCell(value);
-		} else if (field.equals("ORGANELLE:")) {
+		} else if ("ORGANELLE:".equals(field)) {
 			current_compound.setOrganelle(value);
-		} else if (field.equals("SECRETION:")) {
+		} else if ("SECRETION:".equals(field)) {
 			current_compound.setSecretion(value);
-		} else if (field.equals("GENE:")) {
+		} else if ("GENE:".equals(field)) {
 			current_compound.setGene(value);
-		} else if (field.equals("CELLULAR_LOCATION:")) {
+		} else if ("CELLULAR_LOCATION:".equals(field)) {
 			current_compound.setCellularLocation(value);
-		} else if (field.equals("EXPRESSION_SYSTEM:")) {
+		} else if ("EXPRESSION_SYSTEM:".equals(field)) {
 			current_compound.setExpressionSystem(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_TAXID:")) {
+		} else if ("EXPRESSION_SYSTEM_TAXID:".equals(field)) {
 			current_compound.setExpressionSystemTaxId(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_STRAIN:")) {
+		} else if ("EXPRESSION_SYSTEM_STRAIN:".equals(field)) {
 			current_compound.setExpressionSystemStrain(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_VARIANT:")) {
+		} else if ("EXPRESSION_SYSTEM_VARIANT:".equals(field)) {
 			current_compound.setExpressionSystemVariant(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_CELL_LINE:")) {
+		} else if ("EXPRESSION_SYSTEM_CELL_LINE:".equals(field)) {
 			current_compound.setExpressionSystemCellLine(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_ATCC_NUMBER:")) {
+		} else if ("EXPRESSION_SYSTEM_ATCC_NUMBER:".equals(field)) {
 			current_compound.setExpressionSystemAtccNumber(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_ORGAN:")) {
+		} else if ("EXPRESSION_SYSTEM_ORGAN:".equals(field)) {
 			current_compound.setExpressionSystemOrgan(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_TISSUE:")) {
+		} else if ("EXPRESSION_SYSTEM_TISSUE:".equals(field)) {
 			current_compound.setExpressionSystemTissue(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_CELL:")) {
+		} else if ("EXPRESSION_SYSTEM_CELL:".equals(field)) {
 			current_compound.setExpressionSystemCell(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_ORGANELLE:")) {
+		} else if ("EXPRESSION_SYSTEM_ORGANELLE:".equals(field)) {
 			current_compound.setExpressionSystemOrganelle(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_CELLULAR_LOCATION:")) {
+		} else if ("EXPRESSION_SYSTEM_CELLULAR_LOCATION:".equals(field)) {
 			current_compound.setExpressionSystemCellularLocation(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_VECTOR_TYPE:")) {
+		} else if ("EXPRESSION_SYSTEM_VECTOR_TYPE:".equals(field)) {
 			current_compound.setExpressionSystemVectorType(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_VECTOR:")) {
+		} else if ("EXPRESSION_SYSTEM_VECTOR:".equals(field)) {
 			current_compound.setExpressionSystemVector(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_PLASMID:")) {
+		} else if ("EXPRESSION_SYSTEM_PLASMID:".equals(field)) {
 			current_compound.setExpressionSystemPlasmid(value);
-		} else if (field.equals("EXPRESSION_SYSTEM_GENE:")) {
+		} else if ("EXPRESSION_SYSTEM_GENE:".equals(field)) {
 			current_compound.setExpressionSystemGene(value);
-		} else if (field.equals("OTHER_DETAILS:")) {
+		} else if ("OTHER_DETAILS:".equals(field)) {
 			current_compound.setExpressionSystemOtherDetails(value);
 		}
 
@@ -1658,7 +1658,7 @@ private void  pdb_ATOM_Handler(String line)	{
 		// let's first get the chain name which will serve to identify if we are starting a new molecule
 		String chainName      = line.substring(21,22);
 
-		if (chainName.equals(" ")) {
+		if (" ".equals(chainName)) {
 			blankChainIdsPresent = true;
 		}
 
@@ -1716,7 +1716,7 @@ private void  pdb_ATOM_Handler(String line)	{
 
 		boolean isHetAtomInFile = false;
 
-		if (recordName.equals("HETATM") ){
+		if ("HETATM".equals(recordName) ){
 			// HETATOM RECORDS are treated slightly differently
 			// some modified amino acids that we want to treat as amino acids
 			// can be found as HETATOM records
@@ -1808,7 +1808,7 @@ private void  pdb_ATOM_Handler(String line)	{
 		if ( parseCAonly ){
 			// yes , user wants to get CA only
 			// only parse CA atoms...
-			if (! fullname.equals(" CA ")){
+			if (! " CA ".equals(fullname)){
 				//System.out.println("ignoring " + line);
 				atomCount--;
 				return;
@@ -2032,7 +2032,7 @@ private Integer conect_helper (String line,int start,int end) {
 		int bond  = -1 ;
 		Integer b = null ;
 
-		if ( ! sbond.equals("")) {
+		if ( ! "".equals(sbond)) {
 			bond = Integer.parseInt(sbond);
 			b = bond;
 		}
@@ -2256,16 +2256,16 @@ private void pdb_SSBOND_Handler(String line){
 			String symop2 = line.substring(66, 72).trim();
 
 			// until we implement proper treatment of symmetry in biojava #220, we can't deal with sym-related parteners properly, skipping them
-			if (!symop1.equals("") && !symop2.equals("") && // in case the field is missing
-					(!symop1.equals("1555") || !symop2.equals("1555")) ) {
+			if (!"".equals(symop1) && !"".equals(symop2) && // in case the field is missing
+					(!"1555".equals(symop1) || !"1555".equals(symop2)) ) {
 				logger.info("Skipping ss bond between groups {} and {} belonging to different symmetry partners, because it is not supported yet", seqNum1+icode1, seqNum2+icode2);
 				return;
 			}
 		}
 
-		if (icode1.equals(" "))
+		if (" ".equals(icode1))
 			icode1 = "";
-		if (icode2.equals(" "))
+		if (" ".equals(icode2))
 			icode2 = "";
 
 		SSBondImpl ssbond = new SSBondImpl();
@@ -2411,7 +2411,7 @@ private void pdb_SITE_Handler(String line){
 		String groupString = null;
 		//groupString = 'ARG H 221A'
 		//keep iterating through chunks of 10 characters - these are the groups in the siteResidues
-		while (!(groupString = line.substring(0, 10)).equals("          ")) {
+		while (!"          ".equals((groupString = line.substring(0, 10)))) {
 			//groupstring: 'ARG H 221A'
 
 			logger.debug("groupString: '" + groupString + "'");
@@ -2477,7 +2477,7 @@ private void pdb_REMARK_800_Handler(String line){
 		String[] fields = line.split(": ");
 
 		if (fields.length == 2) {
-			if (fields[0].equals("SITE_IDENTIFIER")) {
+			if ("SITE_IDENTIFIER".equals(fields[0])) {
 				//                    remark800Counter++;
 				String siteID = fields[1].trim();
 
@@ -2496,7 +2496,7 @@ private void pdb_REMARK_800_Handler(String line){
 
 				}
 			}
-			if (fields[0].equals("EVIDENCE_CODE")) {
+			if ("EVIDENCE_CODE".equals(fields[0])) {
 				//                    remark800Counter++;
 				String evCode = fields[1].trim();
 
@@ -2505,7 +2505,7 @@ private void pdb_REMARK_800_Handler(String line){
 				//fetch the siteResidues from the map
 				site.setEvCode(evCode);
 			}
-			if (fields[0].equals("SITE_DESCRIPTION")) {
+			if ("SITE_DESCRIPTION".equals(fields[0])) {
 				//                    remark800Counter++;
 				String desc = fields[1].trim();
 
@@ -2644,7 +2644,7 @@ public  Structure parsePDBFile(BufferedReader buf)
 		while ((line = buf.readLine()) != null) {
 
 			// ignore empty lines
-			if ( line.equals("") ||
+			if ( "".equals(line) ||
 					(line.equals(NEWLINE))){
 				continue;
 			}
@@ -2667,54 +2667,54 @@ public  Structure parsePDBFile(BufferedReader buf)
 				recordName = line.substring (0, 6).trim ();
 
 			try {
-				if (recordName.equals("ATOM"))
+				if ("ATOM".equals(recordName))
 					pdb_ATOM_Handler(line);
-				else if (recordName.equals("SEQRES"))
+				else if ("SEQRES".equals(recordName))
 					pdb_SEQRES_Handler(line);
-				else if (recordName.equals("HETATM"))
+				else if ("HETATM".equals(recordName))
 					pdb_ATOM_Handler(line);
-				else if (recordName.equals("MODEL"))
+				else if ("MODEL".equals(recordName))
 					pdb_MODEL_Handler(line);
-				else if (recordName.equals("TER"))
+				else if ("TER".equals(recordName))
 					pdb_TER_Handler();
-				else if (recordName.equals("HEADER"))
+				else if ("HEADER".equals(recordName))
 					pdb_HEADER_Handler(line);
-				else if (recordName.equals("AUTHOR"))
+				else if ("AUTHOR".equals(recordName))
 					pdb_AUTHOR_Handler(line);
-				else if (recordName.equals("TITLE"))
+				else if ("TITLE".equals(recordName))
 					pdb_TITLE_Handler(line);
-				else if (recordName.equals("SOURCE"))
+				else if ("SOURCE".equals(recordName))
 					sourceLines.add(line); //pdb_SOURCE_Handler
-				else if (recordName.equals("COMPND"))
+				else if ("COMPND".equals(recordName))
 					compndLines.add(line); //pdb_COMPND_Handler
-				else if (recordName.equals("KEYWDS"))
+				else if ("KEYWDS".equals(recordName))
 					keywordsLines.add(line);
-				else if (recordName.equals("JRNL"))
+				else if ("JRNL".equals(recordName))
 					pdb_JRNL_Handler(line);
-				else if (recordName.equals("EXPDTA"))
+				else if ("EXPDTA".equals(recordName))
 					pdb_EXPDTA_Handler(line);
-				else if (recordName.equals("CRYST1"))
+				else if ("CRYST1".equals(recordName))
 					pdb_CRYST1_Handler(line);
 				else if (recordName.startsWith("MTRIX"))
 					pdb_MTRIXn_Handler(line);
-				else if (recordName.equals("REMARK"))
+				else if ("REMARK".equals(recordName))
 					pdb_REMARK_Handler(line);
-				else if (recordName.equals("CONECT"))
+				else if ("CONECT".equals(recordName))
 					pdb_CONECT_Handler(line);
-				else if (recordName.equals("REVDAT"))
+				else if ("REVDAT".equals(recordName))
 					pdb_REVDAT_Handler(line);
-				else if (recordName.equals("DBREF"))
+				else if ("DBREF".equals(recordName))
 					pdb_DBREF_Handler(line);
-				else if (recordName.equals("SITE"))
+				else if ("SITE".equals(recordName))
 					pdb_SITE_Handler(line);
-				else if (recordName.equals("SSBOND"))
+				else if ("SSBOND".equals(recordName))
 					pdb_SSBOND_Handler(line);
-				else if (recordName.equals("LINK"))
+				else if ("LINK".equals(recordName))
 					pdb_LINK_Handler(line);
 				else if ( params.isParseSecStruc()) {
-					if ( recordName.equals("HELIX") ) pdb_HELIX_Handler (  line ) ;
-					else if (recordName.equals("SHEET")) pdb_SHEET_Handler(line ) ;
-					else if (recordName.equals("TURN")) pdb_TURN_Handler(   line ) ;
+					if ( "HELIX".equals(recordName) ) pdb_HELIX_Handler (  line ) ;
+					else if ("SHEET".equals(recordName)) pdb_SHEET_Handler(line ) ;
+					else if ("TURN".equals(recordName)) pdb_TURN_Handler(   line ) ;
 				}
 			} catch (StringIndexOutOfBoundsException | NullPointerException ex) {
 				logger.info("Unable to parse [" + line + "]");
@@ -2999,9 +2999,9 @@ private void setSecElement(List<Map<String,String>> secList, String assignment,
 				String endSeqNum   = m.get("endSeqNum");
 				String endICode    = m.get("endICode");
 
-				if (initICode.equals(" "))
+				if (" ".equals(initICode))
 					initICode = "";
-				if (endICode.equals(" "))
+				if (" ".equals(endICode))
 					endICode = "";
 
 				GroupIterator gi = new GroupIterator(structure);
@@ -3149,13 +3149,13 @@ private void assignAsymIds(List<List<Chain>> polys, List<List<Chain>> nonPolys,
 	 */
 	private String getNextAsymId(String asymId) {
 		if (asymId.length()==1) {
-			if (!asymId.equals("Z")) {
+			if (!"Z".equals(asymId)) {
 				return Character.toString(getNextChar(asymId.charAt(0)));
 			} else {
 				return "AA";
 			}
 		} else if (asymId.length()==2) {
-			if (asymId.equals("ZZ")) {
+			if ("ZZ".equals(asymId)) {
 				return "AAA";
 			}
 			char[] c = new char[2];
@@ -3414,13 +3414,13 @@ private void buildjournalArticle() {
 			//            System.out.println("'" + line + "'");
 			String subField = line.substring(12, 16);
 			//            System.out.println("'" + subField + "'");
-			if (subField.equals("AUTH")) {
+			if ("AUTH".equals(subField)) {
 				auth.append(line.substring(19, line.length()).trim());
 
 				logger.debug("AUTH '" + auth.toString() + "'");
 
 			}
-			if (subField.equals("TITL")) {
+			if ("TITL".equals(subField)) {
 				//add a space to the end of a line so that when wrapped the
 				//words on the join won't be concatenated
 				titl.append(line.substring(19, line.length()).trim()).append(" ");
@@ -3428,27 +3428,27 @@ private void buildjournalArticle() {
 				logger.debug("TITL '" + titl.toString() + "'");
 
 			}
-			if (subField.equals("EDIT")) {
+			if ("EDIT".equals(subField)) {
 				edit.append(line.substring(19, line.length()).trim());
 
 				logger.debug("EDIT '" + edit.toString() + "'");
 
 			}
 			//        JRNL        REF    NAT.IMMUNOL.                  V.   8   430 2007
-			if (subField.equals("REF ")) {
+			if ("REF ".equals(subField)) {
 				ref.append(line.substring(19, line.length()).trim()).append(" ");
 
 				logger.debug("REF '" + ref.toString() + "'");
 
 			}
-			if (subField.equals("PUBL")) {
+			if ("PUBL".equals(subField)) {
 				publ.append(line.substring(19, line.length()).trim()).append(" ");
 
 				logger.debug("PUBL '" + publ.toString() + "'");
 
 			}
 			//        JRNL        REFN                   ISSN 1529-2908
-			if (subField.equals("REFN")) {
+			if ("REFN".equals(subField)) {
 				if ( line.length() < 35 ) {
 					logger.info("can not process Journal REFN line: " + line);
 					continue;
@@ -3459,14 +3459,14 @@ private void buildjournalArticle() {
 
 			}
 			//        JRNL        PMID   17351618
-			if (subField.equals("PMID")) {
+			if ("PMID".equals(subField)) {
 				pmid.append(line.substring(19, line.length()).trim());
 
 				logger.debug("PMID '" + pmid.toString() + "'");
 
 			}
 			//        JRNL        DOI    10.1038/NI1450
-			if (subField.equals("DOI ")) {
+			if ("DOI ".equals(subField)) {
 				doi.append(line.substring(19, line.length()).trim());
 
 				logger.debug("DOI '" + doi.toString() + "'");
@@ -3480,7 +3480,7 @@ private void buildjournalArticle() {
 		journalArticle.setRef(ref.toString());
 		JournalParser journalParser = new JournalParser(ref.toString());
 		journalArticle.setJournalName(journalParser.getJournalName());
-		if (!journalArticle.getJournalName().equals("TO BE PUBLISHED")) {
+		if (!"TO BE PUBLISHED".equals(journalArticle.getJournalName())) {
 			journalArticle.setIsPublished(true);
 		}
 		journalArticle.setVolume(journalParser.getVolume());
@@ -3512,7 +3512,7 @@ public JournalParser(String ref) {
 			logger.debug("JournalParser init '" + ref + "'");
 
 
-			if (ref.equals("TO BE PUBLISHED ")) {
+			if ("TO BE PUBLISHED ".equals(ref)) {
 				journalName = ref.trim();
 
 				logger.debug(String.format("JournalParser found journalString '%s'", journalName));
@@ -3571,7 +3571,7 @@ public JournalParser(String ref) {
 			logger.debug(String.format("JournalParser found journalString '%s'", journalString));
 
 
-			if (!dateString.equals("    ")) {
+			if (!"    ".equals(dateString)) {
 				try {
 					publicationDate = Integer.valueOf(dateString);
 				} catch (NumberFormatException nfe) {
@@ -3582,21 +3582,21 @@ public JournalParser(String ref) {
 				//				}
 			}
 
-			if (!startPageString.equals("    ")) {
+			if (!"    ".equals(startPageString)) {
 				startPage = startPageString;
 				//				if (DEBUG) {
 				//					System.out.println("JournalParser set startPage " + startPage);
 				//				}
 			}
 
-			if (!volumeString.equals("    ")) {
+			if (!"    ".equals(volumeString)) {
 				volume = volumeString;
 				//				if (DEBUG) {
 				//					System.out.println("JournalParser set volume " + volume);
 				//				}
 			}
 
-			if (!journalString.equals("    ")) {
+			if (!"    ".equals(journalString)) {
 				journalName = journalString;
 
 				logger.debug("JournalParser set journalName " + journalName);
@@ -3624,7 +3624,7 @@ private String getVolume() {
 	private List<Author> authorBuilder(String authorString) {
 		ArrayList<Author> authorList = new ArrayList<Author>();
 
-		if (authorString.equals("")) {
+		if ("".equals(authorString)) {
 			return authorList;
 		}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SSBondImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SSBondImpl.java
index ae3aaab9ae..bdf132b31a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SSBondImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SSBondImpl.java
@@ -261,8 +261,8 @@ public static List<SSBondImpl> getSsBondListFromBondList(List<Bond> bonds) {
 	 */
 	public static SSBondImpl toSsBond(Bond bond) {
 
-		if (!bond.getAtomA().getGroup().getPDBName().equals("CYS") ||
-			!bond.getAtomB().getGroup().getPDBName().equals("CYS")    ) {
+		if (!"CYS".equals(bond.getAtomA().getGroup().getPDBName()) ||
+			!"CYS".equals(bond.getAtomB().getGroup().getPDBName())    ) {
 
 			throw new IllegalArgumentException("Trying to create a SSBond from a Bond between 2 groups that are not CYS");
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
index 53e38c3463..5d8c5b7ffb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
@@ -411,7 +411,7 @@ public static String getFullAtomSequence(List<Group> groups, Map<Integer, Intege
 						) {
 					//System.out.println(cc.getOne_letter_code());
 					String c = cc.getOneLetterCode();
-					if ( c.equals("?")) {
+					if ( "?".equals(c)) {
 						if (isNucleotideChain && PolymerType.POLYNUCLEOTIDE_ONLY.contains(cc.getPolymerType())) {
 							// the way to represent unknown nucleotides is with 'N', see https://en.wikipedia.org/wiki/Nucleic_acid_notation
 							c = "N";
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index fb3214be96..b1b6b21d01 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -305,7 +305,7 @@ public void consumeAtomSite(AtomSite atomSite) {
                     currentGroup.setResidueNumber(residueNumber);
                     currentGroup.setHetAtomInFile(isHetAtmInFile);
                 } else {
-                    if (altLocation != null && !altLocation.isEmpty() && !altLocation.equals(".")) {
+                    if (altLocation != null && !altLocation.isEmpty() && !".".equals(altLocation)) {
                         altGroup = getAltLocGroup(recordName, altLocation.charAt(0), oneLetterCode, compId, seqId);
                         if (altGroup.getChain() == null) {
                             altGroup.setChain(currentChain);
@@ -332,7 +332,7 @@ public void consumeAtomSite(AtomSite atomSite) {
             atom.setOccupancy((float) occupancy.get(atomIndex));
             atom.setTempFactor((float) bIsoOrEquiv.get(atomIndex));
 
-            if (altLocation == null || altLocation.isEmpty() || altLocation.equals(".")) {
+            if (altLocation == null || altLocation.isEmpty() || ".".equals(altLocation)) {
                 atom.setAltLoc(' ');
             } else {
                 atom.setAltLoc(altLocation.charAt(0));
@@ -1291,7 +1291,7 @@ public void finish() {
             seqMisMatch.setDetails(structRefSeqDif.getDetails().get(rowIndex));
 
             String insCode = structRefSeqDif.getPdbxPdbInsCode().get(rowIndex);
-                if (insCode != null && insCode.equals("?")) {
+                if ("?".equals(insCode)) {
                 insCode = null;
             }
             seqMisMatch.setInsCode(insCode);
@@ -1505,7 +1505,7 @@ private void addSites() {
             String auth_seq_id = structSiteGen.getAuthSeqId().get(rowIndex); // Res num
 
             String insCode = structSiteGen.getPdbxAuthInsCode().get(rowIndex);
-            if (insCode != null && insCode.equals("?")) {
+            if ("?".equals(insCode)) {
                 insCode = null;
             }
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsXMLParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsXMLParser.java
index a563aca4ff..9f0789976c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsXMLParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsXMLParser.java
@@ -233,12 +233,12 @@ private SiftsResidue getResidue(Element residue) {
 
 				//	System.out.println(dbSource + " " + dbCoordSys + " " + dbAccessionId + " " + dbResNum + " " + dbResName + " " + dbChainId);
 
-					if ( dbSource.equals("PDB") && ( dbCoordSys.equals("PDBresnum"))){
+					if ( "PDB".equals(dbSource) && "PDBresnum".equals(dbCoordSys)){
 						res.setPdbResNum(dbResNum);
 						res.setPdbResName(dbResName);
 						res.setChainId(dbChainId);
 						res.setPdbId(dbAccessionId);
-					} else if ( dbSource.equals("UniProt")){
+					} else if ( "UniProt".equals(dbSource)){
 						res.setUniProtPos(Integer.parseInt(dbResNum));
 						res.setUniProtResName(dbResName);
 						res.setUniProtAccessionId(dbAccessionId);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyTransformation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyTransformation.java
index cf5a7a1ea4..2fa6258cf5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyTransformation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyTransformation.java
@@ -268,10 +268,10 @@ public static List<BiologicalAssemblyTransformation> fromMultiXML(String xml) th
 				Node block       = listOfChildren.item(i);
 
 				// we only look at blocks.
-				if ( block.getNodeName().equals("matrix"))
+				if ( "matrix".equals(block.getNodeName()))
 					max.setRotationMatrix(getMatrixFromXML(block));
 
-				if ( block.getNodeName().equals("shift"))
+				if ( "shift".equals(block.getNodeName()))
 					max.setTranslation(getVectorFromXML(block));
 
 			}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopCategory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopCategory.java
index c60e2c06e5..d680430602 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopCategory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopCategory.java
@@ -41,17 +41,17 @@ public enum ScopCategory implements Serializable
 	Class,Fold, Superfamily,  Family, Domain, Species, Px;
 
 	public static ScopCategory fromString(String type){
-		if ( type.equals("cl"))
+		if ( "cl".equals(type))
 			return Class;
-		else if ( type.equals("cf"))
+		else if ( "cf".equals(type))
 			return Fold;
-		else if ( type.equals("sf"))
+		else if ( "sf".equals(type))
 			return Superfamily;
-		else if ( type.equals("fa"))
+		else if ( "fa".equals(type))
 			return Family;
-		else if ( type.equals("dm"))
+		else if ( "dm".equals(type))
 			return Domain;
-		else if ( type.equals("sp"))
+		else if ( "sp".equals(type))
 			return Species;
 		else
 			return Px;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
index 019e084a5d..07d848c942 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
@@ -442,7 +442,7 @@ private void parseHierarchy(BufferedReader buffer) throws IOException {
 			List<Integer> chis = new ArrayList<Integer>();
 
 			for ( String id : childIds){
-				if ( id.equals("-"))
+				if ( "-".equals(id))
 					continue;
 				chis.add(Integer.parseInt(id));
 			}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/DSSPParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/DSSPParser.java
index 69e9cd6d67..3aa4417f13 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/DSSPParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/DSSPParser.java
@@ -137,7 +137,7 @@ private static List<SecStrucState> generalParse(BufferedReader reader,
 			String resNumStr = line.substring(5,10).trim();
 
 			//Only happens if dssp inserts a line indicating a chain break
-			if(!resNumStr.equals("")) {
+			if(!"".equals(resNumStr)) {
 
 				int index = Integer.parseInt(indexStr);
 				//Get the group of the structure corresponding to the residue
@@ -155,14 +155,14 @@ private static List<SecStrucState> generalParse(BufferedReader reader,
 
 				//Parse the Bridge partners - TODO parallel or antiparallel?
 				String bp = line.substring(25,29).trim();
-				if (!bp.equals("")) {
+				if (!"".equals(bp)) {
 					BetaBridge bb = new BetaBridge(
 							index, Integer.parseInt(bp), BridgeType.parallel);
 					ss.addBridge(bb);
 				} else logger.warn("Unable to parse beta Bridge for resn "+index);
 
 				bp = line.substring(29,33).trim();
-				if (!bp.equals("")) {
+				if (!"".equals(bp)) {
 					BetaBridge bb = new BetaBridge(
 							index, Integer.parseInt(bp), BridgeType.parallel);
 					ss.addBridge(bb);
@@ -175,7 +175,7 @@ private static List<SecStrucState> generalParse(BufferedReader reader,
 					int b = a + 8;
 
 					String val = line.substring(a,b).trim();
-					if (val.equals("")) {
+					if ("".equals(val)) {
 						logger.warn("Unable to parse energy for resn "+index);
 						continue;
 					}
@@ -208,15 +208,15 @@ private static List<SecStrucState> generalParse(BufferedReader reader,
 
 				//Angle properties
 				String val = line.substring(91,97).trim();
-				if (!val.equals("")) ss.setKappa(Float.parseFloat(val));
+				if (!"".equals(val)) ss.setKappa(Float.parseFloat(val));
 				else logger.warn("Unable to parse kappa for resn "+index);
 
 				val = line.substring(103,109).trim();
-				if (!val.equals("")) ss.setPhi(Float.parseFloat(val));
+				if (!"".equals(val)) ss.setPhi(Float.parseFloat(val));
 				else logger.warn("Unable to parse phi for resn "+index);
 
 				val = line.substring(109,116).trim();
-				if (!val.equals("")) ss.setPsi(Float.parseFloat(val));
+				if (!"".equals(val)) ss.setPsi(Float.parseFloat(val));
 				else logger.warn("Unable to parse psi for resn "+index);
 
 				if (assign) parent.setProperty(Group.SEC_STRUC, ss);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucCalc.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucCalc.java
index 44f797fbda..c63f3d1684 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucCalc.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucCalc.java
@@ -798,7 +798,7 @@ private void checkAddHBond(int i, int j){
 
 		SecStrucGroup one = groups[i];
 
-		if (one.getPDBName().equals("PRO")){
+		if ("PRO".equals(one.getPDBName())){
 			logger.debug("Ignore: PRO {}", one.getResidueNumber());
 			return;
 		}
@@ -877,7 +877,7 @@ private static double calculateHBondEnergy(SecStrucGroup one,
 	 */
 	private  void trackHBondEnergy(int i, int j, double energy) {
 
-		if (groups[i].getPDBName().equals("PRO")) {
+		if ("PRO".equals(groups[i].getPDBName())) {
 			logger.debug("Ignore: PRO {}",groups[i].getResidueNumber());
 			return;
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/AxisAligner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/AxisAligner.java
index 4721f101b3..b2a6034751 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/AxisAligner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/AxisAligner.java
@@ -40,7 +40,7 @@ public abstract class AxisAligner {
 	public static AxisAligner getInstance(QuatSymmetryResults results) {
 		String symmetry = results.getSymmetry();
 
-		if (symmetry.equals("H")) {
+		if ("H".equals(symmetry)) {
 			return new HelixAxisAligner(results);
 		} else {
 			return new RotationAxisAligner(results);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/RotationAxisAligner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/RotationAxisAligner.java
index 30539a98ca..bb24492389 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/RotationAxisAligner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/RotationAxisAligner.java
@@ -223,7 +223,7 @@ private void run () {
 			}
 			calcReverseTransformation();
 			calcBoundaries();
-			if (! rotationGroup.getPointGroup().equals("Helical")) {
+			if (! "Helical".equals(rotationGroup.getPointGroup())) {
 				calcAlignedOrbits();
 			}
 			modified = false;
@@ -340,7 +340,7 @@ private List<Integer> alignWithReferenceAxis(List<Integer> orbit) {
 
 
 	private void calcTransformation() {
-		if (rotationGroup.getPointGroup().equals("C1")) {
+		if ("C1".equals(rotationGroup.getPointGroup())) {
 			calcTransformationByInertiaAxes();
 		} else {
 			calcTransformationBySymmetryAxes();
@@ -675,13 +675,13 @@ private void calcReferenceVector() {
 			referenceVector = getReferenceAxisCylic();
 		} else if (rotationGroup.getPointGroup().startsWith("D")) {
 			referenceVector = getReferenceAxisDihedral();
-		} else if (rotationGroup.getPointGroup().equals("T")) {
+		} else if ("T".equals(rotationGroup.getPointGroup())) {
 			referenceVector = getReferenceAxisTetrahedral();
-		} else if (rotationGroup.getPointGroup().equals("O")) {
+		} else if ("O".equals(rotationGroup.getPointGroup())) {
 			referenceVector = getReferenceAxisOctahedral();
-		} else if (rotationGroup.getPointGroup().equals("I")) {
+		} else if ("I".equals(rotationGroup.getPointGroup())) {
 			referenceVector = getReferenceAxisIcosahedral();
-		} else if (rotationGroup.getPointGroup().equals("Helical")) {
+		} else if ("Helical".equals(rotationGroup.getPointGroup())) {
 			// TODO what should the reference vector be??
 			referenceVector = getReferenceAxisCylic();
 		}
@@ -735,7 +735,7 @@ private Vector3d orthogonalize(Vector3d vector1, Vector3d vector2) {
 	 * @return
 	 */
 	private Vector3d getReferenceAxisCylic() {
-		if (rotationGroup.getPointGroup().equals("C2")) {
+		if ("C2".equals(rotationGroup.getPointGroup())) {
 			Vector3d vr = new Vector3d(subunits.getOriginalCenters().get(0));
 			vr.sub(subunits.getCentroid());
 			vr.normalize();
@@ -765,7 +765,7 @@ private Vector3d getReferenceAxisCylic() {
 	 * @return reference vector
 	 */
 	private Vector3d getReferenceAxisCylicWithSubunitAlignment() {
-		if (rotationGroup.getPointGroup().equals("C2")) {
+		if ("C2".equals(rotationGroup.getPointGroup())) {
 			return referenceVector;
 		}
 
@@ -797,7 +797,7 @@ private Vector3d getReferenceAxisDihedralWithSubunitAlignment() {
 		for (int i = 0; i < rotationGroup.getOrder(); i++) {
 			if (rotationGroup.getRotation(i).getDirection() == 1 &&
 					(rotationGroup.getRotation(i).getFold() < maxFold) ||
-					rotationGroup.getPointGroup().equals("D2")) {
+					"D2".equals(rotationGroup.getPointGroup())) {
 
 				AxisAngle4d axisAngle = rotationGroup.getRotation(i).getAxisAngle();
 				Vector3d v = new Vector3d(axisAngle.x, axisAngle.y, axisAngle.z);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryDetector.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryDetector.java
index 62906fd6b7..2f524e9171 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryDetector.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryDetector.java
@@ -315,7 +315,7 @@ private static List<QuatSymmetryResults> calcLocalSymmetriesCluster(Stoichiometr
 			QuatSymmetryResults localResult =
 					calcQuatSymmetry(nontrivialComposition.getComponent(i),symmParams);
 
-			if(localResult!=null && !localResult.getSymmetry().equals("C1")) {
+			if(localResult!=null && !"C1".equals(localResult.getSymmetry())) {
 				localResult.setLocal(true);
 				clusterSymmetries.add(localResult);
 				Set<Integer> knownResult = new HashSet<>(clusterIdToSubunitIds.get(i));
@@ -346,7 +346,7 @@ private static List<QuatSymmetryResults> calcLocalSymmetriesCluster(Stoichiometr
 				//check if grouped clusters also have symmetry
 				QuatSymmetryResults localResult = calcQuatSymmetry(groupComposition,symmParams);
 
-				if(localResult!=null && !localResult.getSymmetry().equals("C1")) {
+				if(localResult!=null && !"C1".equals(localResult.getSymmetry())) {
 					localResult.setLocal(true);
 					clusterSymmetries.add(localResult);
 					// find subunit ids in this cluster list
@@ -417,7 +417,7 @@ private static List<QuatSymmetryResults> calcLocalSymmetriesGraph(final Stoichio
 			}
 
 			QuatSymmetryResults localResult = calcQuatSymmetry(localStoichiometry,symmParams);
-			if(localResult!=null && !localResult.getSymmetry().equals("C1")) {
+			if(localResult!=null && !"C1".equals(localResult.getSymmetry())) {
 				localResult.setLocal(true);
 				localSymmetries.add(localResult);
 				continue;
@@ -544,8 +544,8 @@ private static QuatSymmetryResults calcQuatSymmetry(Stoichiometry composition, Q
 				double hRmsd = helixLayers.getScores().getRmsd();
 				// System.out.println("cRMSD: " + cRmsd + " hRMSD: " + hRmsd);
 				double deltaRmsd = hRmsd - cRmsd;
-				if (symmetry.equals("C1")
-						|| (!symmetry.equals("C1") && deltaRmsd <= parameters
+				if ("C1".equals(symmetry)
+						|| (!"C1".equals(symmetry) && deltaRmsd <= parameters
 								.getHelixRmsdThreshold())) {
 					method = SymmetryPerceptionMethod.ROTO_TRANSLATION;
 					results = new QuatSymmetryResults(composition, helixLayers,
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmResult.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmResult.java
index 0c4665a580..441bcda2ce 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmResult.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmResult.java
@@ -203,7 +203,7 @@ public String getSymmGroup() {
 					} catch (StructureException e) {
 						symmGroup = "C1";
 					}
-					if (symmGroup.equals("C1"))
+					if ("C1".equals(symmGroup))
 						symmGroup = "R"; // could not find group
 				} else {
 					// in case significant but not refined
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
index caeaf6c9ee..768724eac7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
@@ -212,15 +212,15 @@ private static double[] convertAlgebraicStrToCoefficients(String algString) {
 				sign = m.group(1);
 			}
 			double s = 1.0;
-			if (sign.equals("-")){
+			if ("-".equals(sign)){
 				s = -1.0;
 			}
 			String coord = m.group(2);
-			if (coord.equals("X")) {
+			if ("X".equals(coord)) {
 				coefficients[0] = s;
-			} else if (coord.equals("Y")) {
+			} else if ("Y".equals(coord)) {
 				coefficients[1] = s;
-			} else if (coord.equals("Z")) {
+			} else if ("Z".equals(coord)) {
 				coefficients[2] = s;
 			}
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
index d0ff2cf4eb..4024c6e811 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
@@ -167,7 +167,7 @@ public static SpaceGroup getSpaceGroup(String shortName) {
 
 		// PDB uses group "P 1-" for 13 racemic mixture entries (as of Sep2011), e.g. 3e7r
 		// they call the space group "P 1-" unusually (symop.lib and everyone else call it "P -1")
-		if (shortName.equals("P 1-")) shortName="P -1";
+		if ("P 1-".equals(shortName)) shortName="P -1";
 
 		// enantiomorphic space groups contain sometime letters indicating glide planes which should always be lower case
 		// in some PDB entries like 4gwv they are in upper case, we fix that here: convert any non-first letter to lower case
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java
index 57f0e983ce..ca98b8d9d9 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java
@@ -1419,7 +1419,7 @@ static public WorkSheet unionWorkSheetsRowJoin(WorkSheet w1, WorkSheet w2, boole
 
 		for (String row : rows) {
 			for (String column : w1Columns) {
-				if (column.equals("META_DATA")) {
+				if ("META_DATA".equals(column)) {
 					continue;
 				}
 				String value = w1.getCell(row, column);
@@ -1429,7 +1429,7 @@ static public WorkSheet unionWorkSheetsRowJoin(WorkSheet w1, WorkSheet w2, boole
 
 		for (String row : rows) {
 			for (String column : w2Columns) {
-				if (column.equals("META_DATA")) {
+				if ("META_DATA".equals(column)) {
 					continue;
 				}
 				String value = w2.getCell(row, column);
@@ -1619,11 +1619,11 @@ public void save(OutputStream outputStream, char delimitter, boolean quoteit) th
 				String value = getCell(row, col);
 				outputStream.write(delimitter);
 				if (!this.isMetaDataColumn(col) && !this.isMetaDataRow(row)) {
-					if (value == null || value.length() == 0 || value.equalsIgnoreCase("null")) {
+					if (value == null || value.length() == 0 || "null".equalsIgnoreCase(value)) {
 						value = "NaN";
 					}
 				} else {
-					if (value == null || value.length() == 0 || value.equalsIgnoreCase("null")) {
+					if (value == null || value.length() == 0 || "null".equalsIgnoreCase(value)) {
 						value = "";
 					}
 				}
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/CensorStatus.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/CensorStatus.java
index afad3d4dd9..1d27224485 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/CensorStatus.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/CensorStatus.java
@@ -126,7 +126,7 @@ public int compareTo(CensorStatus o) {
 			if (censored.equals(o.censored)) {
 				return 0;
 			}
-			if (censored.equals("0")) {
+			if ("0".equals(censored)) {
 				return -1;
 			} else {
 				return 1;
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java
index 9bc6d0572a..b1278b838c 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java
@@ -104,7 +104,7 @@ private void paintTable(Graphics g) {
 			g2.drawLine(15, row - fontHeight/2, left - 5, row - fontHeight/2);
 			g2.setColor(Color.BLACK);
 			StrataInfo si = sfiHashMap.get(group);
-			if(kmf.title.toString().equals("[APOBEC1 Transhera Observation Arm]")){
+			if("[APOBEC1 Transhera Observation Arm]".equals(kmf.title.toString())){
 				//int dummy = 1;
 			}
 //           System.out.println(kmf.title + " Group " +  group);
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java
index 3d9ad05377..db184a9a53 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java
@@ -102,7 +102,7 @@ public void removeAlignmentOption(BlastAlignmentParameterEnum key) {
 	 */
 	public BlastProgramEnum getBlastProgram() {
 		BlastProgramEnum program = BlastProgramEnum.valueOf(getAlignmentOption(PROGRAM));
-		boolean isMegablast = BlastProgramEnum.blastn == program && getAlignmentOption(MEGABLAST).equals("on");
+		boolean isMegablast = BlastProgramEnum.blastn == program && "on".equals(getAlignmentOption(MEGABLAST));
 		return !isMegablast ? program : BlastProgramEnum.megablast;
 	}
 

From 805a9023b78a4f5033bccb80a43c5529d389c8e0 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 1 Mar 2024 22:19:05 -0800
Subject: [PATCH 469/599] Be more lenient with some missing atom_site fields

---
 .../io/cif/CifStructureConsumerImpl.java      | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index fb3214be96..316cf2d8fe 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -217,7 +217,10 @@ public void consumeAtomSite(AtomSite atomSite) {
                 isHetAtmInFile = true;
             }
 
-            String insCodeString = pdbxPDBInsCode.get(atomIndex);
+            String insCodeString = null;
+            if (pdbxPDBInsCode.isDefined()) {
+                insCodeString = pdbxPDBInsCode.get(atomIndex);
+            }
             Character insCode = null;
             if (insCodeString != null && !insCodeString.isEmpty() && !"?".equals(insCodeString)) {
                 insCode = insCodeString.charAt(0);
@@ -246,7 +249,13 @@ public void consumeAtomSite(AtomSite atomSite) {
             }
 
             String asymId = labelAsymId.get(atomIndex);
-            String authId = authAsymId.get(atomIndex);
+            String authId;
+            if (authAsymId.isDefined()) {
+                authId = authAsymId.get(atomIndex);
+            } else {
+                authId = String.valueOf(asymId);
+            }
+
             if (currentChain == null) {
                 currentChain = new ChainImpl();
                 currentChain.setName(authId);
@@ -277,7 +286,13 @@ public void consumeAtomSite(AtomSite atomSite) {
                 }
             }
 
-            ResidueNumber residueNumber = new ResidueNumber(authId, authSeqId.get(atomIndex), insCode);
+            int authSeqIdInt;
+            if (authSeqId.isDefined()) {
+                authSeqIdInt = authSeqId.get(atomIndex);
+            } else {
+                authSeqIdInt = (int)seqId;
+            }
+            ResidueNumber residueNumber = new ResidueNumber(authId, authSeqIdInt, insCode);
 
             String recordName = groupPDB.get(atomIndex);
             String compId = labelCompId.get(atomIndex);
@@ -289,7 +304,10 @@ public void consumeAtomSite(AtomSite atomSite) {
             }
 
             Group altGroup = null;
-            String altLocation = labelAltId.get(atomIndex);
+            String altLocation = null;
+            if (labelAltId.isDefined()) {
+                altLocation = labelAltId.get(atomIndex);
+            }
 
             if (startOfNewChain) {
                 currentGroup = createGroup(recordName, oneLetterCode, compId, seqId);

From ac14da470e97b53b504583d5ea245445a807713e Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 1 Mar 2024 22:28:24 -0800
Subject: [PATCH 470/599] Better with ternary if

---
 .../io/cif/CifStructureConsumerImpl.java      | 26 +++++--------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 316cf2d8fe..9393e285c3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -217,10 +217,8 @@ public void consumeAtomSite(AtomSite atomSite) {
                 isHetAtmInFile = true;
             }
 
-            String insCodeString = null;
-            if (pdbxPDBInsCode.isDefined()) {
-                insCodeString = pdbxPDBInsCode.get(atomIndex);
-            }
+            String insCodeString = pdbxPDBInsCode.isDefined()? pdbxPDBInsCode.get(atomIndex) : null;
+
             Character insCode = null;
             if (insCodeString != null && !insCodeString.isEmpty() && !"?".equals(insCodeString)) {
                 insCode = insCodeString.charAt(0);
@@ -249,12 +247,7 @@ public void consumeAtomSite(AtomSite atomSite) {
             }
 
             String asymId = labelAsymId.get(atomIndex);
-            String authId;
-            if (authAsymId.isDefined()) {
-                authId = authAsymId.get(atomIndex);
-            } else {
-                authId = String.valueOf(asymId);
-            }
+            String authId = authAsymId.isDefined()? authAsymId.get(atomIndex) : asymId;
 
             if (currentChain == null) {
                 currentChain = new ChainImpl();
@@ -286,12 +279,8 @@ public void consumeAtomSite(AtomSite atomSite) {
                 }
             }
 
-            int authSeqIdInt;
-            if (authSeqId.isDefined()) {
-                authSeqIdInt = authSeqId.get(atomIndex);
-            } else {
-                authSeqIdInt = (int)seqId;
-            }
+            int authSeqIdInt = authSeqId.isDefined()? authSeqId.get(atomIndex) : (int)seqId;
+
             ResidueNumber residueNumber = new ResidueNumber(authId, authSeqIdInt, insCode);
 
             String recordName = groupPDB.get(atomIndex);
@@ -304,10 +293,7 @@ public void consumeAtomSite(AtomSite atomSite) {
             }
 
             Group altGroup = null;
-            String altLocation = null;
-            if (labelAltId.isDefined()) {
-                altLocation = labelAltId.get(atomIndex);
-            }
+            String altLocation = labelAltId.isDefined()? labelAltId.get(atomIndex) : null;
 
             if (startOfNewChain) {
                 currentGroup = createGroup(recordName, oneLetterCode, compId, seqId);

From 3e26abe7d526b828fc23694f25a59c91ba2f763d Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Mar 2024 10:26:56 -0800
Subject: [PATCH 471/599] Adding test case

---
 .../io/cif/CifFileConsumerImplTest.java       | 49 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileConsumerImplTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileConsumerImplTest.java
index 0d2ddaf4f6..a8925afa88 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileConsumerImplTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/cif/CifFileConsumerImplTest.java
@@ -181,7 +181,7 @@ private static int[] countEntityTypes(List<EntityInfo> entities) {
 
     /**
      * This tests for cases where dots appear in integer fields. Unusual but it happens in some PDB entries like 1s32.
-     * See issue https://github.com/biojava/biojava/issues/368
+     * See issue <a href="https://github.com/biojava/biojava/issues/368">...</a>
      */
     @Test
     public void specialCases() throws IOException {
@@ -220,4 +220,51 @@ public void specialCases() throws IOException {
         column.valueKinds().forEach(vk -> assertEquals(ValueKind.NOT_PRESENT, vk));
         column.stringData().forEach(sd -> assertTrue(sd.isEmpty()));
     }
+
+    /**
+     * Testing files with atom_site that doesn't have author fields. E.g. cif files from Meta's ESM Atlas (<a href="https://esmatlas.com">...</a>)
+     */
+    @Test
+    public void testAtomSiteWithMissingAuthFields() throws IOException {
+        // taken from MGYP000911143359.cif
+        String mmcifStr =
+                "data_\n" +
+                        "loop_\n" +
+                        "_atom_site.group_PDB\n" +
+                        "_atom_site.id\n" +
+                        "_atom_site.type_symbol\n" +
+                        "_atom_site.label_atom_id\n" +
+                        "_atom_site.label_comp_id\n" +
+                        "_atom_site.label_asym_id\n" +
+                        "_atom_site.label_entity_id\n" +
+                        "_atom_site.label_seq_id\n" +
+                        "_atom_site.Cartn_x\n" +
+                        "_atom_site.Cartn_y\n" +
+                        "_atom_site.Cartn_z\n" +
+                        "_atom_site.occupancy\n" +
+                        "_atom_site.B_iso_or_equiv\n" +
+                        "_atom_site.pdbx_PDB_model_num\n" +
+                        "\n" +
+                        "ATOM 1 N N MET A 1 1 -26.091 68.903 7.841 1.00 90.0 1\n" +
+                        "ATOM 2 C CA MET A 1 1 -26.275 67.677 7.069 1.00 91.0 1\n" +
+                        "ATOM 3 C C MET A 1 1 -24.933 67.025 6.755 1.00 90.0 1\n" +
+                        "ATOM 4 C CB MET A 1 1 -27.033 67.967 5.773 1.00 89.0 1\n" +
+                        "ATOM 5 O O MET A 1 1 -24.314 67.331 5.734 1.00 90.0 1\n" +
+                        "ATOM 6 C CG MET A 1 1 -28.544 67.973 5.934 1.00 86.0 1\n" +
+                        "ATOM 7 S SD MET A 1 1 -29.390 68.904 4.598 1.00 86.0 1\n" +
+                        "ATOM 8 C CE MET A 1 1 -29.202 67.734 3.224 1.00 83.0 1\n" +
+                        "ATOM 9 N N ASN A 1 2 -24.267 66.233 7.730 1.00 90.0 1\n" +
+                        "ATOM 10 C CA ASN A 1 2 -22.897 65.827 8.029 1.00 91.0 1\n" +
+                        "ATOM 11 C C ASN A 1 2 -22.600 64.427 7.500 1.00 90.0 1\n" +
+                        "ATOM 12 C CB ASN A 1 2 -22.634 65.893 9.535 1.00 88.0 1\n" +
+                        "ATOM 13 O O ASN A 1 2 -23.092 63.436 8.044 1.00 89.0 1\n" +
+                        "ATOM 14 C CG ASN A 1 2 -22.191 67.269 9.990 1.00 86.0 1\n" +
+                        "ATOM 15 N ND2 ASN A 1 2 -22.255 67.511 11.294 1.00 87.0 1\n" +
+                        "ATOM 16 O OD1 ASN A 1 2 -21.795 68.108 9.177 1.00 87.0 1\n" ;
+        MmCifFile cifFile = CifIO.readFromInputStream(new ByteArrayInputStream(mmcifStr.getBytes())).as(StandardSchemata.MMCIF);
+        Structure s = CifStructureConverter.fromCifFile(cifFile);
+        assertNotNull(s);
+        assertEquals(2, s.getPolyChain("A").getAtomGroups().size());
+        assertEquals(2, s.getPolyChainByPDB("A").getAtomGroups().size());
+    }
 }
\ No newline at end of file

From 1b5fa3c503d5d071f66f0a59ebbe396ebb2f6181 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Mar 2024 10:56:18 -0800
Subject: [PATCH 472/599] Upgrading actions workflow versions and java versions
 used

---
 .github/workflows/master.yml       | 6 +++---
 .github/workflows/pull_request.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 01acc4f88d..3e7b8e38fb 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -16,15 +16,15 @@ jobs:
         # We do one OS only to reduce resource utilization. To do macOS to this would be needed:
         #os: [ubuntu-20.04, macOS-latest]
         os: [ubuntu-latest]
-        java: [17]
+        java: [21]
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'oracle'
           java-version: ${{ matrix.java }}
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index ff9c7dbbdf..d54ed71185 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -19,15 +19,15 @@ jobs:
         # We do one OS only to reduce resource utilization. To do macOS to this would be needed:
         #os: [ubuntu-20.04, macOS-latest]
         os: [ubuntu-latest]
-        java: [17]
+        java: [11, 17, 21]
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'oracle'
           java-version: ${{ matrix.java }}

From 37b5fca4111f87d875ed65d2ef905ee7eb101d78 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Mar 2024 11:53:09 -0800
Subject: [PATCH 473/599] Replacing home-made copy by Files.copy. Other minor
 fixes

---
 .../nbio/core/util/FileDownloadUtils.java     | 73 ++++---------------
 .../nbio/core/util/FileDownloadUtilsTest.java | 39 ----------
 .../nbio/structure/cath/CathInstallation.java |  3 +-
 .../structure/align/util/AtomCacheTest.java   |  5 +-
 4 files changed, 20 insertions(+), 100 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index 8c3a691e0f..0ec97027eb 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -22,7 +22,6 @@
 package org.biojava.nbio.core.util;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
@@ -34,13 +33,8 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.channels.Channels;
-import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
+import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Scanner;
 
@@ -57,39 +51,6 @@ public enum Hash{
 		MD5, SHA1, SHA256, UNKNOWN
 	}
 
-	/**
-	 * Copy the content of file src to dst TODO since java 1.7 this is provided
-	 * in java.nio.file.Files
-	 *
-	 * @param src
-	 * @param dst
-	 * @throws IOException
-	 */
-	@SuppressWarnings("resource")
-	public static void copy(File src, File dst) throws IOException {
-
-		// Took following recipe from
-		// http://stackoverflow.com/questions/106770/standard-concise-way-to-copy-a-file-in-java
-		// The nio package seems to be the most efficient way to copy a file
-		FileChannel source = null;
-		FileChannel destination = null;
-
-		try {
-			// we need the supress warnings here (the warning that the stream is not closed is harmless)
-			// see http://stackoverflow.com/questions/12970407/does-filechannel-close-close-the-underlying-stream
-			source = new FileInputStream(src).getChannel();
-			destination = new FileOutputStream(dst).getChannel();
-			destination.transferFrom(source, 0, source.size());
-		} finally {
-			if (source != null) {
-				source.close();
-			}
-			if (destination != null) {
-				destination.close();
-			}
-		}
-	}
-
 	/**
 	 * Gets the file extension of a file, excluding '.'.
 	 * If the file name has no extension the file name is returned.
@@ -100,7 +61,7 @@ public static String getFileExtension(File f) {
 		String fileName = f.getName();
 		String ext = "";
 		int mid = fileName.lastIndexOf(".");
-		ext = fileName.substring(mid + 1, fileName.length());
+		ext = fileName.substring(mid + 1);
 		return ext;
 	}
 
@@ -165,7 +126,7 @@ public static void downloadFile(URL url, File destination) throws IOException {
 		}
 
 		logger.debug("Copying temp file [{}] to final location [{}]", tempFile, destination);
-		copy(tempFile, destination);
+		Files.copy(tempFile.toPath(), destination.toPath(), StandardCopyOption.REPLACE_EXISTING);
 
 		// delete the tmp file
 		tempFile.delete();
@@ -252,24 +213,20 @@ public static void createValidationFiles(URLConnection resourceUrlConnection, Fi
 	public static boolean validateFile(File localFile) {
 		File sizeFile = new File(localFile.getParentFile(), localFile.getName() + SIZE_EXT);
 		if(sizeFile.exists()) {
-			Scanner scanner = null;
-			try {
-				scanner = new Scanner(sizeFile);
-				long expectedSize = scanner.nextLong();
-				long actualLSize = localFile.length();
-				if (expectedSize != actualLSize) {
-					logger.warn("File [{}] size ({}) does not match expected size ({}).", localFile, actualLSize, expectedSize);
-					return false;
-				}
-			} catch (FileNotFoundException e) {
-				logger.warn("could not validate size of file [{}] because no size metadata file exists.", localFile);
-			} finally {
-				scanner.close();
-			}
+            try (Scanner scanner = new Scanner(sizeFile)) {
+                long expectedSize = scanner.nextLong();
+                long actualLSize = localFile.length();
+                if (expectedSize != actualLSize) {
+                    logger.warn("File [{}] size ({}) does not match expected size ({}).", localFile, actualLSize, expectedSize);
+                    return false;
+                }
+            } catch (FileNotFoundException e) {
+                logger.warn("could not validate size of file [{}] because no size metadata file exists.", localFile);
+            }
 		}
 
 		File[] hashFiles = localFile.getParentFile().listFiles(new FilenameFilter() {
-			String hashPattern = String.format("%s%s_(%s|%s|%s)", localFile.getName(), HASH_EXT, Hash.MD5, Hash.SHA1, Hash.SHA256);
+			final String hashPattern = String.format("%s%s_(%s|%s|%s)", localFile.getName(), HASH_EXT, Hash.MD5, Hash.SHA1, Hash.SHA256);
 			@Override
 			public boolean accept(File dir, String name) {
 				return name.matches(hashPattern);
@@ -401,7 +358,7 @@ public static URLConnection prepareURLConnection(String url, int timeout) throws
 	public static void deleteDirectory(Path dir) throws IOException {
 		if(dir == null || !Files.exists(dir))
 			return;
-		Files.walkFileTree(dir, new SimpleFileVisitor<Path>() {
+		Files.walkFileTree(dir, new SimpleFileVisitor<>() {
 	        @Override
 	        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
 	            Files.delete(file);
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
index 987ef6be8e..201ad88e48 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/FileDownloadUtilsTest.java
@@ -8,8 +8,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.net.URL;
@@ -20,43 +18,6 @@
 
 class FileDownloadUtilsTest {
 
-    @Nested
-    class FileCopy {   
-        
-        private File createSrcFile () throws IOException {
-            byte [] toSave = new byte []{1,2,3,4,5};
-            File src = Files.createTempFile("test", ".dat").toFile();
-            try (FileOutputStream fos = new FileOutputStream(src);){
-                fos.write(toSave);
-            }
-            return src;
-        }
-
-        @Test
-        void copyFile() throws IOException {
-            File src = createSrcFile();
-            //sanity check
-            assertEquals(5, src.length());
-            File dest = Files.createTempFile("dest", ".dat").toFile();
-            assertEquals(0, dest.length());
-            FileDownloadUtils.copy(src, dest);
-            assertEquals(5, dest.length());
-
-            //original is unaffected
-            assertEquals(5, src.length());
-            
-            // bytes are identical
-            try (FileInputStream fis1 = new FileInputStream(src);
-                FileInputStream fis2 =  new FileInputStream(dest)) {
-                int b = -1;
-                while (( b = fis1.read()) != -1) {
-                    int b2 = fis2.read();
-                    assertEquals (b, b2);
-                }
-            }
-        }
-    }
-
     @Nested
     class FileExtension {
         @Test
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java
index 7c7d2163ef..acf1489a02 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java
@@ -32,6 +32,7 @@
 import java.io.*;
 import java.net.URL;
 import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.ParseException;
@@ -653,7 +654,7 @@ protected void downloadFileFromRemote(URL remoteURL, File localFile) throws IOEx
 		in.close();
 		out.close();
 
-		FileDownloadUtils.copy(tempFile,localFile);
+		Files.copy(tempFile.toPath(), localFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
 
 		// delete the tmp file
 		tempFile.delete();
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
index af56e67046..ec2763df9a 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
@@ -33,6 +33,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -390,7 +391,7 @@ public void testEmptyChemComp() throws IOException, StructureException {
 			Files.createDirectories(testCif.getParent());
 			URL resource = AtomCacheTest.class.getResource("/atp.cif.gz");
 			File src = new File(resource.getPath());
-			FileDownloadUtils.copy(src, testCif.toFile());
+			Files.copy(src.toPath(), testCif, StandardCopyOption.REPLACE_EXISTING);
 
 			// Load structure
 			Structure s = cache.getStructure("1ABC");
@@ -453,7 +454,7 @@ public void testEmptyGZChemComp() throws IOException, StructureException {
 			Files.createDirectories(testCif.getParent());
 			URL resource = AtomCacheTest.class.getResource("/atp.cif.gz");
 			File src = new File(resource.getPath());
-			FileDownloadUtils.copy(src, testCif.toFile());
+			Files.copy(src.toPath(), testCif, StandardCopyOption.REPLACE_EXISTING);
 
 			// Load structure
 			Structure s = cache.getStructure("1ABC");

From a76e0bc387cfa034384a85e56710dc0d30b1c2ba Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Mar 2024 12:02:40 -0800
Subject: [PATCH 474/599] Trying to fix openjdk 11 error in workflows

---
 .github/workflows/pull_request.yml | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index d54ed71185..ae91958fe7 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -12,14 +12,37 @@ permissions:
   contents: read # to fetch code (actions/checkout)
 
 jobs:
-  test:
+  testopenjdk:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         # We do one OS only to reduce resource utilization. To do macOS to this would be needed:
         #os: [ubuntu-20.04, macOS-latest]
         os: [ubuntu-latest]
-        java: [11, 17, 21]
+        java: [17, 21]
+      fail-fast: false
+      max-parallel: 4
+    name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'oracle'
+          java-version: ${{ matrix.java }}
+      - name: Build, test and integration test
+        run: mvn verify --no-transfer-progress
+
+  # Note that 11 is not available in openjdk. So we need to do it with the Zulu distribution (see https://github.com/actions/setup-java)
+  testzulu:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        # We do one OS only to reduce resource utilization. To do macOS to this would be needed:
+        #os: [ubuntu-20.04, macOS-latest]
+        os: [ubuntu-latest]
+        java: [11]
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}

From 30a6002e11fb3b410fee96f74909303ce485740d Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Mar 2024 12:06:33 -0800
Subject: [PATCH 475/599] Forgot to use zulu

---
 .github/workflows/pull_request.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index ae91958fe7..485a59d07b 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'oracle'
+          distribution: 'zulu'
           java-version: ${{ matrix.java }}
       - name: Build, test and integration test
         run: mvn verify --no-transfer-progress

From de0ef2a547739060ef9b371e3be9d86b0f04a9df Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Mar 2024 13:17:26 -0800
Subject: [PATCH 476/599] Docs

---
 .github/workflows/pull_request.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 485a59d07b..d2e35cd56c 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -35,6 +35,7 @@ jobs:
         run: mvn verify --no-transfer-progress
 
   # Note that 11 is not available in openjdk. So we need to do it with the Zulu distribution (see https://github.com/actions/setup-java)
+  # When we drop 11, it will be safe to drop the copy-pasted workflow excerpt below
   testzulu:
     runs-on: ${{ matrix.os }}
     strategy:

From 7f8f95e1b8f9b2529cafc0031900ba809bb2b34c Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 4 Mar 2024 13:38:51 -0800
Subject: [PATCH 477/599] Typo

---
 .../java/org/biojava/nbio/core/util/FileDownloadUtils.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index 0ec97027eb..e099122af2 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -215,9 +215,9 @@ public static boolean validateFile(File localFile) {
 		if(sizeFile.exists()) {
             try (Scanner scanner = new Scanner(sizeFile)) {
                 long expectedSize = scanner.nextLong();
-                long actualLSize = localFile.length();
-                if (expectedSize != actualLSize) {
-                    logger.warn("File [{}] size ({}) does not match expected size ({}).", localFile, actualLSize, expectedSize);
+                long actualSize = localFile.length();
+                if (expectedSize != actualSize) {
+                    logger.warn("File [{}] size ({}) does not match expected size ({}).", localFile, actualSize, expectedSize);
                     return false;
                 }
             } catch (FileNotFoundException e) {

From 1ac29b3fae37ab43b2316ea1c9901de33620c978 Mon Sep 17 00:00:00 2001
From: jlerbsc <jean-pierre.lerbscher@jperf.com>
Date: Tue, 5 Mar 2024 08:59:21 +0100
Subject: [PATCH 478/599] fix sonar issue 2629 Logging arguments should not
 require evaluation

---
 .../nbio/core/util/FileDownloadUtils.java     |  2 +-
 .../core/util/SingleLinkageClusterer.java     |  8 +-
 .../genome/util/ChromosomeMappingTools.java   | 16 +--
 .../org/biojava/nbio/structure/ChainImpl.java |  9 +-
 .../nbio/structure/StructureTools.java        |  5 +-
 .../structure/align/StructurePairAligner.java |  4 +-
 .../align/pairwise/FragmentJoiner.java        |  4 +-
 .../align/seq/SmithWaterman3Daligner.java     |  2 +-
 .../structure/cluster/SubunitExtractor.java   |  2 +-
 .../contact/StructureInterfaceList.java       |  4 +-
 .../structure/domain/SerializableCache.java   |  2 +-
 .../structure/geometry/SuperPositionQCP.java  |  4 +-
 .../nbio/structure/io/EntityFinder.java       |  2 +-
 .../nbio/structure/io/LocalPDBDirectory.java  |  4 +-
 .../nbio/structure/io/PDBFileParser.java      | 97 ++++++++-----------
 .../nbio/structure/io/SeqRes2AtomAligner.java |  6 +-
 .../io/cif/CifStructureConsumerImpl.java      | 11 +--
 .../io/sifts/SiftsMappingProvider.java        |  2 +-
 .../structure/io/sifts/SiftsXMLParser.java    |  4 +-
 .../biojava/nbio/structure/scop/Astral.java   |  2 +-
 .../structure/symmetry/core/HelixSolver.java  | 14 +--
 .../structure/symmetry/internal/CeSymm.java   |  2 +-
 .../symmetry/internal/CeSymmIterative.java    |  3 +-
 .../nbio/structure/xtal/CrystalBuilder.java   | 16 +--
 24 files changed, 100 insertions(+), 125 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index 8c3a691e0f..beabccb2b0 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -212,7 +212,7 @@ public static void createValidationFiles(URLConnection resourceUrlConnection, Fi
 		if(size == -1) {
 			logger.warn("could not find expected file size for resource {}.", resourceUrlConnection.getURL());
 		} else {
-			logger.debug("Content-Length: " + size);
+			logger.debug("Content-Length: {}", size);
 			File sizeFile = new File(localDestination.getParentFile(), localDestination.getName() + SIZE_EXT);
 			try (PrintStream sizePrintStream = new PrintStream(sizeFile)) {
 				sizePrintStream.print(size);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java
index 7c4b15f65a..eef144080a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java
@@ -135,7 +135,7 @@ private void clusterIt() {
 		dendrogram = new LinkedPair[numItems-1];
 
 
-		logger.debug("Initial matrix: \n"+matrixToString());
+		logger.debug("Initial matrix: \n{}", matrixToString());
 
 
 		for (int m=0;m<numItems-1;m++) {
@@ -309,11 +309,11 @@ public Map<Integer, Set<Integer>> getClusters(double cutoff) {
 					}
 				}
 
-				logger.debug("Within cutoff:     "+dendrogram[i]);
+				logger.debug("Within cutoff:     {}", dendrogram[i]);
 
 			} else {
 
-				logger.debug("Not within cutoff: "+dendrogram[i]);
+				logger.debug("Not within cutoff: {}", dendrogram[i]);
 
 			}
 		}
@@ -344,7 +344,7 @@ public Map<Integer, Set<Integer>> getClusters(double cutoff) {
 
 		}
 
-		logger.debug("Clusters: \n"+clustersToString(finalClusters));
+		logger.debug("Clusters: \n{}", clustersToString(finalClusters));
 
 		return finalClusters;
 	}
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/util/ChromosomeMappingTools.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/util/ChromosomeMappingTools.java
index 8d7030f3d4..b19de4657b 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/util/ChromosomeMappingTools.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/util/ChromosomeMappingTools.java
@@ -231,12 +231,12 @@ public static int getCDSLength(GeneChromosomePosition chromPos) {
 	 */
 	public static ChromPos getChromosomePosForCDScoordinate(int cdsNucleotidePosition, GeneChromosomePosition chromPos) {
 
-		logger.debug(" ? Checking chromosome position for CDS position " + cdsNucleotidePosition);
+		logger.debug(" ? Checking chromosome position for CDS position {}", cdsNucleotidePosition);
 
 		List<Integer> exonStarts = chromPos.getExonStarts();
 		List<Integer> exonEnds = chromPos.getExonEnds();
 
-		logger.debug(" Exons:" + exonStarts.size());
+		logger.debug(" Exons:{}", exonStarts.size());
 
 		int cdsStart = chromPos.getCdsStart();
 		int cdsEnd = chromPos.getCdsEnd();
@@ -378,7 +378,7 @@ public static ChromPos getChromPosReverse(int cdsPos, List<Integer> exonStarts,
 
 					if ( tmp > (end - start ) ) {
 						tmp = (end - start );
-						logger.debug("changing tmp to " + tmp);
+						logger.debug("changing tmp to {}", tmp);
 					}
 					logger.debug("     " + cdsPos + " " + codingLength + " | " + (cdsPos - codingLength) + " | " + (end -start) + " | " + tmp);
 					logger.debug("     Exon        : " + format(start+1) + " - " + format(end) + " | " + format(end - start) + " | " + codingLength + " | " + (codingLength % 3));
@@ -397,7 +397,7 @@ public static ChromPos getChromPosReverse(int cdsPos, List<Integer> exonStarts,
 			logger.debug("     coding length: " + codingLength + "(phase:" + (codingLength % 3) + ") CDS POS trying to map:" + cdsPos);
 		}
 
-		logger.debug("length exons: " + lengthExons);
+		logger.debug("length exons: {}", lengthExons);
 		// could not map, or map over the full length??
 		return new ChromPos(-1,-1);
 
@@ -811,11 +811,11 @@ public static int getCDSPosForward(int chromPos, List<Integer> exonStarts, List<
 
 		// the genetic coordinate is not in a coding region
 		if ( (chromPos < (cdsStart+base) ) || ( chromPos > (cdsEnd+base) ) ) {
-			logger.debug("The "+format(chromPos)+" position is not in a coding region");
+			logger.debug("The {} position is not in a coding region", format(chromPos));
 			return -1;
 		}
 
-		logger.debug("looking for CDS position for " +format(chromPos));
+		logger.debug("looking for CDS position for {}", format(chromPos));
 
 		// map the genetic coordinates of coding region on a stretch of a reverse strand
 		List<Range<Integer>> cdsRegions = getCDSRegions(exonStarts, exonEnds, cdsStart, cdsEnd);
@@ -858,11 +858,11 @@ public static int getCDSPosReverse(int chromPos, List<Integer> exonStarts, List<
 
 		// the genetic coordinate is not in a coding region
 		if ( (chromPos < (cdsStart+base)) || ( chromPos > (cdsEnd+base) ) ) {
-			logger.debug("The "+format(chromPos)+" position is not in a coding region");
+			logger.debug("The {} position is not in a coding region", format(chromPos));
 			return -1;
 		}
 
-		logger.debug("looking for CDS position for " +format(chromPos));
+		logger.debug("looking for CDS position for {}", format(chromPos));
 
 		// map the genetic coordinate on a stretch of a reverse strand
 		List<Range<Integer>> cdsRegions = getCDSRegions(exonStarts, exonEnds, cdsStart, cdsEnd);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
index f0e1f02c61..7c30badc02 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ChainImpl.java
@@ -597,14 +597,7 @@ public GroupType getPredominantGroupType(){
 				max = GroupType.HETATM;
 			}
 		}
-		logger.debug(
-				"Ratio of residues to total for chain with asym_id {} is below {}. Assuming it is a {} chain. "
-						+ "Counts: # aa residues: {}, # nuc residues: {}, # non-water het residues: {}, # waters: {}, "
-						+ "ratio aa/total: {}, ratio nuc/total: {}",
-				getId(), ratioResiduesToTotal, max, sizeAminos,
-				sizeNucleotides, sizeHetatomsWithoutWater, sizeWaters,
-				(double) sizeAminos / (double) fullSize,
-				(double) sizeNucleotides / (double) fullSize);
+		logger.debug("Ratio of residues to total for chain with asym_id {} is below {}. Assuming it is a {} chain. Counts: # aa residues: {}, # nuc residues: {}, # non-water het residues: {}, # waters: {}, ratio aa/total: {}, ratio nuc/total: {}{}{}{}{}", getId(), ratioResiduesToTotal, max, sizeAminos, sizeNucleotides, sizeHetatomsWithoutWater, sizeWaters, (double) sizeAminos, (double) fullSize, (double) sizeNucleotides, (double) fullSize);
 
 		return max;
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
index af5f7ab80f..b2b6e88e6b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
@@ -834,10 +834,7 @@ public static Atom[] getAtomArray(Chain c, String[] atomNames) {
 			for (String atomName : atomNames) {
 				Atom a = g.getAtom(atomName);
 				if (a == null) {
-					logger.debug("Group " + g.getResidueNumber() + " ("
-							+ g.getPDBName()
-							+ ") does not have the required atom '" + atomName
-							+ "'");
+					logger.debug("Group {} ({}) does not have the required atom '{}'", g.getResidueNumber(), g.getPDBName(), atomName);
 					// this group does not have a required atom, skip it...
 					thisGroupAllAtoms = false;
 					break;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructurePairAligner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructurePairAligner.java
index d47dc52502..906e79e70a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructurePairAligner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructurePairAligner.java
@@ -407,8 +407,8 @@ public void align(Atom[] ca1, Atom[] ca2, StrucAligParameters params)
 
 		// step 1 get all Diagonals of length X that are similar between both
 		// structures
-		logger.debug(" length atoms1:" + ca1.length);
-		logger.debug(" length atoms2:" + ca2.length);
+		logger.debug(" length atoms1:{}", ca1.length);
+		logger.debug(" length atoms2:{}", ca2.length);
 
 		logger.debug("step 1 - get fragments with similar intramolecular distances ");
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/FragmentJoiner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/FragmentJoiner.java
index ac8fdaa563..cb9b870111 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/FragmentJoiner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/FragmentJoiner.java
@@ -375,10 +375,10 @@ public JointFragments[] frag_pairwise_compat(FragmentPair[] fraglst, int angleDi
 		List<JointFragments> fll = new ArrayList<JointFragments>();
 
 		double adiff = angleDiff * Math.PI / 180d;
-		logger.debug("addiff" + adiff);
+		logger.debug("addiff{}", adiff);
 		//distance between two unit vectors with angle adiff
 		double ddiff = Math.sqrt(2.0-2.0*Math.cos(adiff));
-		logger.debug("ddiff" + ddiff);
+		logger.debug("ddiff{}", ddiff);
 
 		// the fpairs in the flist have to be sorted with respect to their positions
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/seq/SmithWaterman3Daligner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/seq/SmithWaterman3Daligner.java
index 1a0597fd07..a9d9569cc1 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/seq/SmithWaterman3Daligner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/seq/SmithWaterman3Daligner.java
@@ -140,7 +140,7 @@ public AFPChain align(Atom[] ca1, Atom[] ca2, Object parameters)
 			throw new StructureException("Empty alignment for sequences "+s1+" and "+s2);
 		}
 
-		logger.debug("Smith-Waterman alignment is: "+pair.toString(100));
+		logger.debug("Smith-Waterman alignment is: {}", pair.toString(100));
 
 		// convert to a 3D alignment...
 		afpChain = convert(ca1,ca2,pair, smithWaterman);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitExtractor.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitExtractor.java
index 7060037bfc..487a51b564 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitExtractor.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitExtractor.java
@@ -82,7 +82,7 @@ public static List<Subunit> extractSubunits(Structure structure,
 		// Calculate the minimum length of a Subunit
 		int adjustedMinLen = calcAdjustedMinimumSequenceLength(subunits,
 				absMinLen, fraction, minLen);
-		logger.debug("Adjusted minimum sequence length: " + adjustedMinLen);
+		logger.debug("Adjusted minimum sequence length: {}", adjustedMinLen);
 
 		// Filter out short Subunits
 		for (int s = subunits.size() - 1; s >= 0; s--) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceList.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceList.java
index eb9901bd38..5af5a61bc3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceList.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceList.java
@@ -468,13 +468,13 @@ public String toString() {
 	public static StructureInterfaceList calculateInterfaces(Structure struc) {
 		CrystalBuilder builder = new CrystalBuilder(struc);
 		StructureInterfaceList interfaces = builder.getUniqueInterfaces();
-		logger.debug("Calculating ASA for "+interfaces.size()+" potential interfaces");
+		logger.debug("Calculating ASA for {} potential interfaces", interfaces.size());
 		interfaces.calcAsas(StructureInterfaceList.DEFAULT_ASA_SPHERE_POINTS, //fewer for performance
 				Runtime.getRuntime().availableProcessors(),
 				StructureInterfaceList.DEFAULT_MIN_COFACTOR_SIZE);
 		interfaces.removeInterfacesBelowArea();
 		interfaces.getClusters();
-		logger.debug("Found "+interfaces.size()+" interfaces");
+		logger.debug("Found {} interfaces", interfaces.size());
 		return interfaces;
 	}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/SerializableCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/SerializableCache.java
index b653b73d52..0f03a5a31c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/SerializableCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/SerializableCache.java
@@ -127,7 +127,7 @@ public Map<K,V> reloadFromFile() {
 
 		try{
 
-			logger.debug("Reloading from cache " + f.getAbsolutePath());
+			logger.debug("Reloading from cache {}", f.getAbsolutePath());
 
 			FileInputStream fis = new FileInputStream(f);
 			ObjectInputStream ois = new ObjectInputStream(fis);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
index a3d5728f19..bfb029bbe1 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
@@ -261,13 +261,13 @@ private void calcRmsd(Point3d[] x, Point3d[] y) {
 			// translate to origin
 			xref = CalcPoint.clonePoint3dArray(x);
 			xtrans = CalcPoint.centroid(xref);
-			logger.debug("x centroid: " + xtrans);
+			logger.debug("x centroid: {}", xtrans);
 			xtrans.negate();
 			CalcPoint.translate(new Vector3d(xtrans), xref);
 
 			yref = CalcPoint.clonePoint3dArray(y);
 			ytrans = CalcPoint.centroid(yref);
-			logger.debug("y centroid: " + ytrans);
+			logger.debug("y centroid: {}", ytrans);
 			ytrans.negate();
 			CalcPoint.translate(new Vector3d(ytrans), yref);
 			innerProduct(yref, xref);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java
index 1fc2b185c2..d5c47fdf92 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/EntityFinder.java
@@ -297,7 +297,7 @@ private static TreeMap<String,EntityInfo> findEntitiesFromAlignment(List<List<Ch
 
 					logger.debug("Alignment for chain pair {},{}: identity: {}, gap coverage 1: {}, gap coverage 2: {}",
 							c1.getId(), c2.getId(), String.format("%4.2f",identity), String.format("%4.2f",gapCov1), String.format("%4.2f",gapCov2));
-					logger.debug("\n"+pair.toString(100));
+					logger.debug("\n{}", pair.toString(100));
 
 					if (identity > IDENTITY_THRESHOLD && gapCov1<GAP_COVERAGE_THRESHOLD && gapCov2<GAP_COVERAGE_THRESHOLD) {
 						if (	!chainIds2entities.containsKey(c1.getId()) &&
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index 127a1ad019..1ce5300b28 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -436,7 +436,7 @@ public boolean deleteStructure(PdbId pdbId) throws IOException{
 				// delete file
 				boolean success = existing.delete();
 				if(success) {
-					logger.debug("Deleting "+existing.getAbsolutePath());
+					logger.debug("Deleting {}", existing.getAbsolutePath());
 				}
 				deleted = deleted || success;
 
@@ -445,7 +445,7 @@ public boolean deleteStructure(PdbId pdbId) throws IOException{
 				if(parent != null) {
 					success = parent.delete();
 					if(success) {
-						logger.debug("Deleting "+parent.getAbsolutePath());
+						logger.debug("Deleting {}", parent.getAbsolutePath());
 					}
 				}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index 2097369466..a9e30f6aac 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -369,7 +369,7 @@ private void pdb_HEADER_Handler(String line) {
 			pdbCode         = line.substring (62, min(len,66)).trim() ;
 			pdbId = pdbCode;
 
-			logger.debug("Parsing entry " + pdbId);
+			logger.debug("Parsing entry {}", pdbId);
 
 			PdbId pdbIdToSet;
 			if(pdbCode.isBlank()) {
@@ -917,14 +917,10 @@ private void pdb_JRNL_Handler(String line) {
 	 */
 	private void pdb_COMPND_Handler(String line) {
 
-		logger.debug("previousContinuationField  is "
-					+ previousContinuationField);
-		logger.debug("current continuationField  is "
-					+ continuationField);
-		logger.debug("current continuationString is "
-					+ continuationString);
-		logger.debug("current compound           is "
-					+ current_compound);
+		logger.debug("previousContinuationField  is {}", previousContinuationField);
+		logger.debug("current continuationField  is {}", continuationField);
+		logger.debug("current continuationString is {}", continuationString);
+		logger.debug("current compound           is {}", current_compound);
 
 
 		// In legacy PDB files the line ends with the PDB code and a serial number, chop those off!
@@ -979,13 +975,12 @@ private void pdb_COMPND_Handler(String line) {
 			if (previousContinuationField.equals(continuationField)
 					&& compndFieldValues.contains(continuationField)) {
 
-				logger.debug("Still in field " + continuationField);
-				logger.debug("token = " + token);
+				logger.debug("Still in field {}", continuationField);
+				logger.debug("token = {}", token);
 
 				continuationString = continuationString.concat(token + " ");
 
-				logger.debug("continuationString = "
-							+ continuationString);
+				logger.debug("continuationString = {}", continuationString);
 
 			}
 			if (!continuationField.equals(previousContinuationField)) {
@@ -1148,16 +1143,11 @@ private void pdb_SOURCE_Handler(String line) {
 
 
 
-		logger.debug("current continuationNo     is "
-				+ continuationNr);
-		logger.debug("previousContinuationField  is "
-				+ previousContinuationField);
-		logger.debug("current continuationField  is "
-				+ continuationField);
-		logger.debug("current continuationString is "
-				+ continuationString);
-		logger.debug("current compound           is "
-				+ current_compound);
+		logger.debug("current continuationNo     is {}", continuationNr);
+		logger.debug("previousContinuationField  is {}", previousContinuationField);
+		logger.debug("current continuationField  is {}", continuationField);
+		logger.debug("current continuationString is {}", continuationString);
+		logger.debug("current compound           is {}", current_compound);
 
 
 		// following the docs, the last valid character should be 79, chop off the rest
@@ -1167,7 +1157,7 @@ private void pdb_SOURCE_Handler(String line) {
 
 		line = line.substring(10, line.length());
 
-		logger.debug("LINE: >" + line + "<");
+		logger.debug("LINE: >{}<", line);
 
 		String[] fieldList = line.split("\\s+");
 
@@ -1216,12 +1206,11 @@ private void pdb_SOURCE_Handler(String line) {
 			if (previousContinuationField.equals(continuationField)
 					&& sourceFieldValues.contains(continuationField)) {
 
-				logger.debug("Still in field " + continuationField);
+				logger.debug("Still in field {}", continuationField);
 
 				continuationString = continuationString.concat(token + " ");
 
-				logger.debug("continuationString = "
-							+ continuationString);
+				logger.debug("continuationString = {}", continuationString);
 			}
 			if (!continuationField.equals(previousContinuationField)) {
 
@@ -2174,7 +2163,7 @@ private void pdb_TER_Handler() {
 	 */
 	private void pdb_DBREF_Handler(String line){
 
-		logger.debug("Parsing DBREF " + line);
+		logger.debug("Parsing DBREF {}", line);
 
 		DBRef dbref = new DBRef();
 		String idCode      = line.substring(7,11);
@@ -2385,7 +2374,7 @@ private void pdb_SITE_Handler(String line){
 
 		//  make a map of: SiteId to List<ResidueNumber>
 
-		logger.debug("Site Line:"+line);
+		logger.debug("Site Line:{}", line);
 
 
 		String siteID = line.substring(11, 14);
@@ -2398,7 +2387,7 @@ private void pdb_SITE_Handler(String line){
 			siteToResidueMap.put(siteID.trim(), siteResidues);
 
 			logger.debug(String.format("New Site made: %s %s", siteID,  siteResidues));
-			logger.debug("Now made " + siteMap.size() + " sites");
+			logger.debug("Now made {} sites", siteMap.size());
 
 		}
 
@@ -2414,7 +2403,7 @@ private void pdb_SITE_Handler(String line){
 		while (!"          ".equals((groupString = line.substring(0, 10)))) {
 			//groupstring: 'ARG H 221A'
 
-			logger.debug("groupString: '" + groupString + "'");
+			logger.debug("groupString: '{}'", groupString);
 
 			//set the residue name
 			//residueName = 'ARG'
@@ -2444,7 +2433,7 @@ private void pdb_SITE_Handler(String line){
 			ResidueNumber residueNumber = new ResidueNumber();
 
 
-			logger.debug("pdbCode: '" + resNum + insCode + "'");
+			logger.debug("pdbCode: '{}{}'", resNum, insCode);
 
 			residueNumber.setChainName(chainId);
 			residueNumber.setSeqNum(resNum);
@@ -2457,7 +2446,7 @@ private void pdb_SITE_Handler(String line){
 			line = line.substring(11);
 		}
 
-		logger.debug("Current SiteMap (contains "+ siteToResidueMap.keySet().size() + " sites):");
+		logger.debug("Current SiteMap (contains {} sites):", siteToResidueMap.keySet().size());
 		for (String key : siteToResidueMap.keySet()) {
 			logger.debug(key + " : " + siteToResidueMap.get(key));
 		}
@@ -2481,7 +2470,7 @@ private void pdb_REMARK_800_Handler(String line){
 				//                    remark800Counter++;
 				String siteID = fields[1].trim();
 
-				logger.debug("siteID: '" + siteID +"'");
+				logger.debug("siteID: '{}'", siteID);
 
 				//fetch the siteResidues from the map
 				site = siteMap.get(siteID);
@@ -2491,8 +2480,8 @@ private void pdb_REMARK_800_Handler(String line){
 					site = new Site(siteID, new ArrayList<Group>());
 					siteMap.put(site.getSiteID(), site);
 
-					logger.debug("New Site made: " + site);
-					logger.debug("Now made " + siteMap.size() + " sites");
+					logger.debug("New Site made: {}", site);
+					logger.debug("Now made {} sites", siteMap.size());
 
 				}
 			}
@@ -2500,7 +2489,7 @@ private void pdb_REMARK_800_Handler(String line){
 				//                    remark800Counter++;
 				String evCode = fields[1].trim();
 
-				logger.debug("evCode: '" + evCode +"'");
+				logger.debug("evCode: '{}'", evCode);
 
 				//fetch the siteResidues from the map
 				site.setEvCode(evCode);
@@ -2509,12 +2498,12 @@ private void pdb_REMARK_800_Handler(String line){
 				//                    remark800Counter++;
 				String desc = fields[1].trim();
 
-				logger.debug("desc: '" + desc +"'");
+				logger.debug("desc: '{}'", desc);
 
 				//fetch the siteResidues from the map
 				site.setDescription(desc);
 
-				logger.debug("Finished making REMARK 800 for site " + site.getSiteID());
+				logger.debug("Finished making REMARK 800 for site {}", site.getSiteID());
 				logger.debug(site.remark800toPDB());
 
 			}
@@ -3417,7 +3406,7 @@ private void buildjournalArticle() {
 			if ("AUTH".equals(subField)) {
 				auth.append(line.substring(19, line.length()).trim());
 
-				logger.debug("AUTH '" + auth.toString() + "'");
+				logger.debug("AUTH '{}'", auth.toString());
 
 			}
 			if ("TITL".equals(subField)) {
@@ -3425,26 +3414,26 @@ private void buildjournalArticle() {
 				//words on the join won't be concatenated
 				titl.append(line.substring(19, line.length()).trim()).append(" ");
 
-				logger.debug("TITL '" + titl.toString() + "'");
+				logger.debug("TITL '{}'", titl.toString());
 
 			}
 			if ("EDIT".equals(subField)) {
 				edit.append(line.substring(19, line.length()).trim());
 
-				logger.debug("EDIT '" + edit.toString() + "'");
+				logger.debug("EDIT '{}'", edit.toString());
 
 			}
 			//        JRNL        REF    NAT.IMMUNOL.                  V.   8   430 2007
 			if ("REF ".equals(subField)) {
 				ref.append(line.substring(19, line.length()).trim()).append(" ");
 
-				logger.debug("REF '" + ref.toString() + "'");
+				logger.debug("REF '{}'", ref.toString());
 
 			}
 			if ("PUBL".equals(subField)) {
 				publ.append(line.substring(19, line.length()).trim()).append(" ");
 
-				logger.debug("PUBL '" + publ.toString() + "'");
+				logger.debug("PUBL '{}'", publ.toString());
 
 			}
 			//        JRNL        REFN                   ISSN 1529-2908
@@ -3455,21 +3444,21 @@ private void buildjournalArticle() {
 				}
 				refn.append(line.substring(35, line.length()).trim());
 
-				logger.debug("REFN '" + refn.toString() + "'");
+				logger.debug("REFN '{}'", refn.toString());
 
 			}
 			//        JRNL        PMID   17351618
 			if ("PMID".equals(subField)) {
 				pmid.append(line.substring(19, line.length()).trim());
 
-				logger.debug("PMID '" + pmid.toString() + "'");
+				logger.debug("PMID '{}'", pmid.toString());
 
 			}
 			//        JRNL        DOI    10.1038/NI1450
 			if ("DOI ".equals(subField)) {
 				doi.append(line.substring(19, line.length()).trim());
 
-				logger.debug("DOI '" + doi.toString() + "'");
+				logger.debug("DOI '{}'", doi.toString());
 
 			}
 		}
@@ -3509,7 +3498,7 @@ private class JournalParser {
 
 		public JournalParser(String ref) {
 
-			logger.debug("JournalParser init '" + ref + "'");
+			logger.debug("JournalParser init '{}'", ref);
 
 
 			if ("TO BE PUBLISHED ".equals(ref)) {
@@ -3599,7 +3588,7 @@ public JournalParser(String ref) {
 			if (!"    ".equals(journalString)) {
 				journalName = journalString;
 
-				logger.debug("JournalParser set journalName " + journalName);
+				logger.debug("JournalParser set journalName {}", journalName);
 
 			}
 		}
@@ -3649,14 +3638,14 @@ private List<Author> authorBuilder(String authorString) {
 			Author author = new Author();
 			author.setSurname(authors[0]);
 
-			logger.debug("Set consortium author name " + author.getSurname());
+			logger.debug("Set consortium author name {}", author.getSurname());
 
 			authorList.add(author);
 		} else {
 			for (int i = 0; i < authors.length; i++) {
 				String authorFullName = authors[i];
 
-				logger.debug("Building author " + authorFullName);
+				logger.debug("Building author {}", authorFullName);
 
 				Author author = new Author();
 				String regex = "\\.";
@@ -3679,7 +3668,7 @@ private List<Author> authorBuilder(String authorString) {
 				else if (authorNames.length == 1) {
 					author.setSurname(authorNames[0]);
 
-					logger.debug("Set consortium author name in multiple author block " + author.getSurname
+					logger.debug("Set consortium author name in multiple author block {}", author.getSurname
 								());
 
 				} else {
@@ -3693,14 +3682,14 @@ else if (authorNames.length == 1) {
 						initials += initial + ".";
 					}
 
-					logger.debug("built initials '" + initials + "'");
+					logger.debug("built initials '{}'", initials);
 
 					author.setInitials(initials);
 					//surname is always last
 					int lastName = authorNames.length - 1;
 					String surname = authorNames[lastName];
 
-					logger.debug("built author surname " + surname);
+					logger.debug("built author surname {}", surname);
 
 					author.setSurname(surname);
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
index 5d8c5b7ffb..a5854efe08 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
@@ -312,7 +312,7 @@ private List<Group> trySimpleMatch(List<Group> seqResGroups,List<Group> atmResGr
 			//			}
 
 			if ( seqResPos >= seqResGroups.size()){
-				logger.debug("seqres groups don't match atom indices " + seqResPos);
+				logger.debug("seqres groups don't match atom indices {}", seqResPos);
 				if ( atomResGroup instanceof AminoAcid )
 					return null;
 				else
@@ -521,7 +521,7 @@ private boolean alignNucleotideGroups(List<Group> seqRes, List<Group> atomRes) {
 
 
 
-		logger.debug("Alignment:\n"+pair.toString(100));
+		logger.debug("Alignment:\n{}", pair.toString(100));
 
 
 		boolean noMatchFound = mapDNAChains(seqRes,atomRes,pair,seqresIndexPosition, atomIndexPosition );
@@ -617,7 +617,7 @@ private boolean alignProteinChains(List<Group> seqRes, List<Group> atomRes) {
 		}
 
 
-		logger.debug("Alignment:\n"+pair.toString(100));
+		logger.debug("Alignment:\n{}", pair.toString(100));
 
 
 		boolean noMatchFound = mapChains(seqRes,atomRes,pair,seqresIndexPosition, atomIndexPosition );
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 2f91dab7ee..b3be41bad0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -560,8 +560,7 @@ public void consumeCell(Cell cell) {
                 // If the entry describes a structure determined by a technique other than X-ray crystallography,
                 // cell is (sometimes!) a = b = c = 1.0, alpha = beta = gamma = 90 degrees
                 // if so we don't add and CrystalCell will be null
-                logger.debug("The crystal cell read from file does not have reasonable dimensions (at least one " +
-                        "dimension is below {}), discarding it.", CrystalCell.MIN_VALID_CELL_SIZE);
+                logger.debug("The crystal cell read from file does not have reasonable dimensions (at least one dimension is below {}), discarding it.", CrystalCell.MIN_VALID_CELL_SIZE);
                 return;
             }
 
@@ -617,7 +616,7 @@ private Date convert(LocalDate localDate) {
 
     @Override
     public void consumeDatabasePDBRev(DatabasePDBRev databasePDBrev) {
-        logger.debug("got a database revision:" + databasePDBrev);
+        logger.debug("got a database revision:{}", databasePDBrev);
 
         Date modDate = null;
         for (int rowIndex = 0; rowIndex < databasePDBrev.getRowCount(); rowIndex++) {
@@ -715,8 +714,7 @@ public void consumeEntityPolySeq(EntityPolySeq entityPolySeq) {
                     // the group is actually a nucleotide group...
                     g = new NucleotideImpl();
                 } else {
-                    logger.debug("Residue {} {} is not a standard aminoacid or nucleotide, will create a het group " +
-                            "for it", entityPolySeq.getNum().get(rowIndex), entityPolySeq.getMonId().get(rowIndex));
+                    logger.debug("Residue {} {} is not a standard aminoacid or nucleotide, will create a het group for it", entityPolySeq.getNum().get(rowIndex), entityPolySeq.getMonId().get(rowIndex));
                     g = new HetatomImpl();
                 }
             }
@@ -1595,8 +1593,7 @@ private static Chain removeSeqResHeterogeneity(Chain c) {
             if (lastResNum == null || !lastResNum.equals(currentResNum)) {
                 trimmedChain.addGroup(g);
             } else {
-                logger.debug("Removing seqres group because it seems to be repeated in entity_poly_seq, most likely " +
-                        "has hetero='y': {}", g);
+                logger.debug("Removing seqres group because it seems to be repeated in entity_poly_seq, most likely has hetero='y': {}", g);
             }
             lastResNum = currentResNum;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java
index f386140cdf..13e038cadd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsMappingProvider.java
@@ -81,7 +81,7 @@ public static List<SiftsEntity> getSiftsMapping(String pdbId) throws IOException
 		}
 		File dest = new File( hashDir, pdbId + ".sifts.xml.gz");
 
-		logger.debug("testing SIFTS file " + dest.getAbsolutePath());
+		logger.debug("testing SIFTS file {}", dest.getAbsolutePath());
 
 
 		if ( ! dest.exists()){
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsXMLParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsXMLParser.java
index 9f0789976c..e566550df2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsXMLParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsXMLParser.java
@@ -131,13 +131,13 @@ private SiftsEntity getSiftsEntity(Element empEl) {
 
 					SiftsSegment s = getSiftsSegment(el);
 
-					logger.debug("new segment: " + s);
+					logger.debug("new segment: {}", s);
 					entity.addSegment(s);
 
 				}
 			}
 
-			logger.debug("new SIFTS entity: " + entity);
+			logger.debug("new SIFTS entity: {}", entity);
 			return entity;
 		}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/Astral.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/Astral.java
index d7c1ebe5d5..da1f82221f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/Astral.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/Astral.java
@@ -222,7 +222,7 @@ private void init(Reader reader) {
 						String scopId = line.split("\\s")[0].substring(1);
 						names.add(scopId);
 						if (i % 1000 == 0) {
-							logger.debug("Reading ASTRAL line for " + scopId);
+							logger.debug("Reading ASTRAL line for {}", scopId);
 						}
 						i++;
 					} catch (RuntimeException e) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixSolver.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixSolver.java
index 361522fbd4..a2d002280c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixSolver.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixSolver.java
@@ -87,7 +87,7 @@ private void solve() {
 
 		for (Entry<Integer[], Integer> entry : interactionMap.entrySet()) {
 			Integer[] pair = entry.getKey();
-			logger.debug("HelixSolver: pair: " + Arrays.toString(pair));
+			logger.debug("HelixSolver: pair: {}", Arrays.toString(pair));
 
 			int contacts = entry.getValue();
 			Point3d[] h1 = CalcPoint.clonePoint3dArray(repeatUnits.get(pair[0]));
@@ -125,7 +125,7 @@ private void solve() {
 				continue;
 			}
 			permutations.add(permutation);
-			logger.debug("Permutation: " + permutation);
+			logger.debug("Permutation: {}", permutation);
 
 
 			// keep track of which subunits are permuted
@@ -238,10 +238,10 @@ private void solve() {
 					repeatUnitCenters.get(pair[1]));
 			angle = getAngle(transformation);
 
-			logger.debug("Trace rmsd: " + traceRmsd);
-			logger.debug("Trace rise: " + rise);
-			logger.debug("Trace angle: " + Math.toDegrees(angle));
-			logger.debug("Permutation: " + permutation);
+			logger.debug("Trace rmsd: {}", traceRmsd);
+			logger.debug("Trace rise: {}", rise);
+			logger.debug("Trace angle: {}", Math.toDegrees(angle));
+			logger.debug("Permutation: {}", permutation);
 
 			if (traceRmsd > parameters.getRmsdThreshold()) {
 				continue;
@@ -280,7 +280,7 @@ private void solve() {
 			helix.setFold(fold);
 			helix.setContacts(contacts);
 			helix.setRepeatUnits(unit.getRepeatUnitIndices());
-			logger.debug("Layerlines: " + helix.getLayerLines());
+			logger.debug("Layerlines: {}", helix.getLayerLines());
 
 			for (List<Integer> line : helix.getLayerLines()) {
 				maxLayerLineLength = Math.max(maxLayerLineLength, line.size());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java
index 641242a0bf..66626ef3f0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java
@@ -431,7 +431,7 @@ public static CeSymmResult analyzeLevel(Atom[] atoms,
 					msa = optimizer.optimize();
 					result.setMultipleAlignment(msa);
 				} catch (RefinerFailedException e) {
-					logger.debug("Optimization failed:" + e.getMessage());
+					logger.debug("Optimization failed:{}", e.getMessage());
 				}
 			}
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java
index 66df0f2658..f1e50b756d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java
@@ -128,8 +128,7 @@ private void iterate(Atom[] atoms) throws StructureException {
 		if ((atoms.length <= params.getWinSize()
 				|| atoms.length <= params.getMinCoreLength())
 				&& !levels.isEmpty()) {
-			logger.debug("Aborting iteration due to insufficient Atom "
-					+ "array length: %d", atoms.length);
+			logger.debug("Aborting iteration due to insufficient Atom array length: %d", atoms.length);
 			return;
 		}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalBuilder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalBuilder.java
index 2bc6806b77..4b5975cbaa 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalBuilder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalBuilder.java
@@ -280,12 +280,12 @@ private void calcInterfacesCrystal(StructureInterfaceList set, double cutoff) {
 			int neighbors = (2*numCells+1)*(2*numCells+1)*(2*numCells+1)-1;
 			int auTrials = (numPolyChainsAu*(numPolyChainsAu-1))/2;
 			int trials = numPolyChainsAu*numOperatorsSg*numPolyChainsAu*neighbors;
-			logger.debug("Chain clash trials within original AU: "+auTrials);
+			logger.debug("Chain clash trials within original AU: {}", auTrials);
 			logger.debug(
 					"Chain clash trials between the original AU and the neighbouring "+neighbors+
 					" whole unit cells ("+numCells+" neighbours)" +
 					"(2x"+numPolyChainsAu+"chains x "+numOperatorsSg+"AUs x "+neighbors+"cells) : "+trials);
-			logger.debug("Total trials: "+(auTrials+trials));
+			logger.debug("Total trials: {}", (auTrials+trials));
 		}
 
 		List<Chain> polyChains = structure.getPolyChains();
@@ -404,12 +404,12 @@ else if (selfEquivalent)
 		}
 
 		end = System.currentTimeMillis();
-		logger.debug("\n"+trialCount+" chain-chain clash trials done. Time "+(end-start)/1000+"s");
-		logger.debug("  skipped (not overlapping AUs)       : "+skippedAUsNoOverlap);
-		logger.debug("  skipped (not overlapping chains)    : "+skippedChainsNoOverlap);
-		logger.debug("  skipped (sym redundant op pairs)    : "+skippedRedundant);
-		logger.debug("  skipped (sym redundant self op)     : "+skippedSelfEquivalent);
-		logger.debug("Found "+set.size()+" interfaces.");
+		logger.debug("\n{} chain-chain clash trials done. Time {}{}s", trialCount, (end-start), 1000);
+		logger.debug("  skipped (not overlapping AUs)       : {}", skippedAUsNoOverlap);
+		logger.debug("  skipped (not overlapping chains)    : {}", skippedChainsNoOverlap);
+		logger.debug("  skipped (sym redundant op pairs)    : {}", skippedRedundant);
+		logger.debug("  skipped (sym redundant self op)     : {}", skippedSelfEquivalent);
+		logger.debug("Found {} interfaces.", set.size());
 	}
 
 

From 7ed50c1abcafed36b11bb67a0c034c09e8085134 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 6 Mar 2024 09:54:28 -0800
Subject: [PATCH 479/599] Updating changelog for next release

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b624dcc06c..c05fae5f75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 BioJava Changelog
 -----------------
 
+BioJava 7.1.1
+==============================
+### Fixed
+* Now mmCIF files that have no author fields in atom_site can be read (e.g. from PyMol or ESMAtlas) #775 #1083
+* No evaluations of arguments in debug level log statements #1086 #789
+
+### Removed
+* Minor removal from biojava-core: FileDownloadUtils::copy, replaced by Files::copy
+
 BioJava 7.1.0
 ==============================
 ### Added

From 3eaf1651f945a4fff1fc204c9b54d2c9c8ddbb56 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 6 Mar 2024 10:17:01 -0800
Subject: [PATCH 480/599] [maven-release-plugin] prepare release biojava-7.1.1

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index b6ef35131f..df71aba48d 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index fe34a3dd31..f3c10b1058 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index d824f778f5..0f1af0271b 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 0dfc13e4bb..f580773c18 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index f0933aeab4..097efe44f8 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.1-SNAPSHOT</version>
+    	<version>7.1.1</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 302a5f7c4c..10237635f4 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index f80a56524d..b70dfa169f 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.1-SNAPSHOT</version>
+    <version>7.1.1</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 94e8aa7267..da42539949 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index b67201a13a..3689e1425d 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 50b5d7b714..266daf5a05 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 0afe0b933d..f6d0d47164 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 0ca51bcba3..b8a3239658 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.1-SNAPSHOT</version>
+        <version>7.1.1</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 8bd8d61ea1..75145eb656 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.1</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1-SNAPSHOT</version>
+			<version>7.1.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 3f94bfbecb..e067a41886 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.1-SNAPSHOT</version>
+	<version>7.1.1</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.1.1</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 181e5d5d8a0f4e6350250681b5dfd84a459d5596 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 6 Mar 2024 10:17:03 -0800
Subject: [PATCH 481/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index df71aba48d..7c3d994d5c 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index f3c10b1058..31ddaaf246 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 0f1af0271b..5c294cdc97 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index f580773c18..dd395e40b6 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 097efe44f8..4f1f34abd8 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.1</version>
+    <version>7.1.2-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.1</version>
+    	<version>7.1.2-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 10237635f4..ec919839e0 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index b70dfa169f..6803c8a4f4 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.1</version>
+    <version>7.1.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index da42539949..c5a32a81b6 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 3689e1425d..46ad1f4154 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 266daf5a05..05ebf00c97 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.1</version>
+		<version>7.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index f6d0d47164..6b82206a97 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index b8a3239658..37e75445eb 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.1</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 75145eb656..66580cb6ea 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.1</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.1</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index e067a41886..ad75a8e983 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.1</version>
+	<version>7.1.2-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.1.1</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 1042a330c333d430ccca845abd85057fb4eb6b97 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 6 Mar 2024 11:06:16 -0800
Subject: [PATCH 482/599] Updating for new release

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c7ab3d0e12..cccff99106 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-7.1.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.1.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-7.1.1-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.1.1) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>7.1.0</version>
+        <version>7.1.1</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From 756e2d01483cd3f491bc08981420f2727a723e63 Mon Sep 17 00:00:00 2001
From: Michael L Heuer <heuermh@acm.org>
Date: Tue, 19 Mar 2024 10:45:06 -0500
Subject: [PATCH 483/599] Update guava dependency version to 33.1.0-jre.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ad75a8e983..4af310f250 100644
--- a/pom.xml
+++ b/pom.xml
@@ -475,7 +475,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>33.0.0-jre</version>
+				<version>33.1.0-jre</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

From b7a04c5bddcc200de589aea58b4d3cee7362cb74 Mon Sep 17 00:00:00 2001
From: cinsttool <violetlkl73@gmail.com>
Date: Mon, 1 Apr 2024 17:18:32 +0800
Subject: [PATCH 484/599] fix container inefficiency in
 GenericFastaHeaderParser.java

---
 .../nbio/core/sequence/io/GenericFastaHeaderParser.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
index 9acaf1d25c..a53e3141f1 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
@@ -93,9 +93,9 @@ private String[] getHeaderValues(String header) {
 					sb.append(header.charAt(i));
 				}
 
-				data = new String[values.size()];
-				values.toArray(data);
 			}
+			data = new String[values.size()];
+			values.toArray(data);
 		} else {
 			data = header.split(" ");
 		}

From 266d835be82367b9e588d4215ca6167a08052c15 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 8 Apr 2024 14:45:32 -0700
Subject: [PATCH 485/599] Fixing test

---
 .../io/TestQuaternaryStructureProviders.java  | 66 ++++---------------
 1 file changed, 11 insertions(+), 55 deletions(-)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestQuaternaryStructureProviders.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestQuaternaryStructureProviders.java
index 0b67e66aaa..7a60a6e095 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestQuaternaryStructureProviders.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/TestQuaternaryStructureProviders.java
@@ -31,8 +31,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class TestQuaternaryStructureProviders {
 
@@ -51,35 +50,20 @@ public void test3FAD() throws IOException, StructureException{
 	public void test5LDH() throws IOException, StructureException{
 		comparePdbVsMmcif("5LDH",1, 4);
 
-		// the pdb file of 5ldh contains only 1 bioassembly, whilst the mmcif contains 2,
-		// thus we can't test here the comparison between the 2
-		//testID("5LDH",2, 2);
+		// Note 1: since v5 remediation there's 4 bioassemblies with numerical ids for 5ldh, no more PAU and XAU
+		// Note 2: before March 2024 remediation, this entry had 4 assemblies. Now only 1
 
-		// since v5 remediation there's 4 bioassemblies with numerical ids for 5ldh, no more PAU and XAU
+		// bioassembly 1 does exist in mmcif file, let's check that
 		boolean gotException = false;
 		try {
 			AtomCache cache = new AtomCache();
 			cache.setFiletype(StructureFiletype.CIF);
 			StructureIO.setAtomCache(cache);
-			StructureIO.getBiologicalAssembly("5LDH",3);
+			StructureIO.getBiologicalAssembly("5LDH",1);
 		} catch (StructureException e) {
 			gotException = true;
 		}
-
-		assertTrue("Bioassembly 3 for PDB id 5LDH should fail with a StructureException!", !gotException);
-
-		// bioassembly 2 does exist in mmcif file, let's check that
-		gotException = false;
-		try {
-			AtomCache cache = new AtomCache();
-			cache.setFiletype(StructureFiletype.CIF);
-			StructureIO.setAtomCache(cache);
-			StructureIO.getBiologicalAssembly("5LDH",2);
-		} catch (StructureException e) {
-			gotException = true;
-		}
-		assertTrue("Bioassembly 2 for PDB id 5LDH should not fail with a StructureException!", !gotException);
-
+        assertFalse("Bioassembly 1 for PDB id 5LDH should exist and not fail with a StructureException!", gotException);
 	}
 
 	@Test
@@ -94,17 +78,9 @@ public void test1A29() throws IOException, StructureException{
 
 	@Test
 	public void test1EI7() throws IOException, StructureException {
-
 		comparePdbVsMmcif("1ei7",1, 68);
-
 	}
 
-	@Test
-	public void testGetNrBioAssemblies5LDH() throws IOException, StructureException {
-		assertEquals("There should be 4 bioassemblies for 5LDH, see github issue #230", 4, StructureIO.getBiologicalAssemblies("5LDH").size());
-	}
-
-
 	/**
 	 * Bioassembly tests for a single PDB entry
 	 * @param pdbId
@@ -115,9 +91,7 @@ public void testGetNrBioAssemblies5LDH() throws IOException, StructureException
 	 */
 	private void comparePdbVsMmcif(String pdbId, int bioMolecule, int mmSize) throws IOException, StructureException{
 
-
 		Structure pdbS = getPdbBioAssembly(pdbId, bioMolecule, true);
-
 		Structure mmcifS = getMmcifBioAssembly(pdbId, bioMolecule, true);
 
 		PDBHeader pHeader = pdbS.getPDBHeader();
@@ -129,16 +103,13 @@ private void comparePdbVsMmcif(String pdbId, int bioMolecule, int mmSize) throws
 		// mmcif files contain sometimes partial virus assemblies, so they can contain more info than pdb
 		assertTrue(pHeader.getNrBioAssemblies() <= mHeader.getNrBioAssemblies());
 
-
 		Map<Integer, BioAssemblyInfo> pMap = pHeader.getBioAssemblies();
 		Map<Integer, BioAssemblyInfo> mMap = mHeader.getBioAssemblies();
 
-
 		assertTrue(pMap.keySet().size()<= mMap.keySet().size());
 
 		assertEquals(mmSize, mMap.get(bioMolecule).getMacromolecularSize());
 
-
 		for ( int k : pMap.keySet()) {
 			assertTrue(mMap.containsKey(k));
 
@@ -154,45 +125,32 @@ private void comparePdbVsMmcif(String pdbId, int bioMolecule, int mmSize) throws
 
 			//assertEquals(pL.size(), mL.size());
 
-
-			for (BiologicalAssemblyTransformation m1 : pL){
-
+			for (BiologicalAssemblyTransformation m1 : pL) {
 				boolean found = false;
-				for ( BiologicalAssemblyTransformation m2 : mL){
-
-					if  (! m1.getChainId().equals(m2.getChainId()))
+				for (BiologicalAssemblyTransformation m2 : mL) {
+					if (! m1.getChainId().equals(m2.getChainId()))
 						continue;
 
-					if ( ! m1.getTransformationMatrix().epsilonEquals(m2.getTransformationMatrix(), 0.0001))
+					if (! m1.getTransformationMatrix().epsilonEquals(m2.getTransformationMatrix(), 0.0001))
 						continue;
 
 					found = true;
-
 				}
-
-				if ( ! found ){
+				if (! found) {
 					System.err.println("did not find matching matrix " + m1);
 					System.err.println(mL);
 				}
 				assertTrue(found);
-
 			}
 		}
 
-
 		assertEquals("Not the same number of chains!" , pdbS.size(),mmcifS.size());
 
 		Atom[] pdbA = StructureTools.getAllAtomArray(pdbS);
-
 		Atom[] mmcifA = StructureTools.getAllAtomArray(mmcifS);
 
 		assertEquals(pdbA.length, mmcifA.length);
-
 		assertEquals(pdbA[0].toPDB(), mmcifA[0].toPDB());
-
-
-
-
 	}
 
 	private Structure getPdbBioAssembly(String pdbId, int bioMolecule, boolean multiModel) throws IOException, StructureException {
@@ -213,6 +171,4 @@ private Structure getMmcifBioAssembly(String pdbId, int bioMolecule, boolean mul
 		return mmcifS;
 	}
 
-
-
 }

From b18212163e0fd9ff56da13ef258005b7d0decced Mon Sep 17 00:00:00 2001
From: jlerbsc <jean-pierre.lerbscher@jperf.com>
Date: Thu, 18 Apr 2024 09:26:14 +0200
Subject: [PATCH 486/599] Fix sonar issue S2293 Replace the type specification
 in this constructor call with the diamond operator ('<>')

---
 .../nbio/aaproperties/CommandPrompt.java      | 12 ++--
 .../nbio/aaproperties/Constraints.java        | 14 ++--
 .../nbio/aaproperties/PeptideProperties.java  |  4 +-
 .../aaproperties/PeptidePropertiesImpl.java   |  6 +-
 .../org/biojava/nbio/aaproperties/Utils.java  |  2 +-
 .../profeat/ProfeatPropertiesImpl.java        | 14 ++--
 .../xml/AminoAcidCompositionTable.java        |  2 +-
 .../xml/CaseFreeAminoAcidCompoundSet.java     | 16 ++---
 .../nbio/aaproperties/xml/Element.java        |  2 +-
 .../nbio/aaproperties/xml/ElementTable.java   |  4 +-
 .../xml/ModifiedAminoAcidCompoundSet.java     |  4 +-
 .../src/main/java/demo/CookbookMSA.java       |  2 +-
 .../src/main/java/demo/DemoDistanceTree.java  |  4 +-
 .../biojava/nbio/alignment/Alignments.java    | 36 +++++-----
 .../org/biojava/nbio/alignment/GuideTree.java |  6 +-
 .../SimpleProfileProfileAligner.java          |  2 +-
 .../biojava/nbio/alignment/SmithWaterman.java |  2 +-
 .../alignment/io/StockholmFileAnnotation.java |  8 +--
 .../alignment/io/StockholmFileParser.java     |  2 +-
 .../io/StockholmSequenceAnnotation.java       |  2 +-
 .../nbio/alignment/io/StockholmStructure.java |  8 +--
 .../alignment/routines/AlignerHelper.java     |  2 +-
 .../AnchoredPairwiseSequenceAligner.java      |  4 +-
 .../template/AbstractMatrixAligner.java       |  4 +-
 .../biojava/nbio/phylo/ForesterWrapper.java   |  2 +-
 .../java/demo/DemoSixFrameTranslation.java    |  2 +-
 .../main/java/demo/ParseFastaFileDemo.java    |  2 +-
 .../core/alignment/SimpleAlignedSequence.java |  4 +-
 .../nbio/core/alignment/SimpleProfile.java    | 28 ++++----
 .../alignment/matrices/AAIndexFileParser.java |  6 +-
 .../matrices/ScaledSubstitutionMatrix.java    |  4 +-
 .../matrices/SimpleSubstitutionMatrix.java    | 12 ++--
 .../matrices/SubstitutionMatrixHelper.java    |  4 +-
 .../org/biojava/nbio/core/search/io/Hsp.java  |  4 +-
 .../biojava/nbio/core/search/io/SearchIO.java |  2 +-
 .../search/io/blast/BlastTabularParser.java   | 10 +--
 .../core/search/io/blast/BlastXMLParser.java  | 12 ++--
 .../core/sequence/ChromosomeSequence.java     |  2 +-
 .../nbio/core/sequence/DNASequence.java       |  4 +-
 .../nbio/core/sequence/GeneSequence.java      | 10 +--
 .../sequence/MultipleSequenceAlignment.java   |  4 +-
 .../nbio/core/sequence/ProteinSequence.java   |  2 +-
 .../core/sequence/TranscriptSequence.java     |  6 +-
 .../compound/AminoAcidCompoundSet.java        | 16 ++---
 .../nbio/core/sequence/edits/Edit.java        |  8 +--
 .../sequence/features/AbstractFeature.java    |  6 +-
 .../sequence/features/DBReferenceInfo.java    |  2 +-
 .../features/FeatureDbReferenceInfo.java      |  8 +--
 .../sequence/features/QualityFeature.java     |  2 +-
 .../sequence/features/QuantityFeature.java    |  2 +-
 .../CasePreservingProteinSequenceCreator.java |  4 +-
 .../core/sequence/io/DNASequenceCreator.java  |  2 +-
 .../nbio/core/sequence/io/FastaReader.java    |  2 +-
 .../core/sequence/io/FastaReaderHelper.java   | 10 +--
 .../core/sequence/io/FastaWriterHelper.java   |  8 +--
 .../io/FileProxyDNASequenceCreator.java       |  2 +-
 .../io/FileProxyProteinSequenceCreator.java   |  2 +-
 .../io/FileProxyRNASequenceCreator.java       |  2 +-
 .../core/sequence/io/GenbankReaderHelper.java | 12 ++--
 .../core/sequence/io/GenbankWriterHelper.java | 14 ++--
 .../sequence/io/GenericFastaHeaderParser.java |  2 +-
 .../sequence/io/GenericInsdcHeaderFormat.java | 12 ++--
 .../nbio/core/sequence/io/IUPACParser.java    | 12 ++--
 .../sequence/io/ProteinSequenceCreator.java   |  2 +-
 .../core/sequence/io/RNASequenceCreator.java  |  2 +-
 .../nbio/core/sequence/io/util/IOUtils.java   |  2 +-
 .../loader/GenbankProxySequenceReader.java    |  2 +-
 .../loader/SequenceFileProxyLoader.java       |  6 +-
 .../loader/StringProxySequenceReader.java     |  6 +-
 .../loader/UniprotProxySequenceReader.java    | 22 +++----
 .../core/sequence/location/InsdcParser.java   |  4 +-
 .../sequence/location/LocationHelper.java     |  4 +-
 .../location/template/AbstractLocation.java   | 16 ++---
 .../sequence/location/template/Location.java  |  2 +-
 .../storage/ArrayListSequenceReader.java      |  6 +-
 .../storage/FourBitSequenceReader.java        | 10 +--
 .../storage/JoiningSequenceReader.java        |  2 +-
 .../storage/SingleCompoundSequenceReader.java |  4 +-
 .../storage/TwoBitSequenceReader.java         |  2 +-
 .../template/AbstractCompoundSet.java         | 10 +--
 .../template/AbstractCompoundTranslator.java  | 12 ++--
 .../AbstractNucleotideCompoundSet.java        |  8 +--
 .../sequence/template/AbstractSequence.java   | 22 +++----
 .../core/sequence/template/SequenceMixin.java | 22 +++----
 .../sequence/template/SequenceProxyView.java  |  4 +-
 .../transcription/DNAToRNATranslator.java     |  2 +-
 .../core/sequence/transcription/Frame.java    |  2 +-
 .../RNAToAminoAcidTranslator.java             |  8 +--
 .../transcription/TranscriptionEngine.java    |  2 +-
 .../core/sequence/views/RnaSequenceView.java  |  4 +-
 .../biojava/nbio/core/util/FlatFileCache.java |  2 +-
 .../nbio/core/util/PrettyXMLWriter.java       |  8 +--
 .../core/util/SingleLinkageClusterer.java     | 10 +--
 .../biojava/nbio/core/util/SoftHashMap.java   |  6 +-
 .../org/biojava/nbio/core/util/XMLHelper.java |  2 +-
 .../nbio/genome/GeneFeatureHelper.java        | 10 +--
 .../genome/homology/BlastHomologyHits.java    |  2 +-
 .../homology/GFF3FromUniprotBlastHits.java    |  4 +-
 .../nbio/genome/io/fastq/FastqTools.java      |  4 +-
 .../nbio/genome/io/fastq/FastqVariant.java    |  2 +-
 .../parsers/cytoband/CytobandParser.java      |  4 +-
 .../parsers/geneid/GeneIDXMLReader.java       |  4 +-
 .../GeneChromosomePositionParser.java         |  4 +-
 .../parsers/genename/GeneNamesParser.java     |  2 +-
 .../nbio/genome/parsers/gff/Feature.java      |  6 +-
 .../genome/parsers/gff/FeatureHelper.java     |  2 +-
 .../nbio/genome/parsers/gff/FeatureList.java  | 12 ++--
 .../nbio/genome/parsers/gff/GFF3Writer.java   |  2 +-
 .../genome/parsers/twobit/TwoBitParser.java   |  2 +-
 .../nbio/genome/query/BlastXMLQuery.java      |  4 +-
 .../nbio/genome/uniprot/UniprotToFasta.java   |  6 +-
 .../biojava/nbio/genome/util/SplitFasta.java  |  2 +-
 .../org/biojava/nbio/protmod/Component.java   |  8 +--
 .../nbio/protmod/ModificationCategory.java    |  2 +-
 .../protmod/ModificationConditionImpl.java    |  2 +-
 .../protmod/ModificationOccurrenceType.java   |  2 +-
 .../nbio/protmod/ProteinModificationImpl.java |  6 +-
 .../protmod/ProteinModificationRegistry.java  | 30 ++++-----
 .../protmod/io/ComponentXMLConverter.java     |  2 +-
 .../io/ModifiedCompoundXMLConverter.java      |  2 +-
 .../io/ProteinModificationXmlReader.java      | 12 ++--
 .../structure/ModifiedCompoundImpl.java       | 16 ++---
 .../ProteinModificationIdentifier.java        | 46 ++++++-------
 .../nbio/protmod/structure/StructureUtil.java |  4 +-
 .../org/biojava/nbio/ontology/Ontology.java   | 20 +++---
 .../java/org/biojava/nbio/ontology/Term.java  |  2 +-
 .../org/biojava/nbio/ontology/Triple.java     |  2 +-
 .../biojava/nbio/ontology/io/GOParser.java    |  4 +-
 .../nbio/ontology/obo/OboFileHandler.java     |  2 +-
 .../nbio/ontology/obo/OboFileParser.java      | 10 +--
 .../src/main/java/demo/PredictDisorder.java   |  2 +-
 .../nbio/data/sequence/SequenceUtil.java      |  2 +-
 .../java/org/biojava/nbio/ronn/Jronn.java     |  6 +-
 .../org/biojava/nbio/ronn/ModelLoader.java    |  2 +-
 .../java/demo/DemoAlignmentFromFasta.java     |  2 +-
 .../src/main/java/demo/DemoMultipleMC.java    |  4 +-
 .../java/demo/DemoStructureFromFasta.java     |  2 +-
 .../nbio/structure/align/gui/DisplayAFP.java  | 10 +--
 .../structure/align/gui/DotPlotPanel.java     |  2 +-
 .../align/gui/MultipleAlignmentCalc.java      |  2 +-
 .../gui/MultipleAlignmentJmolDisplay.java     |  2 +-
 .../structure/align/gui/ParameterGUI.java     |  2 +-
 .../AligPanelMouseMotionListener.java         |  2 +-
 .../gui/aligpanel/MultipleAligPanel.java      |  6 +-
 .../MultipleAligPanelMouseMotionListener.java |  2 +-
 .../DefaultAutoSuggestProvider.java           |  2 +-
 .../align/gui/autosuggest/JAutoSuggest.java   |  2 +-
 .../autosuggest/SCOPAutoSuggestProvider.java  |  6 +-
 .../align/gui/jmol/MultipleAlignmentJmol.java |  6 +-
 .../align/gui/jmol/RasmolCommandListener.java |  2 +-
 .../gui/jmol/StructureAlignmentJmol.java      |  6 +-
 .../structure/gui/ScaleableMatrixPanel.java   |  2 +-
 .../nbio/structure/gui/SequenceDisplay.java   |  2 +-
 .../structure/gui/util/PDBUploadPanel.java    |  2 +-
 .../gui/util/SelectMultiplePanel.java         |  4 +-
 .../gui/util/SequenceMouseListener.java       |  2 +-
 .../gui/util/SequenceScalePanel.java          |  2 +-
 .../gui/util/color/GradientMapper.java        |  2 +-
 .../symmetry/gui/SymmetryDisplay.java         |  2 +-
 .../JmolSymmetryScriptGeneratorH.java         |  6 +-
 ...JmolSymmetryScriptGeneratorPointGroup.java | 12 ++--
 .../src/main/java/demo/DemoMultipleMC.java    |  4 +-
 .../nbio/structure/AtomPositionMap.java       |  6 +-
 .../org/biojava/nbio/structure/BondImpl.java  |  2 +-
 .../org/biojava/nbio/structure/Element.java   |  2 +-
 .../biojava/nbio/structure/EntityInfo.java    |  6 +-
 .../nbio/structure/ExperimentalTechnique.java |  2 +-
 .../org/biojava/nbio/structure/GroupType.java |  4 +-
 .../nbio/structure/JournalArticle.java        |  4 +-
 .../org/biojava/nbio/structure/Mutator.java   |  2 +-
 .../org/biojava/nbio/structure/PDBHeader.java |  2 +-
 .../biojava/nbio/structure/ResidueRange.java  |  6 +-
 .../nbio/structure/ResidueRangeAndLength.java |  4 +-
 .../java/org/biojava/nbio/structure/Site.java |  2 +-
 .../nbio/structure/StandardAminoAcid.java     |  2 +-
 .../biojava/nbio/structure/StructureImpl.java |  2 +-
 .../nbio/structure/StructureTools.java        | 22 +++----
 .../structure/SubstructureIdentifier.java     |  2 +-
 .../nbio/structure/align/AFPTwister.java      |  2 +-
 .../align/StructureAlignmentFactory.java      |  2 +-
 .../ce/AbstractUserArgumentProcessor.java     |  2 +-
 .../nbio/structure/align/ce/CECalculator.java |  6 +-
 .../nbio/structure/align/ce/CeCPMain.java     |  6 +-
 .../align/ce/CeCalculatorEnhanced.java        |  6 +-
 .../nbio/structure/align/ce/CeParameters.java |  8 +--
 .../structure/align/ce/OptimalCECPMain.java   |  8 +--
 .../structure/align/client/StructureName.java |  4 +-
 .../align/fatcat/calc/AFPCalculator.java      |  2 +-
 .../align/fatcat/calc/FatCatParameters.java   |  8 +--
 .../align/helper/JointFragments.java          |  2 +-
 .../nbio/structure/align/model/AFPChain.java  |  4 +-
 .../align/multiple/AbstractScoresCache.java   |  2 +-
 .../structure/align/multiple/BlockImpl.java   |  4 +-
 .../align/multiple/BlockSetImpl.java          |  6 +-
 .../MultipleAlignmentEnsembleImpl.java        | 16 ++---
 .../align/multiple/MultipleAlignmentImpl.java | 12 ++--
 .../align/multiple/mc/MultipleMcMain.java     | 12 ++--
 .../multiple/mc/MultipleMcOptimizer.java      | 26 ++++----
 .../multiple/mc/MultipleMcParameters.java     |  8 +--
 .../align/multiple/util/CoreSuperimposer.java |  4 +-
 .../util/MultipleAlignmentDisplay.java        |  2 +-
 .../util/MultipleAlignmentScorer.java         |  6 +-
 .../multiple/util/MultipleAlignmentTools.java | 24 +++----
 .../util/MultipleAlignmentWriter.java         |  2 +-
 .../multiple/util/ReferenceSuperimposer.java  |  4 +-
 .../align/pairwise/FragmentJoiner.java        |  8 +--
 .../nbio/structure/align/pairwise/Gotoh.java  |  2 +-
 .../structure/align/quaternary/QsAlign.java   | 22 +++----
 .../align/seq/SmithWaterman3DParameters.java  |  8 +--
 .../align/util/AFPAlignmentDisplay.java       | 18 ++---
 .../structure/align/util/AlignmentTools.java  | 44 ++++++-------
 .../nbio/structure/align/util/CliTools.java   |  8 +--
 .../align/xml/AFPChainXMLParser.java          |  4 +-
 .../align/xml/MultipleAlignmentXMLParser.java |  6 +-
 .../align/xml/PdbPairXMLConverter.java        |  2 +-
 .../structure/align/xml/PdbPairsMessage.java  |  2 +-
 .../biojava/nbio/structure/asa/GroupAsa.java  |  6 +-
 .../nbio/structure/cath/CathDomain.java       |  4 +-
 .../nbio/structure/cath/CathFactory.java      |  2 +-
 .../nbio/structure/cath/CathInstallation.java | 32 ++++-----
 .../structure/cluster/SubunitCluster.java     |  6 +-
 .../structure/cluster/SubunitExtractor.java   |  4 +-
 .../structure/contact/AtomContactSet.java     |  6 +-
 .../nbio/structure/contact/Contact.java       |  2 +-
 .../nbio/structure/contact/GridCell.java      |  8 +--
 .../nbio/structure/contact/GroupContact.java  |  4 +-
 .../structure/contact/GroupContactSet.java    | 10 +--
 .../structure/contact/StructureInterface.java |  8 +--
 .../contact/StructureInterfaceCluster.java    |  2 +-
 .../structure/domain/SerializableCache.java   |  2 +-
 .../structure/domain/pdp/ClusterDomains.java  |  2 +-
 .../nbio/structure/domain/pdp/CutDomain.java  |  2 +-
 .../nbio/structure/domain/pdp/Domain.java     |  2 +-
 .../nbio/structure/ecod/EcodDomain.java       |  2 +-
 .../nbio/structure/ecod/EcodInstallation.java | 12 ++--
 .../structure/geometry/MomentsOfInertia.java  |  2 +-
 .../nbio/structure/io/CAConverter.java        |  2 +-
 .../structure/io/FastaAFPChainConverter.java  | 20 +++---
 .../biojava/nbio/structure/io/GroupToSDF.java |  2 +-
 .../nbio/structure/io/LocalPDBDirectory.java  |  4 +-
 .../structure/io/PDBBioAssemblyParser.java    |  6 +-
 .../nbio/structure/io/PDBFileParser.java      | 66 +++++++++----------
 .../nbio/structure/io/SeqRes2AtomAligner.java |  8 +--
 .../io/StructureSequenceMatcher.java          |  8 +--
 .../io/cif/CifStructureConsumerImpl.java      |  2 +-
 .../nbio/structure/io/mmtf/MmtfUtils.java     |  4 +-
 .../io/sifts/SiftsChainToUniprotMapping.java  |  4 +-
 .../nbio/structure/io/sifts/SiftsEntity.java  |  2 +-
 .../nbio/structure/io/sifts/SiftsSegment.java |  2 +-
 .../structure/io/sifts/SiftsXMLParser.java    |  6 +-
 .../nbio/structure/math/SparseVector.java     |  2 +-
 .../nbio/structure/math/SymbolTable.java      |  2 +-
 .../quaternary/BioAssemblyTools.java          |  6 +-
 .../quaternary/BiologicalAssemblyBuilder.java |  2 +-
 .../BiologicalAssemblyTransformation.java     |  2 +-
 .../quaternary/CartesianProduct.java          |  2 +-
 .../biojava/nbio/structure/scop/Astral.java   |  6 +-
 .../scop/BerkeleyScopInstallation.java        |  2 +-
 .../nbio/structure/scop/ScopDomain.java       |  2 +-
 .../nbio/structure/scop/ScopInstallation.java | 32 ++++-----
 .../nbio/structure/secstruc/DSSPParser.java   |  2 +-
 .../nbio/structure/secstruc/SecStrucCalc.java | 16 ++---
 .../structure/secstruc/SecStrucTools.java     |  2 +-
 .../symmetry/axis/HelixAxisAligner.java       |  4 +-
 .../symmetry/axis/RotationAxisAligner.java    | 10 +--
 .../symmetry/core/HelicalRepeatUnit.java      | 22 +++----
 .../nbio/structure/symmetry/core/Helix.java   |  4 +-
 .../symmetry/core/HelixExtender.java          |  2 +-
 .../structure/symmetry/core/HelixLayers.java  |  2 +-
 .../structure/symmetry/core/HelixSolver.java  |  6 +-
 .../symmetry/core/PermutationGroup.java       | 14 ++--
 .../symmetry/core/QuatSymmetryResults.java    |  4 +-
 .../symmetry/core/QuatSymmetrySubunits.java   |  4 +-
 .../symmetry/core/RotationGroup.java          |  4 +-
 .../symmetry/core/RotationSolver.java         |  8 +--
 .../symmetry/core/SystematicSolver.java       |  4 +-
 .../symmetry/geometry/DistanceBox.java        | 14 ++--
 .../structure/symmetry/geometry/Prism.java    |  2 +-
 .../structure/symmetry/internal/CeSymm.java   |  2 +-
 .../symmetry/internal/CeSymmIterative.java    |  4 +-
 .../symmetry/internal/CeSymmResult.java       |  2 +-
 .../internal/GraphComponentOrderDetector.java |  2 +-
 .../internal/GraphComponentRefiner.java       |  6 +-
 .../symmetry/internal/ResidueGroup.java       |  2 +-
 .../internal/SequenceFunctionRefiner.java     | 16 ++---
 .../symmetry/internal/SymmOptimizer.java      | 34 +++++-----
 .../symmetry/internal/SymmetryAxes.java       |  2 +-
 .../misc/ProteinComplexSignature.java         |  8 +--
 .../symmetry/utils/BlastClustReader.java      |  6 +-
 .../structure/symmetry/utils/PowerSet.java    |  8 +--
 .../symmetry/utils/SymmetryTools.java         | 18 ++---
 .../nbio/structure/xtal/BravaisLattice.java   |  2 +-
 .../nbio/structure/xtal/CrystalCell.java      |  2 +-
 .../nbio/structure/xtal/SpaceGroup.java       |  4 +-
 .../nbio/structure/xtal/SymoplibParser.java   |  8 +--
 .../xtal/io/SpaceGroupMapAdapter.java         |  2 +-
 .../structure/xtal/io/SpaceGroupMapRoot.java  |  2 +-
 .../xtal/io/TransfAlgebraicAdapter.java       |  2 +-
 .../xtal/io/TreeMapSpaceGroupWrapper.java     |  2 +-
 .../org/biojava/nbio/survival/cox/CoxCC.java  | 12 ++--
 .../biojava/nbio/survival/cox/CoxHelper.java  |  4 +-
 .../biojava/nbio/survival/cox/CoxInfo.java    | 12 ++--
 .../org/biojava/nbio/survival/cox/CoxR.java   |  8 +--
 .../biojava/nbio/survival/cox/CoxScore.java   |  2 +-
 .../nbio/survival/cox/CoxVariables.java       |  2 +-
 .../nbio/survival/cox/ResidualsCoxph.java     |  4 +-
 .../biojava/nbio/survival/cox/StrataInfo.java | 26 ++++----
 .../nbio/survival/cox/SurvFitInfo.java        |  4 +-
 .../nbio/survival/cox/SurvivalInfo.java       | 12 ++--
 .../nbio/survival/cox/SurvivalInfoHelper.java | 12 ++--
 .../nbio/survival/cox/stats/AgScore.java      |  2 +-
 .../biojava/nbio/survival/data/WorkSheet.java | 66 +++++++++----------
 .../kaplanmeier/figure/ExpressionFigure.java  | 14 ++--
 .../kaplanmeier/figure/KMFigureInfo.java      |  2 +-
 .../kaplanmeier/figure/KaplanMeierFigure.java | 32 ++++-----
 .../figure/NumbersAtRiskPanel.java            |  4 +-
 .../kaplanmeier/figure/SurvFitKM.java         | 26 ++++----
 .../metadata/ClinicalMetaDataOutcome.java     |  4 +-
 .../kaplanmeier/metadata/MetaDataInfo.java    |  2 +-
 biojava-ws/src/main/java/demo/HmmerDemo.java  |  2 +-
 .../qblast/NCBIQBlastAlignmentProperties.java |  4 +-
 .../qblast/NCBIQBlastOutputProperties.java    |  4 +-
 .../alignment/qblast/NCBIQBlastService.java   |  6 +-
 .../nbio/ws/hmmer/RemoteHmmerScan.java        |  4 +-
 324 files changed, 1102 insertions(+), 1102 deletions(-)

diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/CommandPrompt.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/CommandPrompt.java
index aa3c5cdd5b..727c83b388 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/CommandPrompt.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/CommandPrompt.java
@@ -95,8 +95,8 @@ public static void run(String[] args) throws Exception{
 		/*
 		 * Parse input arguments
 		 */
-		List<Character> propertyList = new ArrayList<Character>();
-		List<Character> specificList = new ArrayList<Character>();
+		List<Character> propertyList = new ArrayList<>();
+		List<Character> specificList = new ArrayList<>();
 		String inputLocation = null;
 		String outputLocation = null;
 		String aminoAcidCompositionLocation = null;
@@ -179,14 +179,14 @@ private static LinkedHashMap<String, ProteinSequence> readInputFile(String input
 		}
 		LinkedHashMap<String, ProteinSequence> ret;
 		if ( inputLocation.toLowerCase().contains(".gb")) {
-			GenbankReader<ProteinSequence, AminoAcidCompound> genbankReader = new GenbankReader<ProteinSequence, AminoAcidCompound>(
+			GenbankReader<ProteinSequence, AminoAcidCompound> genbankReader = new GenbankReader<>(
 					inStream, new GenericGenbankHeaderParser<ProteinSequence, AminoAcidCompound>(),
 					new ProteinSequenceCreator(set));
 			ret = genbankReader.process();
 
 
 		} else {
-			FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<ProteinSequence, AminoAcidCompound>(
+			FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<>(
 					inStream, new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>(),
 					new ProteinSequenceCreator(set));
 			ret = fastaReader.process();
@@ -214,7 +214,7 @@ private static void printHeader(PrintStream output, List<Character> propertyList
 		 * 9 Composition of the 20 standard amino acid
 		 * 0 Composition of the specific amino acid
 		 */
-		List<String> sList = new ArrayList<String>();
+		List<String> sList = new ArrayList<>();
 		sList.add("SequenceName");
 		for(Character c:propertyList){
 			switch(c){
@@ -277,7 +277,7 @@ private static void compute(PrintStream output, String header, String sequence,
 		IPeptideProperties pp = new PeptidePropertiesImpl();
 
 		int specificCount = 0;
-		List<Double> dList = new ArrayList<Double>();
+		List<Double> dList = new ArrayList<>();
 		for(Character c:propertyList){
 			switch(c){
 			case '1':
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Constraints.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Constraints.java
index f223eaca23..d525c6bfe8 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Constraints.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Constraints.java
@@ -64,14 +64,14 @@ public class Constraints {
 	public static AminoAcidCompound Y = aaSet.getCompoundForString("Y");
 	public static AminoAcidCompound V = aaSet.getCompoundForString("V");
 
-	public static Map<AminoAcidCompound, Double> aa2ExtinctionCoefficient = new HashMap<AminoAcidCompound, Double>();
-	public static Map<AminoAcidCompound, Double> aa2MolecularWeight = new HashMap<AminoAcidCompound, Double>();
-	public static Map<AminoAcidCompound, Double> aa2Hydrophathicity = new HashMap<AminoAcidCompound, Double>();
-	public static Map<AminoAcidCompound, Double> aa2PKa = new HashMap<AminoAcidCompound, Double>();
-	public static Map<String, Double> diAA2Instability = new HashMap<String, Double>();
+	public static Map<AminoAcidCompound, Double> aa2ExtinctionCoefficient = new HashMap<>();
+	public static Map<AminoAcidCompound, Double> aa2MolecularWeight = new HashMap<>();
+	public static Map<AminoAcidCompound, Double> aa2Hydrophathicity = new HashMap<>();
+	public static Map<AminoAcidCompound, Double> aa2PKa = new HashMap<>();
+	public static Map<String, Double> diAA2Instability = new HashMap<>();
 
-	public static Map<AminoAcidCompound, Double> aa2NTerminalPka = new HashMap<AminoAcidCompound, Double>();
-	public static Map<AminoAcidCompound, Double> aa2CTerminalPka = new HashMap<AminoAcidCompound, Double>();
+	public static Map<AminoAcidCompound, Double> aa2NTerminalPka = new HashMap<>();
+	public static Map<AminoAcidCompound, Double> aa2CTerminalPka = new HashMap<>();
 
 	static{
 		initMolecularWeight();
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java
index da0cef9997..d14a4d906b 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptideProperties.java
@@ -532,7 +532,7 @@ public static final Map<AminoAcidCompound, Double> getAAComposition(String seque
 	 */
 	public static final Map<String, Double> getAACompositionString(String sequence){
 		Map<AminoAcidCompound, Double> aa2Composition = getAAComposition(sequence);
-		Map<String, Double> aaString2Composition = new HashMap<String, Double>();
+		Map<String, Double> aaString2Composition = new HashMap<>();
 		aaString2Composition = aa2Composition.keySet().stream() .collect(Collectors.toMap(aaCompound -> aaCompound.getShortName(),aaCompound ->aa2Composition.get(aaCompound)));
 		return aaString2Composition;
 	}
@@ -550,7 +550,7 @@ public static final Map<String, Double> getAACompositionString(String sequence){
 	 */
 	public static final Map<Character, Double> getAACompositionChar(String sequence){
 		Map<AminoAcidCompound, Double> aa2Composition = getAAComposition(sequence);
-		Map<Character, Double> aaChar2Composition = new HashMap<Character, Double>();
+		Map<Character, Double> aaChar2Composition = new HashMap<>();
 		for(AminoAcidCompound aaCompound:aa2Composition.keySet()){
 			aaChar2Composition.put(aaCompound.getShortName().charAt(0), aa2Composition.get(aaCompound));
 		}
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java
index fc31b9510b..ceb0b234ed 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/PeptidePropertiesImpl.java
@@ -210,7 +210,7 @@ private Map<AminoAcidCompound, Integer> getExtinctAACount(ProteinSequence sequen
 			}
 		}
 		AminoAcidCompoundSet aaSet = new AminoAcidCompoundSet();
-		Map<AminoAcidCompound, Integer> extinctAA2Count = new HashMap<AminoAcidCompound, Integer>();
+		Map<AminoAcidCompound, Integer> extinctAA2Count = new HashMap<>();
 		//Ignore Case is always true
 		extinctAA2Count.put(aaSet.getCompoundForString("W"), numW + smallW);
 		extinctAA2Count.put(aaSet.getCompoundForString("C"), (int) (numC + smallC));
@@ -532,7 +532,7 @@ private Map<AminoAcidCompound, Integer> getChargedAACount(ProteinSequence sequen
 			}
 		}
 		AminoAcidCompoundSet aaSet = new AminoAcidCompoundSet();
-		Map<AminoAcidCompound, Integer> chargedAA2Count = new HashMap<AminoAcidCompound, Integer>();
+		Map<AminoAcidCompound, Integer> chargedAA2Count = new HashMap<>();
 		chargedAA2Count.put(aaSet.getCompoundForString("K"), numK);
 		chargedAA2Count.put(aaSet.getCompoundForString("R"), numR);
 		chargedAA2Count.put(aaSet.getCompoundForString("H"), numH);
@@ -558,7 +558,7 @@ public double getEnrichment(ProteinSequence sequence, AminoAcidCompound aminoAci
 	@Override
 	public Map<AminoAcidCompound, Double> getAAComposition(ProteinSequence sequence) {
 		int validLength = 0;
-		Map<AminoAcidCompound, Double> aa2Composition = new HashMap<AminoAcidCompound, Double>();
+		Map<AminoAcidCompound, Double> aa2Composition = new HashMap<>();
 		AminoAcidCompoundSet aaSet = new AminoAcidCompoundSet();
 		for(AminoAcidCompound aa:aaSet.getAllCompounds()){
 			aa2Composition.put(aa, 0.0);
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Utils.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Utils.java
index b66e879d7a..298ad61330 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Utils.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Utils.java
@@ -106,7 +106,7 @@ public final static int getNumberOfInvalidChar(String sequence,  Set<Character>
 	 * 		a new sequence with all invalid characters being replaced by '-'.
 	 */
 	public final static String cleanSequence(String sequence, Set<Character> cSet){
-		Set<Character> invalidCharSet = new HashSet<Character>();
+		Set<Character> invalidCharSet = new HashSet<>();
 		StringBuilder cleanSeq = new StringBuilder();
 		if(cSet == null) cSet = PeptideProperties.standardAASet;
 		for(char c:sequence.toCharArray()){
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/ProfeatPropertiesImpl.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/ProfeatPropertiesImpl.java
index 75b0ff3064..18b63a468b 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/ProfeatPropertiesImpl.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/ProfeatPropertiesImpl.java
@@ -125,35 +125,35 @@ private Convertor getConvertor(ATTRIBUTE attribute) throws Exception{
 
 	@Override
 	public Map<GROUPING, Double> getComposition(ProteinSequence sequence, ATTRIBUTE attribute) throws Exception {
-		Map<GROUPING, Double> grouping2Composition = new HashMap<GROUPING, Double>();
+		Map<GROUPING, Double> grouping2Composition = new HashMap<>();
 		for(GROUPING group:GROUPING.values()) grouping2Composition.put(group, getComposition(sequence, attribute, group));
 		return grouping2Composition;
 	}
 
 	@Override
 	public Map<ATTRIBUTE, Map<GROUPING, Double>> getComposition(ProteinSequence sequence) throws Exception {
-		Map<ATTRIBUTE, Map<GROUPING, Double>> attribute2Grouping2Composition = new HashMap<ATTRIBUTE, Map<GROUPING, Double>>();
+		Map<ATTRIBUTE, Map<GROUPING, Double>> attribute2Grouping2Composition = new HashMap<>();
 		for(ATTRIBUTE attribute:ATTRIBUTE.values()) attribute2Grouping2Composition.put(attribute, getComposition(sequence, attribute));
 		return attribute2Grouping2Composition;
 	}
 
 	@Override
 	public Map<TRANSITION, Double> getTransition(ProteinSequence sequence, ATTRIBUTE attribute) throws Exception {
-		Map<TRANSITION, Double> transition2Double = new HashMap<TRANSITION, Double>();
+		Map<TRANSITION, Double> transition2Double = new HashMap<>();
 		for(TRANSITION transition:TRANSITION.values()) transition2Double.put(transition, getTransition(sequence, attribute, transition));
 		return transition2Double;
 	}
 
 	@Override
 	public Map<ATTRIBUTE, Map<TRANSITION, Double>> getTransition(ProteinSequence sequence) throws Exception {
-		Map<ATTRIBUTE, Map<TRANSITION, Double>> attribute2Transition2Double = new HashMap<ATTRIBUTE, Map<TRANSITION, Double>>();
+		Map<ATTRIBUTE, Map<TRANSITION, Double>> attribute2Transition2Double = new HashMap<>();
 		for(ATTRIBUTE attribute:ATTRIBUTE.values()) attribute2Transition2Double.put(attribute, getTransition(sequence, attribute));
 		return attribute2Transition2Double;
 	}
 
 	@Override
 	public Map<DISTRIBUTION, Double> getDistributionPosition(ProteinSequence sequence, ATTRIBUTE attribute, GROUPING group) throws Exception {
-		Map<DISTRIBUTION, Double> distribution2Double = new HashMap<DISTRIBUTION, Double>();
+		Map<DISTRIBUTION, Double> distribution2Double = new HashMap<>();
 		for(DISTRIBUTION distribution:DISTRIBUTION.values())
 			distribution2Double.put(distribution, getDistributionPosition(sequence, attribute, group, distribution));
 		return distribution2Double;
@@ -161,7 +161,7 @@ public Map<DISTRIBUTION, Double> getDistributionPosition(ProteinSequence sequenc
 
 	@Override
 	public Map<GROUPING, Map<DISTRIBUTION, Double>> getDistributionPosition(ProteinSequence sequence, ATTRIBUTE attribute) throws Exception {
-		Map<GROUPING, Map<DISTRIBUTION, Double>> grouping2Distribution2Double = new HashMap<GROUPING, Map<DISTRIBUTION, Double>>();
+		Map<GROUPING, Map<DISTRIBUTION, Double>> grouping2Distribution2Double = new HashMap<>();
 		for(GROUPING group:GROUPING.values())
 			grouping2Distribution2Double.put(group, getDistributionPosition(sequence, attribute, group));
 		return grouping2Distribution2Double;
@@ -170,7 +170,7 @@ public Map<GROUPING, Map<DISTRIBUTION, Double>> getDistributionPosition(ProteinS
 	@Override
 	public Map<ATTRIBUTE, Map<GROUPING, Map<DISTRIBUTION, Double>>> getDistributionPosition(ProteinSequence sequence) throws Exception {
 		Map<ATTRIBUTE, Map<GROUPING, Map<DISTRIBUTION, Double>>> attribute2Grouping2Distribution2Double =
-			new HashMap<ATTRIBUTE, Map<GROUPING, Map<DISTRIBUTION, Double>>>();
+			new HashMap<>();
 		for(ATTRIBUTE attribute:ATTRIBUTE.values())
 			attribute2Grouping2Distribution2Double.put(attribute, getDistributionPosition(sequence, attribute));
 		return attribute2Grouping2Distribution2Double;
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidCompositionTable.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidCompositionTable.java
index c0b2e1489d..b209859600 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidCompositionTable.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/AminoAcidCompositionTable.java
@@ -83,7 +83,7 @@ private void generatesAminoAcidCompoundSet(){
 	 * 		Stores the mass of elements and isotopes
 	 */
 	public void computeMolecularWeight(ElementTable eTable){
-		this.aaSymbol2MolecularWeight = new HashMap<Character, Double>();
+		this.aaSymbol2MolecularWeight = new HashMap<>();
 		for(AminoAcidComposition a:aminoacid){
 			//Check to ensure that the symbol is of single character
 			if(a.getSymbol().length() != 1){
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/CaseFreeAminoAcidCompoundSet.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/CaseFreeAminoAcidCompoundSet.java
index 9b211ab305..7a436d32cd 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/CaseFreeAminoAcidCompoundSet.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/CaseFreeAminoAcidCompoundSet.java
@@ -39,9 +39,9 @@
  */
 public class CaseFreeAminoAcidCompoundSet implements CompoundSet<AminoAcidCompound> {
 
-	private final Map<String, AminoAcidCompound> aminoAcidCompoundCache = new HashMap<String, AminoAcidCompound>();
+	private final Map<String, AminoAcidCompound> aminoAcidCompoundCache = new HashMap<>();
 	private final Map<AminoAcidCompound, Set<AminoAcidCompound>> equivalentsCache =
-			new HashMap<AminoAcidCompound, Set<AminoAcidCompound>>();
+			new HashMap<>();
 
 	public CaseFreeAminoAcidCompoundSet() {
 		aminoAcidCompoundCache.put("A", new AminoAcidCompound(null, "A", "Ala", "Alanine", 71.0788f));
@@ -83,7 +83,7 @@ public CaseFreeAminoAcidCompoundSet() {
 		//which then does the actual conversion to Pyl.
 		aminoAcidCompoundCache.put("O", new AminoAcidCompound(null, "O", "Pyl", "Pyrrolysine", 255.3172f));
 
-		Map<String, AminoAcidCompound> lowerCaseSet = new HashMap<String, AminoAcidCompound>();
+		Map<String, AminoAcidCompound> lowerCaseSet = new HashMap<>();
 		for(String s:this.aminoAcidCompoundCache.keySet()){
 			lowerCaseSet.put(s.toLowerCase(), this.aminoAcidCompoundCache.get(s));
 		}
@@ -144,7 +144,7 @@ public Set<AminoAcidCompound> getEquivalentCompounds(AminoAcidCompound compound)
 			addAmbiguousEquivalents("I", "L", "J");
 			// ambiguous gaps
 			AminoAcidCompound gap1, gap2, gap3;
-			Set<AminoAcidCompound> gaps = new HashSet<AminoAcidCompound>();
+			Set<AminoAcidCompound> gaps = new HashSet<>();
 			gaps.add(gap1 = aminoAcidCompoundCache.get("-"));
 			gaps.add(gap2 = aminoAcidCompoundCache.get("."));
 			gaps.add(gap3 = aminoAcidCompoundCache.get("_"));
@@ -162,18 +162,18 @@ private void addAmbiguousEquivalents(String one, String two, String either) {
 		Set<AminoAcidCompound> equivalents;
 		AminoAcidCompound cOne, cTwo, cEither;
 
-		equivalents = new HashSet<AminoAcidCompound>();
+		equivalents = new HashSet<>();
 		equivalents.add(cOne = aminoAcidCompoundCache.get(one));
 		equivalents.add(cTwo = aminoAcidCompoundCache.get(two));
 		equivalents.add(cEither = aminoAcidCompoundCache.get(either));
 		equivalentsCache.put(cEither, equivalents);
 
-		equivalents = new HashSet<AminoAcidCompound>();
+		equivalents = new HashSet<>();
 		equivalents.add(cOne);
 		equivalents.add(cEither);
 		equivalentsCache.put(cOne, equivalents);
 
-		equivalents = new HashSet<AminoAcidCompound>();
+		equivalents = new HashSet<>();
 		equivalents.add(cTwo);
 		equivalents.add(cEither);
 		equivalentsCache.put(cTwo, equivalents);
@@ -186,7 +186,7 @@ public boolean hasCompound(AminoAcidCompound compound) {
 
 	@Override
 	public List<AminoAcidCompound> getAllCompounds() {
-		return new ArrayList<AminoAcidCompound>(aminoAcidCompoundCache.values());
+		return new ArrayList<>(aminoAcidCompoundCache.values());
 	}
 
 
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Element.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Element.java
index 4fc5f5ad66..c7b9a425fc 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Element.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/Element.java
@@ -120,7 +120,7 @@ public List<Isotope> getIsotopes() {
 
 	public void setIsotopes(List<Isotope> isotopes) {
 		this.isotope = isotopes;
-		this.name2Isotope = new HashMap<String, Isotope>();
+		this.name2Isotope = new HashMap<>();
 		if(isotopes != null){
 			for(Isotope i:isotopes){
 				name2Isotope.put(i.getName(), i);
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/ElementTable.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/ElementTable.java
index acdcee25d9..e2b30c6211 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/ElementTable.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/ElementTable.java
@@ -58,8 +58,8 @@ public void setElement(List<Element> eList){
 	 * Populate the Maps for quick retrieval
 	 */
 	public void populateMaps(){
-		this.elementName2Element = new HashMap<String, Element>();
-		this.isotopeName2Isotope = new HashMap<String, Isotope>();
+		this.elementName2Element = new HashMap<>();
+		this.isotopeName2Isotope = new HashMap<>();
 		if(this.element != null){
 			for(Element e:this.element){
 				this.elementName2Element.put(e.getName(), e);
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/ModifiedAminoAcidCompoundSet.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/ModifiedAminoAcidCompoundSet.java
index d9c11c7e66..b1c63e9655 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/ModifiedAminoAcidCompoundSet.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/xml/ModifiedAminoAcidCompoundSet.java
@@ -28,7 +28,7 @@
 
 public class ModifiedAminoAcidCompoundSet implements CompoundSet<AminoAcidCompound> {
 
-	private final Map<String, AminoAcidCompound> aminoAcidCompoundCache = new HashMap<String, AminoAcidCompound>();
+	private final Map<String, AminoAcidCompound> aminoAcidCompoundCache = new HashMap<>();
 
 	public ModifiedAminoAcidCompoundSet(List<AminoAcidComposition> aaList, Map<Character, Double> aaSymbol2MolecularWeight) {
 		this.aminoAcidCompoundCache.put("-", new AminoAcidCompound(null, "-", "", "", 0.0f));
@@ -84,7 +84,7 @@ public boolean hasCompound(AminoAcidCompound compound) {
 
 	@Override
 	public List<AminoAcidCompound> getAllCompounds() {
-		return new ArrayList<AminoAcidCompound>(aminoAcidCompoundCache.values());
+		return new ArrayList<>(aminoAcidCompoundCache.values());
 	}
 
 	@Override
diff --git a/biojava-alignment/src/main/java/demo/CookbookMSA.java b/biojava-alignment/src/main/java/demo/CookbookMSA.java
index d2952bbeac..c617745539 100644
--- a/biojava-alignment/src/main/java/demo/CookbookMSA.java
+++ b/biojava-alignment/src/main/java/demo/CookbookMSA.java
@@ -43,7 +43,7 @@ public static void main(String[] args) throws Exception {
 	}
 
 	private static void multipleSequenceAlignment(String[] ids) throws Exception {
-		List<ProteinSequence> lst = new ArrayList<ProteinSequence>();
+		List<ProteinSequence> lst = new ArrayList<>();
 		for (String id : ids) {
 			lst.add(getSequenceForId(id));
 		}
diff --git a/biojava-alignment/src/main/java/demo/DemoDistanceTree.java b/biojava-alignment/src/main/java/demo/DemoDistanceTree.java
index c9f82d39f7..e7e0561a9d 100644
--- a/biojava-alignment/src/main/java/demo/DemoDistanceTree.java
+++ b/biojava-alignment/src/main/java/demo/DemoDistanceTree.java
@@ -58,7 +58,7 @@ public static void main(String[] args) throws Exception {
 				.getResourceAsStream("/PF00104_small.fasta");
 
 		FastaReader<ProteinSequence, AminoAcidCompound> fastaReader =
-				new FastaReader<ProteinSequence, AminoAcidCompound>(
+				new FastaReader<>(
 				inStream,
 				new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>(),
 				new ProteinSequenceCreator(AminoAcidCompoundSet
@@ -70,7 +70,7 @@ public static void main(String[] args) throws Exception {
 		inStream.close();
 
 		MultipleSequenceAlignment<ProteinSequence, AminoAcidCompound> msa =
-				new MultipleSequenceAlignment<ProteinSequence, AminoAcidCompound>();
+				new MultipleSequenceAlignment<>();
 
 		for (ProteinSequence proteinSequence : proteinSequences.values()) {
 			msa.addAlignedSequence(proteinSequence);
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/Alignments.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/Alignments.java
index 4ed72d0979..6cc2eb3f35 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/Alignments.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/Alignments.java
@@ -189,7 +189,7 @@ public static <S extends Sequence<C>, C extends Compound> Profile<S, C> getMulti
 		runPairwiseScorers(scorers);
 
 		// stage 2: hierarchical clustering into a guide tree
-		GuideTree<S, C> tree = new GuideTree<S, C>(sequences, scorers);
+		GuideTree<S, C> tree = new GuideTree<>(sequences, scorers);
 		scorers = null;
 
 		// stage 3: progressive alignment
@@ -233,7 +233,7 @@ public static <S extends Sequence<C>, C extends Compound> SequencePair<S, C> get
 	static <S extends Sequence<C>, C extends Compound> List<PairwiseSequenceAligner<S, C>> getAllPairsAligners(
 			List<S> sequences, PairwiseSequenceAlignerType type, GapPenalty gapPenalty,
 			SubstitutionMatrix<C> subMatrix) {
-		List<PairwiseSequenceAligner<S, C>> allPairs = new ArrayList<PairwiseSequenceAligner<S, C>>();
+		List<PairwiseSequenceAligner<S, C>> allPairs = new ArrayList<>();
 		for (int i = 0; i < sequences.size(); i++) {
 			for (int j = i+1; j < sequences.size(); j++) {
 				allPairs.add(getPairwiseAligner(sequences.get(i), sequences.get(j), type, gapPenalty, subMatrix));
@@ -256,7 +256,7 @@ static <S extends Sequence<C>, C extends Compound> List<PairwiseSequenceAligner<
 	public static <S extends Sequence<C>, C extends Compound> List<PairwiseSequenceScorer<S, C>> getAllPairsScorers(
 			List<S> sequences, PairwiseSequenceScorerType type, GapPenalty gapPenalty,
 			SubstitutionMatrix<C> subMatrix) {
-		List<PairwiseSequenceScorer<S, C>> allPairs = new ArrayList<PairwiseSequenceScorer<S, C>>();
+		List<PairwiseSequenceScorer<S, C>> allPairs = new ArrayList<>();
 		for (int i = 0; i < sequences.size(); i++) {
 			for (int j = i+1; j < sequences.size(); j++) {
 				allPairs.add(getPairwiseScorer(sequences.get(i), sequences.get(j), type, gapPenalty, subMatrix));
@@ -291,7 +291,7 @@ public static <S extends Sequence<C>, C extends Compound> double[] getAllPairsSc
 	 * @return calculated elements
 	 */
 	static <E> List<E> getListFromFutures(List<Future<E>> futures) {
-		List<E> list = new ArrayList<E>();
+		List<E> list = new ArrayList<>();
 		for (Future<E> f : futures) {
 			// TODO when added to ConcurrencyTools, log completions and exceptions instead of printing stack traces
 			try {
@@ -326,9 +326,9 @@ public static <S extends Sequence<C>, C extends Compound> PairwiseSequenceAligne
 		switch (type) {
 		default:
 		case GLOBAL:
-			return new NeedlemanWunsch<S, C>(query, target, gapPenalty, subMatrix);
+			return new NeedlemanWunsch<>(query, target, gapPenalty, subMatrix);
 		case LOCAL:
-			return new SmithWaterman<S, C>(query, target, gapPenalty, subMatrix);
+			return new SmithWaterman<>(query, target, gapPenalty, subMatrix);
 		case GLOBAL_LINEAR_SPACE:
 		case LOCAL_LINEAR_SPACE:
 			// TODO other alignment options (Myers-Miller, Thompson)
@@ -374,18 +374,18 @@ static <S extends Sequence<C>, C extends Compound> PairwiseSequenceScorer<S, C>
 		case GLOBAL:
 			return getPairwiseAligner(query, target, PairwiseSequenceAlignerType.GLOBAL, gapPenalty, subMatrix);
 		case GLOBAL_IDENTITIES:
-			return new FractionalIdentityScorer<S, C>(getPairwiseAligner(query, target,
+			return new FractionalIdentityScorer<>(getPairwiseAligner(query, target,
 					PairwiseSequenceAlignerType.GLOBAL, gapPenalty, subMatrix));
 		case GLOBAL_SIMILARITIES:
-			return new FractionalSimilarityScorer<S, C>(getPairwiseAligner(query, target,
+			return new FractionalSimilarityScorer<>(getPairwiseAligner(query, target,
 					PairwiseSequenceAlignerType.GLOBAL, gapPenalty, subMatrix));
 		case LOCAL:
 			return getPairwiseAligner(query, target, PairwiseSequenceAlignerType.LOCAL, gapPenalty, subMatrix);
 		case LOCAL_IDENTITIES:
-			return new FractionalIdentityScorer<S, C>(getPairwiseAligner(query, target,
+			return new FractionalIdentityScorer<>(getPairwiseAligner(query, target,
 					PairwiseSequenceAlignerType.LOCAL, gapPenalty, subMatrix));
 		case LOCAL_SIMILARITIES:
-			return new FractionalSimilarityScorer<S, C>(getPairwiseAligner(query, target,
+			return new FractionalSimilarityScorer<>(getPairwiseAligner(query, target,
 					PairwiseSequenceAlignerType.LOCAL, gapPenalty, subMatrix));
 		case KMERS:
 		case WU_MANBER:
@@ -413,7 +413,7 @@ static <S extends Sequence<C>, C extends Compound> ProfileProfileAligner<S, C> g
 		switch (type) {
 		default:
 		case GLOBAL:
-			return new SimpleProfileProfileAligner<S, C>(profile1, profile2, gapPenalty, subMatrix);
+			return new SimpleProfileProfileAligner<>(profile1, profile2, gapPenalty, subMatrix);
 		case GLOBAL_LINEAR_SPACE:
 		case GLOBAL_CONSENSUS:
 		case LOCAL:
@@ -443,7 +443,7 @@ static <S extends Sequence<C>, C extends Compound> ProfileProfileAligner<S, C> g
 		switch (type) {
 		default:
 		case GLOBAL:
-			return new SimpleProfileProfileAligner<S, C>(profile1, profile2, gapPenalty, subMatrix);
+			return new SimpleProfileProfileAligner<>(profile1, profile2, gapPenalty, subMatrix);
 		case GLOBAL_LINEAR_SPACE:
 		case GLOBAL_CONSENSUS:
 		case LOCAL:
@@ -473,7 +473,7 @@ static <S extends Sequence<C>, C extends Compound> ProfileProfileAligner<S, C> g
 		switch (type) {
 		default:
 		case GLOBAL:
-			return new SimpleProfileProfileAligner<S, C>(profile1, profile2, gapPenalty, subMatrix);
+			return new SimpleProfileProfileAligner<>(profile1, profile2, gapPenalty, subMatrix);
 		case GLOBAL_LINEAR_SPACE:
 		case GLOBAL_CONSENSUS:
 		case LOCAL:
@@ -503,7 +503,7 @@ static <S extends Sequence<C>, C extends Compound> ProfileProfileAligner<S, C> g
 		switch (type) {
 		default:
 		case GLOBAL:
-			return new SimpleProfileProfileAligner<S, C>(profile1, profile2, gapPenalty, subMatrix);
+			return new SimpleProfileProfileAligner<>(profile1, profile2, gapPenalty, subMatrix);
 		case GLOBAL_LINEAR_SPACE:
 		case GLOBAL_CONSENSUS:
 		case LOCAL:
@@ -550,7 +550,7 @@ public static <S extends Sequence<C>, C extends Compound> Profile<S, C> getProgr
 			ProfileProfileAlignerType type, GapPenalty gapPenalty, SubstitutionMatrix<C> subMatrix) {
 
 		// find inner nodes in post-order traversal of tree (each leaf node has a single sequence profile)
-		List<GuideTreeNode<S, C>> innerNodes = new ArrayList<GuideTreeNode<S, C>>();
+		List<GuideTreeNode<S, C>> innerNodes = new ArrayList<>();
 		for (GuideTreeNode<S, C> n : tree) {
 			if (n.getProfile() == null) {
 				innerNodes.add(n);
@@ -599,7 +599,7 @@ public static <S extends Sequence<C>, C extends Compound> Profile<S, C> getProgr
 	static <S extends Sequence<C>, C extends Compound> List<SequencePair<S, C>>
 			runPairwiseAligners(List<PairwiseSequenceAligner<S, C>> aligners) {
 		int n = 1, all = aligners.size();
-		List<Future<SequencePair<S, C>>> futures = new ArrayList<Future<SequencePair<S, C>>>();
+		List<Future<SequencePair<S, C>>> futures = new ArrayList<>();
 		for (PairwiseSequenceAligner<S, C> aligner : aligners) {
 			futures.add(ConcurrencyTools.submit(new CallablePairwiseSequenceAligner<S, C>(aligner),
 					String.format("Aligning pair %d of %d", n++, all)));
@@ -619,7 +619,7 @@ public static <S extends Sequence<C>, C extends Compound> Profile<S, C> getProgr
 	public static <S extends Sequence<C>, C extends Compound> double[] runPairwiseScorers(
 			List<PairwiseSequenceScorer<S, C>> scorers) {
 		int n = 1, all = scorers.size();
-		List<Future<Double>> futures = new ArrayList<Future<Double>>();
+		List<Future<Double>> futures = new ArrayList<>();
 		for (PairwiseSequenceScorer<S, C> scorer : scorers) {
 			futures.add(ConcurrencyTools.submit(new CallablePairwiseSequenceScorer<S, C>(scorer),
 					String.format("Scoring pair %d of %d", n++, all)));
@@ -644,7 +644,7 @@ public static <S extends Sequence<C>, C extends Compound> double[] runPairwiseSc
 	static <S extends Sequence<C>, C extends Compound> List<ProfilePair<S, C>>
 			runProfileAligners(List<ProfileProfileAligner<S, C>> aligners) {
 		int n = 1, all = aligners.size();
-		List<Future<ProfilePair<S, C>>> futures = new ArrayList<Future<ProfilePair<S, C>>>();
+		List<Future<ProfilePair<S, C>>> futures = new ArrayList<>();
 		for (ProfileProfileAligner<S, C> aligner : aligners) {
 			futures.add(ConcurrencyTools.submit(new CallableProfileProfileAligner<S, C>(aligner),
 					String.format("Aligning pair %d of %d", n++, all)));
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/GuideTree.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/GuideTree.java
index ecbcf66e79..c67caa8a4f 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/GuideTree.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/GuideTree.java
@@ -182,7 +182,7 @@ private Node(PhylogenyNode node, Node parent) {
 			distance = node.getDistanceToParent();
 			name = node.getName();
 			if(isLeaf = node.isExternal()) {
-				profile = new SimpleProfile<S, C>(sequences.get(distances.getIndex(name)));
+				profile = new SimpleProfile<>(sequences.get(distances.getIndex(name)));
 			} else {
 				child1 = new Node(node.getChildNode1(), this);
 				child2 = new Node(node.getChildNode2(), this);
@@ -237,7 +237,7 @@ public void setProfileFuture(Future<ProfilePair<S, C>> profileFuture) {
 
 		@Override
 		public Enumeration<GuideTreeNode<S, C>> children() {
-			Vector<GuideTreeNode<S, C>> children = new Vector<GuideTreeNode<S, C>>();
+			Vector<GuideTreeNode<S, C>> children = new Vector<>();
 			children.add(getChild1());
 			children.add(getChild2());
 			return children.elements();
@@ -305,7 +305,7 @@ private class PostOrderIterator implements Iterator<GuideTreeNode<S, C>> {
 
 		private PostOrderIterator() {
 			getRoot().clearVisited();
-			nodes = new Stack<Node>();
+			nodes = new Stack<>();
 			nodes.push(getRoot());
 		}
 
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/SimpleProfileProfileAligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/SimpleProfileProfileAligner.java
index 73579ab8f4..47fb7976e0 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/SimpleProfileProfileAligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/SimpleProfileProfileAligner.java
@@ -110,7 +110,7 @@ public SimpleProfileProfileAligner(Future<ProfilePair<S, C>> query, Profile<S, C
 
 	@Override
 	protected void setProfile(List<Step> sx, List<Step> sy) {
-		profile = pair = new SimpleProfilePair<S, C>(getQuery(), getTarget(), sx, sy);
+		profile = pair = new SimpleProfilePair<>(getQuery(), getTarget(), sx, sy);
 	}
 
 }
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/SmithWaterman.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/SmithWaterman.java
index 7d7e017694..819d8f5187 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/SmithWaterman.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/SmithWaterman.java
@@ -69,7 +69,7 @@ public SmithWaterman(S query, S target, GapPenalty gapPenalty, SubstitutionMatri
 
 	@Override
 	protected void setProfile(List<Step> sx, List<Step> sy) {
-		profile = pair = new SimpleSequencePair<S, C>(getQuery(), getTarget(), sx, xyStart[0],
+		profile = pair = new SimpleSequencePair<>(getQuery(), getTarget(), sx, xyStart[0],
 				getQuery().getLength() - xyMax[0], sy, xyStart[1], getTarget().getLength() - xyMax[1]);
 	}
 
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileAnnotation.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileAnnotation.java
index 80389ca000..f0ca2bfa23 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileAnnotation.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileAnnotation.java
@@ -125,7 +125,7 @@ public void setRefLocation(String refLocation) {
 	private Set<DatabaseReference> dbReferences;
 	private StringBuffer refComment;
 	/**TODO When implementing toString(), the function should loop on the vector */
-	private Vector<StockholmFileAnnotationReference> references = new Vector<StockholmFileAnnotation.StockholmFileAnnotationReference>();
+	private Vector<StockholmFileAnnotationReference> references = new Vector<>();
 	private StringBuffer keywords;
 	private CharSequence comment;
 	private StringBuffer pfamAccession;
@@ -137,7 +137,7 @@ public void setRefLocation(String refLocation) {
 	private float falseDiscoveryRate;
 
 	public StockholmFileAnnotation() {
-		embTrees = new HashMap<String, List<String>>();
+		embTrees = new HashMap<>();
 	}
 
 	public StringBuffer getDbComment() {
@@ -164,7 +164,7 @@ public void setDbReferences(Set<DatabaseReference> dbReferences) {
 	 */
 	public void addDBReference(String dbReferenceRepresentingString) {
 		if (this.dbReferences == null) {
-			this.dbReferences = new HashSet<DatabaseReference>();
+			this.dbReferences = new HashSet<>();
 		}
 		dbReferences.add(new DatabaseReference(dbReferenceRepresentingString));
 	}
@@ -492,7 +492,7 @@ public void setGFMembership(String membership) {
 	public void addGFNewHampshire(String newHampshire) {
 		List<String> hampshireTree = embTrees.get(TREE_DEFAULT_ID);
 		if (hampshireTree == null) {
-			hampshireTree = new ArrayList<String>();
+			hampshireTree = new ArrayList<>();
 		}
 		hampshireTree.add(newHampshire);
 		embTrees.put(TREE_DEFAULT_ID, hampshireTree);
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java
index 2d19a5e8df..83afc9d5a0 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileParser.java
@@ -356,7 +356,7 @@ public List<StockholmStructure> parse(InputStream inStream, int max) throws IOEx
 		if (internalScanner == null) {
 			internalScanner = new Scanner(inStream);
 		}
-		ArrayList<StockholmStructure> structures = new ArrayList<StockholmStructure>();
+		ArrayList<StockholmStructure> structures = new ArrayList<>();
 		while (max != INFINITY && max-- > 0) {
 			StockholmStructure structure = parse(internalScanner);
 			if (structure != null) {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmSequenceAnnotation.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmSequenceAnnotation.java
index 4b36dc192e..6c203bfc5b 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmSequenceAnnotation.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmSequenceAnnotation.java
@@ -74,7 +74,7 @@ public void setDbReferences(Set<DatabaseReference> dbReferences) {
 	 */
 	public void addDBReference(String dbReferenceRepresentingString) {
 		if (this.dbReferences == null) {
-			this.dbReferences = new HashSet<DatabaseReference>();
+			this.dbReferences = new HashSet<>();
 		}
 		dbReferences.add(new DatabaseReference(dbReferenceRepresentingString));
 	}
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
index 8e9380ec06..d95a2bfa97 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
@@ -94,9 +94,9 @@ public class StockholmStructure {
 	public StockholmStructure() {
 		fileAnnotation = new StockholmFileAnnotation();
 		consAnnotation = new StockholmConsensusAnnotation();
-		sequences = new HashMap<String, StringBuffer>();
-		seqsAnnotation = new HashMap<String, StockholmSequenceAnnotation>();
-		resAnnotation = new HashMap<String, StockholmResidueAnnotation>();
+		sequences = new HashMap<>();
+		seqsAnnotation = new HashMap<>();
+		resAnnotation = new HashMap<>();
 	}
 
 	public StockholmFileAnnotation getFileAnnotation() {
@@ -235,7 +235,7 @@ public List<AbstractSequence<? extends AbstractCompound>> getBioSequences(boolea
 		if (forcedSequenceType != null && !(forcedSequenceType.equals(PFAM) || forcedSequenceType.equals(RFAM))) {
 			throw new IllegalArgumentException("Illegal Argument " + forcedSequenceType);
 		}
-		List<AbstractSequence<? extends AbstractCompound>> seqs = new ArrayList<AbstractSequence<? extends AbstractCompound>>();
+		List<AbstractSequence<? extends AbstractCompound>> seqs = new ArrayList<>();
 		for (String sequencename : sequences.keySet()) {
 			AbstractSequence<? extends AbstractCompound> seq = null;
 			String sequence = sequences.get(sequencename).toString();
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AlignerHelper.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AlignerHelper.java
index f00ce2101f..e53fe56c05 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AlignerHelper.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AlignerHelper.java
@@ -268,7 +268,7 @@ public Subproblem(int queryStartIndex, int targetStartIndex, int queryEndIndex,
 		 */
 		public static List<Subproblem> getSubproblems(List<Anchor> anchors, int querySequenceLength, int targetSequenceLength) {
 			Collections.sort(anchors, new Anchor.QueryIndexComparator());
-			List<Subproblem> list = new ArrayList<Subproblem>();
+			List<Subproblem> list = new ArrayList<>();
 			Anchor last = new Anchor(-1, -1); // sentinal anchor
 			boolean isAnchored = false;
 			for (int i = 0; i < anchors.size(); i++) {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AnchoredPairwiseSequenceAligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AnchoredPairwiseSequenceAligner.java
index 41b9502782..95d5264f1e 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AnchoredPairwiseSequenceAligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AnchoredPairwiseSequenceAligner.java
@@ -111,7 +111,7 @@ public int[] getAnchors() {
 	 * @param anchors list of points that are tied to the given indices in the target
 	 */
 	public void setAnchors(int[] anchors) {
-		super.anchors = new ArrayList<Anchor>();
+		super.anchors = new ArrayList<>();
 		if (anchors != null) {
 			for (int i = 0; i < anchors.length; i++) {
 				if (anchors[i] >= 0) {
@@ -133,7 +133,7 @@ public void addAnchor(int queryIndex, int targetIndex) {
 
 	@Override
 	protected void setProfile(List<Step> sx, List<Step> sy) {
-		profile = pair = new SimpleSequencePair<S, C>(getQuery(), getTarget(), sx, sy);
+		profile = pair = new SimpleSequencePair<>(getQuery(), getTarget(), sx, sy);
 	}
 
 }
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractMatrixAligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractMatrixAligner.java
index b5e6f6188c..19fcc9c98f 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractMatrixAligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractMatrixAligner.java
@@ -55,7 +55,7 @@ public abstract class AbstractMatrixAligner<S extends Sequence<C>, C extends Com
 	protected GapPenalty gapPenalty;
 	private SubstitutionMatrix<C> subMatrix;
 	private boolean local, storingScoreMatrix;
-	protected List<Anchor> anchors = new ArrayList<Anchor>();
+	protected List<Anchor> anchors = new ArrayList<>();
 	protected int cutsPerSection;
 
 	// output fields
@@ -312,7 +312,7 @@ protected void align() {
 		}
 		boolean linear = (gapPenalty.getType() == GapPenalty.Type.LINEAR);
 		Last[][][] traceback = new Last[dim[0]][][];
-		List<Step> sx = new ArrayList<Step>(), sy = new ArrayList<Step>();
+		List<Step> sx = new ArrayList<>(), sy = new ArrayList<>();
 
 		if (!local) {
 			xyMax = new int[] { dim[0] - 1, dim[1] - 1 };
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/phylo/ForesterWrapper.java b/biojava-alignment/src/main/java/org/biojava/nbio/phylo/ForesterWrapper.java
index 74cdf2e2f4..5ad8b2f2e0 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/phylo/ForesterWrapper.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/phylo/ForesterWrapper.java
@@ -64,7 +64,7 @@ public static <C extends Sequence<D>, D extends Compound> Msa convert(
 
 		// Convert the biojava MSA to a FASTA String
 		OutputStream os = new ByteArrayOutputStream();
-		FastaWriter<C, D> fastaW = new FastaWriter<C, D>(os,
+		FastaWriter<C, D> fastaW = new FastaWriter<>(os,
 				msa.getAlignedSequences(),
 				new FastaHeaderFormatInterface<C, D>() {
 					@Override
diff --git a/biojava-core/src/main/java/demo/DemoSixFrameTranslation.java b/biojava-core/src/main/java/demo/DemoSixFrameTranslation.java
index 354e0bea26..cf321baee6 100644
--- a/biojava-core/src/main/java/demo/DemoSixFrameTranslation.java
+++ b/biojava-core/src/main/java/demo/DemoSixFrameTranslation.java
@@ -106,7 +106,7 @@ public static void main(String[] args){
 			CompoundSet<NucleotideCompound> nucleotideCompoundSet = AmbiguityRNACompoundSet.getRNACompoundSet();
 
 			FastaReader<DNASequence, NucleotideCompound> proxy =
-					new FastaReader<DNASequence, NucleotideCompound>(
+					new FastaReader<>(
 							stream,
 							new GenericFastaHeaderParser<DNASequence, NucleotideCompound>(),
 							new DNASequenceCreator(ambiguityDNACompoundSet));
diff --git a/biojava-core/src/main/java/demo/ParseFastaFileDemo.java b/biojava-core/src/main/java/demo/ParseFastaFileDemo.java
index 5951ed3ad6..7361de9974 100644
--- a/biojava-core/src/main/java/demo/ParseFastaFileDemo.java
+++ b/biojava-core/src/main/java/demo/ParseFastaFileDemo.java
@@ -94,7 +94,7 @@ public static void main(String[] args) throws Exception {
 		InputStream inStream = isp.getInputStream(f);
 
 
-		FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<ProteinSequence, AminoAcidCompound>(
+		FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<>(
 				inStream,
 				new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>(),
 				new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleAlignedSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleAlignedSequence.java
index 8980fdad7b..85d0a03c26 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleAlignedSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleAlignedSequence.java
@@ -285,7 +285,7 @@ public AccessionID getAccession() {
 
 	@Override
 	public List<C> getAsList() {
-		List<C> compounds = new ArrayList<C>();
+		List<C> compounds = new ArrayList<>();
 		for (int i = 1; i <= length; i++) {
 			compounds.add(getCompoundAt(i));
 		}
@@ -382,7 +382,7 @@ public String toString() {
 
 	// helper method to initialize the location
 	private void setLocation(List<Step> steps) {
-		List<Location> sublocations = new ArrayList<Location>();
+		List<Location> sublocations = new ArrayList<>();
 		int start = 0, step = 0, oStep = numBefore+numAfter, oMax = this.original.getLength(), pStep = 0, pMax =
 				(prev == null) ? 0 : prev.getLength();
 		boolean inGap = true;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleProfile.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleProfile.java
index 7cd7ef1bf5..4b853fcb37 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleProfile.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleProfile.java
@@ -70,11 +70,11 @@ protected SimpleProfile(AlignedSequence<S, C> query, AlignedSequence<S, C> targe
 		if (query.getLength() != target.getLength()) {
 			throw new IllegalArgumentException("Aligned sequences differ in size");
 		}
-		list = new ArrayList<AlignedSequence<S, C>>();
+		list = new ArrayList<>();
 		list.add(query);
 		list.add(target);
 		list = Collections.unmodifiableList(list);
-		originals = new ArrayList<S>();
+		originals = new ArrayList<>();
 		originals.add(query.getOriginalSequence());
 		originals.add(target.getOriginalSequence());
 		originals = Collections.unmodifiableList(originals);
@@ -87,14 +87,14 @@ protected SimpleProfile(AlignedSequence<S, C> query, AlignedSequence<S, C> targe
 	 * @param sequence sequence to seed profile
 	 */
 	public SimpleProfile(S sequence) {
-		List<Step> s = new ArrayList<Step>();
+		List<Step> s = new ArrayList<>();
 		for (int i = 0; i < sequence.getLength(); i++) {
 			s.add(Step.COMPOUND);
 		}
-		list = new ArrayList<AlignedSequence<S, C>>();
+		list = new ArrayList<>();
 		list.add(new SimpleAlignedSequence<S, C>(sequence, s));
 		list = Collections.unmodifiableList(list);
-		originals = new ArrayList<S>();
+		originals = new ArrayList<>();
 		originals.add(sequence);
 		originals = Collections.unmodifiableList(originals);
 		length = sequence.getLength();
@@ -117,11 +117,11 @@ protected SimpleProfile(S query, S target, List<Step> sx, int xb, int xa, List<S
 		if (sx.size() != sy.size()) {
 			throw new IllegalArgumentException("Alignments differ in size");
 		}
-		list = new ArrayList<AlignedSequence<S, C>>();
+		list = new ArrayList<>();
 		list.add(new SimpleAlignedSequence<S, C>(query, sx, xb, xa));
 		list.add(new SimpleAlignedSequence<S, C>(target, sy, yb, ya));
 		list = Collections.unmodifiableList(list);
-		originals = new ArrayList<S>();
+		originals = new ArrayList<>();
 		originals.add(query);
 		originals.add(target);
 		originals = Collections.unmodifiableList(originals);
@@ -141,7 +141,7 @@ protected SimpleProfile(Profile<S, C> query, Profile<S, C> target, List<Step> sx
 		if (sx.size() != sy.size()) {
 			throw new IllegalArgumentException("Alignments differ in size");
 		}
-		list = new ArrayList<AlignedSequence<S, C>>();
+		list = new ArrayList<>();
 		for (AlignedSequence<S, C> s : query) {
 			list.add(new SimpleAlignedSequence<S, C>(s, sx));
 		}
@@ -149,7 +149,7 @@ protected SimpleProfile(Profile<S, C> query, Profile<S, C> target, List<Step> sx
 			list.add(new SimpleAlignedSequence<S, C>(s, sy));
 		}
 		list = Collections.unmodifiableList(list);
-		originals = new ArrayList<S>();
+		originals = new ArrayList<>();
 		originals.addAll(query.getOriginalSequences());
 		originals.addAll(target.getOriginalSequences());
 		originals = Collections.unmodifiableList(originals);
@@ -163,8 +163,8 @@ protected SimpleProfile(Profile<S, C> query, Profile<S, C> target, List<Step> sx
 	 * collection is empty.
 	 */
 	public SimpleProfile(Collection<AlignedSequence<S,C>> alignedSequences) {
-		list = new ArrayList<AlignedSequence<S,C>>();
-		originals = new ArrayList<S>();
+		list = new ArrayList<>();
+		originals = new ArrayList<>();
 
 		Iterator<AlignedSequence<S,C>> itr = alignedSequences.iterator();
 		if(!itr.hasNext()) {
@@ -213,7 +213,7 @@ public List<AlignedSequence<S, C>> getAlignedSequences() {
 
 	@Override
 	public List<AlignedSequence<S, C>> getAlignedSequences(int... listIndices) {
-		List<AlignedSequence<S, C>> tempList = new ArrayList<AlignedSequence<S, C>>();
+		List<AlignedSequence<S, C>> tempList = new ArrayList<>();
 		for (int i : listIndices) {
 			tempList.add(getAlignedSequence(i));
 		}
@@ -222,7 +222,7 @@ public List<AlignedSequence<S, C>> getAlignedSequences(int... listIndices) {
 
 	@Override
 	public List<AlignedSequence<S, C>> getAlignedSequences(S... sequences) {
-		List<AlignedSequence<S, C>> tempList = new ArrayList<AlignedSequence<S, C>>();
+		List<AlignedSequence<S, C>> tempList = new ArrayList<>();
 		for (S s : sequences) {
 			tempList.add(getAlignedSequence(s));
 		}
@@ -262,7 +262,7 @@ public int[] getCompoundCountsAt(int alignmentIndex, List<C> compounds) {
 	@Override
 	public List<C> getCompoundsAt(int alignmentIndex) {
 		// TODO handle circular alignments
-		List<C> column = new ArrayList<C>();
+		List<C> column = new ArrayList<>();
 		for (AlignedSequence<S, C> s : list) {
 			column.add(s.getCompoundAt(alignmentIndex));
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexFileParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexFileParser.java
index 82c8abe914..606b913e59 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexFileParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/AAIndexFileParser.java
@@ -52,7 +52,7 @@ public class AAIndexFileParser {
 	boolean symmetricMatrix ;
 
 	public AAIndexFileParser(){
-		matrices  = new HashMap<String, SubstitutionMatrix<AminoAcidCompound>>();
+		matrices  = new HashMap<>();
 	}
 
 	/** Parse an inputStream that points to an AAINDEX database file
@@ -154,8 +154,8 @@ private void initMatrix(String line) {
 
 		matrix = new short[nrRows][nrCols];
 
-		rows = new ArrayList<AminoAcidCompound>();
-		cols = new ArrayList<AminoAcidCompound>();
+		rows = new ArrayList<>();
+		cols = new ArrayList<>();
 
 		//System.out.println(">" + currentRows+"<");
 		AminoAcidCompoundSet compoundSet = AminoAcidCompoundSet.getAminoAcidCompoundSet();
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/ScaledSubstitutionMatrix.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/ScaledSubstitutionMatrix.java
index ee26384bfa..9d18d50b36 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/ScaledSubstitutionMatrix.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/ScaledSubstitutionMatrix.java
@@ -216,7 +216,7 @@ public SubstitutionMatrix<AminoAcidCompound> normalizeMatrix(short scale) {
 	@Override
 	public Map<AminoAcidCompound, Short> getRow(AminoAcidCompound row) {
 		int rowIndex = rows.indexOf(row);
-		Map<AminoAcidCompound, Short> map = new HashMap<AminoAcidCompound, Short>();
+		Map<AminoAcidCompound, Short> map = new HashMap<>();
 		for (int colIndex = 0; colIndex < matrix[rowIndex].length; colIndex++) {
 			map.put(cols.get(colIndex), matrix[rowIndex][colIndex]);
 		}
@@ -226,7 +226,7 @@ public Map<AminoAcidCompound, Short> getRow(AminoAcidCompound row) {
 	@Override
 	public Map<AminoAcidCompound, Short> getColumn(AminoAcidCompound column) {
 		int colIndex = cols.indexOf(column);
-		Map<AminoAcidCompound, Short> map = new HashMap<AminoAcidCompound, Short>();
+		Map<AminoAcidCompound, Short> map = new HashMap<>();
 		for (int i = 0; i < matrix.length; i++) {
 			map.put(rows.get(i), matrix[i][colIndex]);
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SimpleSubstitutionMatrix.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SimpleSubstitutionMatrix.java
index 8eb897219e..9da982dbf1 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SimpleSubstitutionMatrix.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SimpleSubstitutionMatrix.java
@@ -57,7 +57,7 @@ public class SimpleSubstitutionMatrix<C extends Compound> implements Substitutio
 	private List<C> rows, cols;
 
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum62() {
-		return new SimpleSubstitutionMatrix<AminoAcidCompound>(AminoAcidCompoundSet.getAminoAcidCompoundSet(), new InputStreamReader(
+		return new SimpleSubstitutionMatrix<>(AminoAcidCompoundSet.getAminoAcidCompoundSet(), new InputStreamReader(
 				SimpleSubstitutionMatrix.class.getResourceAsStream("/matrices/blosum62.txt")), "blosum62");
 	}
 
@@ -126,10 +126,10 @@ private SimpleSubstitutionMatrix(CompoundSet<C> compoundSet, Scanner input, Stri
 		this.name = name;
 		max = Short.MIN_VALUE;
 		min = Short.MAX_VALUE;
-		rows = new ArrayList<C>();
-		cols = new ArrayList<C>();
+		rows = new ArrayList<>();
+		cols = new ArrayList<>();
 		StringBuilder descriptionIn = new StringBuilder();
-		List<short[]> matrixIn = new ArrayList<short[]>();
+		List<short[]> matrixIn = new ArrayList<>();
 		while(input.hasNextLine()) {
 			String line = input.nextLine();
 			if (line.startsWith(comment)) {
@@ -288,7 +288,7 @@ public String toString() {
 	@Override
 	public Map<C, Short> getRow(C row) {
 		int rowIndex = rows.indexOf(row);
-		Map<C, Short> map = new HashMap<C, Short>();
+		Map<C, Short> map = new HashMap<>();
 		for (int colIndex = 0; colIndex < matrix[rowIndex].length; colIndex++) {
 			map.put(cols.get(colIndex), matrix[rowIndex][colIndex]);
 		}
@@ -298,7 +298,7 @@ public Map<C, Short> getRow(C row) {
 	@Override
 	public Map<C, Short> getColumn(C column) {
 		int colIndex = cols.indexOf(column);
-		Map<C, Short> map = new HashMap<C, Short>();
+		Map<C, Short> map = new HashMap<>();
 		for (int i = 0; i < matrix.length; i++) {
 			map.put(rows.get(i), matrix[i][colIndex]);
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java
index ca93b1818f..3f55a3897a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java
@@ -50,9 +50,9 @@ public class SubstitutionMatrixHelper implements Serializable {
 	private static final long serialVersionUID = 148491724604653225L;
 
 	private static Map<String, SubstitutionMatrix<AminoAcidCompound>> aminoAcidMatrices =
-			new HashMap<String, SubstitutionMatrix<AminoAcidCompound>>();
+			new HashMap<>();
 	private static Map<String, SubstitutionMatrix<NucleotideCompound>> nucleotideMatrices =
-			new HashMap<String, SubstitutionMatrix<NucleotideCompound>>();
+			new HashMap<>();
 
 	// prevents instantiation
 	private SubstitutionMatrixHelper() { }
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/Hsp.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/Hsp.java
index 8245c635c3..7a27828feb 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/Hsp.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/Hsp.java
@@ -120,7 +120,7 @@ public SequencePair<S,C> getAlignment(){
 		alignedQuery = new SimpleAlignedSequence(getSequence(hspQseq), getAlignmentsSteps(hspQseq));
 		alignedHit = new SimpleAlignedSequence(getSequence(hspHseq), getAlignmentsSteps(hspHseq));
 
-		returnAln = new SimpleSequencePair<S, C>(alignedQuery, alignedHit);
+		returnAln = new SimpleSequencePair<>(alignedQuery, alignedHit);
 
 		return returnAln;
 	}
@@ -145,7 +145,7 @@ else if (sequenceString.matches("^[ACUG]+$"))
 	}
 
 	private List<Step> getAlignmentsSteps(String gappedSequenceString){
-		List<Step> returnList = new ArrayList<Step>();
+		List<Step> returnList = new ArrayList<>();
 
 		for (char c: gappedSequenceString.toCharArray()){
 			if (c=='-') returnList.add(Step.GAP); else returnList.add(Step.COMPOUND);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/SearchIO.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/SearchIO.java
index 52654720d9..d10717ee9e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/SearchIO.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/SearchIO.java
@@ -140,7 +140,7 @@ public void writeResults() throws IOException, ParseException {
 	 */
 	private ResultFactory guessFactory(File f){
 		if (extensionFactoryAssociation == null){
-			extensionFactoryAssociation = new HashMap<String, ResultFactory>();
+			extensionFactoryAssociation = new HashMap<>();
 			ServiceLoader<ResultFactory> impl = ServiceLoader.load(ResultFactory.class);
 			for (ResultFactory loadedImpl : impl) {
 				List<String> fileExtensions = loadedImpl.getFileExtensions();
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastTabularParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastTabularParser.java
index b4593e8135..be3d2f81f1 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastTabularParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastTabularParser.java
@@ -71,7 +71,7 @@ private enum PARSING_CONSISTENCY {
 
 	// data imported private:
 	int queryIdNumber = 0;
-	HashMap<String,String> queryIdMapping = new HashMap<String,String>();
+	HashMap<String,String> queryIdMapping = new HashMap<>();
 	String programName=null, queryName = null, databaseFile = null;
 	private String queryId      ;
 	private String subjectId    ;
@@ -89,7 +89,7 @@ private enum PARSING_CONSISTENCY {
 
 	@Override
 	public List<String> getFileExtensions() {
-		List<String> l = new ArrayList<String>();
+		List<String> l = new ArrayList<>();
 		l.add("blasttabular");
 		l.add("blasttxt");
 		return l;
@@ -102,7 +102,7 @@ public void setFile(File f) {
 
 	@Override
 	public List<Result> createObjects(double maxEScore) throws IOException, ParseException {
-		List<Result> results = new ArrayList<Result>();
+		List<Result> results = new ArrayList<>();
 
 		log.info("Query for hits");
 		LineNumberReader  lnr = new LineNumberReader(new FileReader(targetFile));
@@ -126,13 +126,13 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 						.setQueryDef(queryName)
 						.setReference(blastReference);
 
-				List<Hit> hits = new ArrayList<Hit>();
+				List<Hit> hits = new ArrayList<>();
 
 				String currentQueryId = queryId;
 				while (currentQueryId.equals(queryId) && lineNumber < fileLinesCount){
 					BlastHitBuilder hitBuilder = new BlastHitBuilder();
 
-					List<Hsp> hsps = new ArrayList<Hsp>();
+					List<Hsp> hsps = new ArrayList<>();
 
 					String currentSubjectId=subjectId;
 					while (currentSubjectId.equals(subjectId) && lineNumber < fileLinesCount){
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java
index 9d93f5b325..7714f44749 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java
@@ -105,7 +105,7 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 			ArrayList<Element> IterationsList = XMLHelper.selectElements(blastDoc.getDocumentElement(), "BlastOutput_iterations/Iteration[Iteration_hits]");
 			logger.info(IterationsList.size() + " results");
 
-			resultsCollection = new ArrayList<Result>();
+			resultsCollection = new ArrayList<>();
 			for (Element element : IterationsList) {
 				BlastResultBuilder resultBuilder = new BlastResultBuilder();
 				// will add BlastOutput* key sections in the result object
@@ -131,7 +131,7 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 				Element iterationHitsElement = XMLHelper.selectSingleElement(element, "Iteration_hits");
 				ArrayList<Element> hitList = XMLHelper.selectElements(iterationHitsElement, "Hit");
 
-				hitsCollection = new ArrayList<Hit>();
+				hitsCollection = new ArrayList<>();
 				for (Element hitElement : hitList) {
 					BlastHitBuilder blastHitBuilder = new BlastHitBuilder();
 					blastHitBuilder
@@ -148,7 +148,7 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 					Element hithspsElement = XMLHelper.selectSingleElement(hitElement, "Hit_hsps");
 					ArrayList<Element> hspList = XMLHelper.selectElements(hithspsElement, "Hsp");
 
-					hspsCollection = new ArrayList<Hsp>();
+					hspsCollection = new ArrayList<>();
 					for (Element hspElement : hspList) {
 						Double evalue = Double.valueOf(XMLHelper.selectSingleElement(hspElement, "Hsp_evalue").getTextContent());
 
@@ -195,7 +195,7 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 
 	@Override
 	public List<String> getFileExtensions(){
-		ArrayList<String> extensions = new ArrayList<String>(1);
+		ArrayList<String> extensions = new ArrayList<>(1);
 		extensions.add("blastxml");
 		return extensions;
 	}
@@ -215,7 +215,7 @@ public void setDatabaseReferences(List<Sequence> sequences) {
 	 */
 	private void mapIds() {
 		if (queryReferences != null) {
-			queryReferencesMap = new HashMap<String,Sequence>(queryReferences.size());
+			queryReferencesMap = new HashMap<>(queryReferences.size());
 			for (int counter=0; counter < queryReferences.size() ; counter ++){
 				String id = "Query_"+(counter+1);
 				queryReferencesMap.put(id, queryReferences.get(counter));
@@ -223,7 +223,7 @@ private void mapIds() {
 		}
 
 		if (databaseReferences != null) {
-			databaseReferencesMap = new HashMap<String,Sequence>(databaseReferences.size());
+			databaseReferencesMap = new HashMap<>(databaseReferences.size());
 			for (int counter=0; counter < databaseReferences.size() ; counter ++){
 				// this is strange: while Query_id are 1 based, Hit (database) id are 0 based
 				String id = "gnl|BL_ORD_ID|"+(counter);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ChromosomeSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ChromosomeSequence.java
index 8b16c66472..8b11fa0b63 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ChromosomeSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ChromosomeSequence.java
@@ -37,7 +37,7 @@
 public class ChromosomeSequence extends DNASequence {
 
 	private int chromosomeNumber;
-	private LinkedHashMap<String, GeneSequence> geneSequenceHashMap = new LinkedHashMap<String, GeneSequence>();
+	private LinkedHashMap<String, GeneSequence> geneSequenceHashMap = new LinkedHashMap<>();
 
 	/**
 	 * Empty constructor used by tools that need a proper Bean that allows the actual
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DNASequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DNASequence.java
index 215e3c8a26..08352cb009 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DNASequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DNASequence.java
@@ -136,14 +136,14 @@ public int getGCCount() {
 	 * Returns a Sequence which runs in the current reverse order
 	 */
 	public SequenceView<NucleotideCompound> getReverse() {
-		return new ReversedSequenceView<NucleotideCompound>(this);
+		return new ReversedSequenceView<>(this);
 	}
 
 	/**
 	 * Returns a Sequence which will complement every base
 	 */
 	public SequenceView<NucleotideCompound> getComplement() {
-		return new ComplementSequenceView<NucleotideCompound>(this);
+		return new ComplementSequenceView<>(this);
 	}
 
 	/**
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
index 34f1ec3986..ed6f635611 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
@@ -41,11 +41,11 @@ public class GeneSequence extends DNASequence {
 
 	private final static Logger logger = LoggerFactory.getLogger(GeneSequence.class);
 
-	private final LinkedHashMap<String, TranscriptSequence> transcriptSequenceHashMap = new LinkedHashMap<String, TranscriptSequence>();
-	private final LinkedHashMap<String, IntronSequence> intronSequenceHashMap = new LinkedHashMap<String, IntronSequence>();
-	private final LinkedHashMap<String, ExonSequence> exonSequenceHashMap = new LinkedHashMap<String, ExonSequence>();
-	private final ArrayList<IntronSequence> intronSequenceList = new ArrayList<IntronSequence>();
-	private final ArrayList<ExonSequence> exonSequenceList = new ArrayList<ExonSequence>();
+	private final LinkedHashMap<String, TranscriptSequence> transcriptSequenceHashMap = new LinkedHashMap<>();
+	private final LinkedHashMap<String, IntronSequence> intronSequenceHashMap = new LinkedHashMap<>();
+	private final LinkedHashMap<String, ExonSequence> exonSequenceHashMap = new LinkedHashMap<>();
+	private final ArrayList<IntronSequence> intronSequenceList = new ArrayList<>();
+	private final ArrayList<ExonSequence> exonSequenceList = new ArrayList<>();
 	boolean intronAdded = false; // need to deal with the problem that typically introns are not added when validating the list and adding in introns as the regions not included in exons
 	private Strand strand = Strand.UNDEFINED;
 	private ChromosomeSequence chromosomeSequence;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignment.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignment.java
index a0fb3a37bc..47355db090 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignment.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/MultipleSequenceAlignment.java
@@ -42,7 +42,7 @@
  */
 public class MultipleSequenceAlignment<S extends Sequence<C>, C extends Compound> implements LightweightProfile<S, C> {
 
-	private List<S> sequences = new ArrayList<S>();
+	private List<S> sequences = new ArrayList<>();
 	private Integer length = null;
 
 	/**
@@ -98,7 +98,7 @@ public List<S> getAlignedSequences() {
 	 */
 	@Override
 	public List<C> getCompoundsAt(int alignmentIndex) {
-		List<C> column = new ArrayList<C>();
+		List<C> column = new ArrayList<>();
 		for (S s : sequences) {
 			column.add(s.getCompoundAt(alignmentIndex));
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ProteinSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ProteinSequence.java
index 2e44cd12c7..4248bc908c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ProteinSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ProteinSequence.java
@@ -160,7 +160,7 @@ private DNASequence getRawParentSequence(String accessId) throws IOException {
 		InputStream is = url.openConnection().getInputStream();
 
 		FastaReader<DNASequence, NucleotideCompound> parentReader
-				= new FastaReader<DNASequence, NucleotideCompound>(is,
+				= new FastaReader<>(is,
 						new PlainFastaHeaderParser<DNASequence, NucleotideCompound>(),
 						new DNASequenceCreator(AmbiguityDNACompoundSet.getDNACompoundSet()));
 		LinkedHashMap<String, DNASequence> seq = parentReader.process();
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
index 83e50474bd..460ca6ab45 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
@@ -41,8 +41,8 @@ public class TranscriptSequence extends DNASequence {
 
 	private final static Logger logger = LoggerFactory.getLogger(TranscriptSequence.class);
 
-	private final ArrayList<CDSSequence> cdsSequenceList = new ArrayList<CDSSequence>();
-	private final LinkedHashMap<String, CDSSequence> cdsSequenceHashMap = new LinkedHashMap<String, CDSSequence>();
+	private final ArrayList<CDSSequence> cdsSequenceList = new ArrayList<>();
+	private final LinkedHashMap<String, CDSSequence> cdsSequenceHashMap = new LinkedHashMap<>();
 	private StartCodonSequence startCodonSequence = null;
 	private StopCodonSequence stopCodonSequence = null;
 	private GeneSequence parentGeneSequence = null;
@@ -153,7 +153,7 @@ public CDSSequence addCDS(AccessionID accession, int begin, int end, int phase)
 	 * @return
 	 */
 	public ArrayList<ProteinSequence> getProteinCDSSequences() {
-		ArrayList<ProteinSequence> proteinSequenceList = new ArrayList<ProteinSequence>();
+		ArrayList<ProteinSequence> proteinSequenceList = new ArrayList<>();
 		for (int i = 0; i < cdsSequenceList.size(); i++) {
 			CDSSequence cdsSequence = cdsSequenceList.get(i);
 			String codingSequence = cdsSequence.getCodingSequence();
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/compound/AminoAcidCompoundSet.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/compound/AminoAcidCompoundSet.java
index 8252f27198..82546b5a56 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/compound/AminoAcidCompoundSet.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/compound/AminoAcidCompoundSet.java
@@ -44,11 +44,11 @@ public class AminoAcidCompoundSet implements CompoundSet<AminoAcidCompound>, Ser
 	 *
 	 */
 	private static final long serialVersionUID = 4000344194364133456L;
-	private final Map<String, AminoAcidCompound> aminoAcidCompoundCache = new HashMap<String, AminoAcidCompound>();
-	private final Map<String, AminoAcidCompound> aminoAcidCompoundCache3Letter = new HashMap<String, AminoAcidCompound>();
+	private final Map<String, AminoAcidCompound> aminoAcidCompoundCache = new HashMap<>();
+	private final Map<String, AminoAcidCompound> aminoAcidCompoundCache3Letter = new HashMap<>();
 
 	private final Map<AminoAcidCompound, Set<AminoAcidCompound>> equivalentsCache =
-			new HashMap<AminoAcidCompound, Set<AminoAcidCompound>>();
+			new HashMap<>();
 
 	public AminoAcidCompoundSet() {
 		aminoAcidCompoundCache.put("A", new AminoAcidCompound(this, "A", "Ala", "Alanine", 71.0788f));
@@ -154,7 +154,7 @@ public Set<AminoAcidCompound> getEquivalentCompounds(AminoAcidCompound compound)
 			addAmbiguousEquivalents("I", "L", "J");
 			// ambiguous gaps
 			AminoAcidCompound gap1, gap2, gap3;
-			Set<AminoAcidCompound> gaps = new HashSet<AminoAcidCompound>();
+			Set<AminoAcidCompound> gaps = new HashSet<>();
 			gaps.add(gap1 = aminoAcidCompoundCache.get("-"));
 			gaps.add(gap2 = aminoAcidCompoundCache.get("."));
 			gaps.add(gap3 = aminoAcidCompoundCache.get("_"));
@@ -172,18 +172,18 @@ private void addAmbiguousEquivalents(String one, String two, String either) {
 		Set<AminoAcidCompound> equivalents;
 		AminoAcidCompound cOne, cTwo, cEither;
 
-		equivalents = new HashSet<AminoAcidCompound>();
+		equivalents = new HashSet<>();
 		equivalents.add(cOne = aminoAcidCompoundCache.get(one));
 		equivalents.add(cTwo = aminoAcidCompoundCache.get(two));
 		equivalents.add(cEither = aminoAcidCompoundCache.get(either));
 		equivalentsCache.put(cEither, equivalents);
 
-		equivalents = new HashSet<AminoAcidCompound>();
+		equivalents = new HashSet<>();
 		equivalents.add(cOne);
 		equivalents.add(cEither);
 		equivalentsCache.put(cOne, equivalents);
 
-		equivalents = new HashSet<AminoAcidCompound>();
+		equivalents = new HashSet<>();
 		equivalents.add(cTwo);
 		equivalents.add(cEither);
 		equivalentsCache.put(cTwo, equivalents);
@@ -206,7 +206,7 @@ public boolean isValidSequence(Sequence<AminoAcidCompound> sequence) {
 
 	@Override
 	public List<AminoAcidCompound> getAllCompounds() {
-		return new ArrayList<AminoAcidCompound>(aminoAcidCompoundCache.values());
+		return new ArrayList<>(aminoAcidCompoundCache.values());
 	}
 
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/edits/Edit.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/edits/Edit.java
index 19923effed..edf891c4f7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/edits/Edit.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/edits/Edit.java
@@ -78,13 +78,13 @@ public static abstract class AbstractEdit<C extends Compound> implements Edit<C>
 		@Override
 		public Sequence<C> edit(Sequence<C> editingSequence) {
 			Sequence<C> targetSequence = getTargetSequence(editingSequence);
-			List<Sequence<C>> sequences = new ArrayList<Sequence<C>>();
+			List<Sequence<C>> sequences = new ArrayList<>();
 
 			sequences.add(getFivePrime(editingSequence));
 			sequences.add(targetSequence);
 			sequences.add(getThreePrime(editingSequence));
 
-			return new JoiningSequenceReader<C>(sequences);
+			return new JoiningSequenceReader<>(sequences);
 		}
 		private int start = -1;
 		private int end = -1;
@@ -119,7 +119,7 @@ protected void setSequence(Sequence<C> sequence) {
 		public Sequence<C> getTargetSequence(Sequence<C> editingSequence) {
 			if (sequence == null && stringSequence != null) {
 				try {
-					sequence = new BasicSequence<C>(
+					sequence = new BasicSequence<>(
 								stringSequence, editingSequence.getCompoundSet());
 				} catch (CompoundNotFoundException e) {
 					// TODO is there a better way to handle this exception?
@@ -136,7 +136,7 @@ public Sequence<C> getTargetSequence(Sequence<C> editingSequence) {
 		protected Sequence<C> getEmptySequence(Sequence<C> editingSequence) {
 			Sequence<C> s = null;
 			try {
-				s = new BasicSequence<C>("", editingSequence.getCompoundSet());
+				s = new BasicSequence<>("", editingSequence.getCompoundSet());
 			} catch (CompoundNotFoundException e) {
 				// should not happen
 				logger.error("Could not construct empty sequence. {}. This is most likely a bug.", e.getMessage());
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/AbstractFeature.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/AbstractFeature.java
index d601c573b0..16e894697c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/AbstractFeature.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/AbstractFeature.java
@@ -40,7 +40,7 @@
  */
 public abstract class AbstractFeature<S extends AbstractSequence<C>, C extends Compound>
 		implements FeatureInterface<S, C> {
-	List<FeatureInterface<S, C>> childrenFeatures = new ArrayList<FeatureInterface<S, C>>();
+	List<FeatureInterface<S, C>> childrenFeatures = new ArrayList<>();
 	FeatureInterface<S, C> parentFeature;
 	AbstractLocation sequenceLocation;
 	String type = "";
@@ -48,7 +48,7 @@ public abstract class AbstractFeature<S extends AbstractSequence<C>, C extends C
 	private String description = "";
 	private String shortDescription = "";
 	private Object userObject = null;
-	private Map<String, List<Qualifier>> Qualifiers = new HashMap<String, List<Qualifier>>();
+	private Map<String, List<Qualifier>> Qualifiers = new HashMap<>();
 
 	/**
 	 * A feature has a type and a source
@@ -292,7 +292,7 @@ public void addQualifier(String key, Qualifier qualifier) {
 			vals.add(qualifier);
 			Qualifiers.put(key, vals);
 		} else {
-			List<Qualifier> vals = new ArrayList<Qualifier>();
+			List<Qualifier> vals = new ArrayList<>();
 			vals.add(qualifier);
 			Qualifiers.put(key, vals);
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java
index fc9f7fc8f6..0d2ff2de9a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java
@@ -37,7 +37,7 @@
  * @author Paolo Pavan
  */
 public class DBReferenceInfo extends Qualifier {
-	private LinkedHashMap<String, String> properties = new LinkedHashMap<String, String>();
+	private LinkedHashMap<String, String> properties = new LinkedHashMap<>();
 	private String database = "";
 	private String id = "";
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureDbReferenceInfo.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureDbReferenceInfo.java
index c270cc74e7..3b49341d22 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureDbReferenceInfo.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureDbReferenceInfo.java
@@ -46,11 +46,11 @@ public class FeatureDbReferenceInfo<S extends AbstractSequence<C>, C extends Com
 
 	private AbstractLocation location;
 	private FeatureInterface<S,C> parentFeature;
-	private List<FeatureInterface<S, C>> childrenFeatures = new ArrayList<FeatureInterface<S, C>>();
+	private List<FeatureInterface<S, C>> childrenFeatures = new ArrayList<>();
 	private String description = "";
 	private String shortDescription = "";
 	private Object userObject;
-	private Map<String, List<Qualifier>> qualifiers = new HashMap<String,List<Qualifier>>();
+	private Map<String, List<Qualifier>> qualifiers = new HashMap<>();
 
 
 	public FeatureDbReferenceInfo(String database, String id) {
@@ -150,7 +150,7 @@ public void setQualifiers(Map<String, List<Qualifier>> qualifiers) {
 	@Override
 	public void addQualifier(String key, Qualifier qualifier) {
 		if (qualifiers == null) {
-			qualifiers = new HashMap<String, List<Qualifier>>();
+			qualifiers = new HashMap<>();
 		}
 		// Check for key. Update list of values
 		if (qualifiers.containsKey(key)){
@@ -158,7 +158,7 @@ public void addQualifier(String key, Qualifier qualifier) {
 			vals.add(qualifier);
 			qualifiers.put(key, vals);
 		} else {
-			List<Qualifier> vals = new ArrayList<Qualifier>();
+			List<Qualifier> vals = new ArrayList<>();
 			vals.add(qualifier);
 			qualifiers.put(key, vals);
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/QualityFeature.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/QualityFeature.java
index 7eec33a62a..0e7da9a97b 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/QualityFeature.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/QualityFeature.java
@@ -37,7 +37,7 @@
  */
 public class QualityFeature<S extends AbstractSequence<C>, C extends Compound> extends AbstractFeature<S, C> {
 
-	private List<Number> qualities = new ArrayList<Number>();
+	private List<Number> qualities = new ArrayList<>();
 
 	/**
 	 * @param type
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/QuantityFeature.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/QuantityFeature.java
index bce00e2729..524bdfdaa3 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/QuantityFeature.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/QuantityFeature.java
@@ -35,7 +35,7 @@
  */
 public class QuantityFeature<S extends AbstractSequence<C>, C extends Compound> extends AbstractFeature<S, C> {
 
-	private List<Number> quantities = new ArrayList<Number>();
+	private List<Number> quantities = new ArrayList<>();
 
 	/**
 	 *
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreator.java
index 1a6c20eba1..94b2a6d918 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreator.java
@@ -90,7 +90,7 @@ public AbstractSequence<AminoAcidCompound> getSequence(String sequence,
 	public AbstractSequence<AminoAcidCompound> getSequence(
 			List<AminoAcidCompound> list) {
 		AbstractSequence<AminoAcidCompound> seq =super.getSequence(list);
-		Collection<Object> strCase = new ArrayList<Object>(seq.getLength());
+		Collection<Object> strCase = new ArrayList<>(seq.getLength());
 		for(int i=0;i<seq.getLength();i++) {
 			strCase.add(true);
 		}
@@ -107,7 +107,7 @@ public AbstractSequence<AminoAcidCompound> getSequence(
 	 * This list contains only Booleans.
 	 */
 	private static List<Object> getStringCase(String str) {
-		List<Object> types = new ArrayList<Object>(str.length());
+		List<Object> types = new ArrayList<>(str.length());
 		for(int i=0;i<str.length();i++) {
 			types.add(Character.isUpperCase(str.charAt(i)));
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/DNASequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/DNASequenceCreator.java
index 48eab7cb23..78a5dd4832 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/DNASequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/DNASequenceCreator.java
@@ -83,7 +83,7 @@ public AbstractSequence<NucleotideCompound> getSequence(
 	@Override
 public AbstractSequence<NucleotideCompound> getSequence(
 			List<NucleotideCompound> list) {
-		ArrayListProxySequenceReader<NucleotideCompound> store = new ArrayListProxySequenceReader<NucleotideCompound>();
+		ArrayListProxySequenceReader<NucleotideCompound> store = new ArrayListProxySequenceReader<>();
 		store.setCompoundSet(compoundSet);
 		store.setContents(list);
 		return new DNASequence(store);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java
index d7c4bde215..bdcc197f7e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java
@@ -148,7 +148,7 @@ public LinkedHashMap<String,S> process(int max) throws IOException {
 		boolean keepGoing = true;
 
 
-		LinkedHashMap<String,S> sequences = new LinkedHashMap<String,S>();
+		LinkedHashMap<String,S> sequences = new LinkedHashMap<>();
 
 		do {
 			line = line.trim(); // nice to have but probably not needed
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java
index e250a8d4f9..d185a6f062 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java
@@ -57,7 +57,7 @@ public static LinkedHashMap<String, DNASequence> readFastaDNASequence(File file,
 		}
 
 		FastaReader<DNASequence, NucleotideCompound> fastaProxyReader =
-				new FastaReader<DNASequence, NucleotideCompound>(
+				new FastaReader<>(
 						file,
 						new GenericFastaHeaderParser<DNASequence, NucleotideCompound>(),
 						new FileProxyDNASequenceCreator(
@@ -85,7 +85,7 @@ public static LinkedHashMap<String, RNASequence> readFastaRNASequence(File file,
 		}
 
 		FastaReader<RNASequence, NucleotideCompound> fastaProxyReader =
-				new FastaReader<RNASequence, NucleotideCompound>(
+				new FastaReader<>(
 						file,
 						new GenericFastaHeaderParser<RNASequence, NucleotideCompound>(),
 						new FileProxyRNASequenceCreator(
@@ -124,7 +124,7 @@ public static LinkedHashMap<String, ProteinSequence> readFastaProteinSequence(
 	 */
 	public static LinkedHashMap<String, ProteinSequence> readFastaProteinSequence(
 			InputStream inStream) throws IOException {
-		FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<ProteinSequence, AminoAcidCompound>(
+		FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<>(
 				inStream,
 				new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>(),
 				new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
@@ -139,7 +139,7 @@ public static LinkedHashMap<String, ProteinSequence> readFastaProteinSequence(
 	 */
 	public static LinkedHashMap<String, DNASequence> readFastaDNASequence(
 			InputStream inStream) throws IOException {
-		FastaReader<DNASequence, NucleotideCompound> fastaReader = new FastaReader<DNASequence, NucleotideCompound>(
+		FastaReader<DNASequence, NucleotideCompound> fastaReader = new FastaReader<>(
 				inStream,
 				new GenericFastaHeaderParser<DNASequence, NucleotideCompound>(),
 				new DNASequenceCreator(DNACompoundSet.getDNACompoundSet()));
@@ -168,7 +168,7 @@ public static LinkedHashMap<String, DNASequence> readFastaDNASequence(
 	 */
 	public static LinkedHashMap<String, RNASequence> readFastaRNASequence(
 			InputStream inStream) throws IOException {
-		FastaReader<RNASequence, NucleotideCompound> fastaReader = new FastaReader<RNASequence, NucleotideCompound>(
+		FastaReader<RNASequence, NucleotideCompound> fastaReader = new FastaReader<>(
 				inStream,
 				new GenericFastaHeaderParser<RNASequence, NucleotideCompound>(),
 				new RNASequenceCreator(RNACompoundSet.getRNACompoundSet()));
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriterHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriterHelper.java
index 966d723728..dfeae8a642 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriterHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriterHelper.java
@@ -71,7 +71,7 @@ public static void writeProteinSequence(File file,
 	public static void writeProteinSequence(OutputStream outputStream,
 			Collection<ProteinSequence> proteinSequences) throws Exception {
 
-		FastaWriter<ProteinSequence, AminoAcidCompound> fastaWriter = new FastaWriter<ProteinSequence, AminoAcidCompound>(
+		FastaWriter<ProteinSequence, AminoAcidCompound> fastaWriter = new FastaWriter<>(
 				outputStream, proteinSequences,
 				new GenericFastaHeaderFormat<ProteinSequence, AminoAcidCompound>());
 		fastaWriter.process();
@@ -132,7 +132,7 @@ public static void writeNucleotideSequence(File file, Collection<DNASequence> dn
 	 */
 
 	public static void writeNucleotideSequence(OutputStream outputStream, Collection<DNASequence> dnaSequences) throws Exception {
-		FastaWriter<DNASequence, NucleotideCompound> fastaWriter = new FastaWriter<DNASequence, NucleotideCompound>(
+		FastaWriter<DNASequence, NucleotideCompound> fastaWriter = new FastaWriter<>(
 				outputStream, dnaSequences,
 				new GenericFastaHeaderFormat<DNASequence, NucleotideCompound>());
 		fastaWriter.process();
@@ -170,7 +170,7 @@ public static void writeSequence(OutputStream outputStream, Sequence<?> sequence
 	 */
 
 	private static Collection<Sequence<?>> singleSeqToCollection(Sequence<?> sequence) {
-		Collection<Sequence<?>> sequences = new ArrayList<Sequence<?>>();
+		Collection<Sequence<?>> sequences = new ArrayList<>();
 		sequences.add(sequence);
 		return sequences;
 	}
@@ -199,7 +199,7 @@ public String getHeader(Sequence<?> sequence) {
 				};
 
 		FastaWriter<Sequence<?>, Compound> fastaWriter =
-				new FastaWriter<Sequence<?>, Compound>(outputStream,
+				new FastaWriter<>(outputStream,
 				sequences, fhfi);
 
 		fastaWriter.process();
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyDNASequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyDNASequenceCreator.java
index fb89f1c4e3..21b0699ab6 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyDNASequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyDNASequenceCreator.java
@@ -78,7 +78,7 @@ public FileProxyDNASequenceCreator(File file,
 	 */
 	@Override
 	public AbstractSequence<NucleotideCompound> getSequence(String sequence, long index ) throws CompoundNotFoundException, IOException {
-		SequenceFileProxyLoader<NucleotideCompound> sequenceFileProxyLoader = new SequenceFileProxyLoader<NucleotideCompound>(
+		SequenceFileProxyLoader<NucleotideCompound> sequenceFileProxyLoader = new SequenceFileProxyLoader<>(
 				file,
 				sequenceParser,
 				index,
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyProteinSequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyProteinSequenceCreator.java
index 7db550683f..e45907a2ed 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyProteinSequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyProteinSequenceCreator.java
@@ -76,7 +76,7 @@ public FileProxyProteinSequenceCreator(File file, CompoundSet<AminoAcidCompound>
 	@Override
 	public AbstractSequence<AminoAcidCompound> getSequence(String sequence, long index) throws CompoundNotFoundException, IOException {
 		SequenceFileProxyLoader<AminoAcidCompound> sequenceFileProxyLoader =
-				new SequenceFileProxyLoader<AminoAcidCompound>(
+				new SequenceFileProxyLoader<>(
 						file,
 						sequenceParser,
 						index,
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyRNASequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyRNASequenceCreator.java
index 4be68696fb..58fe3f98d7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyRNASequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyRNASequenceCreator.java
@@ -78,7 +78,7 @@ public FileProxyRNASequenceCreator(File file,
 	 */
 	@Override
 	public AbstractSequence<NucleotideCompound> getSequence(String sequence, long index ) throws CompoundNotFoundException, IOException {
-		SequenceFileProxyLoader<NucleotideCompound> sequenceFileProxyLoader = new SequenceFileProxyLoader<NucleotideCompound>(
+		SequenceFileProxyLoader<NucleotideCompound> sequenceFileProxyLoader = new SequenceFileProxyLoader<>(
 				file,
 				sequenceParser,
 				index,
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java
index 638e570cc5..2a1d30f146 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java
@@ -61,7 +61,7 @@ public static LinkedHashMap<String, DNASequence> readGenbankDNASequence(File fil
 		}
 
 		GenbankReader<DNASequence, NucleotideCompound> GenbankProxyReader =
-				new GenbankReader<DNASequence, NucleotideCompound>(
+				new GenbankReader<>(
 						file,
 						new GenericGenbankHeaderParser<DNASequence, NucleotideCompound>(),
 						new FileProxyDNASequenceCreator(
@@ -89,7 +89,7 @@ public static LinkedHashMap<String, ProteinSequence> readGenbankProteinSequence(
 		}
 
 		GenbankReader<ProteinSequence, AminoAcidCompound> GenbankProxyReader =
-				new GenbankReader<ProteinSequence, AminoAcidCompound>(
+				new GenbankReader<>(
 						file,
 						new GenericGenbankHeaderParser<ProteinSequence, AminoAcidCompound>(),
 						new FileProxyProteinSequenceCreator(
@@ -117,7 +117,7 @@ public static LinkedHashMap<String, RNASequence> readGenbankRNASequence(File fil
 		}
 
 		GenbankReader<RNASequence, NucleotideCompound> GenbankProxyReader =
-				new GenbankReader<RNASequence, NucleotideCompound>(
+				new GenbankReader<>(
 						file,
 						new GenericGenbankHeaderParser<RNASequence, NucleotideCompound>(),
 						new FileProxyRNASequenceCreator(
@@ -156,7 +156,7 @@ public static LinkedHashMap<String, ProteinSequence> readGenbankProteinSequence(
 	 */
 	public static LinkedHashMap<String, ProteinSequence> readGenbankProteinSequence(
 			InputStream inStream) throws Exception {
-		GenbankReader<ProteinSequence, AminoAcidCompound> GenbankReader = new GenbankReader<ProteinSequence, AminoAcidCompound>(
+		GenbankReader<ProteinSequence, AminoAcidCompound> GenbankReader = new GenbankReader<>(
 				inStream,
 				new GenericGenbankHeaderParser<ProteinSequence, AminoAcidCompound>(),
 				new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
@@ -171,7 +171,7 @@ public static LinkedHashMap<String, ProteinSequence> readGenbankProteinSequence(
 	 */
 	public static LinkedHashMap<String, DNASequence> readGenbankDNASequence(
 			InputStream inStream) throws Exception {
-		GenbankReader<DNASequence, NucleotideCompound> GenbankReader = new GenbankReader<DNASequence, NucleotideCompound>(
+		GenbankReader<DNASequence, NucleotideCompound> GenbankReader = new GenbankReader<>(
 				inStream,
 				new GenericGenbankHeaderParser<DNASequence, NucleotideCompound>(),
 				new DNASequenceCreator(DNACompoundSet.getDNACompoundSet()));
@@ -199,7 +199,7 @@ public static LinkedHashMap<String, DNASequence> readGenbankDNASequence(
 	 */
 	public static LinkedHashMap<String, RNASequence> readGenbankRNASequence(
 			InputStream inStream) throws Exception {
-		GenbankReader<RNASequence, NucleotideCompound> GenbankReader = new GenbankReader<RNASequence, NucleotideCompound>(
+		GenbankReader<RNASequence, NucleotideCompound> GenbankReader = new GenbankReader<>(
 				inStream,
 				new GenericGenbankHeaderParser<RNASequence, NucleotideCompound>(),
 				new RNASequenceCreator(RNACompoundSet.getRNACompoundSet()));
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriterHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriterHelper.java
index a0ba83aec0..97cfe557ad 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriterHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriterHelper.java
@@ -76,7 +76,7 @@ public static void writeProteinSequence(File file,
 	public static void writeProteinSequence(OutputStream outputStream,
 			Collection<ProteinSequence> proteinSequences) throws Exception {
 
-		GenbankWriter<ProteinSequence, AminoAcidCompound> genbankWriter = new GenbankWriter<ProteinSequence, AminoAcidCompound>(
+		GenbankWriter<ProteinSequence, AminoAcidCompound> genbankWriter = new GenbankWriter<>(
 				outputStream,
 				proteinSequences,
 				new GenericGenbankHeaderFormat<ProteinSequence, AminoAcidCompound>());
@@ -126,10 +126,10 @@ public static void writeNucleotideSequence(OutputStream outputStream,
 	public static void writeNucleotideSequence(OutputStream outputStream,
 			Collection<DNASequence> dnaSequences, String seqType)
 			throws Exception {
-		GenericGenbankHeaderFormat<DNASequence, NucleotideCompound> genericGenbankHeaderFormat = new GenericGenbankHeaderFormat<DNASequence, NucleotideCompound>(
+		GenericGenbankHeaderFormat<DNASequence, NucleotideCompound> genericGenbankHeaderFormat = new GenericGenbankHeaderFormat<>(
 				seqType);
 		// genericGenbankHeaderFormat.setLineSeparator(lineSep);
-		GenbankWriter<DNASequence, NucleotideCompound> genbankWriter = new GenbankWriter<DNASequence, NucleotideCompound>(
+		GenbankWriter<DNASequence, NucleotideCompound> genbankWriter = new GenbankWriter<>(
 				outputStream, dnaSequences, genericGenbankHeaderFormat);
 		// genbankWriter.setLineSeparator(lineSep);
 		genbankWriter.process();
@@ -146,9 +146,9 @@ public static void writeNucleotideSequence(OutputStream outputStream,
 
 	public static void writeNucleotideSequenceOriginal(OutputStream outputStream, Collection<DNASequence> dnaSequences)
 			throws Exception {
-		GenericGenbankHeaderFormat<DNASequence, NucleotideCompound> genericGenbankHeaderFormat = new GenericGenbankHeaderFormat<DNASequence, NucleotideCompound>(
+		GenericGenbankHeaderFormat<DNASequence, NucleotideCompound> genericGenbankHeaderFormat = new GenericGenbankHeaderFormat<>(
 				true);
-		GenbankWriter<DNASequence, NucleotideCompound> genbankWriter = new GenbankWriter<DNASequence, NucleotideCompound>(
+		GenbankWriter<DNASequence, NucleotideCompound> genbankWriter = new GenbankWriter<>(
 				outputStream, dnaSequences, genericGenbankHeaderFormat);
 		genbankWriter.process();
 	}
@@ -189,7 +189,7 @@ public static void writeSequence(OutputStream outputStream,
 
 	private static Collection<Sequence<?>> singleSeqToCollection(
 			Sequence<?> sequence) {
-		Collection<Sequence<?>> sequences = new ArrayList<Sequence<?>>();
+		Collection<Sequence<?>> sequences = new ArrayList<>();
 		sequences.add(sequence);
 		return sequences;
 	}
@@ -219,7 +219,7 @@ public String getHeader(Sequence<?> sequence) {
 			;
 		};
 
-		GenbankWriter<Sequence<?>, Compound> genbankWriter = new GenbankWriter<Sequence<?>, Compound>(
+		GenbankWriter<Sequence<?>, Compound> genbankWriter = new GenbankWriter<>(
 				outputStream, sequences, fhfi);
 
 		genbankWriter.process();
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
index 9acaf1d25c..d44468d554 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
@@ -71,7 +71,7 @@ public class GenericFastaHeaderParser<S extends AbstractSequence<C>, C extends C
 	 */
 	private String[] getHeaderValues(String header) {
 		String[] data = new String[0];
-		ArrayList<String> values = new ArrayList<String>();
+		ArrayList<String> values = new ArrayList<>();
 		StringBuffer sb = new StringBuffer();
 		//commented out 1/11/2012 to resolve an issue where headers do contain a length= at the end that are not recognized
 		//if(header.indexOf("length=") != -1){
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
index 9542710488..71e5f9379d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
@@ -208,7 +208,7 @@ private String _insdc_feature_location_string(FeatureInterface<AbstractSequence<
 				
 				StringBuilder sb = new StringBuilder();
 				Formatter formatter = new Formatter(sb, Locale.US);
-				ArrayList<String> locations = new ArrayList<String>();
+				ArrayList<String> locations = new ArrayList<>();
 				for(Location l  : feature.getLocations().getSubLocations()) {	
 					locations.add(_insdc_location_string_ignoring_strand_and_subfeatures((AbstractLocation) l, record_length));					
 				}
@@ -223,7 +223,7 @@ private String _insdc_feature_location_string(FeatureInterface<AbstractSequence<
 				//This covers typical forward strand features, and also an evil mixed strand:
 				StringBuilder sb = new StringBuilder();
 				Formatter formatter = new Formatter(sb,Locale.US);
-				ArrayList<String> locations = new ArrayList<String>();
+				ArrayList<String> locations = new ArrayList<>();
 				for(Location l  : feature.getLocations().getSubLocations()) {	
 					locations.add(_insdc_location_string_ignoring_strand_and_subfeatures((AbstractLocation) l, record_length));					
 				}
@@ -248,7 +248,7 @@ private String _insdc_feature_location_string(FeatureInterface<AbstractSequence<
 			}
 			StringBuilder sb = new StringBuilder();
 			Formatter formatter = new Formatter(sb,Locale.US);
-			ArrayList<String> locations = new ArrayList<String>();
+			ArrayList<String> locations = new ArrayList<>();
 			for(FeatureInterface<AbstractSequence<C>, C> f  : feature.getChildrenFeatures()) {
 				locations.add(_insdc_location_string_ignoring_strand_and_subfeatures(f.getLocations(), record_length));
 			}
@@ -261,7 +261,7 @@ private String _insdc_feature_location_string(FeatureInterface<AbstractSequence<
 		//This covers typical forward strand features, and also an evil mixed strand:
 		StringBuilder sb = new StringBuilder();
 		Formatter formatter = new Formatter(sb,Locale.US);
-		ArrayList<String> locations = new ArrayList<String>();
+		ArrayList<String> locations = new ArrayList<>();
 		for(FeatureInterface<AbstractSequence<C>, C> f  : feature.getChildrenFeatures()) {
 			locations.add(_insdc_location_string_ignoring_strand_and_subfeatures(f.getLocations(), record_length));
 		}
@@ -406,14 +406,14 @@ raise ValueError("Expected a SeqFeature position object.")
 	 */
 	protected ArrayList<String> _split_multi_line(String text, int max_len) {
 		// TODO Auto-generated method stub
-		ArrayList<String> output = new ArrayList<String>();
+		ArrayList<String> output = new ArrayList<>();
 		text = text.trim();
 		if(text.length() <= max_len) {
 			output.add(text);
 			return output;
 		}
 
-		ArrayList<String> words = new ArrayList<String>();
+		ArrayList<String> words = new ArrayList<>();
 		Collections.addAll(words, text.split("\\s+"));
 		while(!words.isEmpty()) {
 			text = words.remove(0);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java
index 96ff94ebfd..0f9b3ca950 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java
@@ -134,8 +134,8 @@ public IUPACTable getTable(Integer id) {
 
 	private void populateLookups() {
 		if(nameLookup == null) {
-			nameLookup = new HashMap<String, IUPACTable>();
-			idLookup = new HashMap<Integer, IUPACTable>();
+			nameLookup = new HashMap<>();
+			idLookup = new HashMap<>();
 			for(IUPACTable t: getTables()) {
 				nameLookup.put(t.getName(), t);
 				idLookup.put(t.getId(), t);
@@ -144,7 +144,7 @@ private void populateLookups() {
 	}
 
 	private List<IUPACTable> parseTables() {
-		List<IUPACTable> localTables = new ArrayList<IUPACTable>();
+		List<IUPACTable> localTables = new ArrayList<>();
 		List<String> lines = IOUtils.getList(is);
 		Integer id = null;
 		String name, aa, starts, baseone, basetwo, basethree;
@@ -198,7 +198,7 @@ public static class IUPACTable implements Table {
 		private final String       baseTwo;
 		private final String       baseThree;
 
-		private final List<Codon>  codons    = new ArrayList<Codon>();
+		private final List<Codon>  codons    = new ArrayList<>();
 		private CompoundSet<Codon> compounds = null;
 
 		public IUPACTable(String name, int id, String aminoAcidString,
@@ -328,7 +328,7 @@ public CompoundSet<Codon> getCodonCompoundSet(
 		}
 
 		private List<List<String>> codonStrings() {
-			List<List<String>> codons = new ArrayList<List<String>>();
+			List<List<String>> codons = new ArrayList<>();
 			for (int i = 0; i < baseOne.length(); i++) {
 				List<String> codon = Arrays.asList(Character
 						.toString(baseOne.charAt(i)),
@@ -348,7 +348,7 @@ private List<String> startCodons() {
 		}
 
 		private List<String> split(String string) {
-			List<String> split = new ArrayList<String>();
+			List<String> split = new ArrayList<>();
 			for (int i = 0; i < string.length(); i++) {
 				split.add(Character.toString(string.charAt(i)));
 			}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ProteinSequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ProteinSequenceCreator.java
index c40e3efa2a..1efebed609 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ProteinSequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ProteinSequenceCreator.java
@@ -70,7 +70,7 @@ public AbstractSequence<AminoAcidCompound> getSequence(String sequence,
 	@Override
 public AbstractSequence<AminoAcidCompound> getSequence(
 			List<AminoAcidCompound> list) {
-		ArrayListProxySequenceReader<AminoAcidCompound> store = new ArrayListProxySequenceReader<AminoAcidCompound>();
+		ArrayListProxySequenceReader<AminoAcidCompound> store = new ArrayListProxySequenceReader<>();
 		store.setCompoundSet(compoundSet);
 		store.setContents(list);
 		return new ProteinSequence(store);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/RNASequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/RNASequenceCreator.java
index 96abe9cd35..0a691f1afa 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/RNASequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/RNASequenceCreator.java
@@ -78,7 +78,7 @@ public AbstractSequence<NucleotideCompound> getSequence(
 	@Override
 public AbstractSequence<NucleotideCompound> getSequence(List<NucleotideCompound> list) {
 		ArrayListProxySequenceReader<NucleotideCompound> store =
-			new ArrayListProxySequenceReader<NucleotideCompound>();
+			new ArrayListProxySequenceReader<>();
 		store.setCompoundSet(compoundSet);
 		store.setContents(list);
 		return new RNASequence(store);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/util/IOUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/util/IOUtils.java
index 4f807c5799..b60bc9eb00 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/util/IOUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/util/IOUtils.java
@@ -110,7 +110,7 @@ public static void processReader(BufferedReader br, ReaderProcessor processor) {
 	 * @throws ParserException Can throw this if we cannot parse the given reader
 	 */
 	public static List<String> getList(BufferedReader br) {
-		final List<String> list = new ArrayList<String>();
+		final List<String> list = new ArrayList<>();
 		processReader(br, new ReaderProcessor() {
 			@Override
 			public void process(String line) {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java
index 006827f321..d3e6c52661 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java
@@ -74,7 +74,7 @@ public GenbankProxySequenceReader(
 		String db = compoundSet instanceof AminoAcidCompoundSet ? "protein" : "nuccore";
 
 		InputStream inStream = getBufferedInputStream(accessionID, db);
-		genbankParser = new GenbankSequenceParser<AbstractSequence<C>, C>();
+		genbankParser = new GenbankSequenceParser<>();
 
 		setContents(genbankParser.getSequence(new BufferedReader(new InputStreamReader(inStream)), 0));
 		headerParser = genbankParser.getSequenceHeaderParser();
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java
index fa7d81f4e9..61df84f46d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java
@@ -57,7 +57,7 @@ public class SequenceFileProxyLoader<C extends Compound> implements ProxySequenc
 
 	SequenceParserInterface sequenceParser;
 	private CompoundSet<C> compoundSet;
-	private List<C> parsedCompounds = new ArrayList<C>();
+	private List<C> parsedCompounds = new ArrayList<>();
 	File file;
 	long sequenceStartIndex = -1;
 	int sequenceLength = -1;
@@ -204,7 +204,7 @@ public String getSequenceAsString() {
 	 */
 	public String getSequenceAsString(Integer bioBegin, Integer bioEnd, Strand strand) {
 
-		SequenceAsStringHelper<C> sequenceAsStringHelper = new SequenceAsStringHelper<C>();
+		SequenceAsStringHelper<C> sequenceAsStringHelper = new SequenceAsStringHelper<>();
 		return sequenceAsStringHelper.getSequenceAsString(this.parsedCompounds, compoundSet, bioBegin, bioEnd, strand);
 	}
 
@@ -260,7 +260,7 @@ public int hashCode(){
 	@Override
 	public SequenceView<C> getSubSequence(final Integer bioBegin, final Integer bioEnd) {
 
-		return new SequenceProxyView<C>(SequenceFileProxyLoader.this, bioBegin, bioEnd);
+		return new SequenceProxyView<>(SequenceFileProxyLoader.this, bioBegin, bioEnd);
 	}
 
 	/**
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java
index 57c793ddc1..7ae1fa1632 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java
@@ -46,7 +46,7 @@ public class StringProxySequenceReader<C extends Compound> implements ProxySeque
 
 	private String sequence;
 	private CompoundSet<C> compoundSet;
-	private List<C> parsedCompounds = new ArrayList<C>();
+	private List<C> parsedCompounds = new ArrayList<>();
 
 	public StringProxySequenceReader() {}
 
@@ -126,13 +126,13 @@ public List<C> getAsList() {
 
 
 	public String getSequenceAsString(Integer bioBegin, Integer bioEnd,Strand strand) {
-		SequenceAsStringHelper<C> sequenceAsStringHelper = new SequenceAsStringHelper<C>();
+		SequenceAsStringHelper<C> sequenceAsStringHelper = new SequenceAsStringHelper<>();
 		return sequenceAsStringHelper.getSequenceAsString(this.parsedCompounds, compoundSet, bioBegin, bioEnd, strand);
 	}
 
 	@Override
 	public SequenceView<C> getSubSequence(final Integer bioBegin, final Integer bioEnd) {
-		return new SequenceProxyView<C>(StringProxySequenceReader.this,bioBegin,bioEnd);
+		return new SequenceProxyView<>(StringProxySequenceReader.this,bioBegin,bioEnd);
 	}
 
 	@Override
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
index 4ca7204bbd..020fee4a97 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
@@ -79,7 +79,7 @@ public class UniprotProxySequenceReader<C extends Compound> implements ProxySequ
 	private static String uniprotDirectoryCache = null;
 	private String sequence;
 	private CompoundSet<C> compoundSet;
-	private List<C> parsedCompounds = new ArrayList<C>();
+	private List<C> parsedCompounds = new ArrayList<>();
 	Document uniprotDoc;
 
 	/**
@@ -125,7 +125,7 @@ public UniprotProxySequenceReader(Document document, CompoundSet<C> compoundSet)
 	public static <C extends Compound> UniprotProxySequenceReader<C> parseUniprotXMLString(String xml, CompoundSet<C> compoundSet) {
 		try {
 			Document document = XMLHelper.inputStreamToDocument(new ByteArrayInputStream(xml.getBytes()));
-			return new UniprotProxySequenceReader<C>(document, compoundSet);
+			return new UniprotProxySequenceReader<>(document, compoundSet);
 		} catch (Exception e) {
 			logger.error("Exception on xml parse of: {}", xml);
 		}
@@ -281,7 +281,7 @@ public SequenceView<C> getInverse() {
 	 * @return
 	 */
 	public String getSequenceAsString(Integer bioBegin, Integer bioEnd, Strand strand) {
-		SequenceAsStringHelper<C> sequenceAsStringHelper = new SequenceAsStringHelper<C>();
+		SequenceAsStringHelper<C> sequenceAsStringHelper = new SequenceAsStringHelper<>();
 		return sequenceAsStringHelper.getSequenceAsString(this.parsedCompounds, compoundSet, bioBegin, bioEnd, strand);
 	}
 
@@ -293,7 +293,7 @@ public String getSequenceAsString(Integer bioBegin, Integer bioEnd, Strand stran
 	 */
 	@Override
 	public SequenceView<C> getSubSequence(final Integer bioBegin, final Integer bioEnd) {
-		return new SequenceProxyView<C>(UniprotProxySequenceReader.this, bioBegin, bioEnd);
+		return new SequenceProxyView<>(UniprotProxySequenceReader.this, bioBegin, bioEnd);
 	}
 
 	/**
@@ -341,7 +341,7 @@ public AccessionID getAccession() {
 	 * @throws XPathExpressionException
 	 */
 	public ArrayList<AccessionID> getAccessions() throws XPathExpressionException {
-		ArrayList<AccessionID> accessionList = new ArrayList<AccessionID>();
+		ArrayList<AccessionID> accessionList = new ArrayList<>();
 		if (uniprotDoc == null) {
 			return accessionList;
 		}
@@ -373,7 +373,7 @@ public ArrayList<String> getAliases() throws XPathExpressionException {
 	 * @throws XPathExpressionException
 	 */
 	public ArrayList<String> getProteinAliases() throws XPathExpressionException {
-		ArrayList<String> aliasList = new ArrayList<String>();
+		ArrayList<String> aliasList = new ArrayList<>();
 		if (uniprotDoc == null) {
 			return aliasList;
 		}
@@ -476,7 +476,7 @@ private void getProteinAliasesFromElement(ArrayList<String> aliasList, Element e
 	 * @throws XPathExpressionException
 	 */
 	public ArrayList<String> getGeneAliases() throws XPathExpressionException {
-		ArrayList<String> aliasList = new ArrayList<String>();
+		ArrayList<String> aliasList = new ArrayList<>();
 		if (uniprotDoc == null) {
 			return aliasList;
 		}
@@ -609,7 +609,7 @@ private StringBuilder fetchUniprotXML(String uniprotURL)
 		StringBuilder sb = new StringBuilder();
 		URL uniprot = new URL(uniprotURL);
 		int attempt = 5;
-		List<String> errorCodes = new ArrayList<String>();
+		List<String> errorCodes = new ArrayList<>();
 		while(attempt > 0) {
 			HttpURLConnection uniprotConnection = openURLConnection(uniprot);
 			int statusCode = uniprotConnection.getResponseCode();
@@ -775,7 +775,7 @@ public String getOrganismName() {
 	 */
 	@Override
 	public ArrayList<String> getKeyWords() {
-		ArrayList<String> keyWordsList = new ArrayList<String>();
+		ArrayList<String> keyWordsList = new ArrayList<>();
 		if (uniprotDoc == null) {
 			return keyWordsList;
 		}
@@ -789,7 +789,7 @@ public ArrayList<String> getKeyWords() {
 			}
 		} catch (XPathExpressionException e) {
 			logger.error("Problems while parsing keywords in UniProt XML: {}. No keywords will be available.",e.getMessage());
-			return new ArrayList<String>();
+			return new ArrayList<>();
 		}
 
 		return keyWordsList;
@@ -815,7 +815,7 @@ public Map<String, List<DBReferenceInfo>> getDatabaseReferences()  {
 				String id = element.getAttribute("id");
 				List<DBReferenceInfo> idlist = databaseReferencesHashMap.get(type);
 				if (idlist == null) {
-					idlist = new ArrayList<DBReferenceInfo>();
+					idlist = new ArrayList<>();
 					databaseReferencesHashMap.put(type, idlist);
 				}
 				DBReferenceInfo dbreferenceInfo = new DBReferenceInfo(type, id);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
index f670783a0c..e49bd22216 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
@@ -153,7 +153,7 @@ public Location parse(String locationString) {
 
 	private List<Location> parseLocationString(String string, int versus) {
 		Matcher m;
-		List<Location> boundedLocationsCollection = new ArrayList<Location>();
+		List<Location> boundedLocationsCollection = new ArrayList<>();
 
 		List<String> tokens = splitString(string);
 		for (String t : tokens) {
@@ -272,7 +272,7 @@ private List<Location> parseLocationString(String string, int versus) {
 
 
 	private List<String> splitString(String input) {
-		List<String> result = new ArrayList<String>();
+		List<String> result = new ArrayList<>();
 		int start = 0;
 		int openedParenthesis = 0;
 		for (int current = 0; current < input.length(); current++) {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/LocationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/LocationHelper.java
index efb02f6c64..d36d882c98 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/LocationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/LocationHelper.java
@@ -153,7 +153,7 @@ public static Location circularLocation(int start, int end, Strand strand, int l
 			end = (length * (numberOfPasses + 1)) + modEnd;
 		}
 
-		List<Location> locations = new ArrayList<Location>();
+		List<Location> locations = new ArrayList<>();
 		locations.add(new SimpleLocation(modStart, length, strand));
 		for (int i = 0; i < numberOfPasses; i++) {
 			locations.add(new SimpleLocation(1, length, strand));
@@ -283,7 +283,7 @@ public static boolean detectCicular(List<Location> subLocations) {
 	 * @return Returns a boolean indicating if this is consistently accessioned
 	 */
 	public static boolean consistentAccessions(List<Location> subLocations) {
-		Set<AccessionID> set = new HashSet<AccessionID>();
+		Set<AccessionID> set = new HashSet<>();
 		for(Location sub: subLocations) {
 			set.add(sub.getAccession());
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/template/AbstractLocation.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/template/AbstractLocation.java
index efe1cc6d6f..03dcf54a74 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/template/AbstractLocation.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/template/AbstractLocation.java
@@ -224,7 +224,7 @@ public Iterator<Location> iterator() {
 			list = getSubLocations();
 		}
 		else {
-			list = new ArrayList<Location>();
+			list = new ArrayList<>();
 			list.add(this);
 		}
 		return list.iterator();
@@ -245,7 +245,7 @@ public List<Location> getRelevantSubLocations() {
 	 * Here to allow for recursion
 	 */
 	private List<Location> getAllSubLocations(Location location) {
-		List<Location> flatSubLocations = new ArrayList<Location>();
+		List<Location> flatSubLocations = new ArrayList<>();
 		for (Location l : location.getSubLocations()) {
 			if (l.isComplex()) {
 				flatSubLocations.addAll(getAllSubLocations(l));
@@ -312,11 +312,11 @@ public boolean isBetweenCompounds() {
 	@Override
 	public <C extends Compound> Sequence<C> getSubSequence(Sequence<C> sequence) {
 		if(isCircular()) {
-			List<Sequence<C>> sequences = new ArrayList<Sequence<C>>();
+			List<Sequence<C>> sequences = new ArrayList<>();
 			for(Location l: this) {
 				sequences.add(l.getSubSequence(sequence));
 			}
-			return new JoiningSequenceReader<C>(sequence.getCompoundSet(), sequences);
+			return new JoiningSequenceReader<>(sequence.getCompoundSet(), sequences);
 		}
 		return reverseSequence(sequence.getSubSequence(
 				getStart().getPosition(), getEnd().getPosition()));
@@ -328,11 +328,11 @@ public <C extends Compound> Sequence<C> getSubSequence(Sequence<C> sequence) {
 
 	@Override
 	public <C extends Compound> Sequence<C> getRelevantSubSequence(Sequence<C> sequence) {
-		List<Sequence<C>> sequences = new ArrayList<Sequence<C>>();
+		List<Sequence<C>> sequences = new ArrayList<>();
 		for(Location l: getRelevantSubLocations()) {
 			sequences.add(l.getSubSequence(sequence));
 		}
-		return new JoiningSequenceReader<C>(sequence.getCompoundSet(), sequences);
+		return new JoiningSequenceReader<>(sequence.getCompoundSet(), sequences);
 	}
 
 	/**
@@ -346,12 +346,12 @@ protected <C extends Compound> Sequence<C> reverseSequence(Sequence<C> sequence)
 			return sequence;
 		}
 
-		Sequence<C> reversed = new ReversedSequenceView<C>(sequence);
+		Sequence<C> reversed = new ReversedSequenceView<>(sequence);
 		// "safe" operation as we have tried to check this
 		if(canComplement(sequence)) {
 			Sequence<ComplementCompound> casted = (Sequence<ComplementCompound>) reversed;
 			ComplementSequenceView<ComplementCompound> complement =
-					new ComplementSequenceView<ComplementCompound>(casted);
+					new ComplementSequenceView<>(casted);
 			return (Sequence<C>)complement;
 		}
 		return reversed;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/template/Location.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/template/Location.java
index 25cdf48f05..b0887bf706 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/template/Location.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/template/Location.java
@@ -206,7 +206,7 @@ public static Location circularLocation(int start, int end, Strand strand, int l
 				end = (length * (numberOfPasses + 1)) + modEnd;
 			}
 
-			List<Location> locations = new ArrayList<Location>();
+			List<Location> locations = new ArrayList<>();
 			locations.add(new SimpleLocation(modStart, length, strand));
 			for (int i = 0; i < numberOfPasses; i++) {
 				locations.add(new SimpleLocation(1, length, strand));
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/ArrayListSequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/ArrayListSequenceReader.java
index 48ecb8aff4..5e499261c1 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/ArrayListSequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/ArrayListSequenceReader.java
@@ -44,7 +44,7 @@
 public class ArrayListSequenceReader<C extends Compound> implements SequenceReader<C> {
 
 	private CompoundSet<C> compoundSet;
-	private ArrayList<C> parsedCompounds = new ArrayList<C>();
+	private ArrayList<C> parsedCompounds = new ArrayList<>();
 
 	private volatile Integer hashcode = null;
 
@@ -95,7 +95,7 @@ public String getSequenceAsString() {
 	 */
 	public String getSequenceAsString(Integer begin, Integer end, Strand strand) {
 		// TODO Optimise/cache.
-		SequenceAsStringHelper<C> sequenceAsStringHelper = new SequenceAsStringHelper<C>();
+		SequenceAsStringHelper<C> sequenceAsStringHelper = new SequenceAsStringHelper<>();
 		return sequenceAsStringHelper.getSequenceAsString(this.parsedCompounds, compoundSet, begin, end, strand);
 	}
 
@@ -232,7 +232,7 @@ public void setContents(List<C> list) {
 	 */
 	@Override
 	public SequenceView<C> getSubSequence(final Integer bioBegin, final Integer bioEnd) {
-		return new SequenceProxyView<C>(ArrayListSequenceReader.this, bioBegin, bioEnd);
+		return new SequenceProxyView<>(ArrayListSequenceReader.this, bioBegin, bioEnd);
 	}
 
 	/**
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/FourBitSequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/FourBitSequenceReader.java
index 83f4c5dfd2..49e4c2f8ec 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/FourBitSequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/FourBitSequenceReader.java
@@ -114,7 +114,7 @@ protected int compoundsPerDatatype() {
 		@Override
 		protected Map<C, Integer> generateCompoundsToIndex() {
 			final CompoundSet<C> cs = getCompoundSet();
-			Map<C, Integer> map = new HashMap<C, Integer>();
+			Map<C, Integer> map = new HashMap<>();
 			int index = 0;
 			for (C currentCompound : sortedCompounds(cs)) {
 				C upperCasedCompound = getOptionalUpperCasedCompound(currentCompound, cs);
@@ -143,7 +143,7 @@ private C getOptionalUpperCasedCompound(C currentCompound, CompoundSet<C> cs) {
 		}
 
 		private List<C> sortedCompounds(final CompoundSet<C> cs) {
-			List<C> compounds = new ArrayList<C>(cs.getAllCompounds());
+			List<C> compounds = new ArrayList<>(cs.getAllCompounds());
 			Collections.sort(compounds, new Comparator<C>() {
 
 
@@ -165,7 +165,7 @@ public int compare(C o1, C o2) {
 		protected List<C> generateIndexToCompounds() {
 			CompoundSet<C> cs = getCompoundSet();
 			Map<C, Integer> lookup = getCompoundsToIndexLookup();
-			Map<Integer, C> tempMap = new HashMap<Integer, C>();
+			Map<Integer, C> tempMap = new HashMap<>();
 			//First get the reverse lookup working
 			for (C compound : lookup.keySet()) {
 				C upperCasedCompound = getOptionalUpperCasedCompound(compound, cs);
@@ -174,8 +174,8 @@ protected List<C> generateIndexToCompounds() {
 			}
 
 			//Then populate the results by going back through the sorted integer keys
-			List<C> compounds = new ArrayList<C>();
-			List<Integer> keys = new ArrayList<Integer>(tempMap.keySet());
+			List<C> compounds = new ArrayList<>();
+			List<Integer> keys = new ArrayList<>(tempMap.keySet());
 			Collections.sort(keys);
 			for (Integer key : keys) {
 				compounds.add(tempMap.get(key));
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/JoiningSequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/JoiningSequenceReader.java
index a18d406d73..46a0501b8a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/JoiningSequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/JoiningSequenceReader.java
@@ -86,7 +86,7 @@ public JoiningSequenceReader(CompoundSet<C> compoundSet, List<Sequence<C>> seque
 	}
 
 	private List<Sequence<C>> grepSequences(List<Sequence<C>> sequences) {
-		List<Sequence<C>> seqs = new ArrayList<Sequence<C>>();
+		List<Sequence<C>> seqs = new ArrayList<>();
 		for (Sequence<C> s : sequences) {
 			if (s.getLength() != 0) {
 				seqs.add(s);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SingleCompoundSequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SingleCompoundSequenceReader.java
index 554b7b8361..b02c1e0c77 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SingleCompoundSequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SingleCompoundSequenceReader.java
@@ -146,7 +146,7 @@ public List<C> getAsList() {
 
 	@Override
 	public SequenceView<C> getSubSequence(Integer start, Integer end) {
-		return new SequenceProxyView<C>(this, start, end);
+		return new SequenceProxyView<>(this, start, end);
 	}
 
 	/**
@@ -182,7 +182,7 @@ public int countCompounds(C... compounds) {
 
 	@Override
 	public Iterator<C> iterator() {
-		return new SequenceMixin.SequenceIterator<C>(this);
+		return new SequenceMixin.SequenceIterator<>(this);
 	}
 
 	@Override
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/TwoBitSequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/TwoBitSequenceReader.java
index 1d739905d0..6384638557 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/TwoBitSequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/TwoBitSequenceReader.java
@@ -133,7 +133,7 @@ protected Map<C, Integer> generateCompoundsToIndex() {
 		@Override
 		protected List<C> generateIndexToCompounds() {
 			CompoundSet<C> cs = getCompoundSet();
-			List<C> result = new ArrayList<C>();
+			List<C> result = new ArrayList<>();
 			result.add( cs.getCompoundForString("T"));
 
 			result.add( cs.getCompoundForString("C"));
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractCompoundSet.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractCompoundSet.java
index 579153a2fd..f7be44c572 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractCompoundSet.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractCompoundSet.java
@@ -39,11 +39,11 @@ public abstract class AbstractCompoundSet<C extends Compound> implements Compoun
 
 	private final static Logger logger = LoggerFactory.getLogger(AbstractCompoundSet.class);
 
-	private Map<CharSequence, C> charSeqToCompound = new HashMap<CharSequence, C>();
+	private Map<CharSequence, C> charSeqToCompound = new HashMap<>();
 	private int maxCompoundCharSequenceLength = -1;
 	private Boolean compoundStringLengthEqual = null;
 
-	Map<C,Set<C>> equivalentsMap = new HashMap<C, Set<C>>();
+	Map<C,Set<C>> equivalentsMap = new HashMap<>();
 
 	protected void addCompound(C compound, C lowerCasedCompound, Iterable<C> equivalents) {
 		addCompound(compound);
@@ -61,7 +61,7 @@ protected void addCompound(C compound, C lowerCasedCompound, Iterable<C> equival
 	}
 
 	protected void addCompound(C compound, C lowerCasedCompound, C... equivalents) {
-		List<C> equiv = new ArrayList<C>(equivalents.length);
+		List<C> equiv = new ArrayList<>(equivalents.length);
 		equiv.addAll(Arrays.asList(equivalents));
 		addCompound(compound, lowerCasedCompound, equiv);
 	}
@@ -69,7 +69,7 @@ protected void addCompound(C compound, C lowerCasedCompound, C... equivalents) {
 	protected void addEquivalent(C compound, C equivalent) {
 	 Set<C> s = equivalentsMap.get(compound);
 	 if ( s == null){
-		 s = new HashSet<C>();
+		 s = new HashSet<>();
 		 equivalentsMap.put(compound, s);
 	 }
 
@@ -170,7 +170,7 @@ public boolean isValidSequence(Sequence<C> sequence) {
 
 	@Override
 public List<C> getAllCompounds() {
-		return new ArrayList<C>(charSeqToCompound.values());
+		return new ArrayList<>(charSeqToCompound.values());
 	}
 
 	private void assertCompound(C compound) {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractCompoundTranslator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractCompoundTranslator.java
index e11af2b1de..3320a5edc6 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractCompoundTranslator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractCompoundTranslator.java
@@ -37,7 +37,7 @@ public abstract class AbstractCompoundTranslator<F extends Compound, T extends C
 	public AbstractCompoundTranslator(SequenceCreatorInterface<T> creator,
 			CompoundSet<F> fromCompoundSet, CompoundSet<T> toCompoundSet) {
 		this.creator = creator;
-		this.mapper = new HashMap<F, List<T>>();
+		this.mapper = new HashMap<>();
 		this.fromCompoundSet = fromCompoundSet;
 		this.toCompoundSet = toCompoundSet;
 	}
@@ -66,7 +66,7 @@ protected void addCompounds(F source, T... targets) {
 
 	 List<T> l = mapper.get(source);
 	 if ( l == null) {
-		 l = new ArrayList<T>();
+		 l = new ArrayList<>();
 		 mapper.put(source, l);
 	 }
 		 l.addAll(Arrays.asList(targets));
@@ -97,7 +97,7 @@ else if (compounds.size() > 1) {
 
 		@Override
 	public List<Sequence<T>> createSequences(Sequence<F> originalSequence) {
-		List<List<T>> workingList = new ArrayList<List<T>>();
+		List<List<T>> workingList = new ArrayList<>();
 		for (F source : originalSequence) {
 			List<T> compounds = translateMany(source);
 
@@ -126,7 +126,7 @@ public List<Sequence<T>> createSequences(Sequence<F> originalSequence) {
 
 	protected void addCompoundsToList(List<T> compounds, List<List<T>> workingList) {
 		int size = compounds.size();
-		List<List<T>> currentWorkingList = new ArrayList<List<T>>();
+		List<List<T>> currentWorkingList = new ArrayList<>();
 		for (int i = 0; i < size; i++) {
 			boolean last = (i == (size - 1));
 			// If last run we add the compound to the top set of lists & then
@@ -147,7 +147,7 @@ protected void addCompoundsToList(List<T> compounds, List<List<T>> workingList)
 	}
 
 	protected List<Sequence<T>> workingListToSequences(List<List<T>> workingList) {
-		List<Sequence<T>> sequences = new ArrayList<Sequence<T>>();
+		List<Sequence<T>> sequences = new ArrayList<>();
 		for (List<T> seqList : workingList) {
 			sequences.add(getCreator().getSequence(seqList));
 		}
@@ -155,7 +155,7 @@ protected List<Sequence<T>> workingListToSequences(List<List<T>> workingList) {
 	}
 
 	private List<List<T>> duplicateList(List<List<T>> incoming) {
-		List<List<T>> outgoing = new ArrayList<List<T>>();
+		List<List<T>> outgoing = new ArrayList<>();
 		for (List<T> current : incoming) {
 			outgoing.add(new ArrayList<T>(current));
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractNucleotideCompoundSet.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractNucleotideCompoundSet.java
index af6a8768e3..27e9721182 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractNucleotideCompoundSet.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractNucleotideCompoundSet.java
@@ -46,7 +46,7 @@ protected void addNucleotideCompound(String base, String complement, String... e
 		C upper = newNucleotideCompound(base.toUpperCase(), complement.toUpperCase(), upperEquivalents);
 		C lower = newNucleotideCompound(base.toLowerCase(), complement.toLowerCase(), lowerEquivalents);
 
-		List<C> equivalentCompounds = new ArrayList<C>();
+		List<C> equivalentCompounds = new ArrayList<>();
 
 		for(int i=0; i<equivalents.length; i++) {
 			equivalentCompounds.add(getCompoundForString(upperEquivalents[i]));
@@ -65,7 +65,7 @@ protected void addNucleotideCompound(String base, String complement, String... e
 	 */
 	@SuppressWarnings("unchecked")
 	protected void calculateIndirectAmbiguities() {
-		Map<NucleotideCompound, List<NucleotideCompound>> equivalentsMap = new HashMap<NucleotideCompound, List<NucleotideCompound>>();
+		Map<NucleotideCompound, List<NucleotideCompound>> equivalentsMap = new HashMap<>();
 
 		List<NucleotideCompound> ambiguousCompounds = getAllCompounds().stream()		 
                                                                                .filter(compound -> compound.isAmbiguous())
@@ -116,7 +116,7 @@ private void checkAdd(
 
 			List<NucleotideCompound> listS = equivalentsMap.get(key);
 			if ( listS == null){
-				listS = new ArrayList<NucleotideCompound>();
+				listS = new ArrayList<>();
 				equivalentsMap.put(key, listS);
 			}
 			listS.add(value);
@@ -137,7 +137,7 @@ private NucleotideCompound toLowerCase(NucleotideCompound compound) {
 	 * @return The ambiguity symbol which represents this set of nucleotides best
 	 */
 	public NucleotideCompound getAmbiguity(NucleotideCompound... compounds) {
-		Set<NucleotideCompound> settedCompounds = new HashSet<NucleotideCompound>();
+		Set<NucleotideCompound> settedCompounds = new HashSet<>();
 		for(NucleotideCompound compound: compounds) {
 			for(NucleotideCompound subCompound: compound.getConstituents()) {
 				settedCompounds.add(getCompoundForString(subCompound.getBase().toUpperCase()));
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java
index f68d7614cb..5797df9502 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java
@@ -65,15 +65,15 @@ public abstract class AbstractSequence<C extends Compound> implements Sequence<C
 	private Integer bioEnd = null;
 	private AbstractSequence<?> parentSequence = null;
 	private String source = null;
-	private ArrayList<String> notesList = new ArrayList<String>();
+	private ArrayList<String> notesList = new ArrayList<>();
 	private Double sequenceScore = null;
 	private FeaturesKeyWordInterface featuresKeyWord = null;
 	private DatabaseReferenceInterface databaseReferences = null;
 	private FeatureRetriever featureRetriever = null;
 	private ArrayList<FeatureInterface<AbstractSequence<C>, C>> features =
-			new ArrayList<FeatureInterface<AbstractSequence<C>, C>>();
+			new ArrayList<>();
 	private LinkedHashMap<String, ArrayList<FeatureInterface<AbstractSequence<C>, C>>> groupedFeatures =
-			new LinkedHashMap<String, ArrayList<FeatureInterface<AbstractSequence<C>, C>>>();
+			new LinkedHashMap<>();
 	private List<String> comments = new ArrayList<>();
 	private List<AbstractReference> references;
 
@@ -93,7 +93,7 @@ public AbstractSequence(String seqString, CompoundSet<C> compoundSet) throws Com
 
 	//  so it can be called from subclass constructors
 	protected void initSequenceStorage(String seqString) throws CompoundNotFoundException {
-		sequenceStorage = new ArrayListSequenceReader<C>();
+		sequenceStorage = new ArrayListSequenceReader<>();
 		sequenceStorage.setCompoundSet(this.getCompoundSet());
 		sequenceStorage.setContents(seqString);
 	}
@@ -354,7 +354,7 @@ public void setReferences(List<AbstractReference> references) {
 	 */
 	public List<FeatureInterface<AbstractSequence<C>, C>> getFeatures(String featureType, int bioSequencePosition) {
 		ArrayList<FeatureInterface<AbstractSequence<C>, C>> featureHits =
-				new ArrayList<FeatureInterface<AbstractSequence<C>, C>>();
+				new ArrayList<>();
 		List<FeatureInterface<AbstractSequence<C>, C>> features = getFeaturesByType(featureType);
 		if (features != null) {
 			for (FeatureInterface<AbstractSequence<C>, C> feature : features) {
@@ -373,7 +373,7 @@ public List<FeatureInterface<AbstractSequence<C>, C>> getFeatures(String feature
 	 */
 	public List<FeatureInterface<AbstractSequence<C>, C>> getFeatures(int bioSequencePosition) {
 		ArrayList<FeatureInterface<AbstractSequence<C>, C>> featureHits =
-				new ArrayList<FeatureInterface<AbstractSequence<C>, C>>();
+				new ArrayList<>();
 		if (features != null) {
 			for (FeatureInterface<AbstractSequence<C>, C> feature : features) {
 				if (bioSequencePosition >= feature.getLocations().getStart().getPosition() && bioSequencePosition <= feature.getLocations().getEnd().getPosition()) {
@@ -401,7 +401,7 @@ public List<FeatureInterface<AbstractSequence<C>, C>> getFeatures() {
 	 */
 	public void addFeature(int bioStart, int bioEnd, FeatureInterface<AbstractSequence<C>, C> feature) {
 		SequenceLocation<AbstractSequence<C>, C> sequenceLocation =
-				new SequenceLocation<AbstractSequence<C>, C>(bioStart, bioEnd, this);
+				new SequenceLocation<>(bioStart, bioEnd, this);
 		feature.setLocation(sequenceLocation);
 		addFeature(feature);
 	}
@@ -416,7 +416,7 @@ public void addFeature(FeatureInterface<AbstractSequence<C>, C> feature) {
 		features.add(feature);
 		ArrayList<FeatureInterface<AbstractSequence<C>, C>> featureList = groupedFeatures.get(feature.getType());
 		if (featureList == null) {
-			featureList = new ArrayList<FeatureInterface<AbstractSequence<C>, C>>();
+			featureList = new ArrayList<>();
 			groupedFeatures.put(feature.getType(), featureList);
 		}
 		featureList.add(feature);
@@ -447,7 +447,7 @@ public void removeFeature(FeatureInterface<AbstractSequence<C>, C> feature) {
 	public List<FeatureInterface<AbstractSequence<C>, C>> getFeaturesByType(String type) {
 		List<FeatureInterface<AbstractSequence<C>, C>> features = groupedFeatures.get(type);
 		if (features == null) {
-			features = new ArrayList<FeatureInterface<AbstractSequence<C>, C>>();
+			features = new ArrayList<>();
 		}
 		return features;
 	}
@@ -609,7 +609,7 @@ private SequenceReader<C> getSequenceStorage() {
 			//return parentSequence.getSequenceStorage();
 
 			if ( this.compoundSet.equals(parentSequence.getCompoundSet())){
-				sequenceStorage = new ArrayListSequenceReader<C>();
+				sequenceStorage = new ArrayListSequenceReader<>();
 				sequenceStorage.setCompoundSet(this.getCompoundSet());
 				try {
 					sequenceStorage.setContents(parentSequence.getSequenceAsString());
@@ -706,7 +706,7 @@ public int getLength() {
 	 */
 	@Override
 	public SequenceView<C> getSubSequence(final Integer bioStart, final Integer bioEnd) {
-		return new SequenceProxyView<C>(this, bioStart, bioEnd);
+		return new SequenceProxyView<>(this, bioStart, bioEnd);
 	}
 
 	/**
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceMixin.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceMixin.java
index d6efc03817..c3dec3d0bd 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceMixin.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceMixin.java
@@ -113,7 +113,7 @@ public static int countAT(Sequence<NucleotideCompound> sequence) {
 	 * sequence. Any compound not in the Map will return a fraction of 0.
 	 */
 	public static <C extends Compound> Map<C, Double> getDistribution(Sequence<C> sequence) {
-		Map<C, Double> results = new HashMap<C, Double>();
+		Map<C, Double> results = new HashMap<>();
 		Map<C, Integer> composition = getComposition(sequence);
 		double length = sequence.getLength();
 		for (Map.Entry<C, Integer> entry : composition.entrySet()) {
@@ -133,7 +133,7 @@ public static <C extends Compound> Map<C, Double> getDistribution(Sequence<C> se
 	 * @return Counts for the instances of all compounds in the sequence
 	 */
 	public static <C extends Compound> Map<C, Integer> getComposition(Sequence<C> sequence) {
-		Map<C, Integer> results = new HashMap<C, Integer>();
+		Map<C, Integer> results = new HashMap<>();
 
 		for (C currentCompound : sequence) {
 			Integer currentInteger = results.get(currentCompound);
@@ -187,7 +187,7 @@ public static <C extends Compound> String toString(Sequence<C> sequence) {
 	 * the Compounds of that {@link Sequence}.
 	 */
 	public static <C extends Compound> List<C> toList(Sequence<C> sequence) {
-		List<C> list = new ArrayList<C>(sequence.getLength());
+		List<C> list = new ArrayList<>(sequence.getLength());
 		for (C compound : sequence) {
 			list.add(compound);
 		}
@@ -229,7 +229,7 @@ public static <C extends Compound> int lastIndexOf(Sequence<C> sequence,
 	 */
 	public static <C extends Compound> Iterator<C> createIterator(
 			Sequence<C> sequence) {
-		return new SequenceIterator<C>(sequence);
+		return new SequenceIterator<>(sequence);
 	}
 
 	/**
@@ -237,7 +237,7 @@ public static <C extends Compound> Iterator<C> createIterator(
 	 */
 	public static <C extends Compound> SequenceView<C> createSubSequence(
 			Sequence<C> sequence, int start, int end) {
-		return new SequenceProxyView<C>(sequence, start, end);
+		return new SequenceProxyView<>(sequence, start, end);
 	}
 
 	/**
@@ -250,7 +250,7 @@ public static <C extends Compound> SequenceView<C> createSubSequence(
 	public static <C extends Compound> Sequence<C> shuffle(Sequence<C> sequence) {
 		List<C> compounds = sequence.getAsList();
 		Collections.shuffle(compounds);
-		return new ArrayListSequenceReader<C>(compounds,
+		return new ArrayListSequenceReader<>(compounds,
 				sequence.getCompoundSet());
 	}
 
@@ -275,8 +275,8 @@ public static <C extends Compound> String checksum(Sequence<C> sequence) {
 	 * @return The list of non-overlapping K-mers
 	 */
 	public static <C extends Compound> List<SequenceView<C>> nonOverlappingKmers(Sequence<C> sequence, int kmer) {
-		List<SequenceView<C>> l = new ArrayList<SequenceView<C>>();
-		WindowedSequence<C> w = new WindowedSequence<C>(sequence, kmer);
+		List<SequenceView<C>> l = new ArrayList<>();
+		WindowedSequence<C> w = new WindowedSequence<>(sequence, kmer);
 		for(SequenceView<C> view: w) {
 			l.add(view);
 		}
@@ -293,9 +293,9 @@ public static <C extends Compound> List<SequenceView<C>> nonOverlappingKmers(Seq
 	 * @return The list of overlapping K-mers
 	 */
 	public static <C extends Compound> List<SequenceView<C>> overlappingKmers(Sequence<C> sequence, int kmer) {
-		List<SequenceView<C>> l = new ArrayList<SequenceView<C>>();
+		List<SequenceView<C>> l = new ArrayList<>();
 		List<Iterator<SequenceView<C>>> windows
-				= new ArrayList<Iterator<SequenceView<C>>>();
+				= new ArrayList<>();
 
 		for(int i=1; i<=kmer; i++) {
 			if(i == 1) {
@@ -333,7 +333,7 @@ public static <C extends Compound> List<SequenceView<C>> overlappingKmers(Sequen
 	 */
 	@SuppressWarnings({ "unchecked" })
 	public static <C extends Compound> SequenceView<C> inverse(Sequence<C> sequence) {
-		SequenceView<C> reverse = new ReversedSequenceView<C>(sequence);
+		SequenceView<C> reverse = new ReversedSequenceView<>(sequence);
 		if(sequence.getCompoundSet().isComplementable()) {
 			return new ComplementSequenceView(reverse);
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceProxyView.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceProxyView.java
index f6e51dfad7..92023bd44e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceProxyView.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceProxyView.java
@@ -117,12 +117,12 @@ public CompoundSet<C> getCompoundSet() {
 
 	@Override
 	public SequenceView<C> getSubSequence(final Integer bioStart, final Integer bioEnd) {
-		return new SequenceProxyView<C>(this, bioStart, bioEnd);
+		return new SequenceProxyView<>(this, bioStart, bioEnd);
 	}
 
 	@Override
 	public Iterator<C> iterator() {
-		return new SequenceMixin.SequenceIterator<C>(this);
+		return new SequenceMixin.SequenceIterator<>(this);
 	}
 
 	@Override
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/DNAToRNATranslator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/DNAToRNATranslator.java
index 0016c86507..baafa9419d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/DNAToRNATranslator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/DNAToRNATranslator.java
@@ -65,7 +65,7 @@ public DNAToRNATranslator(SequenceCreatorInterface<NucleotideCompound> rnaCreato
 		@Override
 		public List<Sequence<NucleotideCompound>> createSequences(Sequence<NucleotideCompound> originalSequence) {
 				if(shortCutTranslation) {
-						List<Sequence<NucleotideCompound>> result = new ArrayList<Sequence<NucleotideCompound>>(1);
+						List<Sequence<NucleotideCompound>> result = new ArrayList<>(1);
 						result.add(wrapToRna(originalSequence));
 						return result;
 				}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/Frame.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/Frame.java
index 8f35c0eb03..eb0f4a91c6 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/Frame.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/Frame.java
@@ -83,7 +83,7 @@ public static Frame[] getAllFrames() {
 	public <C extends NucleotideCompound> Sequence<C> wrap(Sequence<C> incoming) {
 		Sequence<C> reversed;
 		if(reverse) {
-			reversed = new ComplementSequenceView<C>(new ReversedSequenceView<C>(incoming));
+			reversed = new ComplementSequenceView<>(new ReversedSequenceView<C>(incoming));
 		}
 		else {
 			reversed = incoming;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/RNAToAminoAcidTranslator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/RNAToAminoAcidTranslator.java
index e748b41387..f6d9f7ca84 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/RNAToAminoAcidTranslator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/RNAToAminoAcidTranslator.java
@@ -81,9 +81,9 @@ public RNAToAminoAcidTranslator(
 		this.initMetOnly = initMetOnly;
 		this.translateNCodons = translateNCodons;
 
-		quickLookup = new HashMap<Table.CaseInsensitiveTriplet, Codon>(codons
+		quickLookup = new HashMap<>(codons
 				.getAllCompounds().size());
-		aminoAcidToCodon = new HashMap<AminoAcidCompound, List<Codon>>();
+		aminoAcidToCodon = new HashMap<>();
 
 		List<Codon> codonList = table.getCodons(nucleotides, aminoAcids);
 		for (Codon codon : codonList) {
@@ -92,7 +92,7 @@ public RNAToAminoAcidTranslator(
 
 			List<Codon> codonL = aminoAcidToCodon.get(codon.getAminoAcid());
 			if (codonL == null) {
-				codonL = new ArrayList<Codon>();
+				codonL = new ArrayList<>();
 				aminoAcidToCodon.put(codon.getAminoAcid(), codonL);
 			}
 			codonL.add(codon);
@@ -114,7 +114,7 @@ public RNAToAminoAcidTranslator(
 	public List<Sequence<AminoAcidCompound>> createSequences(
 			Sequence<NucleotideCompound> originalSequence) {
 
-		List<List<AminoAcidCompound>> workingList = new ArrayList<List<AminoAcidCompound>>();
+		List<List<AminoAcidCompound>> workingList = new ArrayList<>();
 
 		Iterable<SequenceView<NucleotideCompound>> iter = new WindowedSequence<NucleotideCompound>(
 				originalSequence, 3);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/TranscriptionEngine.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/TranscriptionEngine.java
index 0ca5bc6f1a..162d760f05 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/TranscriptionEngine.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/TranscriptionEngine.java
@@ -125,7 +125,7 @@ public Sequence<AminoAcidCompound> translate(
 	 */
 	public Map<Frame, Sequence<AminoAcidCompound>> multipleFrameTranslation(
 			Sequence<NucleotideCompound> dna, Frame... frames) {
-		Map<Frame, Sequence<AminoAcidCompound>> results = new EnumMap<Frame, Sequence<AminoAcidCompound>>(
+		Map<Frame, Sequence<AminoAcidCompound>> results = new EnumMap<>(
 				Frame.class);
 		for (Frame frame : frames) {
 			Sequence<NucleotideCompound> rna = getDnaRnaTranslator()
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/views/RnaSequenceView.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/views/RnaSequenceView.java
index b0c00d6a60..cdb08052fd 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/views/RnaSequenceView.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/views/RnaSequenceView.java
@@ -90,9 +90,9 @@ public Map<NucleotideCompound, NucleotideCompound> getDnaToRna() {
 
 	protected void buildTranslators() {
 		Map<NucleotideCompound, NucleotideCompound> localDnaToRna =
-				new HashMap<NucleotideCompound, NucleotideCompound>();
+				new HashMap<>();
 		Map<NucleotideCompound, NucleotideCompound> localRnaToDna =
-				new HashMap<NucleotideCompound, NucleotideCompound>();
+				new HashMap<>();
 
 		NucleotideCompound thymine =
 				getViewedSequence().getCompoundSet().getCompoundForString("T");
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
index 6808ef01fb..09f8a6760d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
@@ -48,7 +48,7 @@ public class FlatFileCache {
 	/**
 	 * The cache singleton.
 	 */
-	private static SoftHashMap<String, byte[]> cache = new SoftHashMap<String, byte[]>(0);
+	private static SoftHashMap<String, byte[]> cache = new SoftHashMap<>(0);
 
 
 	// no public constructor;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/PrettyXMLWriter.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/PrettyXMLWriter.java
index 27485db5f5..437085866f 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/PrettyXMLWriter.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/PrettyXMLWriter.java
@@ -41,10 +41,10 @@ public class PrettyXMLWriter implements XMLWriter {
 	private boolean afterNewline = true;
 	private int indent = 0;
 
-	private Map<String, String> namespacePrefixes = new HashMap<String, String>();
+	private Map<String, String> namespacePrefixes = new HashMap<>();
 	private int namespaceSeed = 0;
-	private LinkedList<List<String>> namespaceBindings = new LinkedList<List<String>>();
-	private List<String> namespacesDeclared = new ArrayList<String>();
+	private LinkedList<List<String>> namespaceBindings = new LinkedList<>();
+	private List<String> namespacesDeclared = new ArrayList<>();
 
 	public PrettyXMLWriter(PrintWriter writer) {
 		this.writer = writer;
@@ -113,7 +113,7 @@ private String allocPrefix(String nsURI) {
 		namespacePrefixes.put(nsURI, prefix);
 		List<String> bindings = namespaceBindings.getLast();
 		if (bindings == null) {
-			bindings = new ArrayList<String>();
+			bindings = new ArrayList<>();
 			namespaceBindings.removeLast();
 			namespaceBindings.add(bindings);
 		}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java
index eef144080a..1b395828b5 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java
@@ -190,7 +190,7 @@ private double getDistance(int first, int second) {
 	private void updateIndicesToCheck(int m) {
 
 		if (indicesToCheck==null) {
-			indicesToCheck = new ArrayList<Integer>(numItems);
+			indicesToCheck = new ArrayList<>(numItems);
 
 			for (int i=0;i<numItems;i++) {
 				indicesToCheck.add(i);
@@ -250,7 +250,7 @@ public Map<Integer, Set<Integer>> getClusters(double cutoff) {
 			clusterIt();
 		}
 
-		Map<Integer, Set<Integer>> clusters = new TreeMap<Integer, Set<Integer>>();
+		Map<Integer, Set<Integer>> clusters = new TreeMap<>();
 
 		int clusterId = 1;
 
@@ -276,7 +276,7 @@ public Map<Integer, Set<Integer>> getClusters(double cutoff) {
 
 				if (firstClusterId==-1 && secondClusterId==-1) {
 					// neither member is in a cluster yet, let's assign a new cluster and put them both in
-					Set<Integer> members = new TreeSet<Integer>();
+					Set<Integer> members = new TreeSet<>();
 					members.add(dendrogram[i].getFirst());
 					members.add(dendrogram[i].getSecond());
 					clusters.put(clusterId, members);
@@ -319,7 +319,7 @@ public Map<Integer, Set<Integer>> getClusters(double cutoff) {
 		}
 
 		// reassigning cluster numbers by creating a new map (there can be gaps in the numbering if cluster-joining happened)
-		Map<Integer,Set<Integer>> finalClusters = new TreeMap<Integer, Set<Integer>>();
+		Map<Integer,Set<Integer>> finalClusters = new TreeMap<>();
 		int newClusterId = 1;
 		for (int oldClusterId:clusters.keySet()) {
 			finalClusters.put(newClusterId, clusters.get(oldClusterId));
@@ -336,7 +336,7 @@ public Map<Integer, Set<Integer>> getClusters(double cutoff) {
 				}
 			}
 			if (!isAlreadyClustered) {
-				Set<Integer> members = new TreeSet<Integer>();
+				Set<Integer> members = new TreeSet<>();
 				members.add(i);
 				finalClusters.put(newClusterId, members);
 				newClusterId++;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
index b0ac87519c..f3bcef0468 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
@@ -46,16 +46,16 @@ public class SoftHashMap<K, V> extends AbstractMap<K, V> {
 	public static final int DEFAULT_LIMIT = 1;
 
 	/** The internal HashMap that stores SoftReference to actual data. */
-	private final Map<K, SoftReference<V>> map = new HashMap<K, SoftReference<V>>();
+	private final Map<K, SoftReference<V>> map = new HashMap<>();
 
 	/** Maximum Number of references you dont want GC to collect. */
 	private final int max_limit;
 
 	/** The FIFO list of hard references, order of last access. */
-	private final LinkedList<V> hardCache = new LinkedList<V>();
+	private final LinkedList<V> hardCache = new LinkedList<>();
 
 	/** Reference queue for cleared SoftReference objects. */
-	private final ReferenceQueue<V> queue = new ReferenceQueue<V>();
+	private final ReferenceQueue<V> queue = new ReferenceQueue<>();
 
 	public SoftHashMap() {
 		this(1000);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
index d4eab71660..4344063e1d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
@@ -207,7 +207,7 @@ public static Element selectSingleElement(Element element, String xpathExpressio
 	 * @throws XPathExpressionException
 	 */
 	public static ArrayList<Element> selectElements(Element element, String xpathExpression) throws XPathExpressionException {
-		ArrayList<Element> resultVector = new ArrayList<Element>();
+		ArrayList<Element> resultVector = new ArrayList<>();
 		if (element == null) {
 			return resultVector;
 		}
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/GeneFeatureHelper.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/GeneFeatureHelper.java
index 7f7294801e..681ddb0910 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/GeneFeatureHelper.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/GeneFeatureHelper.java
@@ -42,7 +42,7 @@ public class GeneFeatureHelper {
 	private static final Logger logger = LoggerFactory.getLogger(GeneFeatureHelper.class);
 
 	static public LinkedHashMap<String, ChromosomeSequence> loadFastaAddGeneFeaturesFromUpperCaseExonFastaFile(File fastaSequenceFile, File uppercaseFastaFile, boolean throwExceptionGeneNotFound) throws Exception {
-		LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList = new LinkedHashMap<String, ChromosomeSequence>();
+		LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList = new LinkedHashMap<>();
 		LinkedHashMap<String, DNASequence> dnaSequenceList = FastaReaderHelper.readFastaDNASequence(fastaSequenceFile);
 		for (String accession : dnaSequenceList.keySet()) {
 			DNASequence contigSequence = dnaSequenceList.get(accession);
@@ -91,7 +91,7 @@ static public LinkedHashMap<String, ChromosomeSequence> loadFastaAddGeneFeatures
 						dnaSequence.getAccession().toString(), contigDNASequence.getAccession().toString(), bioStart, bioEnd, strand);
 				ChromosomeSequence chromosomeSequence = chromosomeSequenceList.get(accession);
 
-				ArrayList<Integer> exonBoundries = new ArrayList<Integer>();
+				ArrayList<Integer> exonBoundries = new ArrayList<>();
 
 				//look for transitions from lowercase to upper case
 				for (int i = 0; i < geneSequence.length(); i++) {
@@ -314,7 +314,7 @@ static public void addGeneIDGFF2GeneFeatures(LinkedHashMap<String, ChromosomeSeq
 	}
 
 	static public LinkedHashMap<String, ChromosomeSequence> getChromosomeSequenceFromDNASequence(LinkedHashMap<String, DNASequence> dnaSequenceList) {
-		LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList = new LinkedHashMap<String, ChromosomeSequence>();
+		LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList = new LinkedHashMap<>();
 		for (String key : dnaSequenceList.keySet()) {
 			DNASequence dnaSequence = dnaSequenceList.get(key);
 			ChromosomeSequence chromosomeSequence = new ChromosomeSequence(dnaSequence.getProxySequenceReader()); //we want the underlying sequence but don't need storage
@@ -836,7 +836,7 @@ static public void addGeneMarkGTFGeneFeatures(LinkedHashMap<String, ChromosomeSe
 	}
 
 	static public LinkedHashMap<String, ProteinSequence> getProteinSequences(Collection<ChromosomeSequence> chromosomeSequences) throws Exception {
-		LinkedHashMap<String, ProteinSequence> proteinSequenceHashMap = new LinkedHashMap<String, ProteinSequence>();
+		LinkedHashMap<String, ProteinSequence> proteinSequenceHashMap = new LinkedHashMap<>();
 		for (ChromosomeSequence dnaSequence : chromosomeSequences) {
 			for (GeneSequence geneSequence : dnaSequence.getGeneSequences().values()) {
 				for (TranscriptSequence transcriptSequence : geneSequence.getTranscripts().values()) {
@@ -865,7 +865,7 @@ static public LinkedHashMap<String, ProteinSequence> getProteinSequences(Collect
 	}
 
 	static public LinkedHashMap<String, GeneSequence> getGeneSequences(Collection<ChromosomeSequence> chromosomeSequences) throws Exception {
-		LinkedHashMap<String, GeneSequence> geneSequenceHashMap = new LinkedHashMap<String, GeneSequence>();
+		LinkedHashMap<String, GeneSequence> geneSequenceHashMap = new LinkedHashMap<>();
 		for (ChromosomeSequence chromosomeSequence : chromosomeSequences) {
 			for (GeneSequence geneSequence : chromosomeSequence.getGeneSequences().values()) {
 				geneSequenceHashMap.put(geneSequence.getAccession().getID(), geneSequence);
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/BlastHomologyHits.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/BlastHomologyHits.java
index 88881b37eb..0d40fe835c 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/BlastHomologyHits.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/BlastHomologyHits.java
@@ -33,7 +33,7 @@
 public class BlastHomologyHits {
 
 	static public LinkedHashMap<String, ArrayList<String>> getMatches(File xmlBlastHits, double ecutoff) throws Exception {
-		LinkedHashMap<String, ArrayList<String>> homologyHits = new LinkedHashMap<String, ArrayList<String>>();
+		LinkedHashMap<String, ArrayList<String>> homologyHits = new LinkedHashMap<>();
 		BlastXMLQuery blastXMLQuery = new BlastXMLQuery(xmlBlastHits.getAbsolutePath());
 		LinkedHashMap<String, ArrayList<String>> hits = blastXMLQuery.getHitsQueryDef(ecutoff);
 		for (String accessionid : hits.keySet()) {
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
index 7b7111c6a6..e8d7666348 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
@@ -79,7 +79,7 @@ public void process(LinkedHashMap<String, ArrayList<String>> hits, LinkedHashMap
 				}
 				ArrayList<String> uniprotProteinHits = hits.get(accessionid);
 				String uniprotBestHit = uniprotProteinHits.get(0);
-				UniprotProxySequenceReader<AminoAcidCompound> uniprotSequence = new UniprotProxySequenceReader<AminoAcidCompound>(uniprotBestHit, AminoAcidCompoundSet.getAminoAcidCompoundSet());
+				UniprotProxySequenceReader<AminoAcidCompound> uniprotSequence = new UniprotProxySequenceReader<>(uniprotBestHit, AminoAcidCompoundSet.getAminoAcidCompoundSet());
 
 				ProteinSequence proteinSequence = new ProteinSequence(uniprotSequence);
 				String hitSequence = proteinSequence.getSequenceAsString();
@@ -89,7 +89,7 @@ public void process(LinkedHashMap<String, ArrayList<String>> hits, LinkedHashMap
 					String predictedProteinSequence = transcriptSequence.getProteinSequence().getSequenceAsString();
 					ArrayList<ProteinSequence> cdsProteinList = transcriptSequence.getProteinCDSSequences();
 
-					ArrayList<CDSSequence> cdsSequenceList = new ArrayList<CDSSequence>(transcriptSequence.getCDSSequences().values());
+					ArrayList<CDSSequence> cdsSequenceList = new ArrayList<>(transcriptSequence.getCDSSequences().values());
 					String testSequence = "";
 					for (ProteinSequence cdsProteinSequence : cdsProteinList) {
 						testSequence = testSequence + cdsProteinSequence.getSequenceAsString();
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/FastqTools.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/FastqTools.java
index 437d7bd435..78191a7655 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/FastqTools.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/FastqTools.java
@@ -133,7 +133,7 @@ public static QualityFeature<AbstractSequence<NucleotideCompound>, NucleotideCom
 		{
 			throw new IllegalArgumentException("fastq must not be null");
 		}
-		QualityFeature<AbstractSequence<NucleotideCompound>, NucleotideCompound> qualityScores = new QualityFeature<AbstractSequence<NucleotideCompound>, NucleotideCompound>("qualityScores", "sequencing");
+		QualityFeature<AbstractSequence<NucleotideCompound>, NucleotideCompound> qualityScores = new QualityFeature<>("qualityScores", "sequencing");
 		qualityScores.setQualities(toList(qualityScores(fastq)));
 		return qualityScores;
 	}
@@ -153,7 +153,7 @@ public static QuantityFeature<AbstractSequence<NucleotideCompound>, NucleotideCo
 		{
 			throw new IllegalArgumentException("fastq must not be null");
 		}
-		QuantityFeature<AbstractSequence<NucleotideCompound>, NucleotideCompound> errorProbabilities = new QuantityFeature<AbstractSequence<NucleotideCompound>, NucleotideCompound>("errorProbabilities", "sequencing");
+		QuantityFeature<AbstractSequence<NucleotideCompound>, NucleotideCompound> errorProbabilities = new QuantityFeature<>("errorProbabilities", "sequencing");
 		errorProbabilities.setQuantities(toList(errorProbabilities(fastq)));
 		return errorProbabilities;
 	}
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/FastqVariant.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/FastqVariant.java
index efffbf4f78..3a93c5c057 100755
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/FastqVariant.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/io/fastq/FastqVariant.java
@@ -186,7 +186,7 @@ public double errorProbability(final int qualityScore)
 
 
 	/** Map of FASTQ sequence format variants keyed by name and lowercase-with-dashes name. */
-	private static final Map<String, FastqVariant> FASTQ_VARIANTS = new HashMap<String, FastqVariant>(6);
+	private static final Map<String, FastqVariant> FASTQ_VARIANTS = new HashMap<>(6);
 
 	static
 	{
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/cytoband/CytobandParser.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/cytoband/CytobandParser.java
index 560566b0b2..d7ab896b8a 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/cytoband/CytobandParser.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/cytoband/CytobandParser.java
@@ -52,7 +52,7 @@ public static void main(String[] args) {
 		try {
 			SortedSet<Cytoband> cytobands = me.getAllCytobands(new URL(
 					DEFAULT_LOCATION));
-			SortedSet<StainType> types = new TreeSet<StainType>();
+			SortedSet<StainType> types = new TreeSet<>();
 			for (Cytoband c : cytobands) {
 				logger.info("Cytoband: {}", c);
 				if (!types.contains(c.getType()))
@@ -77,7 +77,7 @@ public SortedSet<Cytoband> getAllCytobands(InputStream instream)
 		BufferedReader reader = new BufferedReader(new InputStreamReader(
 				instream));
 		String line = null;
-		SortedSet<Cytoband> cytobands = new TreeSet<Cytoband>();
+		SortedSet<Cytoband> cytobands = new TreeSet<>();
 		while ((line = reader.readLine()) != null) {
 			String[] spl = line.split("\t");
 			if (spl.length != 5) {
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/geneid/GeneIDXMLReader.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/geneid/GeneIDXMLReader.java
index a573a7062d..b509f73ab7 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/geneid/GeneIDXMLReader.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/geneid/GeneIDXMLReader.java
@@ -51,7 +51,7 @@ public GeneIDXMLReader(String geneidXMLFile) throws Exception {
 	}
 
 	public LinkedHashMap<String, ProteinSequence> getProteinSequences() throws Exception {
-		LinkedHashMap<String, ProteinSequence> proteinSequenceList = new LinkedHashMap<String, ProteinSequence>();
+		LinkedHashMap<String, ProteinSequence> proteinSequenceList = new LinkedHashMap<>();
 		ArrayList<Element> elementList = XMLHelper.selectElements(geneidDoc.getDocumentElement(), "prediction/gene/protein");
 		logger.info("{} hits", elementList.size());
 
@@ -68,7 +68,7 @@ public LinkedHashMap<String, ProteinSequence> getProteinSequences() throws Excep
 	}
 
 	public LinkedHashMap<String, DNASequence> getDNACodingSequences() throws Exception {
-		LinkedHashMap<String, DNASequence> dnaSequenceList = new LinkedHashMap<String, DNASequence>();
+		LinkedHashMap<String, DNASequence> dnaSequenceList = new LinkedHashMap<>();
 		ArrayList<Element> elementList = XMLHelper.selectElements(geneidDoc.getDocumentElement(), "prediction/gene/cDNA");
 		logger.info("{} hits", elementList.size());
 
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneChromosomePositionParser.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneChromosomePositionParser.java
index d7a06070c7..0ced7c5e00 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneChromosomePositionParser.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneChromosomePositionParser.java
@@ -79,7 +79,7 @@ public static List<GeneChromosomePosition> getChromosomeMappings() throws IOExce
 	public static List<GeneChromosomePosition> getChromosomeMappings(InputStream inStream) throws IOException {
 		BufferedReader reader = new BufferedReader(new InputStreamReader(inStream));
 
-		ArrayList<GeneChromosomePosition> gcps = new ArrayList<GeneChromosomePosition>();
+		ArrayList<GeneChromosomePosition> gcps = new ArrayList<>();
 
 		String line = null;
 		while ((line = reader.readLine()) != null) {
@@ -126,7 +126,7 @@ private static GeneChromosomePosition getGeneChromosomePosition(String line) {
 
 	private static List<Integer> getIntegerList(String lst){
 		String[] spl = lst.split(",");
-		ArrayList<Integer> l = new ArrayList<Integer>();
+		ArrayList<Integer> l = new ArrayList<>();
 		for (String s : spl){
 			l.add(Integer.parseInt(s));
 		}
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneNamesParser.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneNamesParser.java
index e39a34fd92..1ffba84b52 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneNamesParser.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/genename/GeneNamesParser.java
@@ -92,7 +92,7 @@ public static List<GeneName> getGeneNames() throws IOException{
 	 */
 	public static List<GeneName> getGeneNames(InputStream inStream) throws IOException{
 
-		ArrayList<GeneName> geneNames = new ArrayList<GeneName>();
+		ArrayList<GeneName> geneNames = new ArrayList<>();
 		BufferedReader reader = new BufferedReader(new InputStreamReader(inStream));
 
 		// skip reading first line (it is the legend)
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Feature.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Feature.java
index 9d750f850e..c5c9e07e1e 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Feature.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Feature.java
@@ -153,7 +153,7 @@ public Feature(Feature feature) {
 		mFrame = feature.mFrame;
 		mAttributes = feature.mAttributes;
 		initAttributeHashMap();
-		mUserMap = new HashMap<String, String>(feature.mUserMap);
+		mUserMap = new HashMap<>(feature.mUserMap);
 	}
 
 	/**
@@ -177,7 +177,7 @@ public Feature(String seqname, String source, String type, Location location, Do
 		mFrame = frame;
 		mAttributes = attributes;
 		initAttributeHashMap();
-		mUserMap = new HashMap<String, String>();
+		mUserMap = new HashMap<>();
 
 	}
 
@@ -199,7 +199,7 @@ public HashMap<String, String> userData() {
 		return mUserMap;
 	}
 
-	 HashMap<String,String> attributeHashMap = new HashMap<String,String>();
+	 HashMap<String,String> attributeHashMap = new HashMap<>();
 
 	private void initAttributeHashMap(){
 	   String[] values = mAttributes.split(";");
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/FeatureHelper.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/FeatureHelper.java
index 1383276ce2..bcdc0bc32b 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/FeatureHelper.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/FeatureHelper.java
@@ -38,7 +38,7 @@ public class FeatureHelper {
 	 */
 	static public LinkedHashMap<String,FeatureList> buildFeatureAtrributeIndex(String attribute,FeatureList list){
 
-		LinkedHashMap<String,FeatureList> featureHashMap = new LinkedHashMap<String,FeatureList>();
+		LinkedHashMap<String,FeatureList> featureHashMap = new LinkedHashMap<>();
 		FeatureList featureList = list.selectByAttribute(attribute);
 		for(FeatureI feature : featureList){
 			String value = feature.getAttribute(attribute);
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/FeatureList.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/FeatureList.java
index 19b7afec93..344fe34141 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/FeatureList.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/FeatureList.java
@@ -40,7 +40,7 @@
 @SuppressWarnings("serial")
 public class FeatureList extends ArrayList<FeatureI> {
 
-	 Map<String, Map<String,List<FeatureI>>> featindex = new HashMap<String,Map<String,List<FeatureI>>>();
+	 Map<String, Map<String,List<FeatureI>>> featindex = new HashMap<>();
 	Location mLocation;			//genomic location (union of feature locations)
 
 	/**
@@ -81,11 +81,11 @@ public boolean add(FeatureI feature) {
 			if (featindex.containsKey(entry.getKey())){
 				Map<String,List<FeatureI>> feat = featindex.get(entry.getKey());
 				if (feat==null){
-					feat= new HashMap<String,List<FeatureI>>();
+					feat= new HashMap<>();
 				}
 				List<FeatureI> features = feat.get(entry.getValue());
 				if (features==null){
-					features = new ArrayList<FeatureI>();
+					features = new ArrayList<>();
 				}
 				features.add(feature);
 				feat.put(entry.getValue(), features);
@@ -185,7 +185,7 @@ public String splice(DNASequence sequence) {
 	 * the order of features in the list.
 	 */
 	public Collection<String> groupValues() {
-		Set<String> set = new HashSet<String>();
+		Set<String> set = new HashSet<>();
 		for (FeatureI f : this) {
 			//enter in a set -- removes duplicates
 			set.add(f.group());
@@ -207,10 +207,10 @@ public Collection<String> attributeValues(String key) {
 		if (featindex.containsKey(key)){
 			Map<String, List<FeatureI>> map = featindex.get(key);
 			Collection<String> result = map.keySet();
-			if (result == null) result = new HashSet<String>();
+			if (result == null) result = new HashSet<>();
 			return Collections.unmodifiableCollection(result);
 		}
-		LinkedHashMap<String, String> hash = new LinkedHashMap<String, String>();
+		LinkedHashMap<String, String> hash = new LinkedHashMap<>();
 		for (FeatureI f : this) {
 			//enter as a key -- removes duplicates
 			hash.put(f.getAttribute(key), null);
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java
index 6378a846c5..4d5980fa23 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java
@@ -91,7 +91,7 @@ public void write(OutputStream outputStream, LinkedHashMap<String, ChromosomeSeq
 					outputStream.write(gff3line.getBytes());
 
 					String transcriptParentName = geneSequence.getAccession().getID() + "." + transcriptIndex;
-					ArrayList<CDSSequence> cdsSequenceList = new ArrayList<CDSSequence>(transcriptSequence.getCDSSequences().values());
+					ArrayList<CDSSequence> cdsSequenceList = new ArrayList<>(transcriptSequence.getCDSSequences().values());
 					Collections.sort(cdsSequenceList, new SequenceComparator());
 					for (CDSSequence cdsSequence : cdsSequenceList) {
 						gff3line = key + "\t" + cdsSequence.getSource() + "\t" + "CDS" + "\t" + cdsSequence.getBioBegin() + "\t" + cdsSequence.getBioEnd() + "\t";
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitParser.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitParser.java
index 7818b93996..122dc4e6c8 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitParser.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/twobit/TwoBitParser.java
@@ -52,7 +52,7 @@ public class TwoBitParser extends InputStream {
 	private File f;
 	private boolean reverse = false;
 	private String[] seq_names;
-	private HashMap<String,Long> seq2pos = new HashMap<String,Long>();
+	private HashMap<String,Long> seq2pos = new HashMap<>();
 	private String cur_seq_name;
 	private long[][] cur_nn_blocks;
 	private long[][] cur_mask_blocks;
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/query/BlastXMLQuery.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/query/BlastXMLQuery.java
index ff5e1318d0..3f3cccf654 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/query/BlastXMLQuery.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/query/BlastXMLQuery.java
@@ -47,7 +47,7 @@ public BlastXMLQuery(String blastFile) throws Exception {
 	}
 
 	public LinkedHashMap<String, ArrayList<String>> getHitsQueryDef(double maxEScore) throws Exception {
-		LinkedHashMap<String, ArrayList<String>> hitsHashMap = new LinkedHashMap<String, ArrayList<String>>();
+		LinkedHashMap<String, ArrayList<String>> hitsHashMap = new LinkedHashMap<>();
 		logger.info("Query for hits");
 		ArrayList<Element> elementList = XMLHelper.selectElements(blastDoc.getDocumentElement(), "BlastOutput_iterations/Iteration[Iteration_hits]");
 		logger.info("{} hits", elementList.size());
@@ -69,7 +69,7 @@ public LinkedHashMap<String, ArrayList<String>> getHitsQueryDef(double maxEScore
 					if (evalue <= maxEScore) {
 						ArrayList<String> hits = hitsHashMap.get(querydef);
 						if (hits == null) {
-							hits = new ArrayList<String>();
+							hits = new ArrayList<>();
 							hitsHashMap.put(querydef, hits);
 						}
 						hits.add(hitaccession);
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/uniprot/UniprotToFasta.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/uniprot/UniprotToFasta.java
index 66a9d2a086..2806e83d9d 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/uniprot/UniprotToFasta.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/uniprot/UniprotToFasta.java
@@ -67,10 +67,10 @@ public void process( String uniprotDatFileName,String fastaFileName ) throws Exc
 			String line = br.readLine();
 			String id = "";
 			StringBuffer sequence = new StringBuffer();
-			ArrayList<ProteinSequence> seqCodingRegionsList = new ArrayList<ProteinSequence>();
+			ArrayList<ProteinSequence> seqCodingRegionsList = new ArrayList<>();
 			int count = 0;
-			HashMap<String,String> uniqueGenes = new HashMap<String,String>();
-			HashMap<String,String> uniqueSpecies = new HashMap<String,String>();
+			HashMap<String,String> uniqueGenes = new HashMap<>();
+			HashMap<String,String> uniqueSpecies = new HashMap<>();
 			while(line != null){
 				if(line.startsWith("ID")){
 					String[] data = line.split(" ");
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/util/SplitFasta.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/util/SplitFasta.java
index 4948a62c76..9018749f33 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/util/SplitFasta.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/util/SplitFasta.java
@@ -52,7 +52,7 @@ public void processNucleotides(File fastaFileName,String uniqueid, File outputDi
 			}else{
 				fileName = fileName + uniqueid + dnaSequence.getAccession().getID() + ".fna";
 			}
-			ArrayList<DNASequence> dnaList = new ArrayList<DNASequence>();
+			ArrayList<DNASequence> dnaList = new ArrayList<>();
 			dnaList.add(dnaSequence);
 			FastaWriterHelper.writeNucleotideSequence(new File(fileName), dnaList);
 		}
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/Component.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/Component.java
index ff4b0abb82..4a35ff5218 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/Component.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/Component.java
@@ -50,10 +50,10 @@ public final class Component {
 	 */
 	private static void lazyInit() {
 		if (components==null) {
-			components = new HashSet<Component>();
-			nonTerminalComps = new HashMap<Set<String>, Component>();
-			nTerminalAminoAcids = new HashMap<Set<String>, Component>();
-			cTerminalAminoAcids = new HashMap<Set<String>, Component>();
+			components = new HashSet<>();
+			nonTerminalComps = new HashMap<>();
+			nTerminalAminoAcids = new HashMap<>();
+			cTerminalAminoAcids = new HashMap<>();
 		}
 	}
 
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationCategory.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationCategory.java
index 89d9bd9720..8dcadab400 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationCategory.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationCategory.java
@@ -108,7 +108,7 @@ public static ModificationCategory getByLabel(String label) {
 
 	private static Map<String, ModificationCategory> mapLabelCat;
 	static {
-		mapLabelCat = new HashMap<String, ModificationCategory>();
+		mapLabelCat = new HashMap<>();
 		for (ModificationCategory cat:ModificationCategory.values()) {
 			mapLabelCat.put(cat.label, cat);
 		}
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationConditionImpl.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationConditionImpl.java
index 2af28ed33f..5cb7857bdd 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationConditionImpl.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationConditionImpl.java
@@ -49,7 +49,7 @@ public ModificationConditionImpl(final List<Component> components,
 
 
 		if (components.size() > 1) {
-			Set<Integer> indices = new HashSet<Integer>();
+			Set<Integer> indices = new HashSet<>();
 			for (ModificationLinkage linkage : linkages) {
 				indices.add(linkage.getIndexOfComponent1());
 				indices.add(linkage.getIndexOfComponent2());
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationOccurrenceType.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationOccurrenceType.java
index 30a4bad4e0..3fdcef1e0a 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationOccurrenceType.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationOccurrenceType.java
@@ -73,7 +73,7 @@ public static ModificationOccurrenceType getByLabel(String label) {
 
 	private static Map<String, ModificationOccurrenceType> mapLabelOcc;
 	static {
-		mapLabelOcc = new HashMap<String, ModificationOccurrenceType>();
+		mapLabelOcc = new HashMap<>();
 		for (ModificationOccurrenceType occ:ModificationOccurrenceType.values()) {
 			mapLabelOcc.put(occ.label, occ);
 		}
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ProteinModificationImpl.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ProteinModificationImpl.java
index a06ee41936..dd4f11d41f 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ProteinModificationImpl.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ProteinModificationImpl.java
@@ -251,7 +251,7 @@ public static class Builder {
 		private String sysName = null;
 		private String formula = null;
 
-		private Set<String> keywords = new LinkedHashSet<String>();
+		private Set<String> keywords = new LinkedHashSet<>();
 
 		/**
 		 *
@@ -289,7 +289,7 @@ public Builder(final ProteinModification copyFrom) {
 			this.sysName = copyFrom.getSystematicName();
 			this.formula = copyFrom.getFormula();
 
-			this.keywords = new LinkedHashSet<String>(copyFrom.getKeywords());
+			this.keywords = new LinkedHashSet<>(copyFrom.getKeywords());
 		}
 
 		public Builder setCategory(final ModificationCategory cat) {
@@ -448,7 +448,7 @@ private ProteinModificationImpl(Builder builder) {
 		this.sysName = builder.sysName;
 		this.formula = builder.formula;
 
-		this.keywords = new LinkedHashSet<String>(builder.keywords);
+		this.keywords = new LinkedHashSet<>(builder.keywords);
 	}
 
 	@Override
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ProteinModificationRegistry.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ProteinModificationRegistry.java
index 54babab8e1..043aa3d779 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ProteinModificationRegistry.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ProteinModificationRegistry.java
@@ -109,19 +109,19 @@ private static synchronized void lazyInit() {
 	private static synchronized void lazyInit(InputStream inStream) {
 		if (registry==null) {
 
-			registry = 	new HashSet<ProteinModification>();
-			byId = new HashMap<String, ProteinModification>();
-			byResidId = new HashMap<String, Set<ProteinModification>>();
-			byPsimodId = new HashMap<String, Set<ProteinModification>>();
-			byPdbccId = new HashMap<String, Set<ProteinModification>>();
-			byKeyword = new HashMap<String, Set<ProteinModification>>();
-			byComponent = new HashMap<Component, Set<ProteinModification>>();
-			byCategory = new EnumMap<ModificationCategory, Set<ProteinModification>>(
+			registry = 	new HashSet<>();
+			byId = new HashMap<>();
+			byResidId = new HashMap<>();
+			byPsimodId = new HashMap<>();
+			byPdbccId = new HashMap<>();
+			byKeyword = new HashMap<>();
+			byComponent = new HashMap<>();
+			byCategory = new EnumMap<>(
 					ModificationCategory.class);
 			for (ModificationCategory cat:ModificationCategory.values()) {
 				byCategory.put(cat, new HashSet<ProteinModification>());
 			}
-			byOccurrenceType = new EnumMap<ModificationOccurrenceType, Set<ProteinModification>>(
+			byOccurrenceType = new EnumMap<>(
 					ModificationOccurrenceType.class);
 			for (ModificationOccurrenceType occ:ModificationOccurrenceType.values()) {
 				byOccurrenceType.put(occ, new HashSet<ProteinModification>());
@@ -158,7 +158,7 @@ public static void register(final ProteinModification modification) {
 		for (Component comp:comps) {
 			Set<ProteinModification> mods = byComponent.get(comp);
 			if (mods==null) {
-				mods = new HashSet<ProteinModification>();
+				mods = new HashSet<>();
 				byComponent.put(comp, mods);
 			}
 			mods.add(modification);
@@ -168,7 +168,7 @@ public static void register(final ProteinModification modification) {
 		if (pdbccId!=null) {
 			Set<ProteinModification> mods = byPdbccId.get(pdbccId);
 			if (mods==null) {
-				mods = new HashSet<ProteinModification>();
+				mods = new HashSet<>();
 				byPdbccId.put(pdbccId, mods);
 			}
 			mods.add(modification);
@@ -178,7 +178,7 @@ public static void register(final ProteinModification modification) {
 		if (residId!=null) {
 			Set<ProteinModification> mods = byResidId.get(residId);
 			if (mods==null) {
-				mods = new HashSet<ProteinModification>();
+				mods = new HashSet<>();
 				byResidId.put(residId, mods);
 			}
 			mods.add(modification);
@@ -188,7 +188,7 @@ public static void register(final ProteinModification modification) {
 		if (psimodId!=null) {
 			Set<ProteinModification> mods = byPsimodId.get(psimodId);
 			if (mods==null) {
-				mods = new HashSet<ProteinModification>();
+				mods = new HashSet<>();
 				byPsimodId.put(psimodId, mods);
 			}
 			mods.add(modification);
@@ -197,7 +197,7 @@ public static void register(final ProteinModification modification) {
 		for (String keyword : modification.getKeywords()) {
 			Set<ProteinModification> mods = byKeyword.get(keyword);
 			if (mods==null) {
-				mods = new HashSet<ProteinModification>();
+				mods = new HashSet<>();
 				byKeyword.put(keyword, mods);
 			}
 			mods.add(modification);
@@ -308,7 +308,7 @@ public static Set<ProteinModification> getByComponent(final Component comp1,
 		if (comps.length==0) {
 			return Collections.unmodifiableSet(mods);
 		} else {
-			Set<ProteinModification> ret = new HashSet<ProteinModification>(mods);
+			Set<ProteinModification> ret = new HashSet<>(mods);
 			for (Component comp:comps) {
 				mods = byComponent.get(comp);
 				if (mods==null) {
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ComponentXMLConverter.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ComponentXMLConverter.java
index 67f1ce5eee..15d635f4da 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ComponentXMLConverter.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ComponentXMLConverter.java
@@ -74,7 +74,7 @@ public static Component fromXML(Node componentN) {
 		boolean isNTerminal = Boolean.parseBoolean(nTerminalS);
 		boolean isCTerminal = Boolean.parseBoolean(cTerminalS);
 
-		Set<String>pdbccIds = new HashSet<String>();
+		Set<String>pdbccIds = new HashSet<>();
 
 		NodeList valList = componentN.getChildNodes();
 		int numChildren  = valList.getLength();
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ModifiedCompoundXMLConverter.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ModifiedCompoundXMLConverter.java
index b408c3cc9a..187e113924 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ModifiedCompoundXMLConverter.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ModifiedCompoundXMLConverter.java
@@ -110,7 +110,7 @@ public static ModifiedCompound fromXML(String xml){
 		ProteinModification modification = null;
 		//Collection<StructureAtomLinkage> linkages = new ArrayList<StructureAtomLinkage>();
 		StructureAtomLinkage[] linkages = null;
-		List<StructureGroup> structureGroups = new ArrayList<StructureGroup>();
+		List<StructureGroup> structureGroups = new ArrayList<>();
 		try
 		{
 			//Convert string to XML document
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ProteinModificationXmlReader.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ProteinModificationXmlReader.java
index f1769b816d..598cd17835 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ProteinModificationXmlReader.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/io/ProteinModificationXmlReader.java
@@ -121,14 +121,14 @@ public static void registerProteinModificationFromXml(InputStream isXml)
 				Node compsNode = nodes.get(0);
 
 				// keep track of the labels of component indices
-				Map<String,Integer> mapLabelComp = new HashMap<String,Integer>();
+				Map<String,Integer> mapLabelComp = new HashMap<>();
 
 				Map<String,List<Node>> compInfoNodes = getChildNodes(compsNode);
 
 				// components
 				List<Node> compNodes = compInfoNodes.get("Component");
 				int sizeComp = compNodes.size();
-				List<Component> comps = new ArrayList<Component>(sizeComp);
+				List<Component> comps = new ArrayList<>(sizeComp);
 				for (int iComp=0; iComp<sizeComp; iComp++) {
 					Node compNode = compNodes.get(iComp);
 					// comp label
@@ -146,7 +146,7 @@ public static void registerProteinModificationFromXml(InputStream isXml)
 					}
 
 					// comp PDBCC ID
-					Set<String> compIds = new HashSet<String>();
+					Set<String> compIds = new HashSet<>();
 					List<Node> compIdNodes = getChildNodes(compNode).get("Id");
 					if (compIdNodes!=null) {
 						for (Node compIdNode : compIdNodes) {
@@ -199,7 +199,7 @@ public static void registerProteinModificationFromXml(InputStream isXml)
 				List<ModificationLinkage> linkages = null;
 				if (bondNodes!=null) {
 					int sizeBonds = bondNodes.size();
-					linkages = new ArrayList<ModificationLinkage>(sizeBonds);
+					linkages = new ArrayList<>(sizeBonds);
 					for (int iBond=0; iBond<sizeBonds; iBond++) {
 						Node bondNode = bondNodes.get(iBond);
 						Map<String,List<Node>> bondChildNodes = getChildNodes(bondNode);
@@ -342,7 +342,7 @@ private static Map<String,List<Node>> getChildNodes(Node parent) {
 		if (parent==null)
 			return Collections.emptyMap();
 
-		Map<String,List<Node>> children = new HashMap<String,List<Node>>();
+		Map<String,List<Node>> children = new HashMap<>();
 
 		NodeList nodes = parent.getChildNodes();
 		int nNodes = nodes.getLength();
@@ -354,7 +354,7 @@ private static Map<String,List<Node>> getChildNodes(Node parent) {
 			String name = node.getNodeName();
 			List<Node> namesakes = children.get(name);
 			if (namesakes==null) {
-				namesakes = new ArrayList<Node>();
+				namesakes = new ArrayList<>();
 				children.put(name, namesakes);
 			}
 			namesakes.add(node);
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ModifiedCompoundImpl.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ModifiedCompoundImpl.java
index e42d987e61..889d3948b2 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ModifiedCompoundImpl.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ModifiedCompoundImpl.java
@@ -75,7 +75,7 @@ public ModifiedCompoundImpl (
 			throw new IllegalArgumentException("Null argument(s)");
 		}
 
-		groups = new HashSet<StructureGroup>(1);
+		groups = new HashSet<>(1);
 		groups.add(modifiedResidue);
 
 		// is it possible that components be added by addLinkage later?
@@ -101,7 +101,7 @@ public ModifiedCompoundImpl( ProteinModification modification,
 			throw new IllegalArgumentException("at least one linkage.");
 		}
 
-		this.groups = new HashSet<StructureGroup>();
+		this.groups = new HashSet<>();
 
 		addAtomLinkages(linkages);
 
@@ -128,7 +128,7 @@ else if (originalModification.getCategory()!=ModificationCategory.UNDEFINED)
 			modification = originalModification;
 		else {
 			int nRes = 0;
-			Set<String> ligands = new HashSet<String>();
+			Set<String> ligands = new HashSet<>();
 			for (StructureGroup group : groups) {
 				if (group.isAminoAcid()) {
 					nRes ++;
@@ -174,7 +174,7 @@ public Set<StructureGroup> getGroups() {
 
 	@Override
 	public Set<StructureGroup> getGroups(boolean isAminoAcid) {
-		Set<StructureGroup> result = new HashSet<StructureGroup>();
+		Set<StructureGroup> result = new HashSet<>();
 		for (StructureGroup group : groups) {
 			if (group.isAminoAcid() == isAminoAcid) {
 				result.add(group);
@@ -194,7 +194,7 @@ public Set<StructureAtomLinkage> getAtomLinkages() {
 		if (atomLinkages==null) {
 			return Collections.emptySet();
 		} else {
-			Set<StructureAtomLinkage> result = new HashSet<StructureAtomLinkage>();
+			Set<StructureAtomLinkage> result = new HashSet<>();
 			for (Set<StructureAtomLinkage> linkages : atomLinkages.values()) {
 				result.addAll(linkages);
 			}
@@ -218,17 +218,17 @@ public boolean addAtomLinkage(StructureAtomLinkage linkage) {
 			throw new IllegalArgumentException("Null linkage");
 		}
 
-		Set<StructureGroup> gs = new HashSet<StructureGroup>(2);
+		Set<StructureGroup> gs = new HashSet<>(2);
 		gs.add(linkage.getAtom1().getGroup());
 		gs.add(linkage.getAtom2().getGroup());
 
 		if (atomLinkages==null) {
-			atomLinkages = new HashMap<Set<StructureGroup>, Set<StructureAtomLinkage>>();
+			atomLinkages = new HashMap<>();
 		}
 
 		Set<StructureAtomLinkage> linkages = atomLinkages.get(gs);
 		if (linkages == null) {
-			linkages = new HashSet<StructureAtomLinkage>();
+			linkages = new HashSet<>();
 			atomLinkages.put(gs, linkages);
 			groups.addAll(gs); // it's possible of new groups
 		};
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ProteinModificationIdentifier.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ProteinModificationIdentifier.java
index f4a0a693a8..c9575a5444 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ProteinModificationIdentifier.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ProteinModificationIdentifier.java
@@ -267,9 +267,9 @@ public void identify(final List<Chain> chains,
 		}
 
 
-		residues = new ArrayList<Group>();
-		List<Group> ligands = new ArrayList<Group>();
-		Map<Component, Set<Group>> mapCompGroups = new HashMap<Component, Set<Group>>();
+		residues = new ArrayList<>();
+		List<Group> ligands = new ArrayList<>();
+		Map<Component, Set<Group>> mapCompGroups = new HashMap<>();
 
 		for (Chain chain : chains) {
 
@@ -292,7 +292,7 @@ public void identify(final List<Chain> chains,
 			}
 			logger.warn("No amino acids found for {}. Either you did not parse the PDB file with alignSEQRES records, or this record does not contain any amino acids.", pdbId);
 		}
-		List<ModifiedCompound> modComps = new ArrayList<ModifiedCompound>();
+		List<ModifiedCompound> modComps = new ArrayList<>();
 
 		for (ProteinModification mod : potentialModifications) {
 			ModificationCondition condition = mod.getCondition();
@@ -333,10 +333,10 @@ public void identify(final List<Chain> chains,
 	}
 
 	private void reset() {
-		identifiedModifiedCompounds = new LinkedHashSet<ModifiedCompound>();
+		identifiedModifiedCompounds = new LinkedHashSet<>();
 		if (recordUnidentifiableModifiedCompounds) {
-			unidentifiableAtomLinkages = new LinkedHashSet<StructureAtomLinkage>();
-			unidentifiableModifiedResidues = new LinkedHashSet<StructureGroup>();
+			unidentifiableAtomLinkages = new LinkedHashSet<>();
+			unidentifiableModifiedResidues = new LinkedHashSet<>();
 		}
 
 	}
@@ -392,7 +392,7 @@ private void identifyAdditionalAttachments(ModifiedCompound mc,
 		// ligands to amino acid bonds for same modification of unknown category
 		// will be combined in mergeModComps()
 		// TODO: how about chain-chain links?
-		List<Group> identifiedGroups = new ArrayList<Group>();
+		List<Group> identifiedGroups = new ArrayList<>();
 		for (StructureGroup num : mc.getGroups(false)) {
 			Group group;
 			try {
@@ -464,7 +464,7 @@ private Group getGroup(StructureGroup num, List<Chain> chains) throws StructureE
 	 * Merge identified modified compounds if linked.
 	 */
 	private void mergeModComps(List<ModifiedCompound> modComps) {
-		TreeSet<Integer> remove = new TreeSet<Integer>();
+		TreeSet<Integer> remove = new TreeSet<>();
 		int n = modComps.size();
 		for (int icurr=1; icurr<n; icurr++) {
 			ModifiedCompound curr = modComps.get(icurr);
@@ -512,7 +512,7 @@ private void recordUnidentifiableAtomLinkages(List<ModifiedCompound> modComps,
 			List<Group> ligands) {
 
 		// first put identified linkages in a map for fast query
-		Set<StructureAtomLinkage> identifiedLinkages = new HashSet<StructureAtomLinkage>();
+		Set<StructureAtomLinkage> identifiedLinkages = new HashSet<>();
 		for (ModifiedCompound mc : modComps) {
 			identifiedLinkages.addAll(mc.getAtomLinkages());
 		}
@@ -555,7 +555,7 @@ private void recordUnidentifiableAtomLinkages(List<ModifiedCompound> modComps,
 	}
 
 	private void recordUnidentifiableModifiedResidues(List<ModifiedCompound> modComps) {
-		Set<StructureGroup> identifiedComps = new HashSet<StructureGroup>();
+		Set<StructureGroup> identifiedComps = new HashSet<>();
 		for (ModifiedCompound mc : modComps) {
 			identifiedComps.addAll(mc.getGroups(true));
 		}
@@ -592,7 +592,7 @@ private void addModificationGroups(
 			throw new IllegalArgumentException("Null argument(s).");
 		}
 
-		Map<Component,Set<Component>> mapSingleMultiComps = new HashMap<Component,Set<Component>>();
+		Map<Component,Set<Component>> mapSingleMultiComps = new HashMap<>();
 		for (ProteinModification mod : modifications) {
 			ModificationCondition condition = mod.getCondition();
 			for (Component comp : condition.getComponents()) {
@@ -601,7 +601,7 @@ private void addModificationGroups(
 							comp.isNTerminal(), comp.isCTerminal());
 					Set<Component> mult = mapSingleMultiComps.get(single);
 					if (mult == null) {
-						mult = new HashSet<Component>();
+						mult = new HashSet<>();
 						mapSingleMultiComps.put(single, mult);
 					}
 					mult.add(comp);
@@ -621,7 +621,7 @@ private void addModificationGroups(
 				for (Component comp : unionComponentSet(ligandsWildCard, comps)) {
 					Set<Group> gs = saveTo.get(comp);
 					if (gs==null) {
-						gs = new LinkedHashSet<Group>();
+						gs = new LinkedHashSet<>();
 						saveTo.put(comp, gs);
 					}
 					gs.add(group);
@@ -647,7 +647,7 @@ private void addModificationGroups(
 				for (Component comp : unionComponentSet(residuesWildCard, comps)) {
 					Set<Group> gs = saveTo.get(comp);
 					if (gs==null) {
-						gs = new LinkedHashSet<Group>();
+						gs = new LinkedHashSet<>();
 						saveTo.put(comp, gs);
 					}
 					gs.add(group);
@@ -671,7 +671,7 @@ private void addModificationGroups(
 				for (Component comp : unionComponentSet(nTermWildCard, comps)) {
 					Set<Group> gs = saveTo.get(comp);
 					if (gs==null) {
-						gs = new LinkedHashSet<Group>();
+						gs = new LinkedHashSet<>();
 						saveTo.put(comp, gs);
 					}
 					gs.add(res);
@@ -693,7 +693,7 @@ private void addModificationGroups(
 				for (Component comp : unionComponentSet(cTermWildCard, comps)) {
 					Set<Group> gs = saveTo.get(comp);
 					if (gs==null) {
-						gs = new LinkedHashSet<Group>();
+						gs = new LinkedHashSet<>();
 						saveTo.put(comp, gs);
 					}
 					gs.add(res);
@@ -712,7 +712,7 @@ private Set<Component> unionComponentSet(Set<Component> set1, Set<Component> set
 		if (set2 == null)
 			return set1;
 
-		Set<Component> set = new HashSet<Component>(set1.size()+set2.size());
+		Set<Component> set = new HashSet<>(set1.size()+set2.size());
 		set.addAll(set1);
 		set.addAll(set2);
 
@@ -728,7 +728,7 @@ private List<List<Atom[]>> getMatchedAtomsOfLinkages(
 		int nLink = linkages.size();
 
 		List<List<Atom[]>> matchedAtomsOfLinkages =
-				new ArrayList<List<Atom[]>>(nLink);
+				new ArrayList<>(nLink);
 
 		for (int iLink=0; iLink<nLink; iLink++) {
 			ModificationLinkage linkage = linkages.get(iLink);
@@ -741,7 +741,7 @@ private List<List<Atom[]>> getMatchedAtomsOfLinkages(
 			Set<Group> groups1 = mapCompGroups.get(comp1);
 			Set<Group> groups2 = mapCompGroups.get(comp2);
 
-			List<Atom[]> list = new ArrayList<Atom[]>();
+			List<Atom[]> list = new ArrayList<>();
 
 			List<String> potentialNamesOfAtomOnGroup1 = linkage.getPDBNameOfPotentialAtomsOnComponent1();
 			for (String name : potentialNamesOfAtomOnGroup1) {
@@ -810,9 +810,9 @@ private void assembleLinkages(List<List<Atom[]>> matchedAtomsOfLinkages,
 
 		int nLink = matchedAtomsOfLinkages.size();
 		int[] indices = new int[nLink];
-		Set<ModifiedCompound> identifiedCompounds = new HashSet<ModifiedCompound>();
+		Set<ModifiedCompound> identifiedCompounds = new HashSet<>();
 		while (indices[0]<matchedAtomsOfLinkages.get(0).size()) {
-			List<Atom[]> atomLinkages = new ArrayList<Atom[]>(nLink);
+			List<Atom[]> atomLinkages = new ArrayList<>(nLink);
 			for (int iLink=0; iLink<nLink; iLink++) {
 				Atom[] atoms = matchedAtomsOfLinkages.get(iLink).get(indices[iLink]);
 				atomLinkages.add(atoms);
@@ -821,7 +821,7 @@ private void assembleLinkages(List<List<Atom[]>> matchedAtomsOfLinkages,
 				// matched
 
 				int n = atomLinkages.size();
-				List<StructureAtomLinkage> linkages = new ArrayList<StructureAtomLinkage>(n);
+				List<StructureAtomLinkage> linkages = new ArrayList<>(n);
 				for (int i=0; i<n; i++) {
 					Atom[] linkage = atomLinkages.get(i);
 					StructureAtomLinkage link = StructureUtil.getStructureAtomLinkage(
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/StructureUtil.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/StructureUtil.java
index 23d220e4cd..6999e4b2fd 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/StructureUtil.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/StructureUtil.java
@@ -180,7 +180,7 @@ public static List<Atom[]> findAtomLinkages(final Group group1,
 			throw new IllegalArgumentException("bondLengthTolerance cannot be negative.");
 		}
 
-		List<Atom[]> ret = new ArrayList<Atom[]>();
+		List<Atom[]> ret = new ArrayList<>();
 
 		if (potentialNamesOfAtomOnGroup1 == null) {
 			// if empty name, search for all atoms
@@ -323,7 +323,7 @@ public static List<String> getAtomNames(Group group) {
 		}
 
 		int n = atoms.size();
-		List<String> ret = new ArrayList<String>(n);
+		List<String> ret = new ArrayList<>(n);
 		for (int i=0; i<n; i++) {
 			ret.add(atoms.get(i).getName());
 		}
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Ontology.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Ontology.java
index 2e1f26cf50..b921fdd243 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Ontology.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Ontology.java
@@ -294,13 +294,13 @@ public final class Impl
 		private final OntologyOps ops;
 
 		{
-			terms            = new HashMap<String, Term>();
-			triples          = new HashSet<Triple>();
-			subjectTriples   = new HashMap<Term, Set<Triple>>();
-			objectTriples    = new HashMap<Term, Set<Triple>>();
-			relationTriples  = new HashMap<Term, Set<Triple>>();
-			remoteTerms      = new HashMap<Term, RemoteTerm>();
-			localRemoteTerms = new HashSet<Term>();
+			terms            = new HashMap<>();
+			triples          = new HashSet<>();
+			subjectTriples   = new HashMap<>();
+			objectTriples    = new HashMap<>();
+			relationTriples  = new HashMap<>();
+			remoteTerms      = new HashMap<>();
+			localRemoteTerms = new HashSet<>();
 		}
 
 		public Impl(String name, String description) {
@@ -337,7 +337,7 @@ public void setDescription(String description){
 
 		@Override
 		public Set<Term> getTerms() {
-			return new HashSet<Term>(terms.values());
+			return new HashSet<>(terms.values());
 		}
 
 		@Override
@@ -384,7 +384,7 @@ private Set<Triple> filterTriples(Set<Triple> base, Term subject, Term object, T
 				return Collections.unmodifiableSet(new HashSet<Triple>(base));
 			}
 
-			Set<Triple> retval = new HashSet<Triple>();
+			Set<Triple> retval = new HashSet<>();
 			for (Iterator<Triple> i = base.iterator(); i.hasNext(); ) {
 				Triple t = i.next();
 				if (subject != null && t.getSubject() != subject) {
@@ -566,7 +566,7 @@ private void addTriple(Triple t) {
 		private void pushTriple(Map<Term,Set<Triple>> m, Term key, Triple t) {
 			Set<Triple> s = m.get(key);
 			if (s == null) {
-				s = new HashSet<Triple>();
+				s = new HashSet<>();
 				m.put(key, s);
 			}
 			s.add(t);
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Term.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Term.java
index 387aa7c17a..209c76414f 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Term.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Term.java
@@ -155,7 +155,7 @@ public Impl(Ontology ontology, String name, String description, Object[] synonym
 			this.description = description;
 			this.ontology = ontology;
 
-			this.synonyms = new TreeSet<Object>();
+			this.synonyms = new TreeSet<>();
 			if (synonyms!=null) this.synonyms.addAll(Arrays.asList(synonyms));
 		}
 
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Triple.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Triple.java
index 550c4d5651..a265f2ff56 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Triple.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Triple.java
@@ -182,7 +182,7 @@ public Impl(Term subject,
 			this.name = name;
 			this.description = description;
 
-			this.synonyms = new TreeSet<Object>();
+			this.synonyms = new TreeSet<>();
 			if (synonyms!=null) this.synonyms.addAll(Arrays.asList(synonyms));
 		}
 
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/GOParser.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/GOParser.java
index d314b907ba..000d69740c 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/GOParser.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/GOParser.java
@@ -48,7 +48,7 @@ public Ontology parseGO(BufferedReader goFile,
 			Ontology onto = factory.createOntology(ontoName, ontoDescription);
 			Term isa = onto.importTerm(OntoTools.IS_A, null);
 			Term partof = null; // fixme: onto.importTerm(OntoTools.PART_OF, null);
-			List<Term> termStack = new ArrayList<Term>();
+			List<Term> termStack = new ArrayList<>();
 			String line;
 			while ((line = goFile.readLine()) != null) {
 				int leadSpaces = 0;
@@ -122,7 +122,7 @@ private Term parseTerm(Ontology onto, String s)
 		} else {
 			Term t = onto.createTerm(termName, termDesc);
 			if (toke.hasMoreTokens()) {
-				List<String> secondaries = new ArrayList<String>();
+				List<String> secondaries = new ArrayList<>();
 				while (toke.hasMoreTokens()) {
 					secondaries.add(toke.nextToken());
 				}
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileHandler.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileHandler.java
index aeee6aa627..116ee735d2 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileHandler.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileHandler.java
@@ -90,7 +90,7 @@ public void documentEnd() {
 
 	@Override
 	public void documentStart() {
-		termStack = new ArrayList<Term>();
+		termStack = new ArrayList<>();
 	}
 
 	@Override
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java
index 57b36bc600..96474a5385 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java
@@ -61,10 +61,10 @@ public class OboFileParser {
 
 
 	protected static final Map<Character, Character> escapeChars =
-		new HashMap<Character, Character>();
+		new HashMap<>();
 
 	protected static final Map<Character, Character> unescapeChars =
-		new HashMap<Character, Character>();
+		new HashMap<>();
 
 	static {
 		escapeChars.put('n', '\n');
@@ -114,7 +114,7 @@ public SOPair(String str, int index, int endIndex) {
 
 
 	public OboFileParser(){
-		listeners = new ArrayList<OboFileEventListener>();
+		listeners = new ArrayList<>();
 	}
 
 
@@ -316,7 +316,7 @@ else if ("NARROW".equals(token))
 	}
 
 	protected Map<String,Object>[] getDbxrefList(String line, int startoffset, int endoffset) throws IOException {
-		Vector<Map<String,Object>> temp = new Vector<Map<String,Object>>();
+		Vector<Map<String,Object>> temp = new Vector<>();
 		boolean stop = false;
 		while (!stop) {
 			int braceIndex = findUnescaped(line, '{', startoffset, endoffset);
@@ -381,7 +381,7 @@ protected Map<String,Object> parseXref(String line,
 		}
 
 
-		Map<String, Object> m = new HashMap<String, Object>();
+		Map<String, Object> m = new HashMap<>();
 		m.put("xref",xref_str);
 		m.put("desc",desc_str);
 		return m;
diff --git a/biojava-protein-disorder/src/main/java/demo/PredictDisorder.java b/biojava-protein-disorder/src/main/java/demo/PredictDisorder.java
index f6013dadd2..cb8c0fa98e 100644
--- a/biojava-protein-disorder/src/main/java/demo/PredictDisorder.java
+++ b/biojava-protein-disorder/src/main/java/demo/PredictDisorder.java
@@ -59,7 +59,7 @@ public static void main(String[] args) throws Exception{
 	private static ProteinSequence getUniprot(String uniProtID) throws Exception {
 
 		AminoAcidCompoundSet set = AminoAcidCompoundSet.getAminoAcidCompoundSet();
-		UniprotProxySequenceReader<AminoAcidCompound> uniprotSequence = new UniprotProxySequenceReader<AminoAcidCompound>(uniProtID,set);
+		UniprotProxySequenceReader<AminoAcidCompound> uniprotSequence = new UniprotProxySequenceReader<>(uniProtID,set);
 
 		ProteinSequence seq = new ProteinSequence(uniprotSequence);
 
diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/data/sequence/SequenceUtil.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/data/sequence/SequenceUtil.java
index 55b9bc5cc6..de53ae084d 100644
--- a/biojava-protein-disorder/src/main/java/org/biojava/nbio/data/sequence/SequenceUtil.java
+++ b/biojava-protein-disorder/src/main/java/org/biojava/nbio/data/sequence/SequenceUtil.java
@@ -250,7 +250,7 @@ public static void writeFasta(final OutputStream outstream,
 	 */
 	public static List<FastaSequence> readFasta(final InputStream inStream)
 		throws IOException {
-	final List<FastaSequence> seqs = new ArrayList<FastaSequence>();
+	final List<FastaSequence> seqs = new ArrayList<>();
 
 	final BufferedReader infasta = new BufferedReader(
 		new InputStreamReader(inStream, "UTF8"), 16000);
diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java
index 058e47546d..ccb85292b8 100644
--- a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java
+++ b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java
@@ -214,7 +214,7 @@ public static Range[] scoresToRanges(float[] scores, float probability)  {
 
 		int count=0;
 		int regionLen=0;
-		List<Range> ranges = new ArrayList<Range>();
+		List<Range> ranges = new ArrayList<>();
 		for(float score: scores) {
 			count++;
 			// Round to 2 decimal points before comparison
@@ -245,7 +245,7 @@ public static Range[] scoresToRanges(float[] scores, float probability)  {
 	 * @see #getDisorder(FastaSequence)
 	 */
 	public static Map<FastaSequence,float[]> getDisorderScores(List<FastaSequence> sequences) {
-		Map<FastaSequence,float[]> results = new TreeMap<FastaSequence, float[]>();
+		Map<FastaSequence,float[]> results = new TreeMap<>();
 		results = sequences.stream().collect(Collectors.toMap(fastaSequence ->  fastaSequence, fastaSequence -> predictSerial(fastaSequence)));
 		return results;
 	}
@@ -258,7 +258,7 @@ public static Map<FastaSequence,float[]> getDisorderScores(List<FastaSequence> s
 	 * @see #getDisorder(FastaSequence)
 	 */
 	public static Map<FastaSequence,Range[]> getDisorder(List<FastaSequence> sequences) {
-		Map<FastaSequence,Range[]> disorderRanges = new TreeMap<FastaSequence,Range[]>();
+		Map<FastaSequence,Range[]> disorderRanges = new TreeMap<>();
 		disorderRanges = sequences.stream().collect(Collectors.toMap(fastaSequence -> fastaSequence, fastaSequence -> getDisorder(fastaSequence) ));
 		return disorderRanges;
 	}
diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ModelLoader.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ModelLoader.java
index e9db4ebdde..ff636c0710 100644
--- a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ModelLoader.java
+++ b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/ModelLoader.java
@@ -155,7 +155,7 @@ public String toString() {
 
 	}
 
-	private static final Map<Integer, Model> models = new HashMap<Integer, Model>();
+	private static final Map<Integer, Model> models = new HashMap<>();
 
 	public Model getModel(final int modelNum) {
 	return ModelLoader.models.get(modelNum);
diff --git a/biojava-structure-gui/src/main/java/demo/DemoAlignmentFromFasta.java b/biojava-structure-gui/src/main/java/demo/DemoAlignmentFromFasta.java
index fbd3ecc74d..9bd3e71af4 100644
--- a/biojava-structure-gui/src/main/java/demo/DemoAlignmentFromFasta.java
+++ b/biojava-structure-gui/src/main/java/demo/DemoAlignmentFromFasta.java
@@ -81,7 +81,7 @@ public static void getAlignmentFromFasta() throws StructureException {
 		//   "4HHB.A:1-15" (residue range)
 		// For this example, the built-in fasta parser will extract the correct accession.
 		SequenceHeaderParserInterface<ProteinSequence, AminoAcidCompound> headerParser;
-		headerParser = new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>();
+		headerParser = new GenericFastaHeaderParser<>();
 
 		// Create AtomCache to fetch structures from the PDB
 		AtomCache cache = new AtomCache();
diff --git a/biojava-structure-gui/src/main/java/demo/DemoMultipleMC.java b/biojava-structure-gui/src/main/java/demo/DemoMultipleMC.java
index 062bc6d8d7..a609d925e3 100644
--- a/biojava-structure-gui/src/main/java/demo/DemoMultipleMC.java
+++ b/biojava-structure-gui/src/main/java/demo/DemoMultipleMC.java
@@ -97,9 +97,9 @@ public static void main(String[] args) throws IOException, StructureException, I
 		//Load the CA atoms of the structures
 		AtomCache cache = new AtomCache();
 
-		List<StructureIdentifier> identifiers = new ArrayList<StructureIdentifier>();
+		List<StructureIdentifier> identifiers = new ArrayList<>();
 
-		List<Atom[]> atomArrays = new ArrayList<Atom[]>();
+		List<Atom[]> atomArrays = new ArrayList<>();
 		for (String name:names)	{
 			atomArrays.add(cache.getAtoms(name));
 			identifiers.add(new SubstructureIdentifier(name));
diff --git a/biojava-structure-gui/src/main/java/demo/DemoStructureFromFasta.java b/biojava-structure-gui/src/main/java/demo/DemoStructureFromFasta.java
index c99678d4b9..fd2c15d28a 100644
--- a/biojava-structure-gui/src/main/java/demo/DemoStructureFromFasta.java
+++ b/biojava-structure-gui/src/main/java/demo/DemoStructureFromFasta.java
@@ -73,7 +73,7 @@ public static void getStructureFromFasta() {
 		//   "4HHB.A:1-15" (residue range)
 		// For this example, the built-in fasta parser will extract the correct accession.
 		SequenceHeaderParserInterface<ProteinSequence, AminoAcidCompound> headerParser;
-		headerParser = new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>();
+		headerParser = new GenericFastaHeaderParser<>();
 
 		// Create AtomCache to fetch structures from the PDB
 		AtomCache cache = new AtomCache();
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/DisplayAFP.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/DisplayAFP.java
index 03aa7d5084..ff710bafb8 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/DisplayAFP.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/DisplayAFP.java
@@ -56,7 +56,7 @@ public class DisplayAFP {
 
 	//TODO: same as getEqrPos??? !!!
 	public static final List<Integer> getEQRAlignmentPos(AFPChain afpChain){
-		List<Integer> lst = new ArrayList<Integer>();
+		List<Integer> lst = new ArrayList<>();
 
 		char[] s1 = afpChain.getAlnseq1();
 		char[] s2 = afpChain.getAlnseq2();
@@ -107,7 +107,7 @@ private static boolean isAlignedPosition(int i, char c1, char c2, boolean isFatC
 	 * @param ca
 	 */
 	public static final List<String> getPDBresnum(int aligPos, AFPChain afpChain, Atom[] ca){
-		List<String> lst = new ArrayList<String>();
+		List<String> lst = new ArrayList<>();
 		if ( aligPos > 1) {
 			System.err.println("multiple alignments not supported yet!");
 			return lst;
@@ -407,7 +407,7 @@ private static final int getUngappedFatCatPos(AFPChain afpChain, int chainNr, in
 	 * @throws StructureException
 	 */
 	public static final Atom[] getAtomArray(Atom[] ca,List<Group> hetatms ) throws StructureException{
-		List<Atom> atoms = new ArrayList<Atom>();
+		List<Atom> atoms = new ArrayList<>();
 		Collections.addAll(atoms, ca);
 
 		logger.debug("got {} hetatoms", hetatms.size());
@@ -436,7 +436,7 @@ public static final Atom[] getAtomArray(Atom[] ca,List<Group> hetatms ) throws S
 
 	public static final StructureAlignmentJmol display(AFPChain afpChain,Group[] twistedGroups, Atom[] ca1, Atom[] ca2,List<Group> hetatms1, List<Group> hetatms2 ) throws StructureException {
 
-		List<Atom> twistedAs = new ArrayList<Atom>();
+		List<Atom> twistedAs = new ArrayList<>();
 
 		for ( Group g: twistedGroups){
 			if ( g == null )
@@ -560,7 +560,7 @@ public static Structure createArtificalStructure(AFPChain afpChain, Atom[] ca1,
 
 		Group[] twistedGroups = AlignmentTools.prepareGroupsForDisplay(afpChain,ca1, ca2);
 
-		List<Atom> twistedAs = new ArrayList<Atom>();
+		List<Atom> twistedAs = new ArrayList<>();
 
 		for ( Group g: twistedGroups){
 			if ( g == null )
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/DotPlotPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/DotPlotPanel.java
index 22f4ad1822..0532d91498 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/DotPlotPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/DotPlotPanel.java
@@ -76,7 +76,7 @@ public DotPlotPanel(AFPChain alignment ){
 		int[][][] optAln = alignment.getOptAln(); // [block #][{0,1} chain index][pos]
 
 		for(;alignNumber < optAln.length;alignNumber++) {
-			List<int[]> alignPairs = new ArrayList<int[]>();
+			List<int[]> alignPairs = new ArrayList<>();
 			for(int pos = 0; pos<optAln[alignNumber][0].length; pos++ ) {
 				alignPairs.add( new int[] {
 						optAln[alignNumber][0][pos],
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MultipleAlignmentCalc.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MultipleAlignmentCalc.java
index e764a5e654..d3b2af0c6d 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MultipleAlignmentCalc.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MultipleAlignmentCalc.java
@@ -78,7 +78,7 @@ public void run() {
 				parent.getMultipleStructureAligner();
 		try {
 
-			List<Atom[]> atomArrays = new ArrayList<Atom[]>();
+			List<Atom[]> atomArrays = new ArrayList<>();
 			for (Structure s:structures){
 				Atom[] ca = StructureTools.getRepresentativeAtomArray(s);
 				atomArrays.add(ca);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MultipleAlignmentJmolDisplay.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MultipleAlignmentJmolDisplay.java
index fac312875f..a0b6111a0e 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MultipleAlignmentJmolDisplay.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MultipleAlignmentJmolDisplay.java
@@ -76,7 +76,7 @@ public class MultipleAlignmentJmolDisplay  {
 	public static List<String> getPDBresnum(int structNum,
 			MultipleAlignment multAln, Atom[] ca){
 
-		List<String> lst = new ArrayList<String>();
+		List<String> lst = new ArrayList<>();
 
 		for(Block block : multAln.getBlocks() ) {
 
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ParameterGUI.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ParameterGUI.java
index fe43530bed..ca983d3452 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ParameterGUI.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/ParameterGUI.java
@@ -82,7 +82,7 @@ public ParameterGUI(ConfigStrucAligParams params, String algorithm) {
 		assert(names.size() == types.size());
 		assert(names.size() == helps.size());
 
-		textFields = new ArrayList<Component>();
+		textFields = new ArrayList<>();
 		Box vBox = Box.createVerticalBox();
 
 		for (int i = 0 ; i < keys.size(); i++){
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/AligPanelMouseMotionListener.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/AligPanelMouseMotionListener.java
index 9914f07d2a..83f1dda632 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/AligPanelMouseMotionListener.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/AligPanelMouseMotionListener.java
@@ -44,7 +44,7 @@ public class AligPanelMouseMotionListener implements MouseMotionListener, MouseL
 
 	public AligPanelMouseMotionListener(AligPanel parent){
 		this.parent = parent;
-		aligPosListeners = new ArrayList<AlignmentPositionListener>();
+		aligPosListeners = new ArrayList<>();
 		prevPos = -1;
 		isDragging = false;
 		selectionStart = null;
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/MultipleAligPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/MultipleAligPanel.java
index 1387bbd417..483df6f2df 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/MultipleAligPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/MultipleAligPanel.java
@@ -139,7 +139,7 @@ public MultipleAligPanel(AFPChain afpChain, Atom[] ca1, Atom[] ca2,
 		this.multAln = ensemble.getMultipleAlignment(0);
 
 		//Create the sequence alignment and the structure-sequence mapping.
-		this.mapSeqToStruct = new ArrayList<Integer>();
+		this.mapSeqToStruct = new ArrayList<>();
 		this.alnSeq = MultipleAlignmentTools.getSequenceAlignment(
 				this.multAln, this.mapSeqToStruct);
 
@@ -162,7 +162,7 @@ public MultipleAligPanel(MultipleAlignment msa, AbstractAlignmentJmol jm) {
 		this.multAln = msa;
 
 		//Create the sequence alignment and the structure-sequence mapping.
-		this.mapSeqToStruct = new ArrayList<Integer>();
+		this.mapSeqToStruct = new ArrayList<>();
 		this.alnSeq = MultipleAlignmentTools.getSequenceAlignment(
 				this.multAln, this.mapSeqToStruct);
 
@@ -225,7 +225,7 @@ public void paintComponent(Graphics g){
 			else isGapped = true;
 
 			//Loop through every structure to get all the points
-			List<Point> points = new ArrayList<Point>();
+			List<Point> points = new ArrayList<>();
 			for (int str=0; str<size; str++) points.add(
 					coordManager.getPanelPos(str,i));
 			Point p1 = points.get(0);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/MultipleAligPanelMouseMotionListener.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/MultipleAligPanelMouseMotionListener.java
index c217458ffb..67cb02ba04 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/MultipleAligPanelMouseMotionListener.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/MultipleAligPanelMouseMotionListener.java
@@ -52,7 +52,7 @@ public class MultipleAligPanelMouseMotionListener
 
 	public MultipleAligPanelMouseMotionListener(MultipleAligPanel parent){
 		this.parent = parent;
-		aligPosListeners = new ArrayList<AlignmentPositionListener>();
+		aligPosListeners = new ArrayList<>();
 		prevPos = -1;
 		isDragging = false;
 		selectionStart = null;
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/DefaultAutoSuggestProvider.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/DefaultAutoSuggestProvider.java
index 045ff5ce8d..1a87aa786a 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/DefaultAutoSuggestProvider.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/DefaultAutoSuggestProvider.java
@@ -30,7 +30,7 @@ public class DefaultAutoSuggestProvider implements AutoSuggestProvider {
 
 	@Override
 	public Vector<String> getSuggestion(String userInput) {
-		Vector<String> data = new Vector<String>();
+		Vector<String> data = new Vector<>();
 
 		data.add(userInput + " no AutoSuggestProvider registered yet!");
 		return data;
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/JAutoSuggest.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/JAutoSuggest.java
index ff1e31b2d8..9e3c825910 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/JAutoSuggest.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/JAutoSuggest.java
@@ -247,7 +247,7 @@ private void init(){
 		lastWord = "";
 		regular = getFont();
 		busy = new Font(getFont().getName(), Font.ITALIC, getFont().getSize());
-		suggestions = new Vector<String>();
+		suggestions = new Vector<>();
 		defaultText = DEFAULT_TEXT;
 
 
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/SCOPAutoSuggestProvider.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/SCOPAutoSuggestProvider.java
index d90fd0380f..136f184584 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/SCOPAutoSuggestProvider.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/autosuggest/SCOPAutoSuggestProvider.java
@@ -47,7 +47,7 @@ public Vector<String> getSuggestion(String userInput) {
 
 		long timeS = System.currentTimeMillis();
 
-		List<ScopDomain> domains = new ArrayList<ScopDomain>();
+		List<ScopDomain> domains = new ArrayList<>();
 
 		domains = getPossibleScopDomains(userInput);
 
@@ -55,7 +55,7 @@ public Vector<String> getSuggestion(String userInput) {
 
 		// convert domains to Strings
 
-		Vector<String> v=new Vector<String>();
+		Vector<String> v=new Vector<>();
 
 		int counter = 0;
 		for ( ScopDomain d : domains){
@@ -82,7 +82,7 @@ public Vector<String> getSuggestion(String userInput) {
 
 	private List<ScopDomain> getPossibleScopDomains(String userInput) {
 
-		List<ScopDomain> domains = new ArrayList<ScopDomain>();
+		List<ScopDomain> domains = new ArrayList<>();
 
 		ScopDatabase scop = ScopFactory.getSCOP();
 
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/MultipleAlignmentJmol.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/MultipleAlignmentJmol.java
index fc7d209312..a9d65c3948 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/MultipleAlignmentJmol.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/MultipleAlignmentJmol.java
@@ -113,7 +113,7 @@ public MultipleAlignmentJmol(MultipleAlignment msa,
 		frame.setJMenuBar(menu);
 		this.multAln = msa;
 		this.transformedAtoms = rotatedAtoms;
-		this.selectedStructures = new ArrayList<JCheckBox>();
+		this.selectedStructures = new ArrayList<>();
 
 		frame.addWindowListener(new WindowAdapter() {
 
@@ -432,7 +432,7 @@ public static String getJmolString(MultipleAlignment multAln,
 		// Color the equivalent residues of every structure
 		StringBuffer sel = new StringBuffer();
 		sel.append("select *; color lightgrey; backbone 0.1; ");
-		List<List<String>> allPDB = new ArrayList<List<String>>();
+		List<List<String>> allPDB = new ArrayList<>();
 
 		// Get the aligned residues of every structure
 		for (int i = 0; i < multAln.size(); i++) {
@@ -508,7 +508,7 @@ private static void printJmolScript4Block(Atom[] atoms,
 			int str, int colorPos, int blockNum) {
 
 		// Obtain the residues aligned in this block of the structure
-		List<String> pdb = new ArrayList<String>();
+		List<String> pdb = new ArrayList<>();
 		for (int i = 0; i < alignRes.get(str).size(); i++) {
 
 			// Handle gaps - only color if it is not null
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/RasmolCommandListener.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/RasmolCommandListener.java
index 6a81491f82..d1ce5c0e30 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/RasmolCommandListener.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/RasmolCommandListener.java
@@ -50,7 +50,7 @@ public class RasmolCommandListener
 	public RasmolCommandListener(JmolPanel panel, JTextField field){
 		textfield = field;
 		jmolPanel = panel;
-		history = new ArrayList<String>();
+		history = new ArrayList<>();
 		historyPosition = -2; // -2 = history = empty;
 	}
 
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/StructureAlignmentJmol.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/StructureAlignmentJmol.java
index c25336ab71..7a87f6cbb9 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/StructureAlignmentJmol.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/StructureAlignmentJmol.java
@@ -256,7 +256,7 @@ public void itemStateChanged(ItemEvent e) {
 		zoomSlider.setMajorTickSpacing(100);
 		zoomSlider.setPaintTicks(true);
 
-		Hashtable<Integer, JLabel> labelTable = new Hashtable<Integer, JLabel>();
+		Hashtable<Integer, JLabel> labelTable = new Hashtable<>();
 		labelTable.put(0,new JLabel("0%"));
 		labelTable.put(100,new JLabel("100%"));
 		labelTable.put(200,new JLabel("200%"));
@@ -559,8 +559,8 @@ private static void printJmolScript4Block(Atom[] ca1, Atom[] ca2, int blockNum,
 		c1 = ColorUtils.getIntermediate(ColorUtils.orange, end1, blockNum, bk);
 		c2 = ColorUtils.getIntermediate(ColorUtils.cyan, end2, blockNum, bk);
 
-		List<String> pdb1 = new ArrayList<String>();
-		List<String> pdb2 = new ArrayList<String>();
+		List<String> pdb1 = new ArrayList<>();
+		List<String> pdb2 = new ArrayList<>();
 		for (int i = 0; i < optLen[bk]; i++) {
 			///
 			int pos1 = optAln[bk][0][i];
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/ScaleableMatrixPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/ScaleableMatrixPanel.java
index b2c6917559..37a0133e78 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/ScaleableMatrixPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/ScaleableMatrixPanel.java
@@ -198,7 +198,7 @@ public ScaleableMatrixPanel(){
 
 
 	protected static Map<String,ContinuousColorMapper> createGradients() {
-		SortedMap<String,ContinuousColorMapper> gradients = new TreeMap<String,ContinuousColorMapper>();
+		SortedMap<String,ContinuousColorMapper> gradients = new TreeMap<>();
 
 		int i = 0; //prepend number, since sorted alphabetically
 		ColorSpace hsv = HSVColorSpace.getHSVColorSpace();
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/SequenceDisplay.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/SequenceDisplay.java
index 0aada492fb..93c7757201 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/SequenceDisplay.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/SequenceDisplay.java
@@ -232,7 +232,7 @@ public SequenceDisplay(StructurePairAligner structurePairAligner){
 
 		this.setLayout(new BoxLayout(this,BoxLayout.Y_AXIS));
 
-		apos = new ArrayList<AlignedPosition>();
+		apos = new ArrayList<>();
 	}
 
 	public void clearListeners(){
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
index 7805df236a..70d69d03c5 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/PDBUploadPanel.java
@@ -79,7 +79,7 @@ public class PDBUploadPanel
 
 	public static JComboBox<String> getFileFormatSelect(){
 		JComboBox<String> fileType = new JComboBox<>();
-			fileType = new JComboBox<String>(new String[] {UserConfiguration.PDB_FORMAT,UserConfiguration.MMCIF_FORMAT});
+			fileType = new JComboBox<>(new String[] {UserConfiguration.PDB_FORMAT,UserConfiguration.MMCIF_FORMAT});
 			fileType.setSelectedIndex(0);
 			fileType.setMaximumSize(new Dimension(10,50));
 
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SelectMultiplePanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SelectMultiplePanel.java
index ae8d859951..c651b0deca 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SelectMultiplePanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SelectMultiplePanel.java
@@ -90,7 +90,7 @@ private Box getDomainPanel(JTextField f){
 
 	public List<Structure> getStructures() throws StructureException {
 
-		List<Structure> structures = new ArrayList<Structure>();
+		List<Structure> structures = new ArrayList<>();
 
 		for (StructureIdentifier name:getNames()){
 			structures.add(getStructure(name));
@@ -100,7 +100,7 @@ public List<Structure> getStructures() throws StructureException {
 
 	public List<StructureIdentifier> getNames() {
 
-		List<StructureIdentifier> names = new ArrayList<StructureIdentifier>();
+		List<StructureIdentifier> names = new ArrayList<>();
 
 		String raw = input.getText().trim();
 		String[] split = raw.split(" ");
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SequenceMouseListener.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SequenceMouseListener.java
index e10331b9d5..11d7f2fd31 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SequenceMouseListener.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SequenceMouseListener.java
@@ -86,7 +86,7 @@ public SequenceMouseListener(SequenceDisplay parent) {
 
 		coordManager = new CoordManager();
 
-		alignmentPositionListeners = new ArrayList<AlignmentPositionListener>();
+		alignmentPositionListeners = new ArrayList<>();
 		//renderer.getLayeredPane().addMouseListener(popupFrame);
 
 	}
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SequenceScalePanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SequenceScalePanel.java
index bc29425c07..06542e5271 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SequenceScalePanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SequenceScalePanel.java
@@ -105,7 +105,7 @@ public SequenceScalePanel(int position) {
 		setPrefSize();
 		coordManager = new CoordManager();
 
-		apos = new ArrayList<AlignedPosition>();
+		apos = new ArrayList<>();
 
 	}
 
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/GradientMapper.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/GradientMapper.java
index 4678d68707..55ab77d2ad 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/GradientMapper.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/GradientMapper.java
@@ -61,7 +61,7 @@ public GradientMapper(Color negInf, Color posInf) {
 		this(negInf,posInf,ColorSpace.getInstance(ColorSpace.CS_sRGB));
 	}
 	public GradientMapper(Color negInf, Color posInf, ColorSpace cspace) {
-		mapping = new TreeMap<Double,Color>();
+		mapping = new TreeMap<>();
 		mapping.put(Double.NEGATIVE_INFINITY, negInf);
 		mapping.put(Double.POSITIVE_INFINITY, posInf);
 		interpolator = new LinearColorInterpolator(cspace);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/gui/SymmetryDisplay.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/gui/SymmetryDisplay.java
index f5fc7da991..52df113942 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/gui/SymmetryDisplay.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/gui/SymmetryDisplay.java
@@ -239,7 +239,7 @@ public static String printSymmetryAxes(CeSymmResult symm,boolean allAxes)
 		for (Axis a : symmAxes) {
 			RotationAxis rot = a.getRotationAxis();
 			List<List<Integer>> cyclicForm = axes.getRepeatsCyclicForm(a);
-			List<Atom> repAtoms = new ArrayList<Atom>();
+			List<Atom> repAtoms = new ArrayList<>();
 			for(List<Integer> cycle : cyclicForm) {
 				for(Integer repeat : cycle) {
 					repAtoms.addAll(Arrays.asList(repeats.get(repeat)));
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorH.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorH.java
index 428635c78b..7686b98ac0 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorH.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorH.java
@@ -423,7 +423,7 @@ public String colorBySubunit() {
 					Color4f c = colors[i];
 					List<String> ids = colorMap.get(c);
 					if (ids == null) {
-						ids = new ArrayList<String>();
+						ids = new ArrayList<>();
 						colorMap.put(c,  ids);
 					}
 					String id = getChainSpecification(modelNumbers, chainIds, j);
@@ -454,7 +454,7 @@ public String colorBySequenceCluster() {
 			Color4f c = colors[seqClusterIds.get(i)];
 			List<String> ids = colorMap.get(c);
 			if (ids == null) {
-				ids = new ArrayList<String>();
+				ids = new ArrayList<>();
 				colorMap.put(c,  ids);
 			}
 			String id = getChainSpecification(modelNumbers, chainIds, i);
@@ -504,7 +504,7 @@ public String colorBySymmetry() {
 					c.scale(scale);
 					List<String> ids = colorMap.get(c);
 					if (ids == null) {
-						ids = new ArrayList<String>();
+						ids = new ArrayList<>();
 						colorMap.put(c,  ids);
 					}
 					String id = getChainSpecification(modelNumbers, chainIds, subunit);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorPointGroup.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorPointGroup.java
index 3ee6734d75..7fd90d2497 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorPointGroup.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorPointGroup.java
@@ -332,7 +332,7 @@ public String colorBySubunit() {
 				Color4f c = colors[colorIndex];
 				List<String> ids = colorMap.get(c);
 				if (ids == null) {
-					ids = new ArrayList<String>();
+					ids = new ArrayList<>();
 					colorMap.put(c,  ids);
 				}
 				String id = getChainSpecification(modelNumbers, chainIds, subunit);
@@ -362,7 +362,7 @@ public String colorBySequenceCluster() {
 			Color4f c = colors[seqClusterIds.get(i)];
 			List<String> ids = colorMap.get(c);
 			if (ids == null) {
-				ids = new ArrayList<String>();
+				ids = new ArrayList<>();
 				colorMap.put(c,  ids);
 			}
 			String id = getChainSpecification(modelNumbers, chainIds, i);
@@ -414,7 +414,7 @@ public String colorBySymmetry() {
 				Color4f c = colors[colorIndex];
 				List<String> ids = colorMap.get(c);
 				if (ids == null) {
-					ids = new ArrayList<String>();
+					ids = new ArrayList<>();
 					colorMap.put(c,  ids);
 				}
 				for (int subunit: orbits.get(i)) {
@@ -431,7 +431,7 @@ public String colorBySymmetry() {
 				Color4f c = new Color4f(colors[i]);
 				List<String> ids = colorMap.get(c);
 				if (ids == null) {
-					ids = new ArrayList<String>();
+					ids = new ArrayList<>();
 					colorMap.put(c,  ids);
 				}
 				List<Integer> orbit = orbits.get(i);
@@ -542,7 +542,7 @@ private Map<Color4f, List<String>> getCnColorMap() {
 				Color4f c = colors[i];
 				List<String> ids = colorMap.get(c);
 				if (ids == null) {
-					ids = new ArrayList<String>();
+					ids = new ArrayList<>();
 					colorMap.put(c, ids);
 				}
 				ids.add(id);
@@ -947,7 +947,7 @@ private static Vector3d[] getC2PolygonVertices(Vector3d axis, Vector3d reference
 
 
 	private List<Rotation> getUniqueAxes() {
-		List<Rotation> uniqueRotations = new ArrayList<Rotation>();
+		List<Rotation> uniqueRotations = new ArrayList<>();
 
 		for (int i = 0, n = rotationGroup.getOrder(); i < n; i++) {
 			Rotation rotationI = rotationGroup.getRotation(i);
diff --git a/biojava-structure/src/main/java/demo/DemoMultipleMC.java b/biojava-structure/src/main/java/demo/DemoMultipleMC.java
index 4ca84f0174..6a60c454e6 100644
--- a/biojava-structure/src/main/java/demo/DemoMultipleMC.java
+++ b/biojava-structure/src/main/java/demo/DemoMultipleMC.java
@@ -92,9 +92,9 @@ public static void main(String[] args) throws IOException, StructureException, I
 
 		//Load the CA atoms of the structures
 		AtomCache cache = new AtomCache();
-		List<Atom[]> atomArrays = new ArrayList<Atom[]>();
+		List<Atom[]> atomArrays = new ArrayList<>();
 
-		List<StructureIdentifier> ids = new ArrayList<StructureIdentifier>();
+		List<StructureIdentifier> ids = new ArrayList<>();
 		for (String name:names)	{
 			StructureIdentifier id = new StructureName(name);
 			ids.add(id);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomPositionMap.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomPositionMap.java
index efe8822397..41021e0045 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomPositionMap.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/AtomPositionMap.java
@@ -153,7 +153,7 @@ public AtomPositionMap(Atom[] atoms) {
 	 * @param atoms
 	 */
 	public AtomPositionMap(Atom[] atoms, GroupMatcher matcher) {
-		hashMap = new HashMap<ResidueNumber, Integer>();
+		hashMap = new HashMap<>();
 		for (int i = 0; i < atoms.length; i++) {
 			Group group = atoms[i].getGroup();
 			ResidueNumber rn = group.getResidueNumber();
@@ -164,7 +164,7 @@ public AtomPositionMap(Atom[] atoms, GroupMatcher matcher) {
 			}
 		}
 		Comparator<ResidueNumber> vc = new ValueComparator<ResidueNumber, Integer>(hashMap);
-		treeMap = new TreeMap<ResidueNumber, Integer>(vc);
+		treeMap = new TreeMap<>(vc);
 		treeMap.putAll(hashMap);
 	}
 
@@ -341,7 +341,7 @@ public List<ResidueRangeAndLength> getRanges() {
 		String currentChain = "";
 		ResidueNumber first = null;
 		ResidueNumber prev = null;
-		List<ResidueRangeAndLength> ranges = new ArrayList<ResidueRangeAndLength>();
+		List<ResidueRangeAndLength> ranges = new ArrayList<>();
 		for (ResidueNumber rn : treeMap.keySet()) {
 			if (!rn.getChainName().equals(currentChain)) {
 				if (first != null) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java
index e6a243d7cf..3c5fd7af68 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java
@@ -90,7 +90,7 @@ public BondImpl(Atom atomA, Atom atomB, int bondOrder, boolean addSelfToAtoms) {
 	private void addSelfToAtoms() {
 		List<Bond> bonds = atomA.getBonds();
 		if (bonds==null) {
-			bonds = new ArrayList<Bond>(AtomImpl.BONDS_INITIAL_CAPACITY);
+			bonds = new ArrayList<>(AtomImpl.BONDS_INITIAL_CAPACITY);
 			atomA.setBonds(bonds);
 		}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Element.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Element.java
index 510230ccf6..2f534b2828 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Element.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Element.java
@@ -191,7 +191,7 @@ public enum Element {
 	private static final Map<String,Element> allElements ;
 
 	static {
-		allElements = new HashMap<String,Element>();
+		allElements = new HashMap<>();
 		for (Element e : Element.values()){
 			allElements.put(e.toString().toLowerCase(), e);
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityInfo.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityInfo.java
index 829e8abfc7..61300fe451 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityInfo.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityInfo.java
@@ -159,11 +159,11 @@ public EntityInfo (EntityInfo c) {
 		this.title = c.title;
 
 		if (c.synonyms!=null) {
-			this.synonyms = new ArrayList<String>();
+			this.synonyms = new ArrayList<>();
 			synonyms.addAll(c.synonyms);
 		}
 		if (c.ecNums!=null) {
-			this.ecNums = new ArrayList<String>();
+			this.ecNums = new ArrayList<>();
 			ecNums.addAll(c.ecNums);
 		}
 
@@ -380,7 +380,7 @@ private void initResSerialsMap(Chain c) {
 			return;
 		}
 
-		Map<ResidueNumber,Integer> resNums2ResSerials = new HashMap<ResidueNumber, Integer>();
+		Map<ResidueNumber,Integer> resNums2ResSerials = new HashMap<>();
 		chains2pdbResNums2ResSerials.put(c.getId(), resNums2ResSerials);
 
 		for (int i=0;i<c.getSeqResGroups().size();i++) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ExperimentalTechnique.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ExperimentalTechnique.java
index 65fc455d26..d64c4e08fd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ExperimentalTechnique.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ExperimentalTechnique.java
@@ -71,7 +71,7 @@ private ExperimentalTechnique(String name, boolean isXtallographic, boolean isNm
 
 
 	 private static HashMap<String, ExperimentalTechnique> initExpTechStr2Value() {
-		HashMap<String, ExperimentalTechnique> expTechStr2Value = new HashMap<String, ExperimentalTechnique>();
+		HashMap<String, ExperimentalTechnique> expTechStr2Value = new HashMap<>();
 		for(ExperimentalTechnique exp:ExperimentalTechnique.values()) {
 			expTechStr2Value.put(exp.getName(), exp);
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/GroupType.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/GroupType.java
index 7fa92f7363..e6c3373b9d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/GroupType.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/GroupType.java
@@ -95,7 +95,7 @@ public Set<ResidueType> getResidueTypes() {
 	 * @return
 	 */
 	private static Set<ResidueType> matchPolymerTypes(Set<PolymerType> allowedTypes) {
-		Set<ResidueType> matched = new HashSet<ResidueType>();
+		Set<ResidueType> matched = new HashSet<>();
 		for(ResidueType restype : ResidueType.values()) {
 			if(allowedTypes.contains(restype.polymerType)) {
 				matched.add(restype);
@@ -109,7 +109,7 @@ private static Set<ResidueType> matchPolymerTypes(Set<PolymerType> allowedTypes)
 	 * @return
 	 */
 	private static Set<ResidueType> getHetatmTypes() {
-		Set<ResidueType> unmatched = new HashSet<ResidueType>();
+		Set<ResidueType> unmatched = new HashSet<>();
 		for(ResidueType restype : ResidueType.values()) {
 			if(!AMINOACID.getResidueTypes().contains(restype) &&
 					!NUCLEOTIDE.getResidueTypes().contains(restype) ) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/JournalArticle.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/JournalArticle.java
index a4c77badd2..5e4052a1dc 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/JournalArticle.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/JournalArticle.java
@@ -32,8 +32,8 @@
 public class JournalArticle implements Serializable {
 
 	private static final long serialVersionUID = 5062668226159515468L;
-	private List<Author> authorList = new ArrayList<Author>();
-	private List<Author> editorList = new ArrayList<Author>();
+	private List<Author> authorList = new ArrayList<>();
+	private List<Author> editorList = new ArrayList<>();
 	private String title = "";
 	private String ref = "";
 	private String journalName = "";
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Mutator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Mutator.java
index 42e4662689..a26745f9a5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Mutator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Mutator.java
@@ -59,7 +59,7 @@ public class Mutator{
 	List<String> supportedAtoms;
 
 	public Mutator(){
-		supportedAtoms = new ArrayList<String>();
+		supportedAtoms = new ArrayList<>();
 		supportedAtoms.add("N");
 		supportedAtoms.add("CA");
 		supportedAtoms.add("C");
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
index 216f0b2476..f3cc2d8d16 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/PDBHeader.java
@@ -104,7 +104,7 @@ public PDBHeader(){
 		rFree = DEFAULT_RFREE;
 		rWork = DEFAULT_RFREE;
 
-		bioAssemblies = new LinkedHashMap<Integer, BioAssemblyInfo>();
+		bioAssemblies = new LinkedHashMap<>();
 		crystallographicInfo = new PDBCrystallographicInfo();
 
 		keywords       = new ArrayList<>();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ResidueRange.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ResidueRange.java
index 79dbedbdfc..05fb941fc8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ResidueRange.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ResidueRange.java
@@ -137,7 +137,7 @@ public static List<ResidueRange> parseMultiple(String s) {
 		}
 
 		String[] parts = s.split(",");
-		List<ResidueRange> list = new ArrayList<ResidueRange>(parts.length);
+		List<ResidueRange> list = new ArrayList<>(parts.length);
 		for (String part : parts) {
 			list.add(parse(part));
 		}
@@ -352,7 +352,7 @@ public static Iterator<ResidueNumber> multiIterator(AtomPositionMap map, List<?
 	}
 
 	public static List<ResidueRange> parseMultiple(List<String> ranges) {
-		List<ResidueRange> rrs = new ArrayList<ResidueRange>(ranges.size());
+		List<ResidueRange> rrs = new ArrayList<>(ranges.size());
 		for (String range : ranges) {
 			ResidueRange rr = ResidueRange.parse(range);
 			if (rr != null) rrs.add(rr);
@@ -361,7 +361,7 @@ public static List<ResidueRange> parseMultiple(List<String> ranges) {
 	}
 
 	public static List<String> toStrings(List<? extends ResidueRange> ranges) {
-		List<String> list = new ArrayList<String>(ranges.size());
+		List<String> list = new ArrayList<>(ranges.size());
 		for (ResidueRange range : ranges) {
 			list.add(range.toString());
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ResidueRangeAndLength.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ResidueRangeAndLength.java
index fbf9cb07bf..d9769d0134 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ResidueRangeAndLength.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ResidueRangeAndLength.java
@@ -129,7 +129,7 @@ public static ResidueRangeAndLength parse(String s, AtomPositionMap map) {
 
 
 	public static List<ResidueRangeAndLength> parseMultiple(List<String> ranges, AtomPositionMap map) {
-		List<ResidueRangeAndLength> rrs = new ArrayList<ResidueRangeAndLength>(ranges.size());
+		List<ResidueRangeAndLength> rrs = new ArrayList<>(ranges.size());
 		for (String range : ranges) {
 			ResidueRangeAndLength rr = ResidueRangeAndLength.parse(range, map);
 			if (rr != null) rrs.add(rr);
@@ -145,7 +145,7 @@ public static List<ResidueRangeAndLength> parseMultiple(List<String> ranges, Ato
 	 */
 	public static List<ResidueRangeAndLength> parseMultiple(String s, AtomPositionMap map) {
 		String[] parts = s.split(",");
-		List<ResidueRangeAndLength> list = new ArrayList<ResidueRangeAndLength>(parts.length);
+		List<ResidueRangeAndLength> list = new ArrayList<>(parts.length);
 		for (String part : parts) {
 			list.add(parse(part, map));
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Site.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Site.java
index 306b3a2cee..9158906d23 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Site.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Site.java
@@ -42,7 +42,7 @@ public class Site implements PDBRecord, Comparable<Site> {
 	private static final String lineEnd = System.getProperty("line.separator");
 
 	private String siteID = "";
-	private List<Group> groups = new ArrayList<Group>();
+	private List<Group> groups = new ArrayList<>();
 	//variables for REMARK 800
 	private String evCode = "";
 	private String description = "";
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StandardAminoAcid.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StandardAminoAcid.java
index d52d358385..731267aafa 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StandardAminoAcid.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StandardAminoAcid.java
@@ -64,7 +64,7 @@ private StandardAminoAcid() {
 	 * @author Tamas Horvath provided the standard amino acids
 	 */
 	static {
-		aminoAcids = new HashMap<String,AminoAcid>();
+		aminoAcids = new HashMap<>();
 
 
 		InputStream fileStream = StandardAminoAcid.class.getClassLoader().getResourceAsStream(STANDARD_AMINOS_FILE);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
index 08b7ebceb0..4fce5b853e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
@@ -126,7 +126,7 @@ public Structure clone() {
 
 		// go through each chain and clone chain
 		for (int i=0;i<nrModels();i++){
-			List<Chain> cloned_model = new ArrayList<Chain>();
+			List<Chain> cloned_model = new ArrayList<>();
 
 			for (int j=0;j<size(i);j++){
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
index b2b6e88e6b..3921299613 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureTools.java
@@ -171,7 +171,7 @@ public class StructureTools {
 	private static final Set<String> AMINOACID_BACKBONE_ATOMS;
 
 	static {
-		nucleotides30 = new HashMap<String, Character>();
+		nucleotides30 = new HashMap<>();
 		nucleotides30.put("DA", 'A');
 		nucleotides30.put("DC", 'C');
 		nucleotides30.put("DG", 'G');
@@ -215,14 +215,14 @@ public class StructureTools {
 		// store nucleic acids (C, G, A, T, U, and I), and
 		// the modified versions of nucleic acids (+C, +G, +A, +T, +U, and +I),
 		// and
-		nucleotides23 = new HashMap<String, Character>();
+		nucleotides23 = new HashMap<>();
 		String[] names = { "C", "G", "A", "T", "U", "I", "+C", "+G", "+A",
 				"+T", "+U", "+I" };
 		for (String n : names) {
 			nucleotides23.put(n, n.charAt(n.length() - 1));
 		}
 
-		aminoAcids = new HashMap<String, Character>();
+		aminoAcids = new HashMap<>();
 		aminoAcids.put("GLY", 'G');
 		aminoAcids.put("ALA", 'A');
 		aminoAcids.put("VAL", 'V');
@@ -254,7 +254,7 @@ public class StructureTools {
 		aminoAcids.put("PYH", 'O');
 		aminoAcids.put("PYL", 'O');
 
-		hBondDonorAcceptors = new HashSet<Element>();
+		hBondDonorAcceptors = new HashSet<>();
 		hBondDonorAcceptors.add(Element.N);
 		hBondDonorAcceptors.add(Element.O);
 		hBondDonorAcceptors.add(Element.S);
@@ -320,7 +320,7 @@ public static int getNrGroups(Structure s) {
 	public static Atom[] getAtomArray(Structure s, String[] atomNames) {
 		List<Chain> chains = s.getModel(0);
 
-		List<Atom> atoms = new ArrayList<Atom>();
+		List<Atom> atoms = new ArrayList<>();
 
 		extractAtoms(atomNames, chains, atoms);
 		return atoms.toArray(new Atom[0]);
@@ -787,7 +787,7 @@ private static void extractAtoms(String[] atomNames, List<Chain> chains, List<At
 			for (Group g : c.getAtomGroups()) {
 
 				// a temp container for the atoms of this group
-				List<Atom> thisGroupAtoms = new ArrayList<Atom>();
+				List<Atom> thisGroupAtoms = new ArrayList<>();
 				// flag to check if this group contains all the requested atoms.
 				boolean thisGroupAllAtoms = true;
 				for (String atomName : atomNames) {
@@ -927,7 +927,7 @@ public static Atom[] getRepresentativeAtomArray(Chain c) {
 	public static Atom[] cloneAtomArray(Atom[] ca) {
 		Atom[] newCA = new Atom[ca.length];
 
-		List<Chain> model = new ArrayList<Chain>();
+		List<Chain> model = new ArrayList<>();
 		int apos = -1;
 		for (Atom a : ca) {
 			apos++;
@@ -973,7 +973,7 @@ public static Atom[] cloneAtomArray(Atom[] ca) {
 	public static Group[] cloneGroups(Atom[] ca) {
 		Group[] newGroup = new Group[ca.length];
 
-		List<Chain> model = new ArrayList<Chain>();
+		List<Chain> model = new ArrayList<>();
 		int apos = -1;
 		for (Atom a : ca) {
 			apos++;
@@ -1081,7 +1081,7 @@ public static Atom[] duplicateCA2(Atom[] ca2) {
 	 */
 	public static Atom[] getAtomCAArray(Structure s) {
 
-		List<Atom> atoms = new ArrayList<Atom>();
+		List<Atom> atoms = new ArrayList<>();
 
 		for (Chain c : s.getChains()) {
 			for (Group g : c.getAtomGroups()) {
@@ -1460,12 +1460,12 @@ public static Map<Group, Double> getGroupDistancesWithinShell(
 		// for speed, we avoid calculating square roots
 		radius = radius * radius;
 
-		Map<Group, Double> distances = new HashMap<Group, Double>();
+		Map<Group, Double> distances = new HashMap<>();
 
 		// we only need this if we're averaging distances
 		// note that we can't use group.getAtoms().size() because some the
 		// group's atoms be outside the shell
-		Map<Group, Integer> atomCounts = new HashMap<Group, Integer>();
+		Map<Group, Integer> atomCounts = new HashMap<>();
 
 		for (Chain chain : structure.getChains()) {
 			groupLoop: for (Group chainGroup : chain.getAtomGroups()) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
index 49789d2fc9..6419603c64 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/SubstructureIdentifier.java
@@ -109,7 +109,7 @@ public SubstructureIdentifier(String id) {
 
 			this.ranges = ResidueRange.parseMultiple(rangeStr);
 		} else {
-			this.ranges = new LinkedList<ResidueRange>();
+			this.ranges = new LinkedList<>();
 		}
 	}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/AFPTwister.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/AFPTwister.java
index 3718259c56..0b2d21ae82 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/AFPTwister.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/AFPTwister.java
@@ -295,7 +295,7 @@ private static void transformOrigPDB(int n, int[] res1, int[] res2,
 	private static Atom[] getAtoms(Atom[] ca, int[] positions, int length,
 			boolean clone) {
 
-		List<Atom> atoms = new ArrayList<Atom>();
+		List<Atom> atoms = new ArrayList<>();
 		for (int i = 0; i < length; i++) {
 			int p = positions[i];
 			Atom a;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructureAlignmentFactory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructureAlignmentFactory.java
index 8b1c2629ef..956529262c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructureAlignmentFactory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/StructureAlignmentFactory.java
@@ -135,7 +135,7 @@ public static StructureAlignment[] getAllAlgorithms(){
 
 	public static String[] getAllAlgorithmNames(){
 		StructureAlignment[] algos = getAllAlgorithms();
-		List<String> names = new ArrayList<String>();
+		List<String> names = new ArrayList<>();
 
 		for (StructureAlignment alg : algos){
 			names.add(alg.getAlgorithmName());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java
index fb7382cf71..20bc11827e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java
@@ -82,7 +82,7 @@ public abstract class AbstractUserArgumentProcessor implements UserArgumentProce
 
 	protected StartupParameters params ;
 
-	public static final List<String> mandatoryArgs= new ArrayList<String>();
+	public static final List<String> mandatoryArgs= new ArrayList<>();
 
 	protected AbstractUserArgumentProcessor(){
 		params = getStartupParametersInstance();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java
index 7e88bcb0b2..6c045ba48e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java
@@ -118,7 +118,7 @@ public CECalculator(CeParameters params){
 		dist1= new double[0][0];
 		dist2= new double[0][0];
 		this.params = params;
-		matrixListeners = new ArrayList<MatrixListener>();
+		matrixListeners = new ArrayList<>();
 
 	}
 
@@ -1143,7 +1143,7 @@ private void checkBestTraces( AFPChain afpChain,
 		}
 
 		// start to convert CE internal datastructure to generic AFPChain one...
-		List<AFP> afpSet = new ArrayList<AFP>();
+		List<AFP> afpSet = new ArrayList<>();
 		for (int afp=0;afp<nBestTrace;afp++){
 			// fill in data from nBestTrace into AFP
 
@@ -1923,7 +1923,7 @@ public double calc_rmsd(Atom[] pro1, Atom[] pro2, int strLen,
 	 */
 	private Atom[] getAtoms(Atom[] ca,  int length, boolean clone) throws StructureException{
 
-		List<Atom> atoms = new ArrayList<Atom>();
+		List<Atom> atoms = new ArrayList<>();
 		for ( int i = 0 ; i < length ; i++){
 
 			Atom a;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCPMain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCPMain.java
index 2d7e76cf77..881fc224b4 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCPMain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCPMain.java
@@ -415,8 +415,8 @@ public static AFPChain filterDuplicateAFPs(AFPChain afpChain, CECalculator ceCal
 
 		// Fix numbering:
 		// First, split up the atoms into left and right blocks
-		List< ResiduePair > left = new ArrayList<ResiduePair>(); // residues from left of duplication
-		List< ResiduePair > right = new ArrayList<ResiduePair>(); // residues from right of duplication
+		List< ResiduePair > left = new ArrayList<>(); // residues from left of duplication
+		List< ResiduePair > right = new ArrayList<>(); // residues from right of duplication
 
 		for(int i=0;i<optLen[0];i++) {
 			if( optAln[0][1][i] >= firstRes && optAln[0][1][i] <= lastRes ) { // not trimmed
@@ -432,7 +432,7 @@ public static AFPChain filterDuplicateAFPs(AFPChain afpChain, CECalculator ceCal
 		alignLen = 0;
 
 		// Now we don't care about left/right, so just call them "blocks"
-		List<List<ResiduePair>> blocks = new ArrayList<List<ResiduePair>>(2);
+		List<List<ResiduePair>> blocks = new ArrayList<>(2);
 		if( !left.isEmpty() ) {
 			blocks.add(left);
 			alignLen += left.size();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java
index 05db803cf0..4f57161268 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java
@@ -116,7 +116,7 @@ public CeCalculatorEnhanced(CeParameters params){
 		dist1= new double[0][0];
 		dist2= new double[0][0];
 		this.params = params;
-		matrixListeners = new ArrayList<MatrixListener>();
+		matrixListeners = new ArrayList<>();
 
 	}
 
@@ -1134,7 +1134,7 @@ private void checkBestTraces( AFPChain afpChain,
 		}
 
 		// start to convert CE internal datastructure to generic AFPChain one...
-		List<AFP> afpSet = new ArrayList<AFP>();
+		List<AFP> afpSet = new ArrayList<>();
 		for (int afp=0;afp<nBestTrace;afp++){
 			// fill in data from nBestTrace into AFP
 
@@ -2013,7 +2013,7 @@ public double calc_rmsd(Atom[] pro1, Atom[] pro2, int strLen, boolean storeTrans
 	 */
 	private Atom[] getAtoms(Atom[] ca,  int length, boolean clone) throws StructureException{
 
-		List<Atom> atoms = new ArrayList<Atom>();
+		List<Atom> atoms = new ArrayList<>();
 		for ( int i = 0 ; i < length ; i++){
 
 			Atom a;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeParameters.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeParameters.java
index 8383acf585..106aa08090 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeParameters.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeParameters.java
@@ -205,7 +205,7 @@ public Integer getMaxGapSize() {
 
 	@Override
 	public List<String> getUserConfigHelp() {
-		List<String> params =new ArrayList<String>();
+		List<String> params =new ArrayList<>();
 		String helpMaxGap = "This parameter configures the maximum gap size G, that is applied during the AFP extension. The larger the value, the longer the calculation time can become, Default value is 30. Set to 0 for no limit. " ;
 		//String helpRmsdThr = "This configures the RMSD threshold applied during the trace of the fragment matrix.";
 		String helpWinSize = "This configures the fragment size m of Aligned Fragment Pairs (AFPs).";
@@ -222,7 +222,7 @@ public List<String> getUserConfigHelp() {
 
 	@Override
 	public List<String> getUserConfigParameters() {
-		List<String> params = new ArrayList<String>();
+		List<String> params = new ArrayList<>();
 		params.add("MaxGapSize");
 		//params.add("RmsdThr");
 		params.add("WinSize");
@@ -236,7 +236,7 @@ public List<String> getUserConfigParameters() {
 
 	@Override
 	public List<String> getUserConfigParameterNames(){
-		List<String> params = new ArrayList<String>();
+		List<String> params = new ArrayList<>();
 		params.add("max. gap size G (during AFP extension).");
 		//params.add("RMSD threshold during trace of the fragment matrix.");
 		params.add("fragment size m");
@@ -250,7 +250,7 @@ public List<String> getUserConfigParameterNames(){
 	@Override
 	@SuppressWarnings("rawtypes")
 	public List<Class> getUserConfigTypes() {
-		List<Class> params = new ArrayList<Class>();
+		List<Class> params = new ArrayList<>();
 		params.add(Integer.class);
 		//params.add(Double.class);
 		params.add(Integer.class);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/OptimalCECPMain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/OptimalCECPMain.java
index b10e09fbfd..7fa9c4cf28 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/OptimalCECPMain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/OptimalCECPMain.java
@@ -126,7 +126,7 @@ private static <T> void permuteArray(T[] arr, int cp) {
 					"Permutation point ("+cp+") must be between -ca2.length and ca2.length-1" );
 		}
 
-		List<T> temp = new ArrayList<T>(cp);
+		List<T> temp = new ArrayList<>(cp);
 
 		// shift residues left
 		for(int i=0;i<cp;i++) {
@@ -333,7 +333,7 @@ private static void permuteOptAln(AFPChain afpChain, int cp)
 		int[] optLen = afpChain.getOptLen();
 
 		// the processed alignment
-		List<List<List<Integer>>> blocks = new ArrayList<List<List<Integer>>>(afpChain.getBlockNum()*2);
+		List<List<List<Integer>>> blocks = new ArrayList<>(afpChain.getBlockNum()*2);
 
 		//Update residue indices
 		// newi = (oldi-cp) % N
@@ -342,7 +342,7 @@ private static void permuteOptAln(AFPChain afpChain, int cp)
 				continue;
 
 			// set up storage for the current block
-			List<List<Integer>> currBlock = new ArrayList<List<Integer>>(2);
+			List<List<Integer>> currBlock = new ArrayList<>(2);
 			currBlock.add( new ArrayList<Integer>());
 			currBlock.add( new ArrayList<Integer>());
 			blocks.add(currBlock);
@@ -356,7 +356,7 @@ private static void permuteOptAln(AFPChain afpChain, int cp)
 				//this happens when the new alignment crosses the protein terminus
 				if( optAln[block][1][pos-1]+cp<ca2len &&
 						optAln[block][1][pos]+cp >= ca2len) {
-					currBlock = new ArrayList<List<Integer>>(2);
+					currBlock = new ArrayList<>(2);
 					currBlock.add( new ArrayList<Integer>());
 					currBlock.add( new ArrayList<Integer>());
 					blocks.add(currBlock);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/StructureName.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/StructureName.java
index 0d9428a6b7..c7d68f2d04 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/StructureName.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/client/StructureName.java
@@ -329,7 +329,7 @@ private boolean initFromFile() {
 	}
 
 	private static Set<String> getChainNames(SubstructureIdentifier si) {
-		Set<String> chains = new TreeSet<String>();
+		Set<String> chains = new TreeSet<>();
 		List<ResidueRange> ranges = si.getResidueRanges();
 		for(ResidueRange range : ranges) {
 			String chainName = range.getChainName();
@@ -604,7 +604,7 @@ public int compareTo(StructureName o) {
 	 * @return The best match for name among the domains of scopDB, or null if none match.
 	 */
 	public static ScopDomain guessScopDomain(String name, ScopDatabase scopDB) {
-		List<ScopDomain> matches = new LinkedList<ScopDomain>();
+		List<ScopDomain> matches = new LinkedList<>();
 
 		// Try exact match first
 		ScopDomain domain = scopDB.getDomainByScopID(name);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPCalculator.java
index a672cc9831..52b903189d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPCalculator.java
@@ -48,7 +48,7 @@ public class AFPCalculator
 
 	public static void extractAFPChains(FatCatParameters params, AFPChain afpChain,Atom[] ca1,Atom[] ca2) throws StructureException {
 
-		List<AFP> afpSet = new ArrayList<AFP>();
+		List<AFP> afpSet = new ArrayList<>();
 		afpChain.setAfpSet(afpSet);
 
 		if ( debug )
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FatCatParameters.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FatCatParameters.java
index 760b196bd5..bee2eb4df5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FatCatParameters.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/FatCatParameters.java
@@ -366,7 +366,7 @@ public void setSparse(int sparse)
 
 	@Override
 	public List<String> getUserConfigHelp() {
-		List<String> params = new ArrayList<String>();
+		List<String> params = new ArrayList<>();
 		String fragLen = "The length of the fragments.";
 		String rmsdCutHelp = "The RMSD cutoff to be used during AFP detection.";
 		String disCutHelp = "The distance cutoff used when calculate the connectivity of AFP pairs";
@@ -382,7 +382,7 @@ public List<String> getUserConfigHelp() {
 
 	@Override
 	public List<String> getUserConfigParameterNames() {
-		List<String> params = new ArrayList<String>();
+		List<String> params = new ArrayList<>();
 		params.add("Fragment Length");
 		params.add("RMSD Cutoff");
 		params.add("AFP Distance Cutoff");
@@ -393,7 +393,7 @@ public List<String> getUserConfigParameterNames() {
 
 	@Override
 	public List<String> getUserConfigParameters() {
-		List<String> params = new ArrayList<String>();
+		List<String> params = new ArrayList<>();
 		params.add("FragLen");
 		params.add("RmsdCut");
 		params.add("DisCut");
@@ -406,7 +406,7 @@ public List<String> getUserConfigParameters() {
 	@SuppressWarnings({  "rawtypes" })
 	public List<Class> getUserConfigTypes() {
 
-		List<Class> params = new ArrayList<Class>();
+		List<Class> params = new ArrayList<>();
 		params.add(Integer.class);
 		params.add(Double.class);
 		params.add(Double.class);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/helper/JointFragments.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/helper/JointFragments.java
index 862e7d8d50..05cc643aa8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/helper/JointFragments.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/helper/JointFragments.java
@@ -40,7 +40,7 @@ public class JointFragments {
 
 		List<int[]> idxlist;
 		public JointFragments(){
-			idxlist = new ArrayList<int[]>();
+			idxlist = new ArrayList<>();
 			rms = 999;
 		}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
index d06f91e7d9..41cef89031 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
@@ -180,7 +180,7 @@ public AFPChain(AFPChain o) {
 		this.alignScoreUpdate = o.alignScoreUpdate;
 		this.afpChainTwiNum = o.afpChainTwiNum;
 		this.minLen = o.minLen;
-		this.afpSet = new ArrayList<AFP>(o.afpSet);
+		this.afpSet = new ArrayList<>(o.afpSet);
 		this.afpIndex = o.afpIndex == null? null: o.afpIndex.clone();
 		this.afpAftIndex = o.afpAftIndex == null? null: o.afpAftIndex.clone();
 		this.afpBefIndex = o.afpBefIndex == null? null: o.afpBefIndex.clone();
@@ -440,7 +440,7 @@ private void init(){
 
 		blockResSize = new int[maxTra+1];
 
-		afpSet = new ArrayList<AFP>();
+		afpSet = new ArrayList<>();
 		totalLenIni = totalLenOpt = 0;
 		totalRmsdIni = totalRmsdOpt = 0.0;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/AbstractScoresCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/AbstractScoresCache.java
index b1ae2bf543..796da8382b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/AbstractScoresCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/AbstractScoresCache.java
@@ -48,7 +48,7 @@ protected AbstractScoresCache(AbstractScoresCache cache) {
 	@Override
 	public void putScore(String property, Double score) {
 		if(scores == null) {
-			scores = new TreeMap<String, Double>();
+			scores = new TreeMap<>();
 		}
 		scores.put(property, score);
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockImpl.java
index 402aa5984e..becc817e85 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockImpl.java
@@ -80,7 +80,7 @@ public BlockImpl(BlockImpl b) {
 		this.alignRes = null;
 		if (b.alignRes != null) {
 			// Make a deep copy of everything
-			alignRes = new ArrayList<List<Integer>>();
+			alignRes = new ArrayList<>();
 			for (int k = 0; k < b.size(); k++) {
 				alignRes.add(new ArrayList<Integer>(b.alignRes.get(k)));
 			}
@@ -188,7 +188,7 @@ public List<Integer> getAlignResCounts() {
 		if (alignResCounts != null)
 			return alignResCounts;
 
-		alignResCounts = new ArrayList<Integer>(size());
+		alignResCounts = new ArrayList<>(size());
 		for (int s = 0; s < size(); s++) {
 			int count = 0;
 			for (int r = 0; r < length(); r++) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSetImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSetImpl.java
index c817853634..5282f83b31 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSetImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSetImpl.java
@@ -98,7 +98,7 @@ public BlockSetImpl(BlockSetImpl bs) {
 		blocks = null;
 		if (bs.blocks != null) {
 			// Make a deep copy of everything
-			this.blocks = new ArrayList<Block>();
+			this.blocks = new ArrayList<>();
 			for (Block b : bs.blocks) {
 				Block newB = b.clone();
 				newB.setBlockSet(this);
@@ -143,7 +143,7 @@ public void setMultipleAlignment(MultipleAlignment parent) {
 	@Override
 	public List<Block> getBlocks() {
 		if (blocks == null)
-			blocks = new ArrayList<Block>();
+			blocks = new ArrayList<>();
 		return blocks;
 	}
 
@@ -232,7 +232,7 @@ public List<Integer> getAlignResCounts() {
 		if (alignResCounts != null)
 			return alignResCounts;
 
-		alignResCounts = new ArrayList<Integer>(size());
+		alignResCounts = new ArrayList<>(size());
 		for (int s = 0; s < size(); s++)
 			alignResCounts.add(0);
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentEnsembleImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentEnsembleImpl.java
index 04b31447b0..a6df171705 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentEnsembleImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentEnsembleImpl.java
@@ -115,7 +115,7 @@ public MultipleAlignmentEnsembleImpl(MultipleAlignmentEnsembleImpl e) {
 		distanceMatrix = null;
 		if (e.distanceMatrix != null) {
 			// Make a deep copy of everything
-			distanceMatrix = new ArrayList<Matrix>();
+			distanceMatrix = new ArrayList<>();
 			for (Matrix mat : e.distanceMatrix) {
 				distanceMatrix.add((Matrix) mat.clone());
 			}
@@ -124,7 +124,7 @@ public MultipleAlignmentEnsembleImpl(MultipleAlignmentEnsembleImpl e) {
 		multipleAlignments = null;
 		if (e.multipleAlignments != null) {
 			// Make a deep copy of everything
-			multipleAlignments = new ArrayList<MultipleAlignment>();
+			multipleAlignments = new ArrayList<>();
 			for (MultipleAlignment msa : e.multipleAlignments) {
 				MultipleAlignment newMSA = msa.clone();
 				newMSA.setEnsemble(this);
@@ -133,10 +133,10 @@ public MultipleAlignmentEnsembleImpl(MultipleAlignmentEnsembleImpl e) {
 		}
 
 		if (e.atomArrays != null) {
-			atomArrays = new ArrayList<Atom[]>(e.atomArrays);
+			atomArrays = new ArrayList<>(e.atomArrays);
 		}
 		if (e.structureIdentifiers != null) {
-			structureIdentifiers = new ArrayList<StructureIdentifier>(
+			structureIdentifiers = new ArrayList<>(
 					e.structureIdentifiers);
 		}
 	}
@@ -326,7 +326,7 @@ public void setAtomArrays(List<Atom[]> atomArrays) {
 	 */
 	public void updateAtomArrays() throws IOException, StructureException {
 		AtomCache cache = new AtomCache();
-		atomArrays = new ArrayList<Atom[]>();
+		atomArrays = new ArrayList<>();
 		for (StructureIdentifier name : getStructureIdentifiers()) {
 			Atom[] array = cache.getRepresentativeAtoms(name);
 			atomArrays.add(array);
@@ -346,7 +346,7 @@ public List<Matrix> getDistanceMatrix() {
 	public void updateDistanceMatrix() {
 
 		// Reset the distance Matrix variable
-		distanceMatrix = new ArrayList<Matrix>();
+		distanceMatrix = new ArrayList<>();
 
 		for (int s = 0; s < size(); s++) {
 			Atom[] ca = atomArrays.get(s);
@@ -359,7 +359,7 @@ public void updateDistanceMatrix() {
 	public List<MultipleAlignment> getMultipleAlignments() {
 
 		if (multipleAlignments == null) {
-			multipleAlignments = new ArrayList<MultipleAlignment>();
+			multipleAlignments = new ArrayList<>();
 		}
 		return multipleAlignments;
 	}
@@ -377,7 +377,7 @@ public void setMultipleAlignments(List<MultipleAlignment> alignments) {
 	@Override
 	public void addMultipleAlignment(MultipleAlignment alignment) {
 		if (multipleAlignments == null) {
-			multipleAlignments = new ArrayList<MultipleAlignment>();
+			multipleAlignments = new ArrayList<>();
 		}
 		multipleAlignments.add(alignment);
 		alignment.setEnsemble(this);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
index 91d087b8b8..7f55f1c2f0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
@@ -100,7 +100,7 @@ public MultipleAlignmentImpl(MultipleAlignmentImpl ma) {
 		blockSets = null;
 		if (ma.blockSets != null) {
 			// Make a deep copy of everything
-			this.blockSets = new ArrayList<BlockSet>();
+			this.blockSets = new ArrayList<>();
 			for (BlockSet bs : ma.blockSets) {
 				BlockSet newBS = bs.clone();
 				newBS.setMultipleAlignment(this);
@@ -127,7 +127,7 @@ public MultipleAlignmentImpl clone() {
 
 	@Override
 	public String toString() {
-		List<String> ids = new ArrayList<String>(parent
+		List<String> ids = new ArrayList<>(parent
 				.getStructureIdentifiers().size());
 		for (StructureIdentifier i : parent.getStructureIdentifiers()) {
 			ids.add(i.getIdentifier());
@@ -147,13 +147,13 @@ public String toString() {
 	@Override
 	public List<BlockSet> getBlockSets() {
 		if (blockSets == null)
-			blockSets = new ArrayList<BlockSet>();
+			blockSets = new ArrayList<>();
 		return blockSets;
 	}
 
 	@Override
 	public List<Block> getBlocks() {
-		List<Block> blocks = new ArrayList<Block>();
+		List<Block> blocks = new ArrayList<>();
 		for (BlockSet bs : getBlockSets()) {
 			blocks.addAll(bs.getBlocks());
 		}
@@ -263,7 +263,7 @@ public List<Integer> getAlignResCounts() {
 		if (alignResCounts != null)
 			return alignResCounts;
 
-		alignResCounts = new ArrayList<Integer>(size());
+		alignResCounts = new ArrayList<>(size());
 		for (int s = 0; s < size(); s++)
 			alignResCounts.add(0);
 
@@ -282,7 +282,7 @@ public List<Double> getCoverages() {
 			return coverages;
 
 		List<Integer> counts = getAlignResCounts();
-		coverages = new ArrayList<Double>(size());
+		coverages = new ArrayList<>(size());
 		for (int s = 0; s < size(); s++)
 			coverages.add(counts.get(s)
 					/ (double) getAtomArrays().get(s).length);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcMain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcMain.java
index dcc843d791..702ed1d6a5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcMain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcMain.java
@@ -124,7 +124,7 @@ private MultipleAlignment generateSeed(List<Atom[]> atomArrays)
 		int size = atomArrays.size();
 
 		//List to store the all-to-all alignments
-		List<List<AFPChain>> afpAlignments = new ArrayList<List<AFPChain>>();
+		List<List<AFPChain>> afpAlignments = new ArrayList<>();
 		for (int i=0; i<size; i++){
 			afpAlignments.add(new ArrayList<AFPChain>());
 			for (int j=0; j<size; j++)
@@ -133,7 +133,7 @@ private MultipleAlignment generateSeed(List<Atom[]> atomArrays)
 
 		int threads = params.getNrThreads();
 		ExecutorService executor = Executors.newFixedThreadPool(threads);
-		List<Future<AFPChain>> afpFuture = new ArrayList<Future<AFPChain>>();
+		List<Future<AFPChain>> afpFuture = new ArrayList<>();
 
 		//Create all the possible protein pairwise combinations
 		//(N*(N-1)/2) and call the pairwise alignment algorithm
@@ -184,7 +184,7 @@ private static int chooseReferenceRMSD(List<List<AFPChain>> afpAlignments){
 
 		int size = afpAlignments.size();
 
-		List<Double> RMSDs = new ArrayList<Double>();
+		List<Double> RMSDs = new ArrayList<>();
 		for (int i=0; i<afpAlignments.size(); i++){
 			double rmsd=0.0;
 			for (int j=0; j<size; j++){
@@ -226,10 +226,10 @@ private static MultipleAlignment combineReferenceAlignments(
 		int length = 0;  //the number of residues of the reference structure
 		if (ref==0) length = afpList.get(1).getCa1Length();
 		else length = afpList.get(0).getCa2Length();
-		SortedSet<Integer> flexibleBoundaries = new TreeSet<Integer>();
+		SortedSet<Integer> flexibleBoundaries = new TreeSet<>();
 
 		//Stores the equivalencies of all the structures as a double List
-		List<List<Integer>> equivalencies = new ArrayList<List<Integer>>();
+		List<List<Integer>> equivalencies = new ArrayList<>();
 		for (int str=0; str<size; str++){
 			equivalencies.add(new ArrayList<Integer>());
 			for (int res=0; res<length; res++){
@@ -305,7 +305,7 @@ else if (str<ref){
 				if (lastB.getAlignRes() == null){
 					//Initialize the aligned residues list
 					List<List<Integer>> alnRes =
-							new ArrayList<List<Integer>>(size);
+							new ArrayList<>(size);
 
 					for (int k=0; k<size; k++) {
 						alnRes.add(new ArrayList<Integer>());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java
index 0845c61300..83b2247bbe 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java
@@ -125,7 +125,7 @@ public MultipleMcOptimizer(MultipleAlignment seedAln,
 		imposer = new CoreSuperimposer(reference);
 
 		if (params.getConvergenceSteps() == 0) {
-			List<Integer> lens = new ArrayList<Integer>();
+			List<Integer> lens = new ArrayList<>();
 			for (int i = 0; i < size; i++)
 				lens.add(atomArrays.get(i).length);
 			convergenceSteps = Collections.min(lens) * size;
@@ -142,8 +142,8 @@ public MultipleMcOptimizer(MultipleAlignment seedAln,
 		Lmin = params.getMinBlockLen();
 
 		// Delete all shorter than Lmin blocks, and empty blocksets
-		List<Block> toDelete = new ArrayList<Block>();
-		List<BlockSet> emptyBs = new ArrayList<BlockSet>();
+		List<Block> toDelete = new ArrayList<>();
+		List<BlockSet> emptyBs = new ArrayList<>();
 
 		for (Block b : msa.getBlocks()) {
 			if (b.getCoreLength() < Lmin) {
@@ -183,12 +183,12 @@ public MultipleAlignment call() throws Exception {
 	private void initialize() throws StructureException {
 
 		// Initialize alignment variables
-		freePool = new ArrayList<SortedSet<Integer>>();
-		List<List<Integer>> aligned = new ArrayList<List<Integer>>();
+		freePool = new ArrayList<>();
+		List<List<Integer>> aligned = new ArrayList<>();
 
 		// Generate freePool residues from the ones not aligned
 		for (int i = 0; i < size; i++) {
-			List<Integer> residues = new ArrayList<Integer>();
+			List<Integer> residues = new ArrayList<>();
 			for (BlockSet bs : msa.getBlockSets()) {
 				for (Block b : bs.getBlocks()) {
 					for (int l = 0; l < b.length(); l++) {
@@ -219,9 +219,9 @@ private void initialize() throws StructureException {
 
 		// Initialize the history variables
 		if (history) {
-			lengthHistory = new ArrayList<Integer>();
-			rmsdHistory = new ArrayList<Double>();
-			scoreHistory = new ArrayList<Double>();
+			lengthHistory = new ArrayList<>();
+			rmsdHistory = new ArrayList<>();
+			scoreHistory = new ArrayList<>();
 		}
 	}
 
@@ -249,9 +249,9 @@ public MultipleAlignment optimize() throws StructureException {
 
 			// Save the state of the system
 			MultipleAlignment lastMSA = msa.clone();
-			List<SortedSet<Integer>> lastFreePool = new ArrayList<SortedSet<Integer>>();
+			List<SortedSet<Integer>> lastFreePool = new ArrayList<>();
 			for (int k = 0; k < size; k++) {
-				SortedSet<Integer> p = new TreeSet<Integer>();
+				SortedSet<Integer> p = new TreeSet<>();
 				for (Integer l : freePool.get(k))
 					p.add(l);
 				lastFreePool.add(p);
@@ -349,10 +349,10 @@ private boolean checkGaps() {
 
 		boolean shrinkedAny = false;
 
-		List<List<Integer>> shrinkColumns = new ArrayList<List<Integer>>();
+		List<List<Integer>> shrinkColumns = new ArrayList<>();
 		// Loop for each Block
 		for (Block b : msa.getBlocks()) {
-			List<Integer> shrinkCol = new ArrayList<Integer>();
+			List<Integer> shrinkCol = new ArrayList<>();
 			// Loop for each column in the Block
 			for (int res = 0; res < b.length(); res++) {
 				int gapCount = 0;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcParameters.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcParameters.java
index a49d9febc3..cc42754463 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcParameters.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcParameters.java
@@ -54,7 +54,7 @@ public MultipleMcParameters(){
 	@Override
 	public List<String> getUserConfigParameters() {
 
-		List<String> params = new ArrayList<String>();
+		List<String> params = new ArrayList<>();
 		params.add("RandomSeed");
 		params.add("MinBlockLen");
 		params.add("MinAlignedStructures");
@@ -69,7 +69,7 @@ public List<String> getUserConfigParameters() {
 	@Override
 	public List<String> getUserConfigParameterNames() {
 
-		List<String> params = new ArrayList<String>();
+		List<String> params = new ArrayList<>();
 		params.add("Random Seed");
 		params.add("Minimum Block Length");
 		params.add("Minimum Structures per Column");
@@ -85,7 +85,7 @@ public List<String> getUserConfigParameterNames() {
 	@SuppressWarnings("rawtypes")
 	public List<Class> getUserConfigTypes() {
 
-		List<Class> params = new ArrayList<Class>();
+		List<Class> params = new ArrayList<>();
 		params.add(Integer.class);
 		params.add(Integer.class);
 		params.add(Integer.class);
@@ -100,7 +100,7 @@ public List<Class> getUserConfigTypes() {
 	@Override
 	public List<String> getUserConfigHelp() {
 
-		List<String> params =new ArrayList<String>();
+		List<String> params =new ArrayList<>();
 		String randomSeed =
 				"Random seed for the optimizer random number generator.";
 		String minBlockLen =
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/CoreSuperimposer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/CoreSuperimposer.java
index 097615a554..56a8be3687 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/CoreSuperimposer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/CoreSuperimposer.java
@@ -127,8 +127,8 @@ public void superimpose(MultipleAlignment alignment)
 				Atom[] ref = atomArrays.get(reference);
 				Atom[] curr = atomArrays.get(i);
 
-				List<Atom> atomSet1 = new ArrayList<Atom>();
-				List<Atom> atomSet2 = new ArrayList<Atom>();
+				List<Atom> atomSet1 = new ArrayList<>();
+				List<Atom> atomSet2 = new ArrayList<>();
 
 				for( Block blk : bs.getBlocks() ) {
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentDisplay.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentDisplay.java
index ad5b1dd83f..d3fe14ba20 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentDisplay.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentDisplay.java
@@ -69,7 +69,7 @@ public static List<Atom[]> getRotatedAtoms(MultipleAlignment multAln)
 								+ atomArrays.get(i).length);
 		}
 
-		List<Atom[]> rotatedAtoms = new ArrayList<Atom[]>();
+		List<Atom[]> rotatedAtoms = new ArrayList<>();
 
 		// TODO implement independent BlockSet superposition of the structure
 		List<Matrix4d> transf = multAln.getBlockSet(0).getTransformations();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentScorer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentScorer.java
index 1422348e6d..1a9642e251 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentScorer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentScorer.java
@@ -66,7 +66,7 @@ public static void calculateScores(MultipleAlignment alignment)
 		alignment.putScore(RMSD, getRMSD(trans));
 
 		// Put AvgTM-Score
-		List<Integer> lengths = new ArrayList<Integer>(alignment.size());
+		List<Integer> lengths = new ArrayList<>(alignment.size());
 		for (Atom[] atoms : alignment.getAtomArrays()) {
 			lengths.add(atoms.length);
 		}
@@ -237,7 +237,7 @@ public static double getAvgTMScore(MultipleAlignment alignment)
 
 		List<Atom[]> trans = MultipleAlignmentTools.transformAtoms(alignment);
 
-		List<Integer> lengths = new ArrayList<Integer>(alignment.size());
+		List<Integer> lengths = new ArrayList<>(alignment.size());
 		for (Atom[] atoms : alignment.getAtomArrays()) {
 			lengths.add(atoms.length);
 		}
@@ -314,7 +314,7 @@ public static double getRefTMScore(MultipleAlignment alignment, int ref)
 
 		List<Atom[]> trans = MultipleAlignmentTools.transformAtoms(alignment);
 
-		List<Integer> lengths = new ArrayList<Integer>(alignment.size());
+		List<Integer> lengths = new ArrayList<>(alignment.size());
 		for (Atom[] atoms : alignment.getAtomArrays()) {
 			lengths.add(atoms.length);
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
index d790eec19c..836d5c922a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
@@ -108,7 +108,7 @@ public static List<String> getSequenceAlignment(
 			MultipleAlignment alignment, final List<Integer> mapSeqToStruct) {
 
 		// Initialize sequence variables
-		List<String> alnSequences = new ArrayList<String>();
+		List<String> alnSequences = new ArrayList<>();
 		for (int str = 0; str < alignment.size(); str++)
 			alnSequences.add("");
 		mapSeqToStruct.clear();
@@ -116,13 +116,13 @@ public static List<String> getSequenceAlignment(
 		int globalPos = -1;
 
 		// Initialize helper variables in constucting the sequence alignment
-		List<SortedSet<Integer>> freePool = new ArrayList<SortedSet<Integer>>();
-		List<SortedSet<Integer>> blockStarts = new ArrayList<SortedSet<Integer>>();
-		List<List<Integer>> aligned = new ArrayList<List<Integer>>();
+		List<SortedSet<Integer>> freePool = new ArrayList<>();
+		List<SortedSet<Integer>> blockStarts = new ArrayList<>();
+		List<List<Integer>> aligned = new ArrayList<>();
 
 		// Generate freePool residues from the ones not aligned
 		for (int i = 0; i < alignment.size(); i++) {
-			List<Integer> residues = new ArrayList<Integer>();
+			List<Integer> residues = new ArrayList<>();
 			freePool.add(new TreeSet<Integer>());
 			blockStarts.add(new TreeSet<Integer>());
 			for (BlockSet bs : alignment.getBlockSets()) {
@@ -346,7 +346,7 @@ public static List<String> getBlockSequenceAlignment(
 			MultipleAlignment alignment, List<Integer> mapSeqToStruct) {
 
 		// Initialize sequence variables
-		List<String> alnSequences = new ArrayList<String>();
+		List<String> alnSequences = new ArrayList<>();
 		for (int str = 0; str < alignment.size(); str++)
 			alnSequences.add("");
 		mapSeqToStruct.clear();
@@ -661,7 +661,7 @@ public static List<Atom[]> transformAtoms(MultipleAlignment alignment) {
 		}
 
 		List<Atom[]> atomArrays = alignment.getAtomArrays();
-		List<Atom[]> transformed = new ArrayList<Atom[]>(atomArrays.size());
+		List<Atom[]> transformed = new ArrayList<>(atomArrays.size());
 
 		// Loop through structures
 		for (int i = 0; i < atomArrays.size(); i++) {
@@ -729,7 +729,7 @@ public static List<Atom[]> transformAtoms(MultipleAlignment alignment) {
 	 */
 	public static List<Integer> getCorePositions(Block block) {
 
-		List<Integer> corePositions = new ArrayList<Integer>();
+		List<Integer> corePositions = new ArrayList<>();
 
 		for (int col = 0; col < block.length(); col++) {
 			boolean core = true;
@@ -800,9 +800,9 @@ public static MultipleSequenceAlignment<ProteinSequence, AminoAcidCompound> toPr
 							+ "the structures aligned are not proteins");
 		}
 
-		MultipleSequenceAlignment<ProteinSequence, AminoAcidCompound> msa = new MultipleSequenceAlignment<ProteinSequence, AminoAcidCompound>();
+		MultipleSequenceAlignment<ProteinSequence, AminoAcidCompound> msa = new MultipleSequenceAlignment<>();
 
-		Map<String, Integer> uniqueID = new HashMap<String, Integer>();
+		Map<String, Integer> uniqueID = new HashMap<>();
 		List<String> seqs = getSequenceAlignment(msta);
 		for (int i = 0; i < msta.size(); i++) {
 			// Make sure the identifiers are unique (required by AccessionID)
@@ -875,7 +875,7 @@ public static Matrix getRMSDMatrix(MultipleAlignment msa) {
 			for (int j = i; j < msa.size(); j++) {
 				if (i == j)
 					rmsdMat.set(i, j, 0.0);
-				List<Atom[]> compared = new ArrayList<Atom[]>();
+				List<Atom[]> compared = new ArrayList<>();
 				compared.add(superposed.get(i));
 				compared.add(superposed.get(j));
 				double rmsd = MultipleAlignmentScorer.getRMSD(compared);
@@ -947,7 +947,7 @@ public static Phylogeny getStructuralTree(MultipleAlignment msta) {
 		BasicSymmetricalDistanceMatrix rmsdDist = (BasicSymmetricalDistanceMatrix) DistanceMatrixCalculator
 				.structuralDistance(rmsdMat, 1, 5, 0.4);
 		// Set the identifiers of the matrix
-		Map<String, Integer> alreadySeen = new HashMap<String, Integer>();
+		Map<String, Integer> alreadySeen = new HashMap<>();
 		for (int i = 0; i < msta.size(); i++) {
 			// Make sure the identifiers are unique
 			String id = msta.getStructureIdentifier(i).toString();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java
index 70482a8c78..7db5d2e714 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java
@@ -95,7 +95,7 @@ public static String toFatCat(MultipleAlignment alignment) {
 		fatcat.append(alignment.toString() + "\n\n");
 
 		// Get the alignment sequences and the mapping
-		List<Integer> mapSeqToStruct = new ArrayList<Integer>();
+		List<Integer> mapSeqToStruct = new ArrayList<>();
 		List<String> alnSequences = MultipleAlignmentTools
 				.getSequenceAlignment(alignment, mapSeqToStruct);
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/ReferenceSuperimposer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/ReferenceSuperimposer.java
index 0285f8a90d..24fe3abe9c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/ReferenceSuperimposer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/ReferenceSuperimposer.java
@@ -125,8 +125,8 @@ public void superimpose(MultipleAlignment alignment)
 				Atom[] ref = atomArrays.get(reference);
 				Atom[] curr = atomArrays.get(i);
 
-				List<Atom> atomSet1 = new ArrayList<Atom>();
-				List<Atom> atomSet2 = new ArrayList<Atom>();
+				List<Atom> atomSet1 = new ArrayList<>();
+				List<Atom> atomSet2 = new ArrayList<>();
 
 				for( Block blk : bs.getBlocks() ) {
 					if( blk.size() != atomArrays.size()) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/FragmentJoiner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/FragmentJoiner.java
index cb9b870111..87f51844ec 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/FragmentJoiner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/FragmentJoiner.java
@@ -118,7 +118,7 @@ public JointFragments[] approach_ap3(Atom[] ca1, Atom[] ca2, FragmentPair[] frag
 													 StrucAligParameters params) throws StructureException {
 
 		//the final list of joined fragments stores as apairs
-		List<JointFragments> fll = new ArrayList<JointFragments>();
+		List<JointFragments> fll = new ArrayList<>();
 
 		FragmentPair[] tmpfidx = new FragmentPair[fraglst.length];
 		for ( int i=0 ; i < fraglst.length; i++){
@@ -203,7 +203,7 @@ public JointFragments[] approach_ap3(Atom[] ca1, Atom[] ca2, FragmentPair[] frag
 		Collections.sort(fll,comp);
 		Collections.reverse(fll);
 		int m = Math.min(params.getMaxrefine(),fll.size());
-		List<JointFragments> retlst = new ArrayList<JointFragments>();
+		List<JointFragments> retlst = new ArrayList<>();
 		for ( int i = 0 ; i < m ; i++){
 			JointFragments jf = fll.get(i);
 			retlst.add(jf);
@@ -372,7 +372,7 @@ public JointFragments[] frag_pairwise_compat(FragmentPair[] fraglst, int angleDi
 		int[] used = new int[n];
 
 		//the final list of joined fragments stores as apairs
-		List<JointFragments> fll = new ArrayList<JointFragments>();
+		List<JointFragments> fll = new ArrayList<>();
 
 		double adiff = angleDiff * Math.PI / 180d;
 		logger.debug("addiff{}", adiff);
@@ -443,7 +443,7 @@ public JointFragments[] frag_pairwise_compat(FragmentPair[] fraglst, int angleDi
 		Collections.sort(fll,comp);
 		Collections.reverse(fll);
 		int m = Math.min(maxRefine,fll.size());
-		List<JointFragments> retlst = new ArrayList<JointFragments>();
+		List<JointFragments> retlst = new ArrayList<>();
 		for ( int i = 0 ; i < m ; i++){
 			JointFragments jf = fll.get(i);
 			retlst.add(jf);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/Gotoh.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/Gotoh.java
index d0b9752519..83ed3ffaae 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/Gotoh.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/pairwise/Gotoh.java
@@ -209,7 +209,7 @@ private void setPath(){
 
 		int  n;
 		IndexPair[] backId = new IndexPair[a.getRows()+1+a.getCols()+1];
-		List<IndexPair> path = new ArrayList<IndexPair>();
+		List<IndexPair> path = new ArrayList<>();
 
 		backId[0] = new IndexPair((short)(a.getRows()),(short)(a.getCols()));
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlign.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlign.java
index d7dcade047..2b92f3330d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlign.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlign.java
@@ -94,7 +94,7 @@ public static QsAlignResult align(List<Subunit> s1, List<Subunit> s2,
 		List<SubunitCluster> c2 = SubunitClusterer.cluster(s2, cParams).getClusters();
 
 		// STEP 2: match each subunit cluster between groups O(N^2*L^2) - inter
-		Map<Integer, Integer> clusterMap = new HashMap<Integer, Integer>();
+		Map<Integer, Integer> clusterMap = new HashMap<>();
 		for (int i = 0; i < c1.size(); i++) {
 			for (int j = 0; j < c2.size(); j++) {
 
@@ -123,15 +123,15 @@ public static QsAlignResult align(List<Subunit> s1, List<Subunit> s2,
 			// Take a cluster match as reference
 			int index1 = 0;
 			int index2 = clust1.size() - clust2.size();
-			Map<Integer, Integer> subunitMap = new HashMap<Integer, Integer>();
+			Map<Integer, Integer> subunitMap = new HashMap<>();
 			subunitMap.put(index1, index2);
 
 			// Map cluster id to their subunit matching
-			Map<Integer, Map<Integer, Integer>> clustSubunitMap = new HashMap<Integer, Map<Integer, Integer>>();
+			Map<Integer, Map<Integer, Integer>> clustSubunitMap = new HashMap<>();
 			clustSubunitMap.put(globalKey, subunitMap);
 
 			// Change order of key set so that globalKey is first
-			List<Integer> keySet = new ArrayList<Integer>(clusterMap.keySet());
+			List<Integer> keySet = new ArrayList<>(clusterMap.keySet());
 			keySet.remove((Integer) globalKey);
 			keySet.add(0, globalKey);
 
@@ -141,7 +141,7 @@ public static QsAlignResult align(List<Subunit> s1, List<Subunit> s2,
 				if (key == globalKey)
 					subunitMap = clustSubunitMap.get(key);
 				else
-					subunitMap = new HashMap<Integer, Integer>();
+					subunitMap = new HashMap<>();
 
 				// Obtain the clusters of each subunit group
 				clust1 = c1.get(key);
@@ -224,11 +224,11 @@ public static QsAlignResult align(List<Subunit> s1, List<Subunit> s2,
 			logger.info("Cluster Subunit Map: " + clustSubunitMap.toString());
 
 			// Unfold the nested map into subunit map and alignment
-			subunitMap = new HashMap<Integer, Integer>();
-			List<Integer> alignRes1 = new ArrayList<Integer>();
-			List<Integer> alignRes2 = new ArrayList<Integer>();
-			List<Atom> atomArray1 = new ArrayList<Atom>();
-			List<Atom> atomArray2 = new ArrayList<Atom>();
+			subunitMap = new HashMap<>();
+			List<Integer> alignRes1 = new ArrayList<>();
+			List<Integer> alignRes2 = new ArrayList<>();
+			List<Atom> atomArray1 = new ArrayList<>();
+			List<Atom> atomArray2 = new ArrayList<>();
 
 			for (int key : clustSubunitMap.keySet()) {
 
@@ -274,7 +274,7 @@ public static QsAlignResult align(List<Subunit> s1, List<Subunit> s2,
 			// Fill in the alignment information
 			BlockSet bs = new BlockSetImpl(msa);
 			Block b = new BlockImpl(bs);
-			List<List<Integer>> alignRes = new ArrayList<List<Integer>>(2);
+			List<List<Integer>> alignRes = new ArrayList<>(2);
 			alignRes.add(alignRes1);
 			alignRes.add(alignRes2);
 			b.setAlignRes(alignRes);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/seq/SmithWaterman3DParameters.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/seq/SmithWaterman3DParameters.java
index 986bf3a8d3..74b8b891d5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/seq/SmithWaterman3DParameters.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/seq/SmithWaterman3DParameters.java
@@ -42,7 +42,7 @@ public SmithWaterman3DParameters() {
 
 	@Override
 	public List<String> getUserConfigHelp() {
-		List<String> params = new ArrayList<String>();
+		List<String> params = new ArrayList<>();
 		params.add("The Gap open penalty");
 		params.add("The Gap extension penalty");
 		params.add("The maximum RMSD of superposition allowed");
@@ -54,7 +54,7 @@ public List<String> getUserConfigHelp() {
 
 	@Override
 	public List<String> getUserConfigParameterNames() {
-		List<String> params = new ArrayList<String>();
+		List<String> params = new ArrayList<>();
 		params.add("Gap Open");
 		params.add("Gap Extension");
 		params.add("Maximum RMSD");
@@ -65,7 +65,7 @@ public List<String> getUserConfigParameterNames() {
 
 	@Override
 	public List<String> getUserConfigParameters() {
-		List<String> params = new ArrayList<String>();
+		List<String> params = new ArrayList<>();
 		params.add("GapOpen");
 		params.add("GapExtend");
 		params.add("MaxRmsd");
@@ -77,7 +77,7 @@ public List<String> getUserConfigParameters() {
 	@Override
 	@SuppressWarnings("rawtypes")
 	public List<Class> getUserConfigTypes() {
-		List<Class> params = new ArrayList<Class>();
+		List<Class> params = new ArrayList<>();
 		params.add(Short.class);
 		params.add(Short.class);
 		params.add(Double.class);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AFPAlignmentDisplay.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AFPAlignmentDisplay.java
index cdde7480a3..11f36456ab 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AFPAlignmentDisplay.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AFPAlignmentDisplay.java
@@ -90,7 +90,7 @@ public static Atom getTranslation(AFPChain afpChain,Atom[] ca1,Atom[] ca2) throw
 	}
 
 	public static Atom[] getAlignedAtoms1(AFPChain afpChain,Atom[] ca1){
-		List<Atom> atoms = new ArrayList<Atom>();
+		List<Atom> atoms = new ArrayList<>();
 
 		int blockNum = afpChain.getBlockNum();
 
@@ -111,7 +111,7 @@ public static Atom[] getAlignedAtoms1(AFPChain afpChain,Atom[] ca1){
 	}
 	public static Atom[] getAlignedAtoms2(AFPChain afpChain,Atom[] ca2){
 
-		List<Atom> atoms = new ArrayList<Atom>();
+		List<Atom> atoms = new ArrayList<>();
 
 		int blockNum = afpChain.getBlockNum();
 
@@ -329,7 +329,7 @@ public static Map<String,Double> calcIdSimilarity(char[] seq1, char[] seq2, int
 
 		if ( seq1 == null || seq2 == null){
 			logger.warn("Can't calc %ID for an empty alignment! ");
-			Map<String, Double> m = new HashMap<String, Double>();
+			Map<String, Double> m = new HashMap<>();
 			m.put("similarity", similarity);
 			m.put("identity", identity);
 			return m;
@@ -369,7 +369,7 @@ public static Map<String,Double> calcIdSimilarity(char[] seq1, char[] seq2, int
 			similarity = (similarity) / eqr;
 			identity = identity/eqr;
 		}
-		Map<String, Double> m = new HashMap<String, Double>();
+		Map<String, Double> m = new HashMap<>();
 		m.put("similarity", similarity);
 		m.put("identity", identity);
 
@@ -400,7 +400,7 @@ public static Structure createArtificalStructure(AFPChain afpChain, Atom[] ca1,
 
 		Group[] twistedGroups = AlignmentTools.prepareGroupsForDisplay(afpChain,ca1, ca2);
 
-		List<Atom> twistedAs = new ArrayList<Atom>();
+		List<Atom> twistedAs = new ArrayList<>();
 
 		for ( Group g: twistedGroups){
 			if ( g == null )
@@ -412,8 +412,8 @@ public static Structure createArtificalStructure(AFPChain afpChain, Atom[] ca1,
 		}
 		Atom[] twistedAtoms = twistedAs.toArray(new Atom[twistedAs.size()]);
 
-		List<Group> hetatms  = new ArrayList<Group>();
-		List<Group> nucs1    = new ArrayList<Group>();
+		List<Group> hetatms  = new ArrayList<>();
+		List<Group> nucs1    = new ArrayList<>();
 		Group g1 = ca1[0].getGroup();
 		Chain c1 = null;
 		if ( g1 != null) {
@@ -423,8 +423,8 @@ public static Structure createArtificalStructure(AFPChain afpChain, Atom[] ca1,
 				nucs1  = c1.getAtomGroups(GroupType.NUCLEOTIDE);
 			}
 		}
-		List<Group> hetatms2 = new ArrayList<Group>();
-		List<Group> nucs2    = new ArrayList<Group>();
+		List<Group> hetatms2 = new ArrayList<>();
+		List<Group> nucs2    = new ArrayList<>();
 		Group g2 = ca2[0].getGroup();
 		Chain c2 = null;
 		if ( g2 != null){
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java
index f7660e2097..82d38d010c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java
@@ -157,7 +157,7 @@ public static boolean isSequentialAlignment(AFPChain afpChain, boolean checkWith
 	 * @throws StructureException If afpChain is not one-to-one
 	 */
 	public static Map<Integer, Integer> alignmentAsMap(AFPChain afpChain) throws StructureException {
-		Map<Integer,Integer> map = new HashMap<Integer,Integer>();
+		Map<Integer,Integer> map = new HashMap<>();
 
 		if( afpChain.getAlnLength() < 1 ) {
 			return map;
@@ -223,11 +223,11 @@ public static <S,T> Map<S,T> applyAlignment(Map<S, T> alignmentMap, Map<T,S> ide
 
 		if(k<0) throw new IllegalArgumentException("k must be positive");
 		if(k==1) {
-			return new HashMap<S,T>(alignmentMap);
+			return new HashMap<>(alignmentMap);
 		}
 		// Convert to lists to establish a fixed order
-		List<S> preimage = new ArrayList<S>(alignmentMap.keySet()); // currently unmodified
-		List<S> image = new ArrayList<S>(preimage);
+		List<S> preimage = new ArrayList<>(alignmentMap.keySet()); // currently unmodified
+		List<S> image = new ArrayList<>(preimage);
 
 		for(int n=1;n<k;n++) {
 			// apply alignment
@@ -241,7 +241,7 @@ public static <S,T> Map<S,T> applyAlignment(Map<S, T> alignmentMap, Map<T,S> ide
 
 
 
-		Map<S, T> imageMap = new HashMap<S,T>(alignmentMap.size());
+		Map<S, T> imageMap = new HashMap<>(alignmentMap.size());
 
 		//TODO handle nulls consistently.
 		// assure that all the residues in the domain are valid keys
@@ -321,8 +321,8 @@ public static int getSymmetryOrder(Map<Integer, Integer> alignment,
 	 */
 	public static int getSymmetryOrder(Map<Integer, Integer> alignment, Map<Integer,Integer> identity,
 									   final int maxSymmetry, final float minimumMetricChange) {
-		List<Integer> preimage = new ArrayList<Integer>(alignment.keySet()); // currently unmodified
-		List<Integer> image = new ArrayList<Integer>(preimage);
+		List<Integer> preimage = new ArrayList<>(alignment.keySet()); // currently unmodified
+		List<Integer> image = new ArrayList<>(preimage);
 
 		int bestSymmetry = 1;
 		double bestMetric = Double.POSITIVE_INFINITY; //lower is better
@@ -443,10 +443,10 @@ public static int getSymmetryOrder(AFPChain afpChain, int maxSymmetry, float min
 	 */
 	public static Map<Integer, Integer> guessSequentialAlignment(
 			Map<Integer,Integer> alignment, boolean inverseAlignment) {
-		Map<Integer,Integer> identity = new HashMap<Integer,Integer>();
+		Map<Integer,Integer> identity = new HashMap<>();
 
-		SortedSet<Integer> aligned1 = new TreeSet<Integer>();
-		SortedSet<Integer> aligned2 = new TreeSet<Integer>();
+		SortedSet<Integer> aligned1 = new TreeSet<>();
+		SortedSet<Integer> aligned2 = new TreeSet<>();
 
 		for(Entry<Integer,Integer> pair : alignment.entrySet()) {
 			aligned1.add(pair.getKey());
@@ -480,18 +480,18 @@ public static Map<Integer, Integer> guessSequentialAlignment(
 	public static List<List<List<Integer>>> getOptAlnAsList(AFPChain afpChain) {
 		int[][][] optAln = afpChain.getOptAln();
 		int[] optLen = afpChain.getOptLen();
-		List<List<List<Integer>>> blocks = new ArrayList<List<List<Integer>>>(afpChain.getBlockNum());
+		List<List<List<Integer>>> blocks = new ArrayList<>(afpChain.getBlockNum());
 		for(int blockNum=0;blockNum<afpChain.getBlockNum();blockNum++) {
 			//TODO could improve speed an memory by wrapping the arrays with
 			// an unmodifiable list, similar to Arrays.asList(...) but with the
 			// correct size parameter.
-			List<Integer> align1 = new ArrayList<Integer>(optLen[blockNum]);
-			List<Integer> align2 = new ArrayList<Integer>(optLen[blockNum]);
+			List<Integer> align1 = new ArrayList<>(optLen[blockNum]);
+			List<Integer> align2 = new ArrayList<>(optLen[blockNum]);
 			for(int pos=0;pos<optLen[blockNum];pos++) {
 				align1.add(optAln[blockNum][0][pos]);
 				align2.add(optAln[blockNum][1][pos]);
 			}
-			List<List<Integer>> block = new ArrayList<List<Integer>>(2);
+			List<List<Integer>> block = new ArrayList<>(2);
 			block.add(align1);
 			block.add(align2);
 			blocks.add(block);
@@ -627,7 +627,7 @@ public static AFPChain splitBlocksByTopology(AFPChain a, Atom[] ca1, Atom[] ca2)
 
 		// Determine block lengths
 		// Split blocks if residue indices don't increase monotonically
-		List<Integer> newBlkLen = new ArrayList<Integer>();
+		List<Integer> newBlkLen = new ArrayList<>();
 		boolean blockChanged = false;
 		for(int blk=0;blk<blockNum;blk++) {
 			int currLen=1;
@@ -655,7 +655,7 @@ public static AFPChain splitBlocksByTopology(AFPChain a, Atom[] ca1, Atom[] ca2)
 		}
 
 		// Split blocks
-		List<int[][]> blocks = new ArrayList<int[][]>( newBlkLen.size() );
+		List<int[][]> blocks = new ArrayList<>( newBlkLen.size() );
 
 		int oldBlk = 0;
 		int pos = 0;
@@ -758,7 +758,7 @@ public static AFPChain replaceOptAln(AFPChain afpChain, Atom[] ca1, Atom[] ca2,
 		// increasing monotonically.
 		Integer[] res1 = alignment.keySet().toArray(new Integer[0]);
 		Arrays.sort(res1);
-		List<Integer> blockLens = new ArrayList<Integer>(2);
+		List<Integer> blockLens = new ArrayList<>(2);
 		int optLength = 0;
 		Integer lastRes = alignment.get(res1[0]);
 		int blkLen = lastRes==null?0:1;
@@ -989,17 +989,17 @@ public static Object resizeArray (Object oldArray, int newSize) {
 	 */
 	public static <S,T> String toConciseAlignmentString(Map<S,T> alignment, Map<T,S> identity) {
 		// Clone input to prevent changes
-		Map<S,T> alig = new HashMap<S,T>(alignment);
+		Map<S,T> alig = new HashMap<>(alignment);
 
 		// Generate inverse alignment
-		Map<S,List<S>> inverse = new HashMap<S,List<S>>();
+		Map<S,List<S>> inverse = new HashMap<>();
 		for(Entry<S,T> e: alig.entrySet()) {
 			S val = identity.get(e.getValue());
 			if( inverse.containsKey(val) ) {
 				List<S> l = inverse.get(val);
 				l.add(e.getKey());
 			} else {
-				List<S> l = new ArrayList<S>();
+				List<S> l = new ArrayList<>();
 				l.add(e.getKey());
 				inverse.put(val,l);
 			}
@@ -1058,7 +1058,7 @@ public static <T> String toConciseAlignmentString(Map<T, T> alignment) {
 	 * @see #toConciseAlignmentString(Map, Map)
 	 */
 	public static Map<Integer, Integer> fromConciseAlignmentString(String string) {
-		Map<Integer, Integer> map = new HashMap<Integer, Integer>();
+		Map<Integer, Integer> map = new HashMap<>();
 		boolean matches = true;
 		while (matches) {
 			Pattern pattern = Pattern.compile("(\\d+)>(\\d+)");
@@ -1201,7 +1201,7 @@ public static void alignmentToSIF(Writer out,AFPChain afpChain,
 	 */
 	public static final List<Chain> getAlignedModel(Atom[] ca){
 
-		List<Chain> model = new ArrayList<Chain>();
+		List<Chain> model = new ArrayList<>();
 		for ( Atom a: ca){
 
 			Group g = a.getGroup();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/CliTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/CliTools.java
index 513b2bdf5d..8b8af2539a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/CliTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/CliTools.java
@@ -100,14 +100,14 @@ public static String[] configureBean(Object bean, String[] args)
 			throw new ConfigurationException("Couldn't get information for target bean " + ex.getMessage());
 		}
 
-		Map<String,PropertyDescriptor> propertiesByName = new HashMap<String, PropertyDescriptor>();
+		Map<String,PropertyDescriptor> propertiesByName = new HashMap<>();
 		for (PropertyDescriptor pd : bi.getPropertyDescriptors() ) {
 			propertiesByName.put(pd.getName(), pd);
 		}
 
-		List<String> anonArgs = new ArrayList<String>();
-		Map<PropertyDescriptor,List<String>> arrayProps = new HashMap<PropertyDescriptor, List<String>>();
-		Set<PropertyDescriptor> usedProps = new HashSet<PropertyDescriptor>();
+		List<String> anonArgs = new ArrayList<>();
+		Map<PropertyDescriptor,List<String>> arrayProps = new HashMap<>();
+		Set<PropertyDescriptor> usedProps = new HashSet<>();
 
 		boolean stdInUsed = false;
 		boolean stdOutUsed = false;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLParser.java
index d803ad1a80..282e971c84 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/AFPChainXMLParser.java
@@ -223,7 +223,7 @@ public static void rebuildAFPChain(AFPChain afpChain, Atom[] ca1, Atom[] ca2){
 	}
 
 	public static AFPChain[] parseMultiXML(String xml) throws IOException {
-		List<AFPChain> afpChains = new ArrayList<AFPChain>();
+		List<AFPChain> afpChains = new ArrayList<>();
 
 		try
 		{
@@ -316,7 +316,7 @@ public static AFPChain[] parseMultiXML(String xml) throws IOException {
 				a.setBlockShiftVector(blockShiftVector);
 
 				int afpNum = Integer.parseInt(getAttribute(rootElement,"afpNum"));
-				List<AFP> afpSet = new ArrayList<AFP>();
+				List<AFP> afpSet = new ArrayList<>();
 				for (int afp=0;afp<afpNum;afp++){
 					afpSet.add( new AFP());
 				}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java
index d43ba8db56..759ee61931 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/MultipleAlignmentXMLParser.java
@@ -77,7 +77,7 @@ public static List<MultipleAlignmentEnsemble> parseXMLfile(String xml)
 			throws ParserConfigurationException, SAXException, IOException {
 
 		List<MultipleAlignmentEnsemble> ensembles =
-				new ArrayList<MultipleAlignmentEnsemble>();
+				new ArrayList<>();
 
 		//Convert string to XML document
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -178,7 +178,7 @@ else if ("ScoresCache".equals(child.getNodeName())){
 	private static Block parseBlock(Node root, BlockSet blockSet) {
 
 		Block b = new BlockImpl(blockSet);
-		List<List<Integer>> alignRes = new ArrayList<List<Integer>>();
+		List<List<Integer>> alignRes = new ArrayList<>();
 		b.setAlignRes(alignRes);
 		NodeList children = root.getChildNodes();
 
@@ -276,7 +276,7 @@ private static void parseHeader(Node node,
 	private static void parseStructures(Node root,
 			MultipleAlignmentEnsemble ensemble) {
 
-		List<StructureIdentifier> names = new ArrayList<StructureIdentifier>();
+		List<StructureIdentifier> names = new ArrayList<>();
 		ensemble.setStructureIdentifiers(names);
 
 		NamedNodeMap atts = root.getAttributes();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/PdbPairXMLConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/PdbPairXMLConverter.java
index 433e053a3c..afcc4f95ac 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/PdbPairXMLConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/PdbPairXMLConverter.java
@@ -44,7 +44,7 @@ public class PdbPairXMLConverter {
 	public static final String DEFAULT_METHOD_NAME = FatCatRigid.algorithmName;
 
 	public static PdbPairsMessage convertXMLtoPairs(String xml) {
-		SortedSet<PdbPair>  pairs = new TreeSet<PdbPair>();
+		SortedSet<PdbPair>  pairs = new TreeSet<>();
 		PdbPairsMessage message = new PdbPairsMessage();
 		try
 		{
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/PdbPairsMessage.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/PdbPairsMessage.java
index 170ee5ff47..6aa415a8d9 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/PdbPairsMessage.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/xml/PdbPairsMessage.java
@@ -40,7 +40,7 @@ public PdbPairsMessage(){
 
 		method = PdbPairXMLConverter.DEFAULT_METHOD_NAME;
 
-		pairs = new TreeSet<PdbPair>();
+		pairs = new TreeSet<>();
 
 	}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/GroupAsa.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/GroupAsa.java
index 05d34b8d21..6c8be18ed9 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/GroupAsa.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/GroupAsa.java
@@ -44,7 +44,7 @@ public class GroupAsa implements Serializable {
 
 	private static HashMap<Character,Double>  initTriPeptAsas() {
 		// ASA in extended tripeptide conformation (GLY-X-GLY) from Miller et al JMB 1987 (for calculation of relative ASAs)
-		HashMap<Character,Double> map = new HashMap<Character,Double>();
+		HashMap<Character,Double> map = new HashMap<>();
 		map.put('A', 113.0);
 		map.put('R', 241.0);
 		map.put('N', 158.0);
@@ -223,8 +223,8 @@ public Object clone() {
 		GroupAsa n = new GroupAsa(this.g);
 		n.setAsaC(this.getAsaC());
 		n.setAsaU(this.getAsaU());
-		n.atomAsaUs = new ArrayList<Double>(this.atomAsaUs.size());
-		n.atomAsaCs = new ArrayList<Double>(this.atomAsaCs.size());
+		n.atomAsaUs = new ArrayList<>(this.atomAsaUs.size());
+		n.atomAsaCs = new ArrayList<>(this.atomAsaCs.size());
 		for (int i=0;i<this.atomAsaUs.size();i++) {
 			n.atomAsaUs.add(this.atomAsaUs.get(i));
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathDomain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathDomain.java
index 56d41aba05..3a21ae6bb1 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathDomain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathDomain.java
@@ -423,7 +423,7 @@ public String toString() {
 	 * @throws StructureException 
 	 */
 	public Set<String> getChains() throws StructureException {
-		Set<String> chains = new HashSet<String>();
+		Set<String> chains = new HashSet<>();
 		List<ResidueRange> rrs = toCanonical().getResidueRanges();
 		for (ResidueRange rr : rrs) chains.add(rr.getChainName());
 		return chains;
@@ -436,7 +436,7 @@ public String getIdentifier() {
 
 	@Override
 	public SubstructureIdentifier toCanonical() throws StructureException{
-		List<ResidueRange> ranges = new ArrayList<ResidueRange>();
+		List<ResidueRange> ranges = new ArrayList<>();
 		String chain = String.valueOf(getDomainName().charAt(getDomainName().length() - 3));
 		for (CathSegment segment : this.getSegments()) {
 			ranges.add(new ResidueRange(chain, segment.getStart(), segment.getStop()));
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathFactory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathFactory.java
index 77fe36fd8e..4a7796e6af 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathFactory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathFactory.java
@@ -45,7 +45,7 @@ public class CathFactory {
 
 	private static CathDatabase cath;
 
-	private static Map<String, CathDatabase> versions = new HashMap<String, CathDatabase>();
+	private static Map<String, CathDatabase> versions = new HashMap<>();
 
 	/**
 	 * Sets the default (singleton) CathDatabase.
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java
index acf1489a02..3f0f44158b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cath/CathInstallation.java
@@ -97,11 +97,11 @@ public CathInstallation(String cacheLocation, boolean usingCDDF, boolean parseCF
 		cathVersion = DEFAULT_VERSION;
 		cathDownloadUrl = CATH_DOWNLOAD_URL;
 
-		pdbMap = new HashMap<String, List<CathDomain>>();
-		domainMap = new HashMap<String ,CathDomain>();
-		cathTree = new HashMap<String, CathNode>();
+		pdbMap = new HashMap<>();
+		domainMap = new HashMap< >();
+		cathTree = new HashMap<>();
 
-		if (parseCathFragments) fragmentMap = new HashMap<String,List<CathFragment>>();
+		if (parseCathFragments) fragmentMap = new HashMap<>();
 
 	}
 
@@ -207,7 +207,7 @@ public List<CathDomain> getByCategory(CathCategory category) {
 			ensureDomallInstalled();
 		}
 		ensureNodeListInstalled();
-		List<CathDomain> matches = new ArrayList<CathDomain>();
+		List<CathDomain> matches = new ArrayList<>();
 		CathNode node;
 		for ( String nodeId : cathTree.keySet() ) {
 			if ( (node = cathTree.get(nodeId)).getCategory() == category ) {
@@ -224,7 +224,7 @@ public List<CathDomain> filterByCathCode(String query) {
 		} else {
 			ensureDomallInstalled();
 		}
-		List<CathDomain> matches = new ArrayList<CathDomain>();
+		List<CathDomain> matches = new ArrayList<>();
 		for ( String k : domainMap.keySet() ) {
 			if ( domainMap.get(k).getCATH().startsWith(query) ) {
 				matches.add( domainMap.get(k) );
@@ -236,7 +236,7 @@ public List<CathDomain> filterByCathCode(String query) {
 	@Override
 	public List<CathNode> getTree(CathDomain domain) {
 		CathNode node = getCathNode( domain.getCATH() );
-		List<CathNode> tree = new ArrayList<CathNode>();
+		List<CathNode> tree = new ArrayList<>();
 		while (node != null) {
 			node = getCathNode( node.getParentId() );
 			if (node != null) tree.add(node);
@@ -248,14 +248,14 @@ public List<CathNode> getTree(CathDomain domain) {
 	@Override
 	public List<CathDomain> filterByNodeName(String query) {
 		ensureNodeListInstalled();
-		List<CathNode> matchingNodes = new ArrayList<CathNode>();
+		List<CathNode> matchingNodes = new ArrayList<>();
 		CathNode node;
 		for ( String nodeId : cathTree.keySet() ) {
 			if ( (node = cathTree.get(nodeId) ).getDescription().startsWith(query) ) {
 				matchingNodes.add(node);
 			}
 		}
-		List<CathDomain> matches = new ArrayList<CathDomain>();
+		List<CathDomain> matches = new ArrayList<>();
 		for (CathNode n : matchingNodes) {
 			matches.addAll(getDomainsByNodeId(n.getNodeId()));
 		}
@@ -269,7 +269,7 @@ public List<CathDomain> filterByDescription(String query) {
 		} else {
 			ensureDomallInstalled();
 		}
-		List<CathDomain> matches = new ArrayList<CathDomain>();
+		List<CathDomain> matches = new ArrayList<>();
 		for ( String k : domainMap.keySet() ) {
 			if ( domainMap.get(k).getName().startsWith(query) ) {
 				matches.add( domainMap.get(k) );
@@ -328,7 +328,7 @@ public List<CathDomain> getDomainsByNodeId(String nodeId) {
 		} else {
 			ensureDomallInstalled();
 		}
-		List<CathDomain> domains = new ArrayList<CathDomain>();
+		List<CathDomain> domains = new ArrayList<>();
 		for (String domainName : domainMap.keySet()) {
 			CathDomain description = domainMap.get(domainName);
 			if ( description.getCATH().startsWith(nodeId) ) {
@@ -366,7 +366,7 @@ private void parseCathDomainList(BufferedReader bufferedReader) throws IOExcepti
 			if ( pdbMap.containsKey(pdbId)){
 				domainList = pdbMap.get(pdbId);
 			} else {
-				domainList = new ArrayList<CathDomain>();
+				domainList = new ArrayList<>();
 				pdbMap.put(pdbId,domainList);
 			}
 
@@ -447,7 +447,7 @@ private void parseCathDomainDescriptionFile(BufferedReader bufferedReader) throw
 			} else if ( line.startsWith("DSEQS") ) {
 				seqs = seqs.append( line.substring(10) );
 			} else if ( line.startsWith("NSEGMENTS") ) {
-				segments = new ArrayList<CathSegment>();
+				segments = new ArrayList<>();
 			} else if ( line.startsWith("SEGMENT") ) {
 				segment = new CathSegment();
 				sseqh = new StringBuilder();
@@ -484,7 +484,7 @@ private void parseCathDomainDescriptionFile(BufferedReader bufferedReader) throw
 				if ( pdbMap.containsKey(pdbId)){
 					domainList = pdbMap.get(pdbId);
 				} else {
-					domainList = new ArrayList<CathDomain>();
+					domainList = new ArrayList<>();
 					pdbMap.put(pdbId,domainList);
 				}
 
@@ -584,7 +584,7 @@ private void parseCathDomall(BufferedReader bufferedReader) throws IOException{
 					continue;
 				}
 
-				List<CathSegment> segments = new ArrayList<CathSegment>(numberOfSegments);
+				List<CathSegment> segments = new ArrayList<>(numberOfSegments);
 				segIdx = 1; // Offset from domIdx.
 				for (int j=1; j<=numberOfSegments; j++) {
 					CathSegment segment = new CathSegment();
@@ -611,7 +611,7 @@ private void parseCathDomall(BufferedReader bufferedReader) throws IOException{
 				domIdx += 6*numberOfSegments + 1;
 			}
 			if (parseCathFragments) {
-			List<CathFragment> fragments = new ArrayList<CathFragment>(numberOfFragments);
+			List<CathFragment> fragments = new ArrayList<>(numberOfFragments);
 				for (int i=1; i<=numberOfFragments; i++) {
 					CathFragment fragment = new CathFragment();
 					fragment.setFragmentId(i);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
index d73d747cb6..7851b8dbf3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
@@ -679,9 +679,9 @@ public boolean divideInternally(SubunitClustererParameters clusterParams)
 		}
 
 		// Divide the Subunits in their repeats
-		List<Subunit> newSubunits = new ArrayList<Subunit>(subunits.size()
+		List<Subunit> newSubunits = new ArrayList<>(subunits.size()
 				* columns.size());
-		List<List<Integer>> newSubunitEQR = new ArrayList<List<Integer>>(
+		List<List<Integer>> newSubunitEQR = new ArrayList<>(
 				subunits.size() * columns.size());
 
 		for (int s = 0; s < subunits.size(); s++) {
@@ -700,7 +700,7 @@ public boolean divideInternally(SubunitClustererParameters clusterParams)
 						.get(s).getStructure()));
 
 				// Recalculate equivalent residues
-				List<Integer> eqr = new ArrayList<Integer>();
+				List<Integer> eqr = new ArrayList<>();
 				for (int p = 0; p < columns.get(r).size(); p++) {
 					eqr.add(subunitEQR.get(s).get(columns.get(r).get(p))
 							- start);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitExtractor.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitExtractor.java
index 487a51b564..45641d1e58 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitExtractor.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitExtractor.java
@@ -66,7 +66,7 @@ public static List<Subunit> extractSubunits(Structure structure,
 			int absMinLen, double fraction, int minLen) {
 
 		// The extracted subunit container
-		List<Subunit> subunits = new ArrayList<Subunit>();
+		List<Subunit> subunits = new ArrayList<>();
 
 		for (Chain c : structure.getPolyChains()) {
 			// Only take protein chains
@@ -107,7 +107,7 @@ private static int calcAdjustedMinimumSequenceLength(
 		int minLength = Integer.MAX_VALUE;
 
 		// Extract the length List, the min and the max
-		List<Integer> lengths = new ArrayList<Integer>();
+		List<Integer> lengths = new ArrayList<>();
 		for (int i = 0; i < subunits.size(); i++) {
 			if (subunits.get(i).size() >= absMinLen) {
 				maxLength = Math.max(subunits.get(i).size(), maxLength);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/AtomContactSet.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/AtomContactSet.java
index e1297faec9..34de552786 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/AtomContactSet.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/AtomContactSet.java
@@ -42,7 +42,7 @@ public class AtomContactSet implements Serializable, Iterable<AtomContact> {
 
 	public AtomContactSet(double cutoff) {
 		this.cutoff = cutoff;
-		this.contacts = new HashMap<Pair<AtomIdentifier>,AtomContact>();
+		this.contacts = new HashMap<>();
 	}
 
 	public void add(AtomContact contact) {
@@ -87,7 +87,7 @@ public Iterator<AtomContact> iterator() {
 	}
 
 	private Pair<AtomIdentifier> getAtomIdPairFromContact(AtomContact contact) {
-		Pair<AtomIdentifier> pair = new Pair<AtomIdentifier>(
+		Pair<AtomIdentifier> pair = new Pair<>(
 				new AtomIdentifier(contact.getPair().getFirst().getPDBserial(),contact.getPair().getFirst().getGroup().getChainId()),
 				new AtomIdentifier(contact.getPair().getSecond().getPDBserial(),contact.getPair().getSecond().getGroup().getChainId()));
 
@@ -132,7 +132,7 @@ public List<AtomContact> getContactsWithinDistance(double distance) {
 					String.format("%.2f", distance)+" is larger than contacts' distance cutoff "+
 					String.format("%.2f", cutoff));
 
-		List<AtomContact> list = new ArrayList<AtomContact>();
+		List<AtomContact> list = new ArrayList<>();
 		for (AtomContact contact:this.contacts.values()) {
 			if (contact.getDistance()<distance) {
 				list.add(contact);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/Contact.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/Contact.java
index 1a3c169ce2..e47c8687d9 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/Contact.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/Contact.java
@@ -42,7 +42,7 @@ public Contact(int i, int j, double distance) {
 	}
 
 	public Pair<Integer> getIndexPair() {
-		return new Pair<Integer>(i,j);
+		return new Pair<>(i,j);
 	}
 
 	public int getI() {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GridCell.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GridCell.java
index 5123831ec6..11e2a59283 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GridCell.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GridCell.java
@@ -40,8 +40,8 @@ public class GridCell {
 	private ArrayList<Integer> jIndices;
 
 	public GridCell(Grid parent){
-		iIndices = new ArrayList<Integer>();
-		jIndices = new ArrayList<Integer>();
+		iIndices = new ArrayList<>();
+		jIndices = new ArrayList<>();
 		this.grid = parent;
 	}
 
@@ -70,7 +70,7 @@ public int getNumJindices() {
 	 */
 	public List<Contact> getContactsWithinCell(){
 
-		List<Contact> contacts = new ArrayList<Contact>();
+		List<Contact> contacts = new ArrayList<>();
 
 		Point3d[] iAtoms = grid.getIAtoms();
 		Point3d[] jAtoms = grid.getJAtoms();
@@ -110,7 +110,7 @@ public List<Contact> getContactsWithinCell(){
 	 */
 	public List<Contact> getContactsToOtherCell(GridCell otherCell){
 
-		List<Contact> contacts = new ArrayList<Contact>();
+		List<Contact> contacts = new ArrayList<>();
 
 		Point3d[] iAtoms = grid.getIAtoms();
 		Point3d[] jAtoms = grid.getJAtoms();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GroupContact.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GroupContact.java
index 16c0eb08c5..07b163730d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GroupContact.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GroupContact.java
@@ -41,7 +41,7 @@ public class GroupContact implements Serializable {
 	private List<AtomContact> atomContacts;
 
 	public GroupContact() {
-		atomContacts = new ArrayList<AtomContact>();
+		atomContacts = new ArrayList<>();
 	}
 
 	public void addAtomContact(AtomContact atomContact) {
@@ -82,7 +82,7 @@ public List<AtomContact> getAtomContacts() {
 	 */
 	public List<AtomContact> getContactsWithinDistance(double distance) {
 
-		List<AtomContact> list = new ArrayList<AtomContact>();
+		List<AtomContact> list = new ArrayList<>();
 		for (AtomContact contact:this.atomContacts) {
 			if (contact.getDistance()<distance) {
 				list.add(contact);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GroupContactSet.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GroupContactSet.java
index 625766b46b..3594083c08 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GroupContactSet.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GroupContactSet.java
@@ -43,7 +43,7 @@ public class GroupContactSet implements Serializable, Iterable<GroupContact>{
 	private HashMap<Pair<ResidueIdentifier>, GroupContact> contacts;
 
 	public GroupContactSet() {
-		contacts = new HashMap<Pair<ResidueIdentifier>, GroupContact>();
+		contacts = new HashMap<>();
 	}
 
 	/**
@@ -52,7 +52,7 @@ public GroupContactSet() {
 	 * @param atomContacts
 	 */
 	public GroupContactSet(AtomContactSet atomContacts) {
-		contacts = new HashMap<Pair<ResidueIdentifier>, GroupContact>();
+		contacts = new HashMap<>();
 		atoms2groups(atomContacts);
 	}
 
@@ -69,8 +69,8 @@ private void atoms2groups(AtomContactSet atomContacts) {
 			// we skip the self-residue contacts
 			if (iResidue.equals(jResidue)) continue;
 
-			Pair<Group> residuePair = new Pair<Group> (iResidue, jResidue);
-			Pair<ResidueIdentifier> pair = new Pair<ResidueIdentifier>(new ResidueIdentifier(iResidue), new ResidueIdentifier(jResidue));
+			Pair<Group> residuePair = new Pair<> (iResidue, jResidue);
+			Pair<ResidueIdentifier> pair = new Pair<>(new ResidueIdentifier(iResidue), new ResidueIdentifier(jResidue));
 
 			if (!contacts.containsKey(pair)) {
 
@@ -152,7 +152,7 @@ public Iterator<GroupContact> iterator() {
 	}
 
 	private Pair<ResidueIdentifier> getResIdPairFromContact(GroupContact groupContact) {
-		return new Pair<ResidueIdentifier>(
+		return new Pair<>(
 				new ResidueIdentifier(groupContact.getPair().getFirst()),
 				new ResidueIdentifier(groupContact.getPair().getSecond()) );
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
index b26275cde8..351e00f25b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterface.java
@@ -522,7 +522,7 @@ public Pair<List<Group>> getRimResidues(double bsaToAsaCutoff, double minAsaForS
 			}
 		}
 
-		return new Pair<List<Group>>(rim1, rim2);
+		return new Pair<>(rim1, rim2);
 	}
 
 	/**
@@ -613,8 +613,8 @@ public double getContactOverlapScore(StructureInterface other, boolean invert) {
 			return 0;
 		}
 
-		Pair<EntityInfo> thisCompounds = new Pair<EntityInfo>(thisChains.getFirst().getEntityInfo(), thisChains.getSecond().getEntityInfo());
-		Pair<EntityInfo> otherCompounds = new Pair<EntityInfo>(otherChains.getFirst().getEntityInfo(), otherChains.getSecond().getEntityInfo());
+		Pair<EntityInfo> thisCompounds = new Pair<>(thisChains.getFirst().getEntityInfo(), thisChains.getSecond().getEntityInfo());
+		Pair<EntityInfo> otherCompounds = new Pair<>(otherChains.getFirst().getEntityInfo(), otherChains.getSecond().getEntityInfo());
 
 		if (checkMolIdMatch(thisCompounds,otherCompounds)) {
 
@@ -706,7 +706,7 @@ public Pair<EntityInfo> getParentCompounds() {
 			logger.warn("Could not find parents chains, compounds will be null");
 			return null;
 		}
-		return new Pair<EntityInfo>(chains.getFirst().getEntityInfo(), chains.getSecond().getEntityInfo());
+		return new Pair<>(chains.getFirst().getEntityInfo(), chains.getSecond().getEntityInfo());
 	}
 
 	private Structure getParentStructure() {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceCluster.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceCluster.java
index 5b1699bf8a..8743cdff9a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceCluster.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceCluster.java
@@ -40,7 +40,7 @@ public class StructureInterfaceCluster implements Serializable {
 
 
 	public StructureInterfaceCluster() {
-		this.members = new ArrayList<StructureInterface>();
+		this.members = new ArrayList<>();
 	}
 
 	public List<StructureInterface> getMembers() {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/SerializableCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/SerializableCache.java
index 0f03a5a31c..bbb0323ce9 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/SerializableCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/SerializableCache.java
@@ -117,7 +117,7 @@ public Map<K,V> reloadFromFile() {
 
 		File f = getCacheFile();
 
-		serializedCache = new HashMap<K,V>();
+		serializedCache = new HashMap<>();
 
 		// has never been cached here before
 		if( ! f.exists()) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java
index b771e0f09a..6cdc379da4 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/ClusterDomains.java
@@ -228,7 +228,7 @@ private static List<Domain> combine(List<Domain> domains,int Si, int Sj, double
 		if ( verbose)
 			System.out.println("  +++  combining domains " + Si + " " + Sj);
 
-		List<Domain> newdoms = new ArrayList<Domain>();
+		List<Domain> newdoms = new ArrayList<>();
 
 		//int ndom = domains.size();
 		for(int i=0;i<domains.get(Sj).nseg;i++) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/CutDomain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/CutDomain.java
index 5855cd2e77..ffe0ebea15 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/CutDomain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/CutDomain.java
@@ -43,7 +43,7 @@ public CutDomain(Atom[]ca, PDPDistanceMatrix pdpMatrix){
 
 		ndom = 0;
 
-		domains = new ArrayList<Domain>();
+		domains = new ArrayList<>();
 
 	}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/Domain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/Domain.java
index 635f8bad94..6586c9f941 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/Domain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/domain/pdp/Domain.java
@@ -48,7 +48,7 @@ public class Domain implements Comparable<Domain>, Serializable{
 	int nseg;
 	double score;
 
-	List<Segment>segments = new ArrayList<Segment>();
+	List<Segment>segments = new ArrayList<>();
 
 	public Domain(){
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodDomain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodDomain.java
index 66d6ae615c..7e0ab2c16a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodDomain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodDomain.java
@@ -150,7 +150,7 @@ public EcodDomain(EcodDomain o) {
 		this.tGroupName = o.tGroupName;
 		this.fGroupName = o.fGroupName;
 		this.assemblyId = o.assemblyId;
-		this.ligands = new HashSet<String>(o.ligands);
+		this.ligands = new HashSet<>(o.ligands);
 	}
 
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
index efa042edcf..2f9d27997a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
@@ -153,7 +153,7 @@ public List<EcodDomain> getDomainsForPdb(String id) throws IOException {
 				return null;
 			}
 			// Deep clone
-			List<EcodDomain> clonedDoms = new ArrayList<EcodDomain>(doms.size());
+			List<EcodDomain> clonedDoms = new ArrayList<>(doms.size());
 			for(EcodDomain d : doms) {
 				clonedDoms.add( new EcodDomain(d) );
 			}
@@ -178,7 +178,7 @@ public List<EcodDomain> filterByHierarchy(String hierarchy) throws IOException {
 		Integer hGroup = xhtGroup.length>1 ? Integer.parseInt(xhtGroup[1]) : null;
 		Integer tGroup = xhtGroup.length>2 ? Integer.parseInt(xhtGroup[2]) : null;
 
-		List<EcodDomain> filtered = new ArrayList<EcodDomain>();
+		List<EcodDomain> filtered = new ArrayList<>();
 		for(EcodDomain d: getAllDomains()) {
 			boolean match = true;
 			if(xhtGroup.length>0) {
@@ -485,7 +485,7 @@ private void indexDomains() throws IOException {
 			}
 
 			// Leave enough space for all PDBs as of 2015
-			domainMap = new HashMap<PdbId, List<EcodDomain>>((int) (150000/.85),.85f);
+			domainMap = new HashMap<>((int) (150000/.85),.85f);
 
 			// Index with domainMap
 			for(EcodDomain d : allDomains) {
@@ -504,7 +504,7 @@ private void indexDomains() throws IOException {
 				if( domainMap.containsKey(pdbId) ) {
 					currDomains = domainMap.get(pdbId);
 				} else {
-					currDomains = new LinkedList<EcodDomain>();
+					currDomains = new LinkedList<>();
 					domainMap.put(pdbId,currDomains);
 				}
 				currDomains.add(d);
@@ -582,7 +582,7 @@ public EcodParser(BufferedReader reader) throws IOException {
 		private void parse(BufferedReader in) throws IOException {
 			try {
 				// Allocate plenty of space for ECOD as of 2015
-				ArrayList<EcodDomain> domainsList = new ArrayList<EcodDomain>(500000);
+				ArrayList<EcodDomain> domainsList = new ArrayList<>(500000);
 
 				Pattern versionRE = Pattern.compile("^\\s*#.*ECOD\\s*version\\s+(\\S+).*");
 				Pattern commentRE = Pattern.compile("^\\s*#.*");
@@ -705,7 +705,7 @@ private void parse(BufferedReader in) throws IOException {
 										ligands = Collections.emptySet();
 									} else {
 										String[] ligSplit = ligandStr.split(",");
-										ligands = new LinkedHashSet<String>(ligSplit.length);
+										ligands = new LinkedHashSet<>(ligSplit.length);
 										for(String s : ligSplit) {
 											ligands.add(s.intern());
 										}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/MomentsOfInertia.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/MomentsOfInertia.java
index 7d638bce65..8cfd032daa 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/MomentsOfInertia.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/MomentsOfInertia.java
@@ -47,7 +47,7 @@
 public class MomentsOfInertia {
 
 	private List<Point3d> points = new ArrayList<Point3d>();
-	private List<Double> masses = new ArrayList<Double>();
+	private List<Double> masses = new ArrayList<>();
 
 	private boolean modified = true;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CAConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CAConverter.java
index 6f57eb3a46..1634988665 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CAConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/CAConverter.java
@@ -42,7 +42,7 @@ public class CAConverter {
 	 * @since Biojava 4.1.0
 	 */
 	public static List<Chain> getRepresentativeAtomsOnly(List<Chain> chains){
-		List<Chain> newChains = new ArrayList<Chain>();
+		List<Chain> newChains = new ArrayList<>();
 
 		for (Chain chain : chains){
 			Chain newChain = getRepresentativeAtomsOnly(chain);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaAFPChainConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaAFPChainConverter.java
index 6c6506504c..b0a8ab0bfb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaAFPChainConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaAFPChainConverter.java
@@ -85,8 +85,8 @@ public static AFPChain cpFastaToAfpChain(String first, String second, Structure
 	public static AFPChain cpFastaToAfpChain(File fastaFile, Structure structure, int cpSite) throws IOException, StructureException {
 		InputStream inStream = new FileInputStream(fastaFile);
 		SequenceCreatorInterface<AminoAcidCompound> creator = new CasePreservingProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet());
-		SequenceHeaderParserInterface<ProteinSequence, AminoAcidCompound> headerParser = new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>();
-		FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<ProteinSequence, AminoAcidCompound>(inStream, headerParser, creator);
+		SequenceHeaderParserInterface<ProteinSequence, AminoAcidCompound> headerParser = new GenericFastaHeaderParser<>();
+		FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<>(inStream, headerParser, creator);
 		LinkedHashMap<String, ProteinSequence> sequences = fastaReader.process();
 		inStream.close();
 		Iterator<ProteinSequence> iter = sequences.values().iterator();
@@ -196,8 +196,8 @@ public static AFPChain fastaFileToAfpChain(File fastaFile, Structure structure1,
 		InputStream inStream = new FileInputStream(fastaFile);
 		SequenceCreatorInterface<AminoAcidCompound> creator = new CasePreservingProteinSequenceCreator(
 				AminoAcidCompoundSet.getAminoAcidCompoundSet());
-		SequenceHeaderParserInterface<ProteinSequence, AminoAcidCompound> headerParser = new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>();
-		FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<ProteinSequence, AminoAcidCompound>(
+		SequenceHeaderParserInterface<ProteinSequence, AminoAcidCompound> headerParser = new GenericFastaHeaderParser<>();
+		FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<>(
 				inStream, headerParser, creator);
 		LinkedHashMap<String, ProteinSequence> sequences = fastaReader.process();
 		inStream.close();
@@ -236,8 +236,8 @@ public static AFPChain fastaToAfpChain(Map<String, ProteinSequence> sequences, S
 			throw new IllegalArgumentException("A structure is null");
 		}
 
-		List<ProteinSequence> seqs = new ArrayList<ProteinSequence>();
-		List<String> names = new ArrayList<String>(2);
+		List<ProteinSequence> seqs = new ArrayList<>();
+		List<String> names = new ArrayList<>(2);
 		for (Map.Entry<String, ProteinSequence> entry : sequences.entrySet()) {
 			seqs.add(entry.getValue());
 			names.add(entry.getKey());
@@ -321,7 +321,7 @@ public static AFPChain fastaToAfpChain(SequencePair<Sequence<AminoAcidCompound>,
 				sb1.append(a.getBase());
 			}
 			ProteinSequence seq2 = new ProteinSequence(sb2.toString());
-			LinkedHashMap<String, ProteinSequence> map = new LinkedHashMap<String, ProteinSequence>();
+			LinkedHashMap<String, ProteinSequence> map = new LinkedHashMap<>();
 			map.put(structure1.getName(), seq1);
 			map.put(structure2.getName(), seq2);
 			return fastaToAfpChain(map, structure1, structure2);
@@ -349,8 +349,8 @@ private static AFPChain buildAlignment(Atom[] ca1, Atom[] ca2, ResidueNumber[] r
 
 		// remove any gap
 		// this includes the ones introduced by the nullifying above
-		List<ResidueNumber> alignedResiduesList1 = new ArrayList<ResidueNumber>();
-		List<ResidueNumber> alignedResiduesList2 = new ArrayList<ResidueNumber>();
+		List<ResidueNumber> alignedResiduesList1 = new ArrayList<>();
+		List<ResidueNumber> alignedResiduesList2 = new ArrayList<>();
 		for (int i = 0; i < residues1.length; i++) {
 			if (residues1[i] != null && residues2[i] != null) {
 				alignedResiduesList1.add(residues1[i]);
@@ -379,7 +379,7 @@ private static AFPChain buildAlignment(Atom[] ca1, Atom[] ca2, ResidueNumber[] r
 	 * @param sequence Make sure <em>not</em> to use {@link ProteinSequence#getSequenceAsString()} for this, as it won't preserve upper- and lower-case
 	 */
 	public static List<Object> getAlignedUserCollection(String sequence) {
-		List<Object> aligned = new ArrayList<Object>(sequence.length());
+		List<Object> aligned = new ArrayList<>(sequence.length());
 		for (char c : sequence.toCharArray()) {
 			aligned.add(Character.isUpperCase(c));
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/GroupToSDF.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/GroupToSDF.java
index bbc277b89f..108a65f4a3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/GroupToSDF.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/GroupToSDF.java
@@ -130,7 +130,7 @@ private Object getCharges(Group thisGroup) {
 
 	private static List<Number> getAtomCharges(Group group) {
 		// The list to store the answer
-		List<Number> outArr = new ArrayList<Number>();
+		List<Number> outArr = new ArrayList<>();
 		// Get the atom charge Information
 		for(Atom a: group.getAtoms()){
 			outArr.add(a.getCharge());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index 1ce5300b28..5de75efee5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -174,7 +174,7 @@ public static enum FetchBehavior {
 	 * @param path Path to the PDB file directory
 	 */
 	public LocalPDBDirectory(String path) {
-		extensions    = new ArrayList<String>();
+		extensions    = new ArrayList<>();
 
 		params = new FileParsingParameters();
 
@@ -677,7 +677,7 @@ public File getLocalFile(PdbId pdbId) throws IOException {
 		// Search directories:
 		// 1) LOCAL_MMCIF_SPLIT_DIR/<middle>/(pdb)?<pdbId>.<ext>
 		// 2) LOCAL_MMCIF_ALL_DIR/<middle>/(pdb)?<pdbId>.<ext>
-		LinkedList<File> searchdirs = new LinkedList<File>();
+		LinkedList<File> searchdirs = new LinkedList<>();
 		String middle = id.substring(offset, offset+2).toLowerCase();
 
 		File splitdir = new File(splitDirPath, middle);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBBioAssemblyParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBBioAssemblyParser.java
index 22462bafe1..d40bef1ec3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBBioAssemblyParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBBioAssemblyParser.java
@@ -41,10 +41,10 @@ public class PDBBioAssemblyParser {
 	//private static final Logger logger = LoggerFactory.getLogger(PDBBioAssemblyParser.class);
 
 	private Integer currentBioMolecule = null;
-	private List<String> currentChainIDs = new ArrayList<String>();
+	private List<String> currentChainIDs = new ArrayList<>();
 	private Matrix currentMatrix = null;
 	private double[] shift = null;
-	private Map<Integer,BioAssemblyInfo> transformationMap = new HashMap<Integer, BioAssemblyInfo>();
+	private Map<Integer,BioAssemblyInfo> transformationMap = new HashMap<>();
 	private int modelNumber = 1;
 
 	private List<BiologicalAssemblyTransformation> transformations;
@@ -159,7 +159,7 @@ private void addToCurrentChainList(String line) {
 	}
 
 	private void initialize() {
-		transformations = new ArrayList<BiologicalAssemblyTransformation>();
+		transformations = new ArrayList<>();
 		currentMatrix = Matrix.identity(3,3);
 		currentBioMolecule = null;
 		shift = new double[3];
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index a9e30f6aac..176459bbf2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -177,15 +177,15 @@ public class PDBFileParser  {
 	private boolean isLastCompndLine = false;
 	private boolean isLastSourceLine = false;
 	private EntityInfo current_compound;
-	private List<EntityInfo> entities = new ArrayList<EntityInfo>();
-	private HashMap<Integer,List<String>> compoundMolIds2chainIds = new HashMap<Integer, List<String>>();
-	private List<String> compndLines = new ArrayList<String>();
-	private List<String> sourceLines = new ArrayList<String>();
-	private List<String> journalLines = new ArrayList<String>();
-	private List<String> keywordsLines = new ArrayList<String>();
+	private List<EntityInfo> entities = new ArrayList<>();
+	private HashMap<Integer,List<String>> compoundMolIds2chainIds = new HashMap<>();
+	private List<String> compndLines = new ArrayList<>();
+	private List<String> sourceLines = new ArrayList<>();
+	private List<String> journalLines = new ArrayList<>();
+	private List<String> keywordsLines = new ArrayList<>();
 	private List<DBRef> dbrefs;
-	private Map<String, Site> siteMap = new LinkedHashMap<String, Site>();
-	private Map<String, List<ResidueNumber>> siteToResidueMap = new LinkedHashMap<String, List<ResidueNumber>>();
+	private Map<String, Site> siteMap = new LinkedHashMap<>();
+	private Map<String, List<ResidueNumber>> siteToResidueMap = new LinkedHashMap<>();
 
 	private List<SSBondImpl> ssbonds = new ArrayList<>();
 
@@ -207,7 +207,7 @@ public class PDBFileParser  {
 	private float rfreeStandardLine = -1;
 	private float rfreeNoCutoffLine = -1;
 
-	private static  final List<String> compndFieldValues = new ArrayList<String>(
+	private static  final List<String> compndFieldValues = new ArrayList<>(
 			Arrays.asList(
 					"MOL_ID:", "MOLECULE:", "CHAIN:", "SYNONYM:",
 					"EC:", "FRAGMENT:", "ENGINEERED:", "MUTATION:",
@@ -215,14 +215,14 @@ public class PDBFileParser  {
 					));
 
 
-	private static final List<String> ignoreCompndFieldValues = new ArrayList<String>(
+	private static final List<String> ignoreCompndFieldValues = new ArrayList<>(
 			Arrays.asList(
 					"HETEROGEN:","ENGINEEREED:","FRAGMENT,",
 					"MUTANT:","SYNTHETIC:"
 					));
 	// ENGINEEREED in pdb219d
 
-	private static final List<String> sourceFieldValues = new ArrayList<String>(
+	private static final List<String> sourceFieldValues = new ArrayList<>(
 			Arrays.asList("ENGINEERED:", "MOL_ID:", "SYNTHETIC:", "FRAGMENT:",
 					"ORGANISM_SCIENTIFIC:", "ORGANISM_COMMON:",
 					"ORGANISM_TAXID:","STRAIN:",
@@ -274,14 +274,14 @@ public PDBFileParser() {
 
 		pdbHeader 	  = new PDBHeader();
 		crystallographicInfo = new PDBCrystallographicInfo();
-		connects      = new ArrayList<Map<String,Integer>>() ;
+		connects      = new ArrayList<>() ;
 
 
-		helixList     = new ArrayList<Map<String,String>>();
-		strandList    = new ArrayList<Map<String,String>>();
-		turnList      = new ArrayList<Map<String,String>>();
+		helixList     = new ArrayList<>();
+		strandList    = new ArrayList<>();
+		turnList      = new ArrayList<>();
 		current_compound = null;
-		dbrefs        = new ArrayList<DBRef>();
+		dbrefs        = new ArrayList<>();
 		siteMap = null;
 		dateFormat = new SimpleDateFormat("dd-MMM-yy", Locale.US);
 		atomCount = 0;
@@ -294,7 +294,7 @@ public PDBFileParser() {
 		loadMaxAtoms = params.getMaxAtoms();
 		atomCAThreshold = params.getAtomCaThreshold();
 
-		linkRecords = new ArrayList<LinkRecord>();
+		linkRecords = new ArrayList<>();
 
 		blankChainIdsPresent = false;
 
@@ -486,7 +486,7 @@ private void pdb_HELIX_Handler(String line){
 		//System.out.println(initResName + " " + initChainId + " " + initSeqNum + " " + initICode + " " +
 		//        endResName + " " + endChainId + " " + endSeqNum + " " + endICode);
 
-		Map<String,String> m = new HashMap<String,String>();
+		Map<String,String> m = new HashMap<>();
 
 		m.put("initResName",initResName);
 		m.put("initChainId", initChainId);
@@ -573,7 +573,7 @@ private void pdb_SHEET_Handler( String line){
 		//System.out.println(initResName + " " + initChainId + " " + initSeqNum + " " + initICode + " " +
 		//        endResName + " " + endChainId + " " + endSeqNum + " " + endICode);
 
-		Map<String,String> m = new HashMap<String,String>();
+		Map<String,String> m = new HashMap<>();
 
 		m.put("initResName",initResName);
 		m.put("initChainId", initChainId);
@@ -638,7 +638,7 @@ private void pdb_TURN_Handler( String line){
 		//System.out.println(initResName + " " + initChainId + " " + initSeqNum + " " + initICode + " " +
 		//        endResName + " " + endChainId + " " + endSeqNum + " " + endICode);
 
-		Map<String,String> m = new HashMap<String,String>();
+		Map<String,String> m = new HashMap<>();
 
 		m.put("initResName",initResName);
 		m.put("initChainId", initChainId);
@@ -1055,7 +1055,7 @@ private void compndValueSetter(String field, String value) {
 		if ("CHAIN:".equals(field)) {
 			//System.out.println(value);
 			StringTokenizer chainTokens = new StringTokenizer(value, ",");
-			List<String> chains = new ArrayList<String>();
+			List<String> chains = new ArrayList<>();
 
 			while (chainTokens.hasMoreTokens()) {
 				String chainID = chainTokens.nextToken().trim();
@@ -1070,7 +1070,7 @@ private void compndValueSetter(String field, String value) {
 		if ("SYNONYM:".equals(field)) {
 
 			StringTokenizer synonyms = new StringTokenizer(value, ",");
-			List<String> names = new ArrayList<String>();
+			List<String> names = new ArrayList<>();
 
 			while (synonyms.hasMoreTokens()) {
 				names.add(synonyms.nextToken());
@@ -1083,7 +1083,7 @@ private void compndValueSetter(String field, String value) {
 		if ("EC:".equals(field)) {
 
 			StringTokenizer ecNumTokens = new StringTokenizer(value, ",");
-			List<String> ecNums = new ArrayList<String>();
+			List<String> ecNums = new ArrayList<>();
 
 			while (ecNumTokens.hasMoreTokens()) {
 				ecNums.add(ecNumTokens.nextToken());
@@ -2079,7 +2079,7 @@ private void pdb_CONECT_Handler(String line) {
 
 			//System.out.println(atomserial+ " "+ bond1 +" "+bond2+ " " +bond3+" "+bond4+" "+
 			//		   hyd1+" "+hyd2 +" "+salt1+" "+hyd3+" "+hyd4+" "+salt2);
-			HashMap<String, Integer> cons = new HashMap<String, Integer>();
+			HashMap<String, Integer> cons = new HashMap<>();
 			cons.put("atomserial",atomserial);
 
 			if ( bond1 != null) cons.put("bond1",bond1);
@@ -2383,7 +2383,7 @@ private void pdb_SITE_Handler(String line){
 
 		//if the siteResidues doesn't yet exist, make a new one.
 		if (siteResidues == null || ! siteToResidueMap.containsKey(siteID.trim())){
-			siteResidues = new ArrayList<ResidueNumber>();
+			siteResidues = new ArrayList<>();
 			siteToResidueMap.put(siteID.trim(), siteResidues);
 
 			logger.debug(String.format("New Site made: %s %s", siteID,  siteResidues));
@@ -2600,10 +2600,10 @@ public  Structure parsePDBFile(BufferedReader buf)
 		startOfMolecule = true;
 		startOfModel = true;
 
-		seqResChains  = new ArrayList<Chain>();
-		siteMap = new LinkedHashMap<String, Site>();
+		seqResChains  = new ArrayList<>();
+		siteMap = new LinkedHashMap<>();
 		pdbHeader     = new PDBHeader();
-		connects      = new ArrayList<Map<String,Integer>>();
+		connects      = new ArrayList<>();
 		previousContinuationField = "";
 		continuationField = "";
 		continuationString = "";
@@ -2621,7 +2621,7 @@ public  Structure parsePDBFile(BufferedReader buf)
 		lengthCheck = -1;
 		atomCount = 0;
 		atomOverflow = false;
-		linkRecords = new ArrayList<LinkRecord>();
+		linkRecords = new ArrayList<>();
 		siteToResidueMap.clear();
 
 		blankChainIdsPresent = false;
@@ -2812,7 +2812,7 @@ private void handlePDBKeywords(List<String> lines) {
 		}
 		String fulllengthList = fullList.toString();
 		keywords = fulllengthList.split("( )*,( )*");
-		ArrayList<String> lst = new ArrayList<String>(keywords.length);
+		ArrayList<String> lst = new ArrayList<>(keywords.length);
 		for (String keyword : keywords) {
 			if(keyword.length() == 0) {
 				logger.debug("Keyword empty in structure {}", structure.getIdentifier().toString());
@@ -3317,7 +3317,7 @@ private void linkSitesToGroups() {
 		List<Site> sites = null;
 		//check that there are chains with which to associate the groups
 		if (structure.getChains().isEmpty()) {
-			sites = new ArrayList<Site>(siteMap.values());
+			sites = new ArrayList<>(siteMap.values());
 			logger.info("No chains to link Site Groups with - Sites will not be present in the Structure");
 			return;
 		}
@@ -3360,7 +3360,7 @@ private void linkSitesToGroups() {
 
 		//System.out.println("SITEMAP: " + siteMap);
 
-		sites = new ArrayList<Site>(siteMap.values());
+		sites = new ArrayList<>(siteMap.values());
 		structure.setSites(sites);
 		//System.out.println("STRUCTURE SITES: " + structure.getSites().size());
 		//            for (Site site : structure.getSites()) {
@@ -3611,7 +3611,7 @@ private String getVolume() {
 	}
 
 	private List<Author> authorBuilder(String authorString) {
-		ArrayList<Author> authorList = new ArrayList<Author>();
+		ArrayList<Author> authorList = new ArrayList<>();
 
 		if ("".equals(authorString)) {
 			return authorList;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
index a5854efe08..7ee21de4b4 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/SeqRes2AtomAligner.java
@@ -453,8 +453,8 @@ public static String getFullAtomSequence(List<Group> groups, Map<Integer, Intege
 
 	private boolean alignNucleotideGroups(List<Group> seqRes, List<Group> atomRes) {
 
-		Map<Integer,Integer> seqresIndexPosition = new HashMap<Integer, Integer>();
-		Map<Integer,Integer> atomIndexPosition   = new HashMap<Integer, Integer>();
+		Map<Integer,Integer> seqresIndexPosition = new HashMap<>();
+		Map<Integer,Integer> atomIndexPosition   = new HashMap<>();
 
 		String seq1 = getFullAtomSequence(seqRes, seqresIndexPosition, true);
 		//
@@ -573,8 +573,8 @@ private Sequence<NucleotideCompound> getNucleotideSequence(String seq) {
 	 */
 	private boolean alignProteinChains(List<Group> seqRes, List<Group> atomRes) {
 
-		Map<Integer,Integer> seqresIndexPosition = new HashMap<Integer, Integer>();
-		Map<Integer,Integer> atomIndexPosition   = new HashMap<Integer, Integer>();
+		Map<Integer,Integer> seqresIndexPosition = new HashMap<>();
+		Map<Integer,Integer> atomIndexPosition   = new HashMap<>();
 
 		String seq1 = getFullAtomSequence(seqRes, seqresIndexPosition, false);
 		//
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
index 252c9422dc..fd06080118 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
@@ -118,7 +118,7 @@ public static ProteinSequence getProteinSequenceForStructure(Structure struct, M
 
 		for(Chain chain : struct.getChains()) {
 			List<Group> groups = chain.getAtomGroups();
-			Map<Integer,Integer> chainIndexPosition = new HashMap<Integer, Integer>();
+			Map<Integer,Integer> chainIndexPosition = new HashMap<>();
 			int prevLen = seqStr.length();
 
 			// get the sequence for this chain
@@ -162,7 +162,7 @@ public static ProteinSequence getProteinSequenceForStructure(Structure struct, M
 	public static ResidueNumber[] matchSequenceToStructure(ProteinSequence seq, Structure struct) {
 
 		//1. Create ProteinSequence for struct while remembering to which group each residue corresponds
-		Map<Integer,Group> atomIndexPosition   = new HashMap<Integer, Group>();
+		Map<Integer,Group> atomIndexPosition   = new HashMap<>();
 
 		ProteinSequence structSeq = getProteinSequenceForStructure(struct,atomIndexPosition);
 
@@ -171,10 +171,10 @@ public static ResidueNumber[] matchSequenceToStructure(ProteinSequence seq, Stru
 		// Identity substitution matrix with +1 for match, -1 for mismatch
 		// TODO
 		SubstitutionMatrix<AminoAcidCompound> matrix =
-			new SimpleSubstitutionMatrix<AminoAcidCompound>(
+			new SimpleSubstitutionMatrix<>(
 					AminoAcidCompoundSet.getAminoAcidCompoundSet(),
 					(short)1, (short)-1 );
-		matrix = new SimpleSubstitutionMatrix<AminoAcidCompound>(
+		matrix = new SimpleSubstitutionMatrix<>(
 				AminoAcidCompoundSet.getAminoAcidCompoundSet(),
 				new InputStreamReader(
 						SimpleSubstitutionMatrix.class.getResourceAsStream("/matrices/blosum100.txt")),
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index b3be41bad0..ca3906e4b2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -934,7 +934,7 @@ public void consumeStructConnType(StructConnType structConnType) {
 
     @Override
     public void consumeStructKeywords(StructKeywords structKeywords) {
-        ArrayList<String> keywordsList = new ArrayList<String>();
+        ArrayList<String> keywordsList = new ArrayList<>();
 
         StrColumn text = structKeywords.getText();
         if (text.isDefined()) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
index 622f16122f..5b9fe460c6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfUtils.java
@@ -256,8 +256,8 @@ public static int getNumGroups(Structure structure) {
 	 * @return the atoms for the input Biojava Group
 	 */
 	public static List<Atom> getAtomsForGroup(Group inputGroup) {
-		Set<Atom> uniqueAtoms = new HashSet<Atom>();
-		List<Atom> theseAtoms = new ArrayList<Atom>();
+		Set<Atom> uniqueAtoms = new HashSet<>();
+		List<Atom> theseAtoms = new ArrayList<>();
 		for(Atom a: inputGroup.getAtoms()){
 			theseAtoms.add(a);
 			uniqueAtoms.add(a);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsChainToUniprotMapping.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsChainToUniprotMapping.java
index 84cd9ae138..d4c11544ca 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsChainToUniprotMapping.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsChainToUniprotMapping.java
@@ -156,9 +156,9 @@ private static void download() throws IOException {
 
 	}
 
-	private Map<String, SiftsChainEntry> byChainId = new HashMap<String, SiftsChainEntry>();
+	private Map<String, SiftsChainEntry> byChainId = new HashMap<>();
 
-	private Map<String, SiftsChainEntry> byUniProtId = new HashMap<String, SiftsChainEntry>();
+	private Map<String, SiftsChainEntry> byUniProtId = new HashMap<>();
 
 	private SiftsChainToUniprotMapping() {
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsEntity.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsEntity.java
index 34b2ba1bc4..20e1008859 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsEntity.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsEntity.java
@@ -46,7 +46,7 @@ public SiftsEntity(){
 	public SiftsEntity(String type, String entityId) {
 		this.type = type;
 		this.entityId = entityId;
-		segments = new ArrayList<SiftsSegment>();
+		segments = new ArrayList<>();
 	}
 
 	public void addSegment(SiftsSegment s) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsSegment.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsSegment.java
index 1594228a05..e582a3881a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsSegment.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsSegment.java
@@ -49,7 +49,7 @@ public SiftsSegment(String segId, String start, String end) {
 		this.segId = segId;
 		this.start = start;
 		this.end = end;
-		residues = new ArrayList<SiftsResidue>();
+		residues = new ArrayList<>();
 	}
 
 	public String getSegId() {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsXMLParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsXMLParser.java
index e566550df2..6922f49366 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsXMLParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/sifts/SiftsXMLParser.java
@@ -51,7 +51,7 @@ public class SiftsXMLParser {
 
 	static boolean debug = false;
 	public SiftsXMLParser(){
-		entities = new ArrayList<SiftsEntity>();
+		entities = new ArrayList<>();
 	}
 
 	public List<SiftsEntity> getEntities(){
@@ -60,7 +60,7 @@ public List<SiftsEntity> getEntities(){
 
 
 	public void parseXmlFile(InputStream is){
-		entities = new ArrayList<SiftsEntity>();
+		entities = new ArrayList<>();
 
 		//get the factory
 		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -269,7 +269,7 @@ private String getTextValue(Element ele, String tagName) {
 		}
 
 	private List<String> getTextValues(Element ele, String tagName) {
-		List<String>values = new ArrayList<String>();
+		List<String>values = new ArrayList<>();
 		NodeList nl = ele.getElementsByTagName(tagName);
 		if(nl != null && nl.getLength() > 0) {
 			for ( int i = 0 ;i < nl.getLength() ; i ++) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/math/SparseVector.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/math/SparseVector.java
index 124b44d1c2..d4e7d19d93 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/math/SparseVector.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/math/SparseVector.java
@@ -54,7 +54,7 @@ public class SparseVector implements Serializable{
 	 */
 	public SparseVector(int N) {
 		this.N  = N;
-		this.symbolTable = new SymbolTable<Integer, Double>();
+		this.symbolTable = new SymbolTable<>();
 	}
 
 	/** Setter method (should it be renamed to set?)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/math/SymbolTable.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/math/SymbolTable.java
index 39d7926d9f..0f9066b323 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/math/SymbolTable.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/math/SymbolTable.java
@@ -69,7 +69,7 @@ public class SymbolTable<Key extends Comparable<Key>, Value> implements Iterable
 	 * Create an empty symbol table.
 	 */
 	public SymbolTable() {
-		st = new TreeMap<Key, Value>();
+		st = new TreeMap<>();
 	}
 
 	/**
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
index 92bdc89ead..95bcf1b402 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
@@ -76,7 +76,7 @@ private static List<String> parseSubExpression(String expression) {
 		}
 
 		// expand ranges if present, i.e. 1-60 -> 1, 2, 3, ..., 60
-		List<String> operators = new ArrayList<String>();
+		List<String> operators = new ArrayList<>();
 		for (String component : components) {
 			if (component.contains("-")) {
 				operators.addAll(expandRange(component));
@@ -104,7 +104,7 @@ private static List<String> expandRange(String expression) {
 			throw new IllegalArgumentException("Invalid range specification in oper_expression: " + expression);
 		}
 
-		List<String> expandedExpression = new ArrayList<String>(last-first+1);
+		List<String> expandedExpression = new ArrayList<>(last-first+1);
 		for (int i = first; i <= last; i++) {
 			expandedExpression.add(String.valueOf(i));
 		}
@@ -127,7 +127,7 @@ public static List<OrderedPair<String>> parseBinaryOperatorExpression(String exp
 		List<String> rightSide = parseSubExpression(subExpressions[1]);
 
 		// form the cartesian product of the two lists
-		CartesianProduct<String> product = new CartesianProduct<String>(leftSide, rightSide);
+		CartesianProduct<String> product = new CartesianProduct<>(leftSide, rightSide);
 		return product.getOrderedPairs();
 	}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java
index 083633c28f..f9597bbb7d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java
@@ -184,7 +184,7 @@ public int compare(BiologicalAssemblyTransformation t1, BiologicalAssemblyTransf
 	 * @return
 	 */
 	private List<String> getChainIds(Structure asymUnit) {
-		List<String> chainIds = new ArrayList<String>();
+		List<String> chainIds = new ArrayList<>();
 		for ( Chain c : asymUnit.getChains()){
 			String intChainID = c.getId();
 			chainIds.add(intChainID);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyTransformation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyTransformation.java
index 2fa6258cf5..36bccd7b39 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyTransformation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyTransformation.java
@@ -236,7 +236,7 @@ public static BiologicalAssemblyTransformation fromXML(String xml)
 	public static List<BiologicalAssemblyTransformation> fromMultiXML(String xml) throws ParserConfigurationException, SAXException, IOException{
 
 
-		List<BiologicalAssemblyTransformation> transformations = new ArrayList<BiologicalAssemblyTransformation>();
+		List<BiologicalAssemblyTransformation> transformations = new ArrayList<>();
 
 		// read the XML of a string and returns a ModelTransformationmatrix
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/CartesianProduct.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/CartesianProduct.java
index da6853a6fb..7aa4690b5c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/CartesianProduct.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/CartesianProduct.java
@@ -60,7 +60,7 @@ public CartesianProduct(List<T> list1, List<T> list2) {
 	 * @return the list of ordered pairs
 	 */
 	public List<OrderedPair<T>> getOrderedPairs() {
-		List<OrderedPair<T>> pairs = new ArrayList<OrderedPair<T>>(list1.size()*list2.size());
+		List<OrderedPair<T>> pairs = new ArrayList<>(list1.size()*list2.size());
 
 		for (T element1: list1) {
 			for (T element2: list2) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/Astral.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/Astral.java
index da1f82221f..9d30e42248 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/Astral.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/Astral.java
@@ -101,7 +101,7 @@ public String toString() {
 		}
 	}
 
-	private static Map<String, SoftReference<Astral>> instances = new HashMap<String, SoftReference<Astral>>();
+	private static Map<String, SoftReference<Astral>> instances = new HashMap<>();
 
 	private static final Logger logger = LoggerFactory.getLogger(Astral.class);
 
@@ -203,8 +203,8 @@ public LinkedHashMap<Integer, String> getFailedLines() {
 	 * Parses the FASTA file opened by reader.
 	 */
 	private void init(Reader reader) {
-		names = new TreeSet<String>();
-		failedLines = new LinkedHashMap<Integer,String>();
+		names = new TreeSet<>();
+		failedLines = new LinkedHashMap<>();
 
 		BufferedReader br = null;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/BerkeleyScopInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/BerkeleyScopInstallation.java
index f0aab86b95..d688beadac 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/BerkeleyScopInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/BerkeleyScopInstallation.java
@@ -45,7 +45,7 @@ public class BerkeleyScopInstallation extends ScopInstallation {
 	 * A map from SCOP version names which the Berkeley server offers as a
 	 * download to an array of equivalent deprecated SCOP version names.
 	 */
-	public static final Map<String,String[]> EQUIVALENT_VERSIONS = new HashMap<String,String[]>();
+	public static final Map<String,String[]> EQUIVALENT_VERSIONS = new HashMap<>();
 
 	static {
 		EQUIVALENT_VERSIONS.put("2.01", new String[] {"1.75A"});
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java
index 34e7702e23..b6783316c8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopDomain.java
@@ -243,7 +243,7 @@ protected Object clone() throws CloneNotSupportedException {
 	 * Returns the chains this domain is defined over; contains more than 1 element only if this domains is a multi-chain domain.
 	 */
 	public Set<String> getChains() {
-		Set<String> chains = new HashSet<String>();
+		Set<String> chains = new HashSet<>();
 		List<ResidueRange> rrs = ResidueRange.parseMultiple(getRanges());
 		for (ResidueRange rr : rrs) chains.add(rr.getChainName());
 		return chains;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
index 07d848c942..d092d5485e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
@@ -123,12 +123,12 @@ public ScopInstallation(String cacheLocation){
 		installedCom.set(false);
 
 		scopVersion = DEFAULT_VERSION;
-		mirrors = new ArrayList<ScopMirror>(1);
+		mirrors = new ArrayList<>(1);
 
-		domainMap = new HashMap<String, List<ScopDomain>>();
+		domainMap = new HashMap<>();
 
-		sunidMap  = new HashMap<Integer, ScopDescription>();
-		scopTree  = new TreeMap<Integer, ScopNode>();
+		sunidMap  = new HashMap<>();
+		scopTree  = new TreeMap<>();
 
 	}
 
@@ -189,7 +189,7 @@ public List<ScopDescription> getByCategory(ScopCategory category){
 			throw new ScopIOException(e);
 		}
 
-		List<ScopDescription> matches = new ArrayList<ScopDescription>();
+		List<ScopDescription> matches = new ArrayList<>();
 		for (Integer i : sunidMap.keySet()){
 			ScopDescription sc = sunidMap.get(i);
 			if ( sc.getCategory().equals(category))
@@ -216,7 +216,7 @@ public List<ScopDescription> filterByClassificationId(String query){
 			throw new ScopIOException(e);
 		}
 
-		List<ScopDescription> matches = new ArrayList<ScopDescription>();
+		List<ScopDescription> matches = new ArrayList<>();
 		for (Integer i : sunidMap.keySet()){
 			ScopDescription sc = sunidMap.get(i);
 
@@ -238,7 +238,7 @@ public List<ScopNode> getTree(ScopDomain domain){
 		ScopNode node = getScopNode(domain.getSunid());
 
 
-		List<ScopNode> tree = new ArrayList<ScopNode>();
+		List<ScopNode> tree = new ArrayList<>();
 		while (node != null){
 
 			//System.out.println("This node: sunid:" + node.getSunid() );
@@ -257,7 +257,7 @@ public List<ScopNode> getTree(ScopDomain domain){
 	@Override
 	public List<ScopDomain> filterByDomainName(String query) {
 
-		List<ScopDomain > domains = new ArrayList<ScopDomain>();
+		List<ScopDomain > domains = new ArrayList<>();
 		if (query.length() <5){
 			return domains;
 		}
@@ -292,7 +292,7 @@ public List<ScopDescription> filterByDescription(String query) {
 		}
 
 		query = query.toLowerCase();
-		List<ScopDescription> matches = new ArrayList<ScopDescription>();
+		List<ScopDescription> matches = new ArrayList<>();
 		for (Integer i : sunidMap.keySet()){
 			ScopDescription sc = sunidMap.get(i);
 
@@ -332,7 +332,7 @@ public  List<ScopDomain> getDomainsForPDB(String pdbId) {
 
 		List<ScopDomain> doms = domainMap.get(pdbId.toLowerCase());
 
-		List<ScopDomain> retdoms = new ArrayList<ScopDomain>();
+		List<ScopDomain> retdoms = new ArrayList<>();
 
 		if ( doms == null)
 			return retdoms;
@@ -439,7 +439,7 @@ private void parseHierarchy(BufferedReader buffer) throws IOException {
 			String children = spl[2];
 			String[] childIds = children.split(",");
 
-			List<Integer> chis = new ArrayList<Integer>();
+			List<Integer> chis = new ArrayList<>();
 
 			for ( String id : childIds){
 				if ( "-".equals(id))
@@ -483,7 +483,7 @@ private void parseComments() throws IOException{
 
 	private void parseComments(BufferedReader buffer) throws IOException {
 
-		commentsMap = new HashMap<Integer,List<String>>();
+		commentsMap = new HashMap<>();
 
 		int counter = 0;
 		String line;
@@ -495,7 +495,7 @@ private void parseComments(BufferedReader buffer) throws IOException {
 				commentsMap.put(sunId, new ArrayList<String>(1));
 				continue;
 			}
-			List<String> comments = new ArrayList<String>(parts.length - 1);
+			List<String> comments = new ArrayList<>(parts.length - 1);
 			for (int i = 1; i < parts.length; i++) {
 				String trimmed = parts[i].trim();
 				if( !trimmed.isEmpty() ) {
@@ -611,7 +611,7 @@ private void parseClassification(BufferedReader buffer) throws IOException {
 			if ( domainMap.containsKey(pdbId)){
 				domainList = domainMap.get(pdbId);
 			} else {
-				domainList = new ArrayList<ScopDomain>();
+				domainList = new ArrayList<>();
 				domainMap.put(pdbId,domainList);
 			}
 
@@ -862,7 +862,7 @@ public List<ScopDomain> getScopDomainsBySunid(Integer sunid)
 			throw new ScopIOException(e);
 		}
 
-		List<ScopDomain> domains = new ArrayList<ScopDomain>();
+		List<ScopDomain> domains = new ArrayList<>();
 
 		for (String pdbId: domainMap.keySet()){
 			for (ScopDomain d : domainMap.get(pdbId)){
@@ -900,7 +900,7 @@ public List<String> getComments(int sunid) {
 		} catch (IOException e) {
 			throw new ScopIOException(e);
 		}
-		if (!commentsMap.containsKey(sunid)) return new ArrayList<String>(1);
+		if (!commentsMap.containsKey(sunid)) return new ArrayList<>(1);
 		return commentsMap.get(sunid);
 	}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/DSSPParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/DSSPParser.java
index 3aa4417f13..f6fb7bff42 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/DSSPParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/DSSPParser.java
@@ -124,7 +124,7 @@ private static List<SecStrucState> generalParse(BufferedReader reader,
 		String startLine = "  #  RESIDUE AA STRUCTURE BP1 BP2  ACC";
 		String line;
 
-		List<SecStrucState> secstruc = new ArrayList<SecStrucState>();
+		List<SecStrucState> secstruc = new ArrayList<>();
 
 		//Find the first line of the DSSP output
 		while((line = reader.readLine()) != null) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucCalc.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucCalc.java
index c63f3d1684..c4d308e366 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucCalc.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucCalc.java
@@ -104,8 +104,8 @@ public class SecStrucCalc {
 	private AtomContactSet contactSet;
 	private Map<ResidueNumber, Integer> indResMap;
 	public SecStrucCalc(){
-		ladders = new ArrayList<Ladder>();
-		bridges = new ArrayList<BetaBridge>();
+		ladders = new ArrayList<>();
+		bridges = new ArrayList<>();
 	}
 
 
@@ -120,11 +120,11 @@ public SecStrucCalc(){
 	public List<SecStrucState> calculate(Structure s, boolean assign)
 			throws StructureException {
 
-		List<SecStrucState> secstruc = new ArrayList<SecStrucState>();
+		List<SecStrucState> secstruc = new ArrayList<>();
 		for(int i=0; i<s.nrModels(); i++) {
 			// Reinitialise the global vars
-			ladders = new ArrayList<Ladder>();
-			bridges = new ArrayList<BetaBridge>();
+			ladders = new ArrayList<>();
+			bridges = new ArrayList<>();
 			groups = initGroupArray(s, i);
 			// Initialise the contact set for this structure
 			initContactSet();
@@ -424,7 +424,7 @@ private boolean shouldExtendLadder(Ladder ladder, BetaBridge b) {
 	private void findBridges() {
 		// Get the interator of contacts
 		Iterator<AtomContact> myIter = contactSet.iterator();
-		List<Pair<Integer>> outList = new ArrayList<Pair<Integer>>();
+		List<Pair<Integer>> outList = new ArrayList<>();
 
 		// Now iterate through this
 		while(myIter.hasNext()){
@@ -461,7 +461,7 @@ private void findBridges() {
 				continue;
 			}
 
-			Pair<Integer> thisPair = new Pair<Integer>(i,j);
+			Pair<Integer> thisPair = new Pair<>(i,j);
 			outList.add(thisPair);
 		}
 		//
@@ -705,7 +705,7 @@ public boolean equals(Object o){
 	}
 
 	private static SecStrucGroup[] initGroupArray(Structure s, int modelId) {
-		List<SecStrucGroup> groupList = new ArrayList<SecStrucGroup>();
+		List<SecStrucGroup> groupList = new ArrayList<>();
 		//
 		for ( Chain c : s.getChains(modelId)){
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucTools.java
index d90c5ba263..7732c04b80 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucTools.java
@@ -99,7 +99,7 @@ public static List<SecStrucElement> getSecStrucElements(Structure s) {
 		int count = 0; // counts the number of residues in SSE
 
 		// Create a map for the IDs of the SSE in the structure
-		Map<SecStrucType, Integer> ids = new TreeMap<SecStrucType, Integer>();
+		Map<SecStrucType, Integer> ids = new TreeMap<>();
 		for (SecStrucType t : SecStrucType.values())
 			ids.put(t, 1);
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/HelixAxisAligner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/HelixAxisAligner.java
index b76e844965..10d9144db4 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/HelixAxisAligner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/HelixAxisAligner.java
@@ -356,7 +356,7 @@ private Matrix4d reorientHelix(int index) {
 	 * @return list of orbits ordered by z-depth
 	 */
 	private void calcAlignedOrbits() {
-		Map<Double, List<Integer>> depthMap = new TreeMap<Double, List<Integer>>();
+		Map<Double, List<Integer>> depthMap = new TreeMap<>();
 		double[] depth = getSubunitZDepth();
 		alignedOrbits = calcOrbits();
 
@@ -585,7 +585,7 @@ private double[] getSubunitZDepth() {
 	private List<List<Integer>> calcOrbits() {
 		int n = subunits.getSubunitCount();
 
-		List<List<Integer>> orbits = new ArrayList<List<Integer>>();
+		List<List<Integer>> orbits = new ArrayList<>();
 		for (int i = 0; i < n; i++) {
 			orbits.add(Collections.singletonList(i));
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/RotationAxisAligner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/RotationAxisAligner.java
index bb24492389..65621135d1 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/RotationAxisAligner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/axis/RotationAxisAligner.java
@@ -236,7 +236,7 @@ private void run () {
 	 * @return list of orbits ordered by z-depth
 	 */
 	private void calcAlignedOrbits() {
-		Map<Double, List<Integer>> depthMap = new TreeMap<Double, List<Integer>>();
+		Map<Double, List<Integer>> depthMap = new TreeMap<>();
 		double[] depth = getSubunitZDepth();
 		alignedOrbits = calcOrbits();
 
@@ -539,7 +539,7 @@ private void calcZDirection() {
 	 *
 	 */
 	private List<List<Integer>> getOrbitsByXYWidth() {
-		Map<Double, List<Integer>> widthMap = new TreeMap<Double, List<Integer>>();
+		Map<Double, List<Integer>> widthMap = new TreeMap<>();
 		double[] width = getSubunitXYWidth();
 		List<List<Integer>> orbits = calcOrbits();
 
@@ -608,14 +608,14 @@ private List<List<Integer>> calcOrbits() {
 		int n = subunits.getSubunitCount();
 		int fold = rotationGroup.getRotation(0).getFold();
 
-		List<List<Integer>> orbits = new ArrayList<List<Integer>>();
+		List<List<Integer>> orbits = new ArrayList<>();
 		boolean[] used = new boolean[n];
 		Arrays.fill(used, false);
 
 		for (int i = 0; i < n; i++) {
 			if (! used[i]) {
 				// determine the equivalent subunits
-				List<Integer> orbit = new ArrayList<Integer>(fold);
+				List<Integer> orbit = new ArrayList<>(fold);
 				for (int j = 0; j < fold; j++) {
 					List<Integer> permutation = rotationGroup.getRotation(j).getPermutation();
 					orbit.add(permutation.get(i));
@@ -637,7 +637,7 @@ private List<Integer> deconvolute(List<Integer> orbit) {
 //		System.out.println("Permutation0: " + p0);
 //		System.out.println("Permutation1: " + p1);
 
-		List<Integer> inRotationOrder = new ArrayList<Integer>(orbit.size());
+		List<Integer> inRotationOrder = new ArrayList<>(orbit.size());
 		inRotationOrder.add(orbit.get(0));
 		for (int i = 1; i < orbit.size(); i++) {
 			int current = inRotationOrder.get(i-1);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelicalRepeatUnit.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelicalRepeatUnit.java
index f62208aadf..ff9c77cf13 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelicalRepeatUnit.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelicalRepeatUnit.java
@@ -30,7 +30,7 @@ public class HelicalRepeatUnit {
 	private QuatSymmetrySubunits subunits = null;
 	private List<Point3d> repeatUnitCenters = new ArrayList<Point3d>();
 	private List<Point3d[]> repeatUnits = new ArrayList<Point3d[]>();
-	private List<List<Integer>> repeatUnitIndices = new ArrayList<List<Integer>>();
+	private List<List<Integer>> repeatUnitIndices = new ArrayList<>();
 	private Map<Integer[], Integer> interactingNeighbors = Collections.emptyMap();
 
 public HelicalRepeatUnit(QuatSymmetrySubunits subunits) {
@@ -74,10 +74,10 @@ private void run() {
 private List<Point3d> calcRepeatUnitCenters() {
 
 	// TODO why do we use models here? it should not matter. Setting to 0 all
-	List<Integer> models = new ArrayList<Integer>(subunits.getSubunitCount());
+	List<Integer> models = new ArrayList<>(subunits.getSubunitCount());
 	for (int s = 0; s <subunits.getSubunitCount(); s++)
 		models.add(0);
-	Set<Integer> uniqueModels = new HashSet<Integer>(Arrays.asList(1));
+	Set<Integer> uniqueModels = new HashSet<>(Arrays.asList(1));
 
 	int modelCount = uniqueModels.size();
 	List<Integer> folds = this.subunits.getFolds();
@@ -90,7 +90,7 @@ private List<Point3d> calcRepeatUnitCenters() {
 	if (maxFold%modelCount == 0 && modelCount > 1 && subunits.getSubunitCount() > 3) {
 //		System.out.println("calcRepeatUnitCenters case 1");
 		for (int i = 0; i < modelCount; i++) {
-			List<Integer> subunitIndices = new ArrayList<Integer>();
+			List<Integer> subunitIndices = new ArrayList<>();
 			Point3d p = new Point3d();
 			int count = 0;
 //			System.out.println("Models: " + models.size());
@@ -113,7 +113,7 @@ private List<Point3d> calcRepeatUnitCenters() {
 		// Case of 3B5U: A14, but seems to form (A2)*7 and symmetry related subunits don't have direct contact
 		List<Integer> sequenceClusterIds = subunits.getClusterIds();
 		for (int i = 0; i < subunits.getSubunitCount(); i++) {
-			List<Integer> subunitIndices = new ArrayList<Integer>(1);
+			List<Integer> subunitIndices = new ArrayList<>(1);
 			if (sequenceClusterIds.get(i) == 0) {
 				repeatCenters.add(new Point3d(centers.get(i)));
 //				System.out.println("Orig Repeat unit: " + centers.get(i));
@@ -135,11 +135,11 @@ private List<Point3d> calcRepeatUnitCenters() {
 private List<Point3d[]> calcRepeatUnits() {
 
 	// TODO why do we use models here? it should not matter. Setting to 0 all
-	List<Integer> models = new ArrayList<Integer>(
+	List<Integer> models = new ArrayList<>(
 			subunits.getSubunitCount());
 	for (int s = 0; s < subunits.getSubunitCount(); s++)
 		models.add(0);
-	Set<Integer> uniqueModels = new HashSet<Integer>(Arrays.asList(1));
+	Set<Integer> uniqueModels = new HashSet<>(Arrays.asList(1));
 
 	int modelCount = uniqueModels.size();
 	List<Integer> folds = this.subunits.getFolds();
@@ -180,7 +180,7 @@ private List<Point3d[]> calcRepeatUnits() {
 }
 
 private Map<Integer[], Integer> findInteractingNeigbors() {
-	Map<Integer[], Integer>  contactMap = new HashMap<Integer[], Integer>();
+	Map<Integer[], Integer>  contactMap = new HashMap<>();
 
 	Map<Integer, List<Integer[]>> distanceMap = findClosestPairs(8);
 	for (List<Integer[]> pairs: distanceMap.values())
@@ -196,9 +196,9 @@ private Map<Integer[], Integer> findInteractingNeigbors() {
 }
 
 private Map<Integer, List<Integer[]>> findClosestPairs(int maxNeighbors) {
-	Map<Integer, List<Integer[]>>  reducedMap = new TreeMap<Integer, List<Integer[]>>();
+	Map<Integer, List<Integer[]>>  reducedMap = new TreeMap<>();
 
-	Map<Integer, List<Integer[]>>  distanceMap = new TreeMap<Integer, List<Integer[]>>();
+	Map<Integer, List<Integer[]>>  distanceMap = new TreeMap<>();
 	int nCenters = repeatUnitCenters.size();
 //	System.out.println("repeatUnitCenters: " + repeatUnitCenters);
 
@@ -212,7 +212,7 @@ private Map<Integer, List<Integer[]>> findClosestPairs(int maxNeighbors) {
 			List<Integer[]> pairs = distanceMap.get(intDist);
 			// save only one representative pair for each distance
 			if (pairs == null) {
-				pairs = new ArrayList<Integer[]>();
+				pairs = new ArrayList<>();
 			}
 			Integer[] pair = new Integer[2];
 			pair[0] = i;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Helix.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Helix.java
index d25f14ec34..4dabe0c0ac 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Helix.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Helix.java
@@ -161,7 +161,7 @@ public String toString() {
 	}
 
 	public List<List<Integer>> getLayerLines() {
-		List<List<Integer>> layerLines = new ArrayList<List<Integer>>();
+		List<List<Integer>> layerLines = new ArrayList<>();
 
 		createLineSegments(permutation, layerLines);
 
@@ -192,7 +192,7 @@ private static void createLineSegments(List<Integer> permutation,
 			List<List<Integer>> layerLines) {
 		for (int i = 0; i < permutation.size(); i++) {
 			if (permutation.get(i) != -1 ) {
-				List<Integer> lineSegment = new ArrayList<Integer>();
+				List<Integer> lineSegment = new ArrayList<>();
 				lineSegment.add(i);
 				lineSegment.add(permutation.get(i));
 				layerLines.add(lineSegment);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixExtender.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixExtender.java
index 30d799b6f3..f99a998131 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixExtender.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixExtender.java
@@ -40,7 +40,7 @@ public Point3d[] extendHelix(int steps) {
 		List<List<Integer>> layerLines = helix.getLayerLines();
 
 		// get list of subunit indices to be used for helix extension
-		List<Integer> indices = new ArrayList<Integer>();
+		List<Integer> indices = new ArrayList<>();
 		for (List<Integer> line: layerLines) {
 			if (steps < 0) {
 				indices.add(line.get(0));
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixLayers.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixLayers.java
index a42958d062..bbcce99df0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixLayers.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixLayers.java
@@ -29,7 +29,7 @@
  * @author Peter
  */
 public class HelixLayers {
-	private List<Helix> helices = new ArrayList<Helix>();
+	private List<Helix> helices = new ArrayList<>();
 	private double symmetryDeviation = 0;
 
 	public int size() {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixSolver.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixSolver.java
index a2d002280c..ff76812152 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixSolver.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelixSolver.java
@@ -73,7 +73,7 @@ private void solve() {
 		HelicalRepeatUnit unit = new HelicalRepeatUnit(subunits);
 		List<Point3d> repeatUnitCenters = unit.getRepeatUnitCenters();
 		List<Point3d[]> repeatUnits = unit.getRepeatUnits();
-		Set<List<Integer>> permutations = new HashSet<List<Integer>>();
+		Set<List<Integer>> permutations = new HashSet<>();
 
 		double minRise = parameters.getMinimumHelixRise() * fold; // for n-start
 																	// helix,
@@ -129,7 +129,7 @@ private void solve() {
 
 
 			// keep track of which subunits are permuted
-			Set<Integer> permSet = new HashSet<Integer>();
+			Set<Integer> permSet = new HashSet<>();
 			int count = 0;
 			boolean valid = true;
 			for (int i = 0; i < permutation.size(); i++) {
@@ -355,7 +355,7 @@ private List<Integer> getPermutation(Matrix4d transformation) {
 		List<Point3d> centers = subunits.getOriginalCenters();
 		List<Integer> seqClusterId = subunits.getClusterIds();
 
-		List<Integer> permutations = new ArrayList<Integer>(centers.size());
+		List<Integer> permutations = new ArrayList<>(centers.size());
 		double[] dSqs = new double[centers.size()];
 		boolean[] used = new boolean[centers.size()];
 		Arrays.fill(used, false);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/PermutationGroup.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/PermutationGroup.java
index 8bbcb5a650..e1f4792410 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/PermutationGroup.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/PermutationGroup.java
@@ -32,7 +32,7 @@
  * @author Peter
  */
 public class PermutationGroup implements Iterable<List<Integer>> {
-	List<List<Integer>> permutations = new ArrayList<List<Integer>>();
+	List<List<Integer>> permutations = new ArrayList<>();
 
 	public void addPermutation(List<Integer> permutation) {
 		if (!permutations.contains(permutation)) {
@@ -60,13 +60,13 @@ public int getOrder() {
 	 */
 	public void completeGroup() {
 		// Copy initial set to allow permutations to grow
-		List<List<Integer>> gens = new ArrayList<List<Integer>>(permutations);
+		List<List<Integer>> gens = new ArrayList<>(permutations);
 		// Keep HashSet version of permutations for fast lookup.
-		Set<List<Integer>> known = new HashSet<List<Integer>>(permutations);
+		Set<List<Integer>> known = new HashSet<>(permutations);
 		//breadth-first search through the map of all members
-		List<List<Integer>> currentLevel = new ArrayList<List<Integer>>(permutations);
+		List<List<Integer>> currentLevel = new ArrayList<>(permutations);
 		while( currentLevel.size() > 0) {
-			List<List<Integer>> nextLevel = new ArrayList<List<Integer>>();
+			List<List<Integer>> nextLevel = new ArrayList<>();
 			for( List<Integer> p : currentLevel) {
 				for(List<Integer> gen : gens) {
 					List<Integer> y = combine(p,gen);
@@ -93,7 +93,7 @@ public String toString() {
 	}
 
 	public static List<Integer> combine(List<Integer> permutation1, List<Integer> permutation2) {
-		List<Integer> intermediate = new ArrayList<Integer>(permutation1.size());
+		List<Integer> intermediate = new ArrayList<>(permutation1.size());
 		for (int i = 0, n = permutation1.size(); i < n; i++) {
 			intermediate.add(permutation2.get(permutation1.get(i)));
 		}
@@ -101,7 +101,7 @@ public static List<Integer> combine(List<Integer> permutation1, List<Integer> pe
 	}
 
 	public static int getOrder(List<Integer> permutation) {
-		List<Integer> copy = new ArrayList<Integer>(permutation);
+		List<Integer> copy = new ArrayList<>(permutation);
 		for (int i = 0, n = permutation.size(); i < n; i++) {
 			copy = combine(copy, permutation);
 			if (copy.equals(permutation)) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryResults.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryResults.java
index cdc7341c4b..db5cb229a2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryResults.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetryResults.java
@@ -72,7 +72,7 @@ public QuatSymmetryResults(Stoichiometry stoichiometry,
 		this.stoichiometry = stoichiometry;
 		this.clusters = stoichiometry.getClusters();
 
-		subunits = new ArrayList<Subunit>();
+		subunits = new ArrayList<>();
 		for (SubunitCluster c : clusters) {
 			subunits.addAll(c.getSubunits());
 		}
@@ -95,7 +95,7 @@ public QuatSymmetryResults(Stoichiometry stoichiometry,
 		this.stoichiometry = stoichiometry;
 		this.clusters = stoichiometry.getClusters();
 
-		subunits = new ArrayList<Subunit>();
+		subunits = new ArrayList<>();
 		for (SubunitCluster c : clusters) {
 			subunits.addAll(c.getSubunits());
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetrySubunits.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetrySubunits.java
index 27d16cd6fe..98eb315855 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetrySubunits.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetrySubunits.java
@@ -105,7 +105,7 @@ public List<Integer> getClusterIds() {
 	 */
 	public List<String> getChainIds() {
 
-		List<String> chains = new ArrayList<String>(getSubunitCount());
+		List<String> chains = new ArrayList<>(getSubunitCount());
 
 		// Loop through all subunits in the clusters and fill Lists
 		for (int c = 0; c < clusters.size(); c++) {
@@ -125,7 +125,7 @@ public List<String> getChainIds() {
 	 */
 	public List<Integer> getModelNumbers() {
 
-		List<Integer> models = new ArrayList<Integer>(getSubunitCount());
+		List<Integer> models = new ArrayList<>(getSubunitCount());
 
 		// Loop through all subunits in the clusters and fill Lists
 		for (int c = 0; c < clusters.size(); c++) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationGroup.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationGroup.java
index 9a13d35813..9d25a7acbc 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationGroup.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationGroup.java
@@ -35,7 +35,7 @@
  * @author Peter
  */
 public class RotationGroup implements Iterable<Rotation> {
-	private List<Rotation> rotations = new ArrayList<Rotation>();
+	private List<Rotation> rotations = new ArrayList<>();
 	private int principalAxisIndex = 0;
 	private int higherOrderRotationAxis = 0;
 	private int twoFoldsPerpendicular = 0;
@@ -61,7 +61,7 @@ public void addRotation(Rotation rotation) {
 
 	public void setC1(int n) {
 		Rotation r = new Rotation();
-		List<Integer> permutation = new ArrayList<Integer>(n);
+		List<Integer> permutation = new ArrayList<>(n);
 		for (int i = 0; i < n; i++) {
 			permutation.add(i);
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java
index 95c73cb540..37a44be7ac 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java
@@ -282,7 +282,7 @@ private List<Double> getAngles() {
 			n = 60;
 		}
 		List<Integer> folds = subunits.getFolds();
-		List<Double> angles = new ArrayList<Double>(folds.size()-1);
+		List<Double> angles = new ArrayList<>(folds.size()-1);
 
 		// note this loop starts at 1, we do ignore 1-fold symmetry, which is the first entry
 		for (int fold: folds) {
@@ -370,7 +370,7 @@ private static Rotation createSymmetryOperation(List<Integer> permutation, Matri
 
 	private void setupDistanceBox() {
 		distanceThreshold = calcDistanceThreshold();
-		box = new DistanceBox<Integer>(distanceThreshold);
+		box = new DistanceBox<>(distanceThreshold);
 
 		for (int i = 0; i < originalCoords.length; i++) {
 			box.addPoint(originalCoords[i], i);
@@ -402,7 +402,7 @@ private double calcDistanceThreshold() {
 	 * @return A list mapping each subunit to the closest transformed subunit
 	 */
 	private List<Integer> getPermutation() {
-		List<Integer> permutation = new ArrayList<Integer>(transformedCoords.length);
+		List<Integer> permutation = new ArrayList<>(transformedCoords.length);
 		double sum = 0.0f;
 
 		for (Point3d t: transformedCoords) {
@@ -432,7 +432,7 @@ private List<Integer> getPermutation() {
 		}
 
 		// check uniqueness of indices
-		Set<Integer> set = new HashSet<Integer>(permutation);
+		Set<Integer> set = new HashSet<>(permutation);
 
 		// if size mismatch, clear permutation (its invalid)
 		if (set.size() != originalCoords.length) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java
index 4ad0494c28..d13fa4db16 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java
@@ -50,7 +50,7 @@ public class SystematicSolver implements QuatSymmetrySolver {
 	private RotationGroup rotations = new RotationGroup();
 	private Vector3d centroid = new Vector3d();
 	private Matrix4d centroidInverse = new Matrix4d();
-	private Set<List<Integer>> hashCodes = new HashSet<List<Integer>>();
+	private Set<List<Integer>> hashCodes = new HashSet<>();
 
 	public SystematicSolver(QuatSymmetrySubunits subunits, QuatSymmetryParameters parameters) {
 		if (subunits.getSubunitCount()== 2) {
@@ -77,7 +77,7 @@ private void solve() {
 		// loop over all permutations
 		while (g.hasMore()) {
 			int[] perm = g.getNext();
-			List<Integer> permutation = new ArrayList<Integer>(perm.length);
+			List<Integer> permutation = new ArrayList<>(perm.length);
 			for (int j = 0; j < n; j++) {
 				permutation.add(perm[j]);
 			}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/DistanceBox.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/DistanceBox.java
index 37430260ca..2d9b1d6dca 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/DistanceBox.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/DistanceBox.java
@@ -63,12 +63,12 @@ public class DistanceBox<T> {
 		1 + ( 1 * 10000) + ( 1 * 1000000000L)
 	};
 
-	private List<T> tempBox = new ArrayList<T>(offset.length);
+	private List<T> tempBox = new ArrayList<>(offset.length);
 
 	/** Creates a new instance of DistanceBox */
 	public DistanceBox(double binWidth) {
-		map = new HashMap<Long, List<T>>();
-		layerMap = new HashMap<Long, List<T>>();
+		map = new HashMap<>();
+		layerMap = new HashMap<>();
 		this.inverseBinWidth = 1.0f/binWidth;
 		this.modified = true;
 	}
@@ -82,7 +82,7 @@ public void addPoint(Point3d point, T object) {
 		List<T> box = map.get(location);
 
 		if (box == null) {
-			box = new ArrayList<T>();
+			box = new ArrayList<>();
 			map.put(location, box);
 		}
 
@@ -127,8 +127,8 @@ public List<T> getNeighbors(Point3d point) {
 	}
 
 	public List<T> getIntersection(DistanceBox<T> distanceBox) {
-		List<T> intersection = new ArrayList<T>();
-		HashSet<Long> checkedLocations = new HashSet<Long>();
+		List<T> intersection = new ArrayList<>();
+		HashSet<Long> checkedLocations = new HashSet<>();
 
 		for (Iterator<Long> iter = map.keySet().iterator(); iter.hasNext();) {
 			long location = iter.next();
@@ -171,7 +171,7 @@ private List<T> getBoxTwo(long location) {
 		} else if (tempBox.size() == 1) {
 			boxTwo = Collections.singletonList(tempBox.get(0));
 		} else {
-			boxTwo = new ArrayList<T>(tempBox);
+			boxTwo = new ArrayList<>(tempBox);
 		}
 		return boxTwo;
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Prism.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Prism.java
index 6b5d7edacf..770126b601 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Prism.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Prism.java
@@ -119,7 +119,7 @@ public Point3d[] getVertices() {
 
 	@Override
 	public List<int[]> getLineLoops() {
-		List<int[]> list = new ArrayList<int[]>();
+		List<int[]> list = new ArrayList<>();
 		int[] l1 = new int[2*n+2];
 		for (int i = 0; i < n; i++) {
 			l1[i] = i;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java
index 66626ef3f0..43ee89c234 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java
@@ -189,7 +189,7 @@ protected static CeSymmResult align(Atom[] atoms, CESymmParameters params)
 		CECalculator calculator = new CECalculator(params);
 		Matrix lastMatrix = null;
 
-		List<AFPChain> selfAlignments = new ArrayList<AFPChain>();
+		List<AFPChain> selfAlignments = new ArrayList<>();
 		AFPChain optimalAFP = null;
 
 		// STEP 2: perform the self-alignments of the structure
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java
index f1e50b756d..4527a7fa49 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java
@@ -89,7 +89,7 @@ public class CeSymmIterative {
 	public CeSymmIterative(CESymmParameters param) {
 		params = param;
 		alignGraph = new SimpleGraph<Integer, DefaultEdge>(DefaultEdge.class);
-		levels = new ArrayList<CeSymmResult>();
+		levels = new ArrayList<>();
 	}
 
 	/**
@@ -231,7 +231,7 @@ private CeSymmResult reconstructSymmResult(Atom[] atoms)
 		ConnectivityInspector<Integer, DefaultEdge> inspector = new ConnectivityInspector<Integer, DefaultEdge>(
 				alignGraph);
 		List<Set<Integer>> comps = inspector.connectedSets();
-		List<ResidueGroup> groups = new ArrayList<ResidueGroup>(comps.size());
+		List<ResidueGroup> groups = new ArrayList<>(comps.size());
 		for (Set<Integer> comp : comps)
 			groups.add(new ResidueGroup(comp));
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmResult.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmResult.java
index 441bcda2ce..67d91362bd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmResult.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmResult.java
@@ -106,7 +106,7 @@ public List<StructureIdentifier> getRepeatsID() throws StructureException {
 		if (!isRefined())
 			return null;
 
-		List<StructureIdentifier> repeats = new ArrayList<StructureIdentifier>(
+		List<StructureIdentifier> repeats = new ArrayList<>(
 				numRepeats);
 
 		PdbId pdbId = structureId.toCanonical().getPdbId();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentOrderDetector.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentOrderDetector.java
index 822e62a8c2..db1dbb8939 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentOrderDetector.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentOrderDetector.java
@@ -59,7 +59,7 @@ public int calculateOrder(AFPChain selfAlignment, Atom[] ca)
 		List<Set<Integer>> components = inspector.connectedSets();
 
 		// The order maximizes the residues aligned
-		Map<Integer, Integer> counts = new HashMap<Integer, Integer>();
+		Map<Integer, Integer> counts = new HashMap<>();
 		for (Set<Integer> c : components) {
 			if (counts.containsKey(c.size()))
 				counts.put(c.size(), counts.get(c.size()) + c.size());
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentRefiner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentRefiner.java
index 6c7d44f6a7..efcd4c34b0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentRefiner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/GraphComponentRefiner.java
@@ -68,7 +68,7 @@ public MultipleAlignment refine(AFPChain selfAlignment, Atom[] atoms, int order)
 		List<Set<Integer>> components = inspector.connectedSets();
 
 		// Filter components with size != order, and transform to ResidueGroups
-		List<ResidueGroup> groups = new ArrayList<ResidueGroup>();
+		List<ResidueGroup> groups = new ArrayList<>();
 		for (Set<Integer> comp : components) {
 			if (comp.size() == order) {
 				ResidueGroup group = new ResidueGroup(comp);
@@ -103,7 +103,7 @@ public MultipleAlignment refine(AFPChain selfAlignment, Atom[] atoms, int order)
 		}
 
 		// The compatibility score is the sum of rows of the matrix
-		List<Integer> rowScores = new ArrayList<Integer>(size);
+		List<Integer> rowScores = new ArrayList<>(size);
 		for (int i = 0; i < size; i++) {
 			GVector row = new GVector(size);
 			matrix.getRow(i, row);
@@ -113,7 +113,7 @@ public MultipleAlignment refine(AFPChain selfAlignment, Atom[] atoms, int order)
 		}
 
 		// Refined multiple alignment Block as a result
-		List<List<Integer>> alignRes = new ArrayList<List<Integer>>(order);
+		List<List<Integer>> alignRes = new ArrayList<>(order);
 		for (int i = 0; i < order; i++)
 			alignRes.add(new ArrayList<Integer>());
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/ResidueGroup.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/ResidueGroup.java
index 2fb0b0e64e..a9e1bcdeb5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/ResidueGroup.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/ResidueGroup.java
@@ -48,7 +48,7 @@ public class ResidueGroup {
 	 */
 	public ResidueGroup(Set<Integer> component) {
 		// Transform component into sorted List of residues
-		residues = new ArrayList<Integer>(component);
+		residues = new ArrayList<>(component);
 		Collections.sort(residues);
 	}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SequenceFunctionRefiner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SequenceFunctionRefiner.java
index 9635debb05..beeba62df2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SequenceFunctionRefiner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SequenceFunctionRefiner.java
@@ -117,8 +117,8 @@ public static Map<Integer, Integer> refineSymmetry(Map<Integer, Integer> alignme
 		//  2. f^K-1(x) is defined
 		//	3. score(f^K-1(x))>0
 
-		TreeSet<Integer> forwardLoops = new TreeSet<Integer>();
-		TreeSet<Integer> backwardLoops = new TreeSet<Integer>();
+		TreeSet<Integer> forwardLoops = new TreeSet<>();
+		TreeSet<Integer> backwardLoops = new TreeSet<>();
 
 
 		List<Integer> eligible = null;
@@ -240,7 +240,7 @@ private static List<Integer> initializeEligible(Map<Integer, Integer> alignment,
 
 		// Assume all residues are eligible to start
 		if(eligible == null) {
-			eligible = new LinkedList<Integer>(alignment.keySet());
+			eligible = new LinkedList<>(alignment.keySet());
 		}
 
 		// Precalculate f^K-1(x)
@@ -334,8 +334,8 @@ private static List<Integer> initializeEligible(Map<Integer, Integer> alignment,
 	private static Map<Integer, Integer> applyAlignmentAndCheckCycles(Map<Integer, Integer> alignmentMap, int k, List<Integer> eligible) {
 
 		// Convert to lists to establish a fixed order (avoid concurrent modification)
-		List<Integer> preimage = new ArrayList<Integer>(alignmentMap.keySet()); // currently unmodified
-		List<Integer> image = new ArrayList<Integer>(preimage);
+		List<Integer> preimage = new ArrayList<>(alignmentMap.keySet()); // currently unmodified
+		List<Integer> image = new ArrayList<>(preimage);
 
 		for (int n = 1; n <= k; n++) {
 			// apply alignment
@@ -351,7 +351,7 @@ private static Map<Integer, Integer> applyAlignmentAndCheckCycles(Map<Integer, I
 			}
 		}
 
-		Map<Integer, Integer> imageMap = new HashMap<Integer, Integer>(alignmentMap.size());
+		Map<Integer, Integer> imageMap = new HashMap<>(alignmentMap.size());
 
 		// now populate with actual values
 		for (int i = 0; i < preimage.size(); i++) {
@@ -372,7 +372,7 @@ private static Map<Integer, Integer> applyAlignmentAndCheckCycles(Map<Integer, I
 	private static Map<Integer, Double> initializeScores(Map<Integer, Integer> alignment,
 			Map<Integer, Double> scores, int k) {
 		if(scores == null) {
-			scores = new HashMap<Integer, Double>(alignment.size());
+			scores = new HashMap<>(alignment.size());
 		} else {
 			scores.clear();
 		}
@@ -444,7 +444,7 @@ private static AFPChain partitionAFPchain(AFPChain afpChain,
 		int repeatLen = afpChain.getOptLength()/order;
 
 		//Extract all the residues considered in the first chain of the alignment
-		List<Integer> alignedRes = new ArrayList<Integer>();
+		List<Integer> alignedRes = new ArrayList<>();
 		for (int su=0; su<afpChain.getBlockNum(); su++){
 			for (int i=0; i<afpChain.getOptLen()[su]; i++){
 				alignedRes.add(afpChain.getOptAln()[su][0][i]);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java
index ce4a1d69e7..a974bf1659 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java
@@ -146,21 +146,21 @@ private void initialize() throws StructureException, RefinerFailedException {
 					"Seed alignment too short: repeat core length < 1");
 
 		// Initialize the history variables
-		timeHistory = new ArrayList<Long>();
-		lengthHistory = new ArrayList<Integer>();
-		rmsdHistory = new ArrayList<Double>();
-		mcScoreHistory = new ArrayList<Double>();
-		tmScoreHistory = new ArrayList<Double>();
+		timeHistory = new ArrayList<>();
+		lengthHistory = new ArrayList<>();
+		rmsdHistory = new ArrayList<>();
+		mcScoreHistory = new ArrayList<>();
+		tmScoreHistory = new ArrayList<>();
 
 		C = 20 * order;
 
 		// Initialize alignment variables
 		block = msa.getBlock(0).getAlignRes();
-		freePool = new ArrayList<Integer>();
+		freePool = new ArrayList<>();
 		length = block.get(0).size();
 
 		// Store the residues aligned in the block
-		List<Integer> aligned = new ArrayList<Integer>();
+		List<Integer> aligned = new ArrayList<>();
 		for (int su = 0; su < order; su++)
 			aligned.addAll(block.get(su));
 
@@ -196,11 +196,11 @@ public MultipleAlignment optimize() throws StructureException,
 		initialize();
 
 		// Save the optimal alignment
-		List<List<Integer>> optBlock = new ArrayList<List<Integer>>();
-		List<Integer> optFreePool = new ArrayList<Integer>();
+		List<List<Integer>> optBlock = new ArrayList<>();
+		List<Integer> optFreePool = new ArrayList<>();
 		optFreePool.addAll(freePool);
 		for (int k = 0; k < order; k++) {
-			List<Integer> b = new ArrayList<Integer>();
+			List<Integer> b = new ArrayList<>();
 			b.addAll(block.get(k));
 			optBlock.add(b);
 		}
@@ -214,11 +214,11 @@ public MultipleAlignment optimize() throws StructureException,
 		while (i < maxIter && conv < stepsToConverge) {
 
 			// Save the state of the system
-			List<List<Integer>> lastBlock = new ArrayList<List<Integer>>();
-			List<Integer> lastFreePool = new ArrayList<Integer>();
+			List<List<Integer>> lastBlock = new ArrayList<>();
+			List<Integer> lastFreePool = new ArrayList<>();
 			lastFreePool.addAll(freePool);
 			for (int k = 0; k < order; k++) {
-				List<Integer> b = new ArrayList<Integer>();
+				List<Integer> b = new ArrayList<>();
 				b.addAll(block.get(k));
 				lastBlock.add(b);
 			}
@@ -281,11 +281,11 @@ public MultipleAlignment optimize() throws StructureException,
 
 			// Store as the optimal alignment if better
 			if (mcScore > optScore) {
-				optBlock = new ArrayList<List<Integer>>();
-				optFreePool = new ArrayList<Integer>();
+				optBlock = new ArrayList<>();
+				optFreePool = new ArrayList<>();
 				optFreePool.addAll(freePool);
 				for (int k = 0; k < order; k++) {
-					List<Integer> b = new ArrayList<Integer>();
+					List<Integer> b = new ArrayList<>();
 					b.addAll(block.get(k));
 					optBlock.add(b);
 				}
@@ -366,7 +366,7 @@ private void updateMultipleAlignment() throws StructureException,
 	 */
 	private boolean checkGaps() {
 
-		List<Integer> shrinkColumns = new ArrayList<Integer>();
+		List<Integer> shrinkColumns = new ArrayList<>();
 		// Loop for each column
 		for (int res = 0; res < length; res++) {
 			int gapCount = 0;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmetryAxes.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmetryAxes.java
index fcf9ff29d0..5eb2584401 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmetryAxes.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmetryAxes.java
@@ -541,7 +541,7 @@ private int getNumRepeats(int level) {
 	 * @return List of first Repeats of each index, sorted in ascending order
 	 */
 	public List<Integer> getFirstRepeats(int level) {
-		List<Integer> firstRepeats = new ArrayList<Integer>();
+		List<Integer> firstRepeats = new ArrayList<>();
 		int m = getNumRepeats(level+1); //size of the level
 		int d = axes.get(level).getOrder(); //degree of this level
 		int n = m*d; // number of repeats included in each axis
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/misc/ProteinComplexSignature.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/misc/ProteinComplexSignature.java
index 492e1485e1..892e326fb5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/misc/ProteinComplexSignature.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/misc/ProteinComplexSignature.java
@@ -29,7 +29,7 @@ public class ProteinComplexSignature {
 	private BlastClustReader blastClust = null;
 	private String pdbId = "";
 	private List<String> chainIds = null;
-	private List<ChainSignature> chainSignatures = new ArrayList<ChainSignature>();
+	private List<ChainSignature> chainSignatures = new ArrayList<>();
 
 
 	public ProteinComplexSignature(String pdbId, List<String> chainIds, BlastClustReader blastClust) {
@@ -75,15 +75,15 @@ public int getSubunitTypeCount() {
 	private List<ChainSignature> getChainSignatures() {
 		String alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
-		Map<String,Integer> mapCounts = new TreeMap<String,Integer>();
-		Map<String,List<String>> mapChainIds = new TreeMap<String, List<String>>();
+		Map<String,Integer> mapCounts = new TreeMap<>();
+		Map<String,List<String>> mapChainIds = new TreeMap<>();
 
 		for (String chainId: chainIds) {
 			String rep = blastClust.getRepresentativeChain(pdbId, chainId);
 			Integer value = mapCounts.get(rep);
 			if (value == null) {
 				mapCounts.put(rep, 1);
-				List<String> list = new ArrayList<String>();
+				List<String> list = new ArrayList<>();
 				list.add(chainId);
 				mapChainIds.put(rep, list);
 			} else {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/BlastClustReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/BlastClustReader.java
index a0653c2055..b2b3298157 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/BlastClustReader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/BlastClustReader.java
@@ -102,7 +102,7 @@ public List<List<String>> getPdbChainIdClusters(String pdbId) {
 		loadClusters(sequenceIdentity);
 		String pdbIdUpper = pdbId.toUpperCase();
 
-		List<List<String>> matches = new ArrayList<List<String>>();
+		List<List<String>> matches = new ArrayList<>();
 		for (List<String> cluster: clusters) {
 			for (String chainId: cluster) {
 				if (chainId.startsWith(pdbIdUpper)) {
@@ -117,14 +117,14 @@ public List<List<String>> getPdbChainIdClusters(String pdbId) {
 	public List<List<String>> getChainIdsInEntry(String pdbId) {
 		loadClusters(sequenceIdentity);
 
-		List<List<String>> matches = new ArrayList<List<String>>();
+		List<List<String>> matches = new ArrayList<>();
 		List<String> match = null;
 
 		for (List<String> cluster: clusters) {
 			for (String chainId: cluster) {
 				if (chainId.startsWith(pdbId)) {
 					if (match == null) {
-						match = new ArrayList<String>();
+						match = new ArrayList<>();
 					}
 					match.add(chainId.substring(5));
 				}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/PowerSet.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/PowerSet.java
index 10b5652ea1..bfaa0e375e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/PowerSet.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/PowerSet.java
@@ -52,16 +52,16 @@ public PowerSet() {
 	 * @return the set of power Sets of the original Set
 	 */
 	public Set<Set<T>> powerSet(Set<T> originalSet) {
-		Set<Set<T>> sets = new LinkedHashSet<Set<T>>();
+		Set<Set<T>> sets = new LinkedHashSet<>();
 		if (originalSet.isEmpty()) {
 			sets.add(new LinkedHashSet<T>());
 			return sets;
 		}
-		List<T> list = new ArrayList<T>(originalSet);
+		List<T> list = new ArrayList<>(originalSet);
 		T head = list.get(0);
-		Set<T> rest = new LinkedHashSet<T>(list.subList(1, list.size()));
+		Set<T> rest = new LinkedHashSet<>(list.subList(1, list.size()));
 		for (Set<T> set : powerSet(rest)) {
-			Set<T> newSet = new LinkedHashSet<T>();
+			Set<T> newSet = new LinkedHashSet<>();
 			newSet.add(head);
 			newSet.addAll(set);
 			sets.add(newSet);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/SymmetryTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/SymmetryTools.java
index 3cac9be3f1..431babdd5f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/SymmetryTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/SymmetryTools.java
@@ -443,7 +443,7 @@ public static double getAngle(AFPChain afpChain, Atom[] ca1, Atom[] ca2) {
 	public static List<List<Integer>> buildSymmetryGraph(List<AFPChain> afps,
 			Atom[] atoms, boolean undirected) {
 
-		List<List<Integer>> graph = new ArrayList<List<Integer>>();
+		List<List<Integer>> graph = new ArrayList<>();
 
 		for (int n = 0; n < atoms.length; n++) {
 			graph.add(new ArrayList<Integer>());
@@ -512,7 +512,7 @@ public static List<Structure> divideStructure(CeSymmResult symmetry)
 		Atom[] atoms = symmetry.getAtoms();
 		Set<Group> allGroups = StructureTools.getAllGroupsFromSubset(atoms, GroupType.HETATM);
 		List<StructureIdentifier> repeatsId = symmetry.getRepeatsID();
-		List<Structure> repeats = new ArrayList<Structure>(order);
+		List<Structure> repeats = new ArrayList<>(order);
 
 		// Create new structure containing the repeat atoms
 		for (int i = 0; i < order; i++) {
@@ -613,7 +613,7 @@ public static MultipleAlignment toRepeatsAlignment(CeSymmResult result)
 
 		MultipleAlignment repeats = newEnsemble.getMultipleAlignment(0);
 		Block block = repeats.getBlock(0);
-		List<Atom[]> atomArrays = new ArrayList<Atom[]>();
+		List<Atom[]> atomArrays = new ArrayList<>();
 
 		for (Structure s : repSt)
 			atomArrays.add(StructureTools.getRepresentativeAtomArray(s));
@@ -737,7 +737,7 @@ public static QuatSymmetryResults getQuaternarySymmetry(CeSymmResult result)
 	 */
 	public static List<Group> getGroups(Atom[] rAtoms) {
 
-		List<Group> groups = new ArrayList<Group>(rAtoms.length);
+		List<Group> groups = new ArrayList<>(rAtoms.length);
 
 		for (Atom a : rAtoms) {
 			Group g = a.getGroup();
@@ -774,8 +774,8 @@ public static void updateSymmetryTransformation(SymmetryAxes axes,
 			for (int level = 0; level < axes.getNumLevels(); level++) {
 
 				// Calculate the aligned atom arrays to superimpose
-				List<Atom> list1 = new ArrayList<Atom>();
-				List<Atom> list2 = new ArrayList<Atom>();
+				List<Atom> list1 = new ArrayList<>();
+				List<Atom> list2 = new ArrayList<>();
 
 				for (int firstRepeat : axes.getFirstRepeats(level)) {
 
@@ -866,7 +866,7 @@ public static Atom[] getRepresentativeAtoms(Structure structure) {
 		else {
 
 			// Get Atoms of all models
-			List<Atom> atomList = new ArrayList<Atom>();
+			List<Atom> atomList = new ArrayList<>();
 			for (int m = 0; m < structure.nrModels(); m++) {
 				for (Chain c : structure.getModel(m))
 					atomList.addAll(Arrays.asList(StructureTools
@@ -888,7 +888,7 @@ public static Atom[] getRepresentativeAtoms(Structure structure) {
 	 */
 	public static List<Integer> getValidFolds(List<Integer> stoichiometry) {
 
-		List<Integer> denominators = new ArrayList<Integer>();
+		List<Integer> denominators = new ArrayList<>();
 
 		if (stoichiometry.isEmpty())
 			return denominators;
@@ -896,7 +896,7 @@ public static List<Integer> getValidFolds(List<Integer> stoichiometry) {
 		int nChains = Collections.max(stoichiometry);
 
 		// Remove duplicate stoichiometries
-		Set<Integer> nominators = new TreeSet<Integer>(stoichiometry);
+		Set<Integer> nominators = new TreeSet<>(stoichiometry);
 
 		// find common denominators
 		for (int d = 1; d <= nChains; d++) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/BravaisLattice.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/BravaisLattice.java
index 02efe5be5a..69eca10550 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/BravaisLattice.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/BravaisLattice.java
@@ -62,7 +62,7 @@ public CrystalCell getExampleUnitCell() {
 	}
 
 	private static HashMap<String,BravaisLattice> initname2bl(){
-		HashMap<String,BravaisLattice> name2bl = new HashMap<String, BravaisLattice>();
+		HashMap<String,BravaisLattice> name2bl = new HashMap<>();
 		for (BravaisLattice bl:BravaisLattice.values()) {
 			name2bl.put(bl.getName(), bl);
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalCell.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalCell.java
index b1449475f0..d8fa098458 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalCell.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/CrystalCell.java
@@ -489,7 +489,7 @@ public double getMaxDimension() {
 		Point3d vert7 = new Point3d(1,1,1);
 		transfToOrthonormal(vert7);
 
-		ArrayList<Double> vertDists = new ArrayList<Double>();
+		ArrayList<Double> vertDists = new ArrayList<>();
 		vertDists.add(vert0.distance(vert7));
 		vertDists.add(vert3.distance(vert4));
 		vertDists.add(vert1.distance(vert6));
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
index 768724eac7..cff84c70f8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
@@ -105,7 +105,7 @@ public SpaceGroup(int id, int multiplicity, int primitiveMultiplicity, String sh
 		this.shortSymbol = shortSymbol;
 		this.altShortSymbol = altShortSymbol;
 		transformations = new ArrayList<Matrix4d>(multiplicity);
-		transfAlgebraic = new ArrayList<String>(multiplicity);
+		transfAlgebraic = new ArrayList<>(multiplicity);
 		cellTranslations = new Vector3d[multiplicity/primitiveMultiplicity];
 		this.bravLattice = bravLattice;
 	}
@@ -649,7 +649,7 @@ public void setTransfAlgebraic(List<String> transfAlgebraic) {
 			transformations = new ArrayList<Matrix4d>(transfAlgebraic.size());
 
 		if ( this.transfAlgebraic == null || this.transfAlgebraic.size() == 0)
-			this.transfAlgebraic = new ArrayList<String>(transfAlgebraic.size());
+			this.transfAlgebraic = new ArrayList<>(transfAlgebraic.size());
 
 		for ( String transf : transfAlgebraic){
 			addTransformation(transf);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
index 4024c6e811..5d58e019eb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
@@ -98,7 +98,7 @@ private static TreeMap<Integer, SpaceGroup> parseSpaceGroupsXML() {
 			System.exit(1);
 		}
 
-		TreeMap<Integer, SpaceGroup> map = new TreeMap<Integer, SpaceGroup>();
+		TreeMap<Integer, SpaceGroup> map = new TreeMap<>();
 
 		try {
 			map = parseSpaceGroupsXML(spaceGroupIS);
@@ -110,7 +110,7 @@ private static TreeMap<Integer, SpaceGroup> parseSpaceGroupsXML() {
 			System.exit(1);
 		}
 
-		name2sgs = new HashMap<String, SpaceGroup>();
+		name2sgs = new HashMap<>();
 
 		for (SpaceGroup sg:map.values()) {
 
@@ -193,8 +193,8 @@ public static TreeMap<Integer,SpaceGroup> getAllSpaceGroups() {
 	 * @return
 	 */
 	public static TreeMap<Integer,SpaceGroup> parseSymopLib(InputStream symoplibIS) {
-		TreeMap<Integer, SpaceGroup> map = new TreeMap<Integer, SpaceGroup>();
-		name2sgs = new HashMap<String, SpaceGroup>();
+		TreeMap<Integer, SpaceGroup> map = new TreeMap<>();
+		name2sgs = new HashMap<>();
 		try {
 			BufferedReader br = new BufferedReader(new InputStreamReader(symoplibIS));
 			String line;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapAdapter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapAdapter.java
index aab18d3ff0..2116b94471 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapAdapter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapAdapter.java
@@ -42,7 +42,7 @@ public SpaceGroupMapElements[] marshal(Map<Integer, SpaceGroup> arg0) throws Exc
 
 	@Override
 	public Map<Integer, SpaceGroup> unmarshal(SpaceGroupMapElements[] arg0) throws Exception {
-		Map<Integer, SpaceGroup> r = new TreeMap<Integer, SpaceGroup>();
+		Map<Integer, SpaceGroup> r = new TreeMap<>();
 		for (SpaceGroupMapElements mapelement : arg0)
 			r.put(mapelement.key, mapelement.value);
 		return r;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapRoot.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapRoot.java
index eaf23f6d6e..b711e3179b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapRoot.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/SpaceGroupMapRoot.java
@@ -43,7 +43,7 @@ public class SpaceGroupMapRoot {
 	private TreeMap<Integer, SpaceGroup> mapProperty;
 
 	public SpaceGroupMapRoot() {
-		mapProperty = new TreeMap<Integer, SpaceGroup>();
+		mapProperty = new TreeMap<>();
 	}
 
 	@XmlJavaTypeAdapter(SpaceGroupMapAdapter.class)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TransfAlgebraicAdapter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TransfAlgebraicAdapter.java
index c1416b7fad..e4d4847597 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TransfAlgebraicAdapter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TransfAlgebraicAdapter.java
@@ -41,7 +41,7 @@ public String[] marshal(List<String> arg0) throws Exception {
 
 	@Override
 	public List<String> unmarshal(String[] arg0) throws Exception {
-		List<String> l = new ArrayList<String>();
+		List<String> l = new ArrayList<>();
 		for (String s : arg0)
 			l.add(s);
 		return l;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TreeMapSpaceGroupWrapper.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TreeMapSpaceGroupWrapper.java
index 5a438b55d7..2a5f760f2b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TreeMapSpaceGroupWrapper.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/io/TreeMapSpaceGroupWrapper.java
@@ -52,7 +52,7 @@ public class TreeMapSpaceGroupWrapper implements Serializable{
 
 
 	public TreeMapSpaceGroupWrapper(){
-		data = new TreeMap<Integer,SpaceGroup>();
+		data = new TreeMap<>();
 	}
 
 	public TreeMap<Integer,SpaceGroup> getData() {
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxCC.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxCC.java
index 728e6e925c..a6e4779a44 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxCC.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxCC.java
@@ -42,9 +42,9 @@ public class CoxCC {
 	static public void process(CoxInfo ci) throws Exception {
 		ArrayList<SurvivalInfo> survivalInfoList = ci.survivalInfoList;
 		//r
-		ArrayList<String> variables = new ArrayList<String>(ci.getCoefficientsList().keySet());
+		ArrayList<String> variables = new ArrayList<>(ci.getCoefficientsList().keySet());
 
-		ArrayList<Integer> strataClass = new ArrayList<Integer>(survivalInfoList.size());
+		ArrayList<Integer> strataClass = new ArrayList<>(survivalInfoList.size());
 		double[] wt = new double[survivalInfoList.size()];
 		for (int i = 0; i < survivalInfoList.size(); i++) {
 			SurvivalInfo si = survivalInfoList.get(i);
@@ -75,7 +75,7 @@ static public void process(CoxInfo ci) throws Exception {
 			rvar = ci.getVariance();
 		}
 		//nj
-		LinkedHashMap<Integer, Double> nj = new LinkedHashMap<Integer, Double>();
+		LinkedHashMap<Integer, Double> nj = new LinkedHashMap<>();
 		Collections.sort(strataClass);
 		for (Integer value : strataClass) {
 			Double count = nj.get(value);
@@ -86,7 +86,7 @@ static public void process(CoxInfo ci) throws Exception {
 			nj.put(value, count);
 		}
 		//Nj
-		LinkedHashMap<Integer, Double> Nj = new LinkedHashMap<Integer, Double>();
+		LinkedHashMap<Integer, Double> Nj = new LinkedHashMap<>();
 		//N = N + Nj[key];
 		double N = 0;
 		for (int i = 0; i < survivalInfoList.size(); i++) {
@@ -106,7 +106,7 @@ static public void process(CoxInfo ci) throws Exception {
 			N = N + value;
 		}
 
-		LinkedHashMap<Integer, Double> k1j = new LinkedHashMap<Integer, Double>();
+		LinkedHashMap<Integer, Double> k1j = new LinkedHashMap<>();
 		for (Integer key : nj.keySet()) {
 			double _nj = (nj.get(key)); //trying to copy what R is doing on precision
 			double _Nj = (Nj.get(key));
@@ -119,7 +119,7 @@ static public void process(CoxInfo ci) throws Exception {
 		for (Integer i : k1j.keySet()) {
 			//          System.out.println("Strata=" + i + " " + k1j.get(i) + " " + Nj.get(i) + " " + nj.get(i));
 			if (nj.get(i) > 1) {
-				LinkedHashMap<String, DescriptiveStatistics> variableStatsMap = new LinkedHashMap<String, DescriptiveStatistics>();
+				LinkedHashMap<String, DescriptiveStatistics> variableStatsMap = new LinkedHashMap<>();
 
 				for (int p = 0; p < survivalInfoList.size(); p++) {
 					SurvivalInfo si = survivalInfoList.get(p);
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxHelper.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxHelper.java
index 920fd3cc33..dfc149c54e 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxHelper.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxHelper.java
@@ -71,7 +71,7 @@ public static CoxInfo process(String datafile, String timeColumn, String statusC
 	public static CoxInfo process(WorkSheet worksheet, String timeColumn, String statusColumn, String weightColumn, String strataColumn, String clusterColumn, ArrayList<String> variables, boolean useStrata, boolean useWeights) {
 
 		try {
-			ArrayList<SurvivalInfo> survivalInfoList = new ArrayList<SurvivalInfo>();
+			ArrayList<SurvivalInfo> survivalInfoList = new ArrayList<>();
 
 			int i = 1;
 			for (String row : worksheet.getRows()) {
@@ -152,7 +152,7 @@ public static void main(String[] args) {
 		try {
 			if (true) {
 				String datafile = "/Users/Scooter/scripps/ngs/DataSets/E2197/misc/ecoglabtransfer/500790/2013.05.10.12.28.58.313/clindasl0228.txt";
-				ArrayList<String> variables = new ArrayList<String>();
+				ArrayList<String> variables = new ArrayList<>();
 				variables.add("nndpos");
 				variables.add("meno");
 //              variables.add("er1");
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxInfo.java
index d60d8a316e..7bfafba710 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxInfo.java
@@ -59,9 +59,9 @@ public class CoxInfo {
 	int numSamples = 0;
 	int numEvents = 0;
 	private LinkedHashMap<String, String> metaDataFilter = null;
-	private LinkedHashMap<String, CoxCoefficient> coefficientsList = new LinkedHashMap<String, CoxCoefficient>();
-	LinkedHashMap<Double, Double> baselineSurvivorFunction = new LinkedHashMap<Double, Double>();
-	ArrayList<SurvivalInfo> survivalInfoList = new ArrayList<SurvivalInfo>();
+	private LinkedHashMap<String, CoxCoefficient> coefficientsList = new LinkedHashMap<>();
+	LinkedHashMap<Double, Double> baselineSurvivorFunction = new LinkedHashMap<>();
+	ArrayList<SurvivalInfo> survivalInfoList = new ArrayList<>();
 	/**
 	 *
 	 */
@@ -184,7 +184,7 @@ public double[] getWeighted() {
 	 * @return
 	 */
 	public double[][] getVariableResiduals() {
-		ArrayList<String> variables = new ArrayList<String>(coefficientsList.keySet());
+		ArrayList<String> variables = new ArrayList<>(coefficientsList.keySet());
 		double[][] rr = new double[survivalInfoList.size()][variables.size()];
 		int p = 0;
 		for (SurvivalInfo si : this.survivalInfoList) {
@@ -204,7 +204,7 @@ public double[][] getVariableResiduals() {
 	 * @param rr
 	 */
 	public void setVariableResiduals(double[][] rr) {
-		ArrayList<String> variables = new ArrayList<String>(coefficientsList.keySet());
+		ArrayList<String> variables = new ArrayList<>(coefficientsList.keySet());
 
 		int p = 0;
 		for (SurvivalInfo si : this.survivalInfoList) {
@@ -320,7 +320,7 @@ private void calcSummaryValues() {
 
 		//beta
 
-		ArrayList<String> variables = new ArrayList<String>(coefficientsList.keySet());
+		ArrayList<String> variables = new ArrayList<>(coefficientsList.keySet());
 		for (int i = 0; i < variables.size(); i++) {
 			String variable = variables.get(i);
 			CoxCoefficient coe = coefficientsList.get(variable);
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxR.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxR.java
index 6a3002f492..943dde980d 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxR.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxR.java
@@ -273,7 +273,7 @@ public CoxInfo process(ArrayList<String> variables, ArrayList<SurvivalInfo> data
 		ArrayList<String> clusterList = null;
 
 		if(cluster){
-			clusterList = new ArrayList<String>();
+			clusterList = new ArrayList<>();
 		}
 		//copy data over to local arrays to minimuze changing code
 		for (person = 0; person < nused; person++) {
@@ -797,7 +797,7 @@ public void coxphfitSCleanup(CoxInfo ci, boolean useWeighted,boolean robust, Arr
 		double[] infs = Matrix.abs(Matrix.multiply(ci.u, ci.getVariance()));
 //        StdArrayIO.print(infs);
 
-		ArrayList<CoxCoefficient> coxCoefficients = new ArrayList<CoxCoefficient>(ci.getCoefficientsList().values());
+		ArrayList<CoxCoefficient> coxCoefficients = new ArrayList<>(ci.getCoefficientsList().values());
 
 		for (int i = 0; i < infs.length; i++) {
 			double inf = infs[i];
@@ -958,7 +958,7 @@ public static void main(String[] args) {
 
 
 				WorkSheet worksheet = WorkSheet.readCSV(is, '\t');
-				ArrayList<SurvivalInfo> survivalInfoList = new ArrayList<SurvivalInfo>();
+				ArrayList<SurvivalInfo> survivalInfoList = new ArrayList<>();
 				int i = 0;
 				for (String row : worksheet.getRows()) {
 					double time = worksheet.getCellDouble(row, "TIME");
@@ -977,7 +977,7 @@ public static void main(String[] args) {
 				}
 
 				CoxR cox = new CoxR();
-				ArrayList<String> variables = new ArrayList<String>();
+				ArrayList<String> variables = new ArrayList<>();
 				//               variables.add("AGE");
 
 				variables.add("AGE");
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxScore.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxScore.java
index dd8e73822e..cc51ec4d3f 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxScore.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxScore.java
@@ -41,7 +41,7 @@ public static double[][] process(CoxMethod method, ArrayList<SurvivalInfo> survi
 		double temp;
 		int n = survivalInfoList.size();
 
-		ArrayList<String> variables = new ArrayList<String>(coxInfo.getCoefficientsList().keySet());
+		ArrayList<String> variables = new ArrayList<>(coxInfo.getCoefficientsList().keySet());
 		int nvar = variables.size();
 
 		double deaths;
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxVariables.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxVariables.java
index bfcaa5bd97..7a99f4db02 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxVariables.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxVariables.java
@@ -55,7 +55,7 @@ public int getUniqueID() {
 		String link = geneSet + "_" + cohortName;
 		return link.hashCode();
 	}
-	private LinkedHashMap<String, CoxInfo> coxInfoHashMap = new LinkedHashMap<String, CoxInfo>();
+	private LinkedHashMap<String, CoxInfo> coxInfoHashMap = new LinkedHashMap<>();
 
 	/**
 	 *
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/ResidualsCoxph.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/ResidualsCoxph.java
index 819ad24e0b..94baf9dce8 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/ResidualsCoxph.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/ResidualsCoxph.java
@@ -124,7 +124,7 @@ public static double[][] process(CoxInfo ci, Type type, boolean useWeighted, Arr
 	 * @return
 	 */
 	private static double[][] rowsum(double[][] rr, ArrayList<String> sets) throws Exception {
-		LinkedHashMap<String, Double> sumMap = new LinkedHashMap<String, Double>();
+		LinkedHashMap<String, Double> sumMap = new LinkedHashMap<>();
 		if (rr.length != sets.size()) {
 			throw new Exception("Cluster value for each sample are not of equal length n=" + rr.length + " cluster length=" + sets.size());
 		}
@@ -144,7 +144,7 @@ private static double[][] rowsum(double[][] rr, ArrayList<String> sets) throws E
 				sum = new double[sumMap.size()][rr[0].length];
 			}
 
-			ArrayList<String> index = new ArrayList<String>(sumMap.keySet());
+			ArrayList<String> index = new ArrayList<>(sumMap.keySet());
 			//sorting does seem to make a difference in test cases at the .0000000001
 	   //     ArrayList<Integer> in = new ArrayList<Integer>();
 	   //     for (String s : index) {
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/StrataInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/StrataInfo.java
index 11b01cf41c..5cf88613ab 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/StrataInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/StrataInfo.java
@@ -31,19 +31,19 @@
  */
 public class StrataInfo {
 
-	private ArrayList<Double> time = new ArrayList<Double>();
-	private ArrayList<Integer> status = new ArrayList<Integer>();
-	private ArrayList<Double> nevent = new ArrayList<Double>();
-	private ArrayList<Double> ncens = new ArrayList<Double>();
-	private ArrayList<Double> nrisk = new ArrayList<Double>();
-	private ArrayList<Double> weight = new ArrayList<Double>();
-	private ArrayList<Double> surv = new ArrayList<Double>();
-	private ArrayList<Double> varhaz = new ArrayList<Double>();
-	private ArrayList<Double> stderr = new ArrayList<Double>();
-	private ArrayList<Double> stdlow = new ArrayList<Double>();
-	private ArrayList<Double> upper = new ArrayList<Double>();
-	private ArrayList<Double> lower = new ArrayList<Double>();
-	private LinkedHashMap<Double, Integer> ndead = new LinkedHashMap<Double, Integer>();
+	private ArrayList<Double> time = new ArrayList<>();
+	private ArrayList<Integer> status = new ArrayList<>();
+	private ArrayList<Double> nevent = new ArrayList<>();
+	private ArrayList<Double> ncens = new ArrayList<>();
+	private ArrayList<Double> nrisk = new ArrayList<>();
+	private ArrayList<Double> weight = new ArrayList<>();
+	private ArrayList<Double> surv = new ArrayList<>();
+	private ArrayList<Double> varhaz = new ArrayList<>();
+	private ArrayList<Double> stderr = new ArrayList<>();
+	private ArrayList<Double> stdlow = new ArrayList<>();
+	private ArrayList<Double> upper = new ArrayList<>();
+	private ArrayList<Double> lower = new ArrayList<>();
+	private LinkedHashMap<Double, Integer> ndead = new LinkedHashMap<>();
 	DecimalFormat df = new DecimalFormat("#.######");
 	DecimalFormat dfe = new DecimalFormat("0.000000E0");
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvFitInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvFitInfo.java
index 0d2567a78b..c22e6fb9b5 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvFitInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvFitInfo.java
@@ -29,8 +29,8 @@
  */
 public class SurvFitInfo {
 
-	private LinkedHashMap<String, StrataInfo> strataInfoHashMap = new LinkedHashMap<String, StrataInfo>();
-	private LinkedHashMap<String, StrataInfo> unweightedStrataInfoHashMap = new LinkedHashMap<String, StrataInfo>();
+	private LinkedHashMap<String, StrataInfo> strataInfoHashMap = new LinkedHashMap<>();
+	private LinkedHashMap<String, StrataInfo> unweightedStrataInfoHashMap = new LinkedHashMap<>();
 	private boolean weighted = false;
 
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfo.java
index 6d4455193e..c1ed799293 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfo.java
@@ -45,12 +45,12 @@ public class SurvivalInfo implements Comparable<SurvivalInfo> {
 	private double residual = 0.0;
 	private String clusterValue = "";
 
-	LinkedHashMap<String,Double> residualVariableMap = new LinkedHashMap<String,Double>();
+	LinkedHashMap<String,Double> residualVariableMap = new LinkedHashMap<>();
 
-	LinkedHashMap<String, Double> data = new LinkedHashMap<String, Double>();
+	LinkedHashMap<String, Double> data = new LinkedHashMap<>();
 	//    LinkedHashMap<String, Double> discreteData = new LinkedHashMap<String, Double>();
-	LinkedHashMap<String, String> unknownDataType = new LinkedHashMap<String, String>();
-	LinkedHashMap<String, String> originalMetaData = new LinkedHashMap<String,String>();
+	LinkedHashMap<String, String> unknownDataType = new LinkedHashMap<>();
+	LinkedHashMap<String, String> originalMetaData = new LinkedHashMap<>();
 
 	/**
 	 *
@@ -177,7 +177,7 @@ public Double getContinuousVariable(String variable) {
 	 * @return
 	 */
 	public ArrayList<String> getGroupCategories(String groupName) {
-		ArrayList<String> groupNameList = new ArrayList<String>();
+		ArrayList<String> groupNameList = new ArrayList<>();
 		for (String key : data.keySet()) {
 			if (key.startsWith(groupName + "_")) {
 				groupNameList.add(key);
@@ -199,7 +199,7 @@ public ArrayList<String> getGroupCategories(String groupName) {
 	 * @return
 	 */
 	public ArrayList<String> getDataVariables(){
-		ArrayList<String> v = new ArrayList<String>();
+		ArrayList<String> v = new ArrayList<>();
 		v.addAll(data.keySet());
 		v.addAll(unknownDataType.keySet());
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfoHelper.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfoHelper.java
index 4e5c0981c0..6e292d1633 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfoHelper.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfoHelper.java
@@ -86,13 +86,13 @@ private static boolean isCategorical(LinkedHashMap<String, Double> values) {
 	public static void categorizeData(ArrayList<SurvivalInfo> DataT) {
 
 		//Go through and get all variable value pairs
-		LinkedHashMap<String, LinkedHashMap<String, Double>> valueMap = new LinkedHashMap<String, LinkedHashMap<String, Double>>();
+		LinkedHashMap<String, LinkedHashMap<String, Double>> valueMap = new LinkedHashMap<>();
 		for (SurvivalInfo si : DataT) {
 
 			for (String key : si.unknownDataType.keySet()) {
 				LinkedHashMap<String, Double> map = valueMap.get(key);
 				if (map == null) {
-					map = new LinkedHashMap<String, Double>();
+					map = new LinkedHashMap<>();
 					valueMap.put(key, map);
 				}
 				map.put(si.unknownDataType.get(key), null);
@@ -102,7 +102,7 @@ public static void categorizeData(ArrayList<SurvivalInfo> DataT) {
 		for (String variable : valueMap.keySet()) {
 			LinkedHashMap<String, Double> values = valueMap.get(variable);
 			if (isCategorical(values)) {
-				ArrayList<String> categories = new ArrayList<String>(values.keySet());
+				ArrayList<String> categories = new ArrayList<>(values.keySet());
 				Collections.sort(categories); //go ahead and put in alphabetical order
 				if (categories.size() == 2) {
 					for (String value : values.keySet()) {
@@ -147,7 +147,7 @@ public static void categorizeData(ArrayList<SurvivalInfo> DataT) {
 	 * @return
 	 */
 	public static ArrayList<String> addInteraction(String variable1, String variable2, ArrayList<SurvivalInfo> survivalInfoList) {
-		ArrayList<String> variables = new ArrayList<String>();
+		ArrayList<String> variables = new ArrayList<>();
 		variables.add(variable1);
 		variables.add(variable2);
 		variables.add(variable1 + ":" + variable2);
@@ -170,7 +170,7 @@ public static ArrayList<String> addInteraction(String variable1, String variable
 	 * @throws Exception
 	 */
 	public static void groupByRange(double[] range, String variable, String groupName, ArrayList<SurvivalInfo> survivalInfoList) throws Exception {
-		ArrayList<String> labels = new ArrayList<String>();
+		ArrayList<String> labels = new ArrayList<>();
 		for (int i = 0; i < range.length; i++) {
 			String label = "";
 			if (i == 0) {
@@ -184,7 +184,7 @@ public static void groupByRange(double[] range, String variable, String groupNam
 			}
 			labels.add(label);
 		}
-		ArrayList<String> validLabels = new ArrayList<String>();
+		ArrayList<String> validLabels = new ArrayList<>();
 
 		//need to find the categories so we can set 1 and 0 and not include ranges with no values
 		for (SurvivalInfo si : survivalInfoList) {
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/AgScore.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/AgScore.java
index ba85c9084b..7760cbe23d 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/AgScore.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/AgScore.java
@@ -45,7 +45,7 @@ public static double[][] process(CoxMethod method, ArrayList<SurvivalInfo> survi
 		//double temp;
 		int n = survivalInfoList.size();
 
-		ArrayList<String> variables = new ArrayList<String>(coxInfo.getCoefficientsList().keySet());
+		ArrayList<String> variables = new ArrayList<>(coxInfo.getCoefficientsList().keySet());
 		int nvar = variables.size();
 
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java
index ca98b8d9d9..9e4de21fcc 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java
@@ -31,10 +31,10 @@
  */
 public class WorkSheet {
 
-	private LinkedHashMap<String, HeaderInfo> columnLookup = new LinkedHashMap<String, HeaderInfo>();
-	private LinkedHashMap<String, HeaderInfo> rowLookup = new LinkedHashMap<String, HeaderInfo>();
+	private LinkedHashMap<String, HeaderInfo> columnLookup = new LinkedHashMap<>();
+	private LinkedHashMap<String, HeaderInfo> rowLookup = new LinkedHashMap<>();
 	private CompactCharSequence[][] data = new CompactCharSequence[1][1];
-	HashMap<String, String> dataGrid = new HashMap<String, String>();
+	HashMap<String, String> dataGrid = new HashMap<>();
 	private String indexColumnName = "";
 
 	/**
@@ -233,14 +233,14 @@ public WorkSheet(CompactCharSequence[][] values) {
 
 		data = values;
 	}
-	private LinkedHashMap<String, String> metaDataColumnsHashMap = new LinkedHashMap<String, String>();
+	private LinkedHashMap<String, String> metaDataColumnsHashMap = new LinkedHashMap<>();
 
 	/**
 	 *
 	 * @return
 	 */
 	public ArrayList<String> getMetaDataColumns() {
-		ArrayList<String> metaColumns = new ArrayList<String>();
+		ArrayList<String> metaColumns = new ArrayList<>();
 		for (String key : metaDataColumnsHashMap.keySet()) {
 			HeaderInfo hi = columnLookup.get(key);
 			if (!hi.isHide()) {
@@ -255,7 +255,7 @@ public ArrayList<String> getMetaDataColumns() {
 	 * @return
 	 */
 	public ArrayList<String> getMetaDataRows() {
-		ArrayList<String> metaRows = new ArrayList<String>();
+		ArrayList<String> metaRows = new ArrayList<>();
 		for (String key : metaDataRowsHashMap.keySet()) {
 			HeaderInfo hi = rowLookup.get(key);
 			if (!hi.isHide()) {
@@ -270,7 +270,7 @@ public ArrayList<String> getMetaDataRows() {
 	 * @return
 	 */
 	public ArrayList<String> getDataColumns() {
-		ArrayList<String> dataColumns = new ArrayList<String>();
+		ArrayList<String> dataColumns = new ArrayList<>();
 		ArrayList<String> columns = this.getColumns();
 		for (String column : columns) {
 			if (!metaDataColumnsHashMap.containsKey(column)) {
@@ -292,7 +292,7 @@ public void shuffleColumnsAndThenRows(ArrayList<String> columns, ArrayList<Strin
 		doubleValues.clear();
 
 		for (String column : columns) { //shuffle all values in the column
-			ArrayList<Integer> rowIndex = new ArrayList<Integer>();
+			ArrayList<Integer> rowIndex = new ArrayList<>();
 			for (int i = 0; i < rows.size(); i++) {
 				rowIndex.add(i);
 			}
@@ -311,7 +311,7 @@ public void shuffleColumnsAndThenRows(ArrayList<String> columns, ArrayList<Strin
 		}
 
 		for (String row : rows) {
-			ArrayList<Integer> columnIndex = new ArrayList<Integer>();
+			ArrayList<Integer> columnIndex = new ArrayList<>();
 			for (int i = 0; i < columns.size(); i++) {
 				columnIndex.add(i);
 			}
@@ -344,7 +344,7 @@ public void shuffleColumnValues(ArrayList<String> columns) throws Exception {
 		doubleValues.clear();
 		ArrayList<String> rows = this.getDataRows();
 		for (String column : columns) { //shuffle all values in the column
-			ArrayList<Integer> rowIndex = new ArrayList<Integer>();
+			ArrayList<Integer> rowIndex = new ArrayList<>();
 			for (int i = 0; i < rows.size(); i++) {
 				rowIndex.add(i);
 			}
@@ -375,7 +375,7 @@ public void shuffleRowValues(ArrayList<String> rows) throws Exception {
 		doubleValues.clear();
 		ArrayList<String> columns = this.getColumns();
 		for (String row : rows) {
-			ArrayList<Integer> columnIndex = new ArrayList<Integer>();
+			ArrayList<Integer> columnIndex = new ArrayList<>();
 			for (int i = 0; i < columns.size(); i++) {
 				columnIndex.add(i);
 			}
@@ -521,7 +521,7 @@ public boolean isMetaDataRow(String row) {
 			return true;
 		}
 	}
-	private LinkedHashMap<String, String> metaDataRowsHashMap = new LinkedHashMap<String, String>();
+	private LinkedHashMap<String, String> metaDataRowsHashMap = new LinkedHashMap<>();
 
 	/**
 	 *
@@ -646,7 +646,7 @@ public void applyColumnFilter(String column, ChangeValue changeValue) throws Exc
 	 * @param defaultValue
 	 */
 	public void addColumn(String column, String defaultValue) {
-		ArrayList<String> columns = new ArrayList<String>();
+		ArrayList<String> columns = new ArrayList<>();
 		columns.add(column);
 		addColumns(columns, defaultValue);
 	}
@@ -694,7 +694,7 @@ public void addColumns(ArrayList<String> columns, String defaultValue) {
 	 * @param defaultValue
 	 */
 	public void addRow(String row, String defaultValue) {
-		ArrayList<String> rows = new ArrayList<String>();
+		ArrayList<String> rows = new ArrayList<>();
 		rows.add(row);
 		addRows(rows, defaultValue);
 	}
@@ -808,7 +808,7 @@ public boolean isValidColumn(String col) {
 		}
 	}
 	//When we do gene signatures we ask for the same data value often. This method took up 50% of the time.
-	HashMap<String, Double> doubleValues = new HashMap<String, Double>();
+	HashMap<String, Double> doubleValues = new HashMap<>();
 	boolean cacheDoubleValues = false;
 
 	/**
@@ -909,7 +909,7 @@ public String getCell(String row, String col) throws Exception {
 	 * @param changeValue
 	 */
 	public void changeRowHeader(ChangeValue changeValue) {
-		ArrayList<String> rows = new ArrayList<String>(rowLookup.keySet());
+		ArrayList<String> rows = new ArrayList<>(rowLookup.keySet());
 		for (String row : rows) {
 			String newRow = changeValue.change(row);
 			HeaderInfo value = rowLookup.get(row);
@@ -923,7 +923,7 @@ public void changeRowHeader(ChangeValue changeValue) {
 	 * @param changeValue
 	 */
 	public void changeColumnHeader(ChangeValue changeValue) {
-		ArrayList<String> columns = new ArrayList<String>(columnLookup.keySet());
+		ArrayList<String> columns = new ArrayList<>(columnLookup.keySet());
 		for (String col : columns) {
 			String newCol = changeValue.change(col);
 			HeaderInfo value = columnLookup.get(col);
@@ -1030,8 +1030,8 @@ public ArrayList<String> getRandomDataColumns(int number) {
 	 * @return
 	 */
 	public ArrayList<String> getRandomDataColumns(int number, ArrayList<String> columns) {
-		ArrayList<String> randomColumns = new ArrayList<String>();
-		HashMap<String, String> picked = new HashMap<String, String>();
+		ArrayList<String> randomColumns = new ArrayList<>();
+		HashMap<String, String> picked = new HashMap<>();
 		while (picked.size() < number) {
 			double v = Math.random();
 			int index = (int) (v * columns.size());
@@ -1051,7 +1051,7 @@ public ArrayList<String> getRandomDataColumns(int number, ArrayList<String> colu
 	 * @return
 	 */
 	public ArrayList<String> getAllColumns() {
-		ArrayList<String> columns = new ArrayList<String>();
+		ArrayList<String> columns = new ArrayList<>();
 		for (String col : columnLookup.keySet()) {
 			columns.add(col);
 		}
@@ -1064,7 +1064,7 @@ public ArrayList<String> getAllColumns() {
 	 * @return
 	 */
 	public ArrayList<String> getColumns() {
-		ArrayList<String> columns = new ArrayList<String>();
+		ArrayList<String> columns = new ArrayList<>();
 		for (String col : columnLookup.keySet()) {
 			HeaderInfo hi = columnLookup.get(col);
 			if (!hi.isHide()) {
@@ -1082,8 +1082,8 @@ public ArrayList<String> getColumns() {
 	 * @throws Exception
 	 */
 	public ArrayList<String> getDiscreteColumnValues(String column) throws Exception {
-		HashMap<String, String> hashMapValues = new HashMap<String, String>();
-		ArrayList<String> values = new ArrayList<String>();
+		HashMap<String, String> hashMapValues = new HashMap<>();
+		ArrayList<String> values = new ArrayList<>();
 		ArrayList<String> rows = getDataRows();
 		for (String row : rows) {
 			String value = getCell(row, column);
@@ -1103,8 +1103,8 @@ public ArrayList<String> getDiscreteColumnValues(String column) throws Exception
 	 * @throws Exception
 	 */
 	public ArrayList<String> getDiscreteRowValues(String row) throws Exception {
-		HashMap<String, String> hashMapValues = new HashMap<String, String>();
-		ArrayList<String> values = new ArrayList<String>();
+		HashMap<String, String> hashMapValues = new HashMap<>();
+		ArrayList<String> values = new ArrayList<>();
 		for (String column : getColumns()) {
 			String value = getCell(row, column);
 			if (!hashMapValues.containsKey(value)) {
@@ -1121,7 +1121,7 @@ public ArrayList<String> getDiscreteRowValues(String row) throws Exception {
 	 * @return
 	 */
 	public ArrayList<String> getAllRows() {
-		ArrayList<String> rows = new ArrayList<String>();
+		ArrayList<String> rows = new ArrayList<>();
 		for (String row : rowLookup.keySet()) {
 			rows.add(row);
 		}
@@ -1135,7 +1135,7 @@ public ArrayList<String> getAllRows() {
 	 * @return
 	 */
 	public ArrayList<String> getRows() {
-		ArrayList<String> rows = new ArrayList<String>();
+		ArrayList<String> rows = new ArrayList<>();
 		for (String row : rowLookup.keySet()) {
 			HeaderInfo hi = rowLookup.get(row);
 			if (!hi.isHide()) {
@@ -1151,7 +1151,7 @@ public ArrayList<String> getRows() {
 	 * @return
 	 */
 	public ArrayList<String> getDataRows() {
-		ArrayList<String> rows = new ArrayList<String>();
+		ArrayList<String> rows = new ArrayList<>();
 		for (String row : rowLookup.keySet()) {
 			if (this.isMetaDataRow(row)) {
 				continue;
@@ -1262,7 +1262,7 @@ static CompactCharSequence[][] getAllValuesCompactCharSequence(InputStream is, c
 		BufferedReader br = new BufferedReader(new InputStreamReader(is));
 
 
-		ArrayList<CompactCharSequence[]> rows = new ArrayList<CompactCharSequence[]>();
+		ArrayList<CompactCharSequence[]> rows = new ArrayList<>();
 
 		String line = br.readLine();
 		int numcolumns = -1;
@@ -1309,7 +1309,7 @@ static CompactCharSequence[][] getAllValuesCompactCharSequence(InputStream is, c
 	static String[][] getAllValues(String fileName, char delimiter) throws Exception {
 		FileReader reader = new FileReader(fileName);
 		BufferedReader br = new BufferedReader(reader);
-		ArrayList<String[]> rows = new ArrayList<String[]>();
+		ArrayList<String[]> rows = new ArrayList<>();
 
 		String line = br.readLine();
 		int numcolumns = -1;
@@ -1388,7 +1388,7 @@ static public WorkSheet unionWorkSheetsRowJoin(WorkSheet w1, WorkSheet w2, boole
 			}
 		}
 
-		ArrayList<String> joinedColumns = new ArrayList<String>();
+		ArrayList<String> joinedColumns = new ArrayList<>();
 		joinedColumns.addAll(w1DataColumns);
 		joinedColumns.addAll(w2DataColumns);
 		if (!joinedColumns.contains("META_DATA") && (w1MetaDataColumns.size() > 0 || w2MetaDataColumns.size() > 0)) {
@@ -1406,9 +1406,9 @@ static public WorkSheet unionWorkSheetsRowJoin(WorkSheet w1, WorkSheet w2, boole
 		}
 		ArrayList<String> w1Rows = w1.getRows();
 		ArrayList<String> w2Rows = w2.getRows();
-		ArrayList<String> rows = new ArrayList<String>();
+		ArrayList<String> rows = new ArrayList<>();
 
-		HashSet<String> w1Key = new HashSet<String>(w1Rows);
+		HashSet<String> w1Key = new HashSet<>(w1Rows);
 		for (String key : w2Rows) {
 			if (w1Key.contains(key)) {
 				rows.add(key);
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/ExpressionFigure.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/ExpressionFigure.java
index a6fda3f095..d8d120aee7 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/ExpressionFigure.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/ExpressionFigure.java
@@ -41,7 +41,7 @@ public class ExpressionFigure extends JPanel {
 
 	private static final long serialVersionUID = 1L;
 
-	ArrayList<String> title = new ArrayList<String>();
+	ArrayList<String> title = new ArrayList<>();
 	/**
 	 *
 	 */
@@ -70,8 +70,8 @@ public class ExpressionFigure extends JPanel {
 	FontMetrics fm;
 	KMFigureInfo kmfi = new KMFigureInfo();
 //    LinkedHashMap<String, ArrayList<CensorStatus>> survivalData = new LinkedHashMap<String, ArrayList<CensorStatus>>();
-	ArrayList<String> lineInfoList = new ArrayList<String>();
-	ArrayList<SurvivalInfo> siList = new ArrayList<SurvivalInfo>();
+	ArrayList<String> lineInfoList = new ArrayList<>();
+	ArrayList<SurvivalInfo> siList = new ArrayList<>();
 	String variable = "";
 	private String fileName = "";
 
@@ -120,7 +120,7 @@ public void setFigureLineInfo(ArrayList<String> lineInfoList) {
 	 * @param variable
 	 */
 	public void setSurvivalInfo(ArrayList<String> title, ArrayList<SurvivalInfo> _siList, String variable) {
-		this.siList = new ArrayList<SurvivalInfo>();
+		this.siList = new ArrayList<>();
 		this.title = title;
 		this.variable = variable;
 
@@ -372,13 +372,13 @@ public static void main(String[] args) {
 			application.setSize(500, 400);         // window is 500 pixels wide, 400 high
 			application.setVisible(true);
 
-			ArrayList<String> titles = new ArrayList<String>();
+			ArrayList<String> titles = new ArrayList<>();
 			titles.add("Line 1");
 			titles.add("line 2");
 
-			ArrayList<String> figureInfo = new ArrayList<String>();
+			ArrayList<String> figureInfo = new ArrayList<>();
 
-			ArrayList<SurvivalInfo> survivalInfoList = new ArrayList<SurvivalInfo>();
+			ArrayList<SurvivalInfo> survivalInfoList = new ArrayList<>();
 
 			for (int i = 0; i < 600; i++) {
 				double r = Math.random();
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KMFigureInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KMFigureInfo.java
index 24f053d592..d17d6afa51 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KMFigureInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KMFigureInfo.java
@@ -87,7 +87,7 @@ public class KMFigureInfo {
 	 *
 	 */
 	public Color[] legendColor = {Color.RED, Color.BLUE, Color.GREEN, Color.CYAN, Color.ORANGE, Color.YELLOW, Color.MAGENTA, Color.PINK};
-	public ArrayList<Double> xAxisLabels = new ArrayList<Double>();//new ArrayList<Double>(Arrays.asList(0.0, 5.0, 10.0, 15.0, 20.0));
+	public ArrayList<Double> xAxisLabels = new ArrayList<>();//new ArrayList<Double>(Arrays.asList(0.0, 5.0, 10.0, 15.0, 20.0));
 	public String xAxisLegend = "";
 	public String yAxisLegend = "";
 	public Color getColor(int index) {
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KaplanMeierFigure.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KaplanMeierFigure.java
index c5d358cbeb..f1e8877f97 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KaplanMeierFigure.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KaplanMeierFigure.java
@@ -42,7 +42,7 @@ public class KaplanMeierFigure extends JPanel {
 
 	private static final long serialVersionUID = 1L;
 
-	ArrayList<String> title = new ArrayList<String>();
+	ArrayList<String> title = new ArrayList<>();
 	/**
 	 *
 	 */
@@ -69,12 +69,12 @@ public class KaplanMeierFigure extends JPanel {
 	double maxPercentage = 1.0;
 	FontMetrics fm;
 	KMFigureInfo kmfi = new KMFigureInfo();
-	LinkedHashMap<String, ArrayList<CensorStatus>> survivalData = new LinkedHashMap<String, ArrayList<CensorStatus>>();
-	ArrayList<String> lineInfoList = new ArrayList<String>();
+	LinkedHashMap<String, ArrayList<CensorStatus>> survivalData = new LinkedHashMap<>();
+	ArrayList<String> lineInfoList = new ArrayList<>();
 	SurvFitInfo sfi = new SurvFitInfo();
 	private String fileName = "";
-	private ArrayList<Double> xAxisTimeValues = new ArrayList<Double>();
-	private ArrayList<Integer> xAxisTimeCoordinates = new ArrayList<Integer>();
+	private ArrayList<Double> xAxisTimeValues = new ArrayList<>();
+	private ArrayList<Integer> xAxisTimeCoordinates = new ArrayList<>();
 
 	/**
 	 *
@@ -91,7 +91,7 @@ public KaplanMeierFigure() {
 	 * @return
 	 */
 	public ArrayList<String> getGroups() {
-		return new ArrayList<String>(survivalData.keySet());
+		return new ArrayList<>(survivalData.keySet());
 	}
 
 	/**
@@ -160,7 +160,7 @@ public void setFigureLineInfo(ArrayList<String> lineInfoList) {
 	 * @throws Exception
 	 */
 	public void setCoxInfo(ArrayList<String> title, CoxInfo ci, String strataVariable, LinkedHashMap<String, String> legendMap, Boolean useWeighted) throws Exception {
-		LinkedHashMap<String, ArrayList<CensorStatus>> survivalData = new LinkedHashMap<String, ArrayList<CensorStatus>>();
+		LinkedHashMap<String, ArrayList<CensorStatus>> survivalData = new LinkedHashMap<>();
 		ArrayList<SurvivalInfo> siList = ci.getSurvivalInfoList();
 		int n = 0;
 		int event = 0;
@@ -173,7 +173,7 @@ public void setCoxInfo(ArrayList<String> title, CoxInfo ci, String strataVariabl
 			}
 			ArrayList<CensorStatus> censorStatusList = survivalData.get(legend);
 			if (censorStatusList == null) {
-				censorStatusList = new ArrayList<CensorStatus>();
+				censorStatusList = new ArrayList<>();
 				survivalData.put(legend, censorStatusList);
 			}
 			CensorStatus cs = new CensorStatus(strata, si.getTime(), si.getStatus() + "");
@@ -195,7 +195,7 @@ public void setCoxInfo(ArrayList<String> title, CoxInfo ci, String strataVariabl
 //        System.out.println("setCoxInfo=" + cc.pvalue + " " + title);
 
 
-		ArrayList<String> lines = new ArrayList<String>();
+		ArrayList<String> lines = new ArrayList<>();
 		lines.add(line1);
 		lines.add(line2);
 		lines.add(line3);
@@ -303,7 +303,7 @@ public void setSurvivalData(ArrayList<String> title, LinkedHashMap<String, Array
 		this.title = title;
 		this.survivalData = survivalData;
 		Double mTime = null;
-		ArrayList<String> labels = new ArrayList<String>(survivalData.keySet());
+		ArrayList<String> labels = new ArrayList<>(survivalData.keySet());
 		Collections.sort(labels);
 		for (String legend : labels) {
 			ArrayList<CensorStatus> censorStatusList = survivalData.get(legend);
@@ -394,7 +394,7 @@ private void drawSurvivalCurves(Graphics g) {
 
 
 		int colorIndex = 0;
-		ArrayList<String> labels = new ArrayList<String>(sfi.getStrataInfoHashMap().keySet());
+		ArrayList<String> labels = new ArrayList<>(sfi.getStrataInfoHashMap().keySet());
 		Collections.sort(labels);
 
 		LinkedHashMap<String, StrataInfo> strataInfoHashMap = sfi.getStrataInfoHashMap();
@@ -763,7 +763,7 @@ public static void main(String[] args) {
 		try {
 
 			KaplanMeierFigure kaplanMeierFigure = new KaplanMeierFigure();
-			LinkedHashMap<String, ArrayList<CensorStatus>> survivalDataHashMap = new LinkedHashMap<String, ArrayList<CensorStatus>>();
+			LinkedHashMap<String, ArrayList<CensorStatus>> survivalDataHashMap = new LinkedHashMap<>();
 
 //            if (false) { //http://sph.bu.edu/otlt/MPH-Modules/BS/BS704_Survival/
 //                ArrayList<CensorStatus> graph1 = new ArrayList<CensorStatus>();
@@ -801,7 +801,7 @@ public static void main(String[] args) {
 
 
 
-				ArrayList<CensorStatus> graph1 = new ArrayList<CensorStatus>();
+				ArrayList<CensorStatus> graph1 = new ArrayList<>();
 				graph1.add(new CensorStatus("A", 1.0, "1"));
 				graph1.add(new CensorStatus("A", 1.0, "1"));
 				graph1.add(new CensorStatus("A", 1.0, "1"));
@@ -841,7 +841,7 @@ public static void main(String[] args) {
 
 				survivalDataHashMap.put("Label 1", graph1);
 
-				ArrayList<CensorStatus> graph2 = new ArrayList<CensorStatus>();
+				ArrayList<CensorStatus> graph2 = new ArrayList<>();
 				graph2.add(new CensorStatus("A", 1.0, "1"));
 				graph2.add(new CensorStatus("A", 1.0, "1"));
 				graph2.add(new CensorStatus("A", 1.0, "0"));
@@ -882,7 +882,7 @@ public static void main(String[] args) {
 				survivalDataHashMap.put("Label 2", graph2);
 			}
 
-			ArrayList<String> figureInfo = new ArrayList<String>();
+			ArrayList<String> figureInfo = new ArrayList<>();
 			//DecimalFormat dfe = new DecimalFormat("0.00E0");
 			//DecimalFormat df = new DecimalFormat("0.00");
 
@@ -896,7 +896,7 @@ public static void main(String[] args) {
 			application.setSize(500, 400);         // window is 500 pixels wide, 400 high
 			application.setVisible(true);
 
-			ArrayList<String> titles = new ArrayList<String>();
+			ArrayList<String> titles = new ArrayList<>();
 			titles.add("Line 1");
 			titles.add("Line 2");
 			kaplanMeierFigure.setSurvivalData(titles, survivalDataHashMap, true);
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java
index b1278b838c..dc3e57994e 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java
@@ -69,7 +69,7 @@ private void paintTable(Graphics g) {
 		g2.setStroke(kmfi.kmStroke);
 		SurvFitInfo sfi = kmf.getSurvivalFitInfo();
 
-		LinkedHashMap<String, StrataInfo> sfiHashMap = new LinkedHashMap<String, StrataInfo>();
+		LinkedHashMap<String, StrataInfo> sfiHashMap = new LinkedHashMap<>();
 		if(sfi.isWeighted()){
 			sfiHashMap = sfi.getUnweightedStrataInfoHashMap();
 		}else{
@@ -94,7 +94,7 @@ private void paintTable(Graphics g) {
 		ArrayList<Double> xaxisTimeValues = kmf.getxAxisTimeValues();
 		ArrayList<Integer> xAxisTimeCoordinates = kmf.getxAxisTimeCoordinates();
 
-		ArrayList<String> labels = new ArrayList<String>(sfiHashMap.keySet());
+		ArrayList<String> labels = new ArrayList<>(sfiHashMap.keySet());
 		Collections.sort(labels);
 
 		for (String group : labels) {
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/SurvFitKM.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/SurvFitKM.java
index f315eaaf0a..764c8af76f 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/SurvFitKM.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/SurvFitKM.java
@@ -122,7 +122,7 @@ public enum ConfLower {
 	 * @throws Exception
 	 */
 	public SurvFitInfo process(LinkedHashMap<String, ArrayList<CensorStatus>> survivalData, boolean useWeights) throws Exception {
-		ArrayList<SurvivalInfo> survivalInfoList = new ArrayList<SurvivalInfo>();
+		ArrayList<SurvivalInfo> survivalInfoList = new ArrayList<>();
 		int i = 0;
 		for (String strata : survivalData.keySet()) {
 			ArrayList<CensorStatus> csList = survivalData.get(strata);
@@ -154,7 +154,7 @@ public SurvFitInfo process(LinkedHashMap<String, ArrayList<CensorStatus>> surviv
 	 */
 	public SurvFitInfo process(String datafile, String timeColumn, String statusColumn, String weightColumn, String variableColumn, boolean useWeights) throws Exception {
 		WorkSheet worksheet = WorkSheet.readCSV(datafile, '\t');
-		ArrayList<SurvivalInfo> survivalInfoList = new ArrayList<SurvivalInfo>();
+		ArrayList<SurvivalInfo> survivalInfoList = new ArrayList<>();
 
 		int i = 1;
 		for (String row : worksheet.getRows()) {
@@ -223,8 +223,8 @@ public LinkedHashMap<String, StrataInfo>  processStrataInfo(String variable, Arr
 		int n = dataT.size();
 
 
-		LinkedHashMap<String, Integer> levels = new LinkedHashMap<String, Integer>();
-		LinkedHashMap<String, ArrayList<SurvivalInfo>> strataHashMap = new LinkedHashMap<String, ArrayList<SurvivalInfo>>();
+		LinkedHashMap<String, Integer> levels = new LinkedHashMap<>();
+		LinkedHashMap<String, ArrayList<SurvivalInfo>> strataHashMap = new LinkedHashMap<>();
 
 		for (int i = 0; i < n; i++) {
 			SurvivalInfo si = dataT.get(i);
@@ -237,7 +237,7 @@ public LinkedHashMap<String, StrataInfo>  processStrataInfo(String variable, Arr
 			levels.put(value, count);
 			ArrayList<SurvivalInfo> strataList = strataHashMap.get(value);
 			if (strataList == null) {
-				strataList = new ArrayList<SurvivalInfo>();
+				strataList = new ArrayList<>();
 				strataHashMap.put(value, strataList);
 			}
 			strataList.add(si);
@@ -246,7 +246,7 @@ public LinkedHashMap<String, StrataInfo>  processStrataInfo(String variable, Arr
 
 		//int nstrat = levels.size();
 
-		LinkedHashMap<String, StrataInfo> strataInfoHashMap = new LinkedHashMap<String, StrataInfo>();
+		LinkedHashMap<String, StrataInfo> strataInfoHashMap = new LinkedHashMap<>();
 
 		for (String strata : strataHashMap.keySet()) {
 
@@ -379,8 +379,8 @@ public LinkedHashMap<String, StrataInfo>  processStrataInfo(String variable, Arr
 
 		}
 
-		ArrayList<Boolean> events = new ArrayList<Boolean>();
-		ArrayList<Double> nrisk = new ArrayList<Double>();
+		ArrayList<Boolean> events = new ArrayList<>();
+		ArrayList<Double> nrisk = new ArrayList<>();
 		for (StrataInfo strataInfo : strataInfoHashMap.values()) {
 			boolean firsttime = true;
 			for (int j = 0; j < strataInfo.getNevent().size(); j++) {
@@ -395,19 +395,19 @@ public LinkedHashMap<String, StrataInfo>  processStrataInfo(String variable, Arr
 			}
 
 		}
-		ArrayList<Integer> zz = new ArrayList<Integer>();
+		ArrayList<Integer> zz = new ArrayList<>();
 		for (int i = 0; i < events.size(); i++) {
 			if (events.get(i)) {
 				zz.add(i + 1);
 			}
 		}
 		zz.add(events.size() + 1);
-		ArrayList<Integer> diffzz = new ArrayList<Integer>();
+		ArrayList<Integer> diffzz = new ArrayList<>();
 		for (int i = 0; i < zz.size() - 1; i++) {
 			diffzz.add(zz.get(i + 1) - zz.get(i));
 		}
 		//System.out.println(diffzz);
-		ArrayList<Double> nlag = new ArrayList<Double>();
+		ArrayList<Double> nlag = new ArrayList<>();
 		for (int j = 0; j < nrisk.size(); j++) {
 			int count = diffzz.get(j);
 			for (int c = 0; c < count; c++) {
@@ -542,12 +542,12 @@ public static void main(String[] args) {
 				application.setSize(500, 400);         // window is 500 pixels wide, 400 high
 				application.setVisible(true);
 
-				ArrayList<String> titles = new ArrayList<String>();
+				ArrayList<String> titles = new ArrayList<>();
 				titles.add("Line 1");
 				titles.add("line 2");
 				kaplanMeierFigure.setSurvivalData(titles, si, null);
 
-				ArrayList<String> figureInfo = new ArrayList<String>();
+				ArrayList<String> figureInfo = new ArrayList<>();
 				//   figureInfo.add("HR=2.1 95% CI(1.8-2.5)");
 				//   figureInfo.add("p-value=.001");
 				kaplanMeierFigure.setFigureLineInfo(figureInfo);
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/ClinicalMetaDataOutcome.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/ClinicalMetaDataOutcome.java
index b75cc2d3ad..3b1ca8fe15 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/ClinicalMetaDataOutcome.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/ClinicalMetaDataOutcome.java
@@ -66,7 +66,7 @@ static public void process(WorkSheet worksheet, String sensorMapColumn, LinkedHa
 	public static void main(String[] args) {
 
 		try {
-			LinkedHashMap<String, String> censorMap = new LinkedHashMap<String, String>();
+			LinkedHashMap<String, String> censorMap = new LinkedHashMap<>();
 			censorMap.put("a", "0");
 			censorMap.put("d", "1");
 			censorMap.put("d-d.s.", "1");
@@ -74,7 +74,7 @@ public static void main(String[] args) {
 			String timeColumn = "TIME";
 			String sensorMapColumn = "last_follow_up_status"; // "survstat3";
 			double timeScale = 1.0;
-			ArrayList<MetaDataInfo> metaDataInfoList = new ArrayList<MetaDataInfo>();
+			ArrayList<MetaDataInfo> metaDataInfoList = new ArrayList<>();
 			metaDataInfoList.add(new MetaDataInfo("age_at_diagnosis", true, new MeanQuantizer()));
 			metaDataInfoList.add(new MetaDataInfo("size", true, new MeanQuantizer()));
 			metaDataInfoList.add(new MetaDataInfo("lymph_nodes_positive", true, new MeanQuantizer()));
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/MetaDataInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/MetaDataInfo.java
index 26bcef3081..bad051b590 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/MetaDataInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/MetaDataInfo.java
@@ -42,7 +42,7 @@ public class MetaDataInfo {
 	 *
 	 */
 	public DiscreteQuantizerInterface discreteQuantizer = null;
-	ArrayList<String> discreteValues = new ArrayList<String>();
+	ArrayList<String> discreteValues = new ArrayList<>();
 
 	/**
 	 *
diff --git a/biojava-ws/src/main/java/demo/HmmerDemo.java b/biojava-ws/src/main/java/demo/HmmerDemo.java
index 689d62ec92..3c6f3ff1f2 100644
--- a/biojava-ws/src/main/java/demo/HmmerDemo.java
+++ b/biojava-ws/src/main/java/demo/HmmerDemo.java
@@ -86,7 +86,7 @@ public static void main(String[] args) throws Exception {
 	private static ProteinSequence getUniprot(String uniProtID) throws Exception {
 
 		AminoAcidCompoundSet set = AminoAcidCompoundSet.getAminoAcidCompoundSet();
-		UniprotProxySequenceReader<AminoAcidCompound> uniprotSequence = new UniprotProxySequenceReader<AminoAcidCompound>(uniProtID,set);
+		UniprotProxySequenceReader<AminoAcidCompound> uniprotSequence = new UniprotProxySequenceReader<>(uniProtID,set);
 
 		ProteinSequence seq = new ProteinSequence(uniprotSequence);
 
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java
index db184a9a53..196dc30c90 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java
@@ -45,7 +45,7 @@
 public class NCBIQBlastAlignmentProperties implements RemotePairwiseAlignmentProperties {
 	private static final long serialVersionUID = 7158270364392309841L;
 
-	private Map<BlastAlignmentParameterEnum, String> param = new HashMap<BlastAlignmentParameterEnum, String>();
+	private Map<BlastAlignmentParameterEnum, String> param = new HashMap<>();
 
 	/**
 	 * This method forwards to {@link #getAlignmentOption(BlastAlignmentParameterEnum)}. Consider using it instead.
@@ -69,7 +69,7 @@ public void setAlignementOption(String key, String val) {
 	 */
 	@Override
 	public Set<String> getAlignmentOptions() {
-		Set<String> result = new HashSet<String>();
+		Set<String> result = new HashSet<>();
 		for (BlastAlignmentParameterEnum parameter : param.keySet()) {
 			result.add(parameter.name());
 		}
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastOutputProperties.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastOutputProperties.java
index 8efc91908b..3c38328ae6 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastOutputProperties.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastOutputProperties.java
@@ -41,7 +41,7 @@
 public class NCBIQBlastOutputProperties implements RemotePairwiseAlignmentOutputProperties {
 	private static final long serialVersionUID = -9202060390925345163L;
 
-	private Map<BlastOutputParameterEnum, String> param = new HashMap<BlastOutputParameterEnum, String>();
+	private Map<BlastOutputParameterEnum, String> param = new HashMap<>();
 
 	/**
 	 * This constructor builds the parameters for the output of the GET command sent to the QBlast service with default
@@ -96,7 +96,7 @@ public void setOutputOption(BlastOutputParameterEnum key, String value) {
 	 */
 	@Override
 	public Set<String> getOutputOptions() {
-		Set<String> result = new HashSet<String>();
+		Set<String> result = new HashSet<>();
 		for (BlastOutputParameterEnum parameter : param.keySet()) {
 			result.add(parameter.name());
 		}
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastService.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastService.java
index c63a4b7eb9..42fafb0155 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastService.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastService.java
@@ -72,7 +72,7 @@ public class NCBIQBlastService implements RemotePairwiseAlignmentService {
 	private String email = DEFAULT_EMAIL;
 	private String tool = DEFAULT_TOOL;
 
-	private Map<String, BlastJob> jobs = new HashMap<String, BlastJob>();
+	private Map<String, BlastJob> jobs = new HashMap<>();
 
 	/** Constructs a service object that targets the public NCBI BLAST network
 	 * service.
@@ -164,7 +164,7 @@ public String sendAlignmentRequest(int gid, RemotePairwiseAlignmentProperties rp
 	 */
 	@Override
 	public String sendAlignmentRequest(String query, RemotePairwiseAlignmentProperties alignmentProperties) throws Exception {
-		Map<String, String> params = new HashMap<String, String>();
+		Map<String, String> params = new HashMap<>();
 		for (String key : alignmentProperties.getAlignmentOptions()) {
 			params.put(key, alignmentProperties.getAlignmentOption(key));
 		}
@@ -318,7 +318,7 @@ public boolean isReady(String id, long present) throws Exception {
 	 */
 	@Override
 	public InputStream getAlignmentResults(String id, RemotePairwiseAlignmentOutputProperties outputProperties) throws Exception {
-		Map<String, String> params = new HashMap<String, String>();
+		Map<String, String> params = new HashMap<>();
 		for (String key : outputProperties.getOutputOptions()) {
 			params.put(key, outputProperties.getOutputOption(key));
 		}
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/hmmer/RemoteHmmerScan.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/hmmer/RemoteHmmerScan.java
index 2083db63aa..2c8e494971 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/hmmer/RemoteHmmerScan.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/hmmer/RemoteHmmerScan.java
@@ -134,7 +134,7 @@ public SortedSet<HmmerResult> scan(ProteinSequence sequence, URL serviceLocation
 
 		// process the response and build up a container for the data.
 
-		SortedSet<HmmerResult> results = new TreeSet<HmmerResult>();
+		SortedSet<HmmerResult> results = new TreeSet<>();
 		try {
 			JSONObject json =  JSONObject.fromObject(result.toString());
 
@@ -170,7 +170,7 @@ public SortedSet<HmmerResult> scan(ProteinSequence sequence, URL serviceLocation
 
 				JSONArray hmmdomains = hit.getJSONArray("domains");
 
-				SortedSet<HmmerDomain> domains = new TreeSet<HmmerDomain>();
+				SortedSet<HmmerDomain> domains = new TreeSet<>();
 				for ( int j= 0 ; j < hmmdomains.size() ; j++){
 					JSONObject d = hmmdomains.getJSONObject(j);
 					Integer is_included = getInteger(d.get("is_included"));

From 19640407969376b083cf220a30f5e1ce7e7d9e2f Mon Sep 17 00:00:00 2001
From: alawi <alawi.wow@gmail.com>
Date: Wed, 24 Apr 2024 23:07:14 +0200
Subject: [PATCH 487/599] Use toURI instead of getFile which doesn't have file
 scheme

---
 biojava-aa-prop/pom.xml                            |  6 +++---
 biojava-alignment/pom.xml                          |  4 ++--
 biojava-core/pom.xml                               |  2 +-
 .../nbio/core/sequence/io/FastaStreamerTest.java   | 14 ++++++++------
 biojava-genome/pom.xml                             |  6 +++---
 biojava-integrationtest/pom.xml                    |  4 ++--
 biojava-modfinder/pom.xml                          |  4 ++--
 biojava-ontology/pom.xml                           |  2 +-
 biojava-protein-comparison-tool/pom.xml            | 10 +++++-----
 biojava-protein-disorder/pom.xml                   |  4 ++--
 biojava-structure-gui/pom.xml                      |  6 +++---
 biojava-structure/pom.xml                          |  6 +++---
 biojava-survival/pom.xml                           |  2 +-
 biojava-ws/pom.xml                                 |  4 ++--
 pom.xml                                            |  2 +-
 15 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 7c3d994d5c..6c6bcb2d62 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 31ddaaf246..64e9042d34 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 5c294cdc97..9bfe594a80 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaStreamerTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaStreamerTest.java
index 614c6f06c8..6c93c912c1 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaStreamerTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaStreamerTest.java
@@ -5,6 +5,8 @@
 import org.junit.Test;
 
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
@@ -16,9 +18,9 @@
 public class FastaStreamerTest {
 
 	@Test
-	public void stream() throws IOException {
-		String file = this.getClass().getResource("PF00104_small.fasta.gz").getFile();
-		Path path = Paths.get(file);
+	public void stream() throws IOException, URISyntaxException {
+		URI fileUri = this.getClass().getResource("PF00104_small.fasta.gz").toURI();
+		Path path = Paths.get(fileUri);
 		List<ProteinSequence> sequences;
 
 		sequences = FastaStreamer.from(path).stream().collect(Collectors.toList());
@@ -38,9 +40,9 @@ public void stream() throws IOException {
 	}
 
 	@Test
-	public void iterate() {
-		String file = this.getClass().getResource("PF00104_small.fasta.gz").getFile();
-		Path path = Paths.get(file);
+	public void iterate() throws URISyntaxException {
+		URI fileUri = this.getClass().getResource("PF00104_small.fasta.gz").toURI();
+		Path path = Paths.get(fileUri);
 		int count = 0;
 		for (ProteinSequence sequence : FastaStreamer.from(path).each()) {
 			count++;
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index dd395e40b6..898d42594d 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 4f1f34abd8..03ba45181b 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.2-SNAPSHOT</version>
+    <version>7.1.3-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.2-SNAPSHOT</version>
+    	<version>7.1.3-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index ec919839e0..f013d4e6f9 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 6803c8a4f4..9762b35076 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.2-SNAPSHOT</version>
+    <version>7.1.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index c5a32a81b6..7b819dbf0a 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 46ad1f4154..a69135171e 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 05ebf00c97..e5ce572362 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 6b82206a97..ed22484e53 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 37e75445eb..dcc460234b 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.2-SNAPSHOT</version>
+        <version>7.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 66580cb6ea..fd19c88670 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 4af310f250..d492d29bd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.2-SNAPSHOT</version>
+	<version>7.1.3-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the

From d96cae47d66ea5d0644a077aabc74876ad37d4ea Mon Sep 17 00:00:00 2001
From: alawi <alawi.wow@gmail.com>
Date: Wed, 24 Apr 2024 23:51:17 +0200
Subject: [PATCH 488/599] Reverting changes to pom files

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  2 +-
 14 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 6c6bcb2d62..7c3d994d5c 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 64e9042d34..31ddaaf246 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 9bfe594a80..5c294cdc97 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 898d42594d..dd395e40b6 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 03ba45181b..4f1f34abd8 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.3-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.3-SNAPSHOT</version>
+    	<version>7.1.2-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index f013d4e6f9..ec919839e0 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 9762b35076..6803c8a4f4 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.3-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 7b819dbf0a..c5a32a81b6 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index a69135171e..46ad1f4154 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index e5ce572362..05ebf00c97 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index ed22484e53..6b82206a97 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -44,13 +44,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index dcc460234b..37e75445eb 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.3-SNAPSHOT</version>
+        <version>7.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index fd19c88670..66580cb6ea 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index d492d29bd2..4af310f250 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.3-SNAPSHOT</version>
+	<version>7.1.2-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the

From 4fcb3b1b61591d158c5984f51c121db2674e619c Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 24 Apr 2024 14:53:28 -0700
Subject: [PATCH 489/599] Adding windows, #1092

---
 .github/workflows/pull_request.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index d2e35cd56c..a0d31ee08a 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -16,9 +16,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # We do one OS only to reduce resource utilization. To do macOS to this would be needed:
-        #os: [ubuntu-20.04, macOS-latest]
-        os: [ubuntu-latest]
+        # Linux and Windows only (MacOS is quite close to Linux, so less of a risk)
+        os: [ubuntu-latest, windows-latest]
         java: [17, 21]
       fail-fast: false
       max-parallel: 4

From 1be0260ebfd433eb89c2b422208556342eb082e4 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 24 Apr 2024 16:21:15 -0700
Subject: [PATCH 490/599] Bumping up to slf4j2 and log4j2. Logging doesn't work
 correctly yet, at least in some modules

---
 biojava-aa-prop/pom.xml                 | 2 +-
 biojava-alignment/pom.xml               | 2 +-
 biojava-core/pom.xml                    | 2 +-
 biojava-genome/pom.xml                  | 2 +-
 biojava-integrationtest/pom.xml         | 2 +-
 biojava-modfinder/pom.xml               | 2 +-
 biojava-ontology/pom.xml                | 2 +-
 biojava-protein-comparison-tool/pom.xml | 2 +-
 biojava-protein-disorder/pom.xml        | 2 +-
 biojava-structure-gui/pom.xml           | 2 +-
 biojava-structure/pom.xml               | 2 +-
 biojava-survival/pom.xml                | 2 +-
 biojava-ws/pom.xml                      | 2 +-
 pom.xml                                 | 6 +++---
 14 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 7c3d994d5c..adbe089c75 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -86,7 +86,7 @@
 		<!-- binding for log4j2, scope=runTime set in parent pom -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 31ddaaf246..a79449454e 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -63,7 +63,7 @@
     	<!-- binding for log4j2, scope=runTime set in parent pom -->
  		<dependency>
     		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-slf4j-impl</artifactId>
+    		<artifactId>log4j-slf4j2-impl</artifactId>
   		</dependency>
   		<dependency>
     		<groupId>org.apache.logging.log4j</groupId>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 5c294cdc97..3b467df321 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -63,7 +63,7 @@
 		<!-- binding for log4j2, scope=runTime set in parent pom -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index dd395e40b6..bff2faa563 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -103,7 +103,7 @@
     	<!-- binding for log4j2, scope=runTime set in parent pom -->
  		<dependency>
     		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-slf4j-impl</artifactId>
+    		<artifactId>log4j-slf4j2-impl</artifactId>
   		</dependency>
   		<dependency>
     		<groupId>org.apache.logging.log4j</groupId>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 4f1f34abd8..507f23abbd 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -50,7 +50,7 @@
     	<!-- binding for log4j2, scope=runTime set in parent pom -->
  		<dependency>
     		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-slf4j-impl</artifactId>
+    		<artifactId>log4j-slf4j2-impl</artifactId>
   		</dependency>
   		<dependency>
     		<groupId>org.apache.logging.log4j</groupId>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index ec919839e0..dc5985beaa 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -43,7 +43,7 @@
 		<!-- binding for log4j2, scope=runTime set in parent pom -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 6803c8a4f4..03f1097109 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -33,7 +33,7 @@
     	<!-- binding for log4j2, scope=runTime set in parent pom -->
  		<dependency>
     		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-slf4j-impl</artifactId>
+    		<artifactId>log4j-slf4j2-impl</artifactId>
   		</dependency>
   		<dependency>
     		<groupId>org.apache.logging.log4j</groupId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index c5a32a81b6..88c0cbbc82 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -67,7 +67,7 @@
 		<!-- binding for log4j2, scope=runTime set in parent pom -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 46ad1f4154..4344b5e112 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -74,7 +74,7 @@
 		<!-- binding for log4j2, scope=runTime set in parent pom -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 05ebf00c97..1f954eebf6 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -53,7 +53,7 @@
         <!-- binding for log4j2, scope=runTime set in parent pom -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 6b82206a97..3a9a58ced0 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -91,7 +91,7 @@
 		<!-- binding for log4j2, scope=runTime set in parent pom -->
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 37e75445eb..3ebb91b3b6 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -37,7 +37,7 @@
     	<!-- binding for log4j2, scope=runTime set in parent pom -->
  		<dependency>
     		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-slf4j-impl</artifactId>
+    		<artifactId>log4j-slf4j2-impl</artifactId>
   		</dependency>
   		<dependency>
     		<groupId>org.apache.logging.log4j</groupId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 66580cb6ea..a9f68e6030 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -41,7 +41,7 @@
     	<!-- binding for log4j2, scope=runTime set in parent pom -->
  		<dependency>
     		<groupId>org.apache.logging.log4j</groupId>
-    		<artifactId>log4j-slf4j-impl</artifactId>
+    		<artifactId>log4j-slf4j2-impl</artifactId>
   		</dependency>
   		<dependency>
     		<groupId>org.apache.logging.log4j</groupId>
diff --git a/pom.xml b/pom.xml
index 4af310f250..74e3783b70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,8 @@
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maxmem>512M</maxmem>
 		<mmtf.version>1.0.11</mmtf.version>
-		<slf4j.version>1.7.36</slf4j.version>
-		<log4j.version>2.22.0</log4j.version>
+		<slf4j.version>2.0.12</slf4j.version>
+		<log4j.version>2.23.1</log4j.version>
 		<junit-jupiter.version>5.10.1</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java</ciftools.artifact>
 		<ciftools.version>5.0.1</ciftools.version>
@@ -436,7 +436,7 @@
 			<!-- binding for log4j 2 -->
 			<dependency>
 				<groupId>org.apache.logging.log4j</groupId>
-				<artifactId>log4j-slf4j-impl</artifactId>
+				<artifactId>log4j-slf4j2-impl</artifactId>
 				<version>${log4j.version}</version>
 				<!-- runtime scope includes the test scope as well -->
 				<scope>runtime</scope>

From e7d09d0081e07a2b3ab1dc5eca7f5a11ce3b7d82 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 25 Apr 2024 16:14:18 -0700
Subject: [PATCH 491/599] Fixing logging clash in structure module

---
 biojava-structure/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 3a9a58ced0..cde4be0064 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -40,6 +40,13 @@
 			<artifactId>mmtf-codec</artifactId>
 			<version>${mmtf.version}</version>
 			<scope>compile</scope>
+			<exclusions>
+				<!-- This is needed because mmtf uses slf4j 1.7 and the log4j2 slf4j1 binding, somehow clashing with slf4j2 in this repo -->
+				<exclusion>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-slf4j-impl</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>

From 1ae6b52630282eba2079b5764218f5420c1b12b5 Mon Sep 17 00:00:00 2001
From: jlerbsc <jean-pierre.lerbscher@jperf.com>
Date: Wed, 15 May 2024 17:59:58 +0200
Subject: [PATCH 492/599] Fix issue s1319 Declarations should use Java
 collection interfaces on biojava-core

---
 .../nbio/alignment/TestDNAAlignment.java      |  3 +-
 .../biojava/nbio/core/search/io/Result.java   |  5 ++-
 .../biojava/nbio/core/search/io/SearchIO.java |  3 +-
 .../core/search/io/blast/BlastResult.java     |  3 +-
 .../search/io/blast/BlastResultBuilder.java   |  5 ++-
 .../search/io/blast/BlastTabularParser.java   |  3 +-
 .../core/search/io/blast/BlastXMLParser.java  | 14 +++----
 .../core/sequence/ChromosomeSequence.java     |  5 ++-
 .../nbio/core/sequence/GeneSequence.java      | 18 ++++----
 .../nbio/core/sequence/ProteinSequence.java   |  3 +-
 .../core/sequence/TranscriptSequence.java     | 12 +++---
 .../sequence/features/DBReferenceInfo.java    |  7 ++--
 .../core/sequence/io/FastaReaderHelper.java   | 23 ++++++-----
 .../nbio/core/sequence/io/FastaStreamer.java  |  2 +-
 .../core/sequence/io/GenbankReaderHelper.java | 25 +++++------
 .../sequence/io/GenbankSequenceParser.java    |  2 +-
 .../sequence/io/GenericFastaHeaderParser.java |  3 +-
 .../io/GenericGenbankHeaderFormat.java        |  4 +-
 .../io/GenericGenbankHeaderParser.java        |  4 +-
 .../sequence/io/GenericInsdcHeaderFormat.java | 14 +++----
 .../loader/StringProxySequenceReader.java     |  2 +-
 .../loader/UniprotProxySequenceReader.java    | 38 ++++++++---------
 .../sequence/template/AbstractSequence.java   | 20 ++++-----
 .../core/util/SingleLinkageClusterer.java     |  2 +-
 .../org/biojava/nbio/core/util/XMLHelper.java |  5 ++-
 .../nbio/core/sequence/GeneSequenceTest.java  |  2 +-
 .../core/sequence/io/GenbankCookbookTest.java |  5 ++-
 .../core/sequence/io/GenbankWriterTest.java   |  2 +-
 .../biojava/nbio/core/util/XMLHelperTest.java |  5 ++-
 .../nbio/genome/GeneFeatureHelper.java        | 41 ++++++++++---------
 .../homology/GFF3FromUniprotBlastHits.java    |  6 +--
 .../parsers/geneid/GeneIDXMLReader.java       |  5 ++-
 .../nbio/genome/parsers/gff/GFF3Writer.java   |  6 ++-
 .../nbio/genome/query/BlastXMLQuery.java      |  7 ++--
 .../biojava/nbio/genome/util/SplitFasta.java  |  3 +-
 .../nbio/genome/GeneFeatureHelperTest.java    | 11 ++---
 36 files changed, 172 insertions(+), 146 deletions(-)

diff --git a/biojava-alignment/src/test/java/org/biojava/nbio/alignment/TestDNAAlignment.java b/biojava-alignment/src/test/java/org/biojava/nbio/alignment/TestDNAAlignment.java
index 169babaf04..aeb839747f 100644
--- a/biojava-alignment/src/test/java/org/biojava/nbio/alignment/TestDNAAlignment.java
+++ b/biojava-alignment/src/test/java/org/biojava/nbio/alignment/TestDNAAlignment.java
@@ -43,6 +43,7 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 public class TestDNAAlignment {
 
@@ -75,7 +76,7 @@ public void testDNAAlignment() {
 	private static List<DNASequence> getDNAFASTAFile() throws Exception {
 
 		InputStream inStream = TestDNAAlignment.class.getResourceAsStream(String.format("/dna-fasta.txt"));
-		LinkedHashMap<String, DNASequence> fastas = FastaReaderHelper.readFastaDNASequence(inStream);
+		Map<String, DNASequence> fastas = FastaReaderHelper.readFastaDNASequence(inStream);
 
 		List<DNASequence> sequences = new ArrayList<DNASequence>();
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/Result.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/Result.java
index aa1b432b57..bebdfea5ff 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/Result.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/Result.java
@@ -27,6 +27,7 @@
 import java.util.NoSuchElementException;
 
 import org.biojava.nbio.core.sequence.template.Sequence;
+import java.util.Map;
 
 /**
  * This class models a search result.
@@ -46,7 +47,7 @@ public abstract class Result implements Iterable<Hit>{
 	private String reference;
 	private String dbFile;
 
-	private HashMap<String,String> programSpecificParameters;
+	private Map<String, String> programSpecificParameters;
 
 	private int iterationNumber;
 	private String queryID;
@@ -56,7 +57,7 @@ public abstract class Result implements Iterable<Hit>{
 	private List<Hit> hits;
 	private int hitCounter = -1;
 
-	public Result(String program, String version, String reference, String dbFile, HashMap<String, String> programSpecificParameters, int iterationNumber, String queryID, String queryDef, int queryLength, List<Hit> hits, Sequence querySequence) {
+	public Result(String program, String version, String reference, String dbFile, Map<String, String> programSpecificParameters, int iterationNumber, String queryID, String queryDef, int queryLength, List<Hit> hits, Sequence querySequence) {
 		this.program = program;
 		this.version = version;
 		this.reference = reference;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/SearchIO.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/SearchIO.java
index d10717ee9e..95ffb9fcfc 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/SearchIO.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/SearchIO.java
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.ServiceLoader;
 import java.util.NoSuchElementException;
+import java.util.Map;
 
 /**
  * Designed by Paolo Pavan.
@@ -39,7 +40,7 @@
  */
 
 public class SearchIO implements Iterable<Result>{
-	static private HashMap<String,ResultFactory> extensionFactoryAssociation;
+	static private Map<String, ResultFactory> extensionFactoryAssociation;
 
 	final private ResultFactory factory;
 	final private File file;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastResult.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastResult.java
index bcacdde20d..9410becea0 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastResult.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastResult.java
@@ -25,6 +25,7 @@
 import java.util.HashMap;
 import java.util.List;
 import org.biojava.nbio.core.sequence.template.Sequence;
+import java.util.Map;
 
 /**
  * This class models a Blast/Blast plus result.
@@ -39,7 +40,7 @@
  *
  */
 public class BlastResult extends Result{
-	public BlastResult(String program, String version, String reference, String dbFile, HashMap<String, String> programSpecificParameters, int iterationNumber, String queryID, String queryDef, int queryLength, List<Hit> hits, Sequence querySequence) {
+	public BlastResult(String program, String version, String reference, String dbFile, Map<String, String> programSpecificParameters, int iterationNumber, String queryID, String queryDef, int queryLength, List<Hit> hits, Sequence querySequence) {
 		super(program, version, reference, dbFile, programSpecificParameters, iterationNumber, queryID, queryDef, queryLength, hits, querySequence);
 	}
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastResultBuilder.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastResultBuilder.java
index 8d7e06a89e..5c26f4b63a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastResultBuilder.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastResultBuilder.java
@@ -24,6 +24,7 @@
 import java.util.HashMap;
 import java.util.List;
 import org.biojava.nbio.core.sequence.template.Sequence;
+import java.util.Map;
 
 /**
  * Designed by Paolo Pavan.
@@ -39,7 +40,7 @@ public class BlastResultBuilder {
 	private String version;
 	private String reference;
 	private String dbFile;
-	private HashMap<String, String> programSpecificParameters;
+	private Map<String, String> programSpecificParameters;
 	private int iterationNumber;
 	private String queryID;
 	private String queryDef;
@@ -70,7 +71,7 @@ public BlastResultBuilder setDbFile(String dbFile) {
 		return this;
 	}
 
-	public BlastResultBuilder setProgramSpecificParameters(HashMap<String, String> programSpecificParameters) {
+	public BlastResultBuilder setProgramSpecificParameters(Map<String, String> programSpecificParameters) {
 		this.programSpecificParameters = programSpecificParameters;
 		return this;
 	}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastTabularParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastTabularParser.java
index be3d2f81f1..03c4b6ba64 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastTabularParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastTabularParser.java
@@ -37,6 +37,7 @@
 import org.biojava.nbio.core.sequence.template.Sequence;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import java.util.Map;
 
 /**
  * Designed by Paolo Pavan.
@@ -71,7 +72,7 @@ private enum PARSING_CONSISTENCY {
 
 	// data imported private:
 	int queryIdNumber = 0;
-	HashMap<String,String> queryIdMapping = new HashMap<>();
+	Map<String, String> queryIdMapping = new HashMap<>();
 	String programName=null, queryName = null, databaseFile = null;
 	private String queryId      ;
 	private String subjectId    ;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java
index 7714f44749..73932d9147 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java
@@ -90,9 +90,9 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 		// create mappings between sequences and blast id
 		mapIds();
 
-		ArrayList<Result> resultsCollection;
-		ArrayList<Hit> hitsCollection;
-		ArrayList<Hsp> hspsCollection;
+		List<Result> resultsCollection;
+		List<Hit> hitsCollection;
+		List<Hsp> hspsCollection;
 
 		try {
 			// select top level elements
@@ -102,7 +102,7 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 			String dbFile = XMLHelper.selectSingleElement(blastDoc.getDocumentElement(),"BlastOutput_db").getTextContent();
 
 			logger.info("Query for hits in "+ targetFile);
-			ArrayList<Element> IterationsList = XMLHelper.selectElements(blastDoc.getDocumentElement(), "BlastOutput_iterations/Iteration[Iteration_hits]");
+			List<Element> IterationsList = XMLHelper.selectElements(blastDoc.getDocumentElement(), "BlastOutput_iterations/Iteration[Iteration_hits]");
 			logger.info(IterationsList.size() + " results");
 
 			resultsCollection = new ArrayList<>();
@@ -129,7 +129,7 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 
 
 				Element iterationHitsElement = XMLHelper.selectSingleElement(element, "Iteration_hits");
-				ArrayList<Element> hitList = XMLHelper.selectElements(iterationHitsElement, "Hit");
+				List<Element> hitList = XMLHelper.selectElements(iterationHitsElement, "Hit");
 
 				hitsCollection = new ArrayList<>();
 				for (Element hitElement : hitList) {
@@ -146,7 +146,7 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 					));
 
 					Element hithspsElement = XMLHelper.selectSingleElement(hitElement, "Hit_hsps");
-					ArrayList<Element> hspList = XMLHelper.selectElements(hithspsElement, "Hsp");
+					List<Element> hspList = XMLHelper.selectElements(hithspsElement, "Hsp");
 
 					hspsCollection = new ArrayList<>();
 					for (Element hspElement : hspList) {
@@ -195,7 +195,7 @@ public List<Result> createObjects(double maxEScore) throws IOException, ParseExc
 
 	@Override
 	public List<String> getFileExtensions(){
-		ArrayList<String> extensions = new ArrayList<>(1);
+		List<String> extensions = new ArrayList<>(1);
 		extensions.add("blastxml");
 		return extensions;
 	}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ChromosomeSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ChromosomeSequence.java
index 8b11fa0b63..4a7e1ec575 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ChromosomeSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ChromosomeSequence.java
@@ -29,6 +29,7 @@
 import org.biojava.nbio.core.sequence.template.SequenceReader;
 
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * A ChromosomeSequence is a DNASequence but keeps track of geneSequences
@@ -37,7 +38,7 @@
 public class ChromosomeSequence extends DNASequence {
 
 	private int chromosomeNumber;
-	private LinkedHashMap<String, GeneSequence> geneSequenceHashMap = new LinkedHashMap<>();
+	private Map<String, GeneSequence> geneSequenceHashMap = new LinkedHashMap<>();
 
 	/**
 	 * Empty constructor used by tools that need a proper Bean that allows the actual
@@ -106,7 +107,7 @@ public void setChromosomeNumber(int chromosomeNumber) {
 	 * @return
 	 */
 
-	public LinkedHashMap<String, GeneSequence> getGeneSequences() {
+	public Map<String, GeneSequence> getGeneSequences() {
 		return geneSequenceHashMap;
 	}
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
index ed6f635611..f0f2662fea 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
@@ -32,6 +32,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.List;
 
 /**
  *
@@ -41,11 +43,11 @@ public class GeneSequence extends DNASequence {
 
 	private final static Logger logger = LoggerFactory.getLogger(GeneSequence.class);
 
-	private final LinkedHashMap<String, TranscriptSequence> transcriptSequenceHashMap = new LinkedHashMap<>();
-	private final LinkedHashMap<String, IntronSequence> intronSequenceHashMap = new LinkedHashMap<>();
-	private final LinkedHashMap<String, ExonSequence> exonSequenceHashMap = new LinkedHashMap<>();
-	private final ArrayList<IntronSequence> intronSequenceList = new ArrayList<>();
-	private final ArrayList<ExonSequence> exonSequenceList = new ArrayList<>();
+	private final Map<String, TranscriptSequence> transcriptSequenceHashMap = new LinkedHashMap<>();
+	private final Map<String, IntronSequence> intronSequenceHashMap = new LinkedHashMap<>();
+	private final Map<String, ExonSequence> exonSequenceHashMap = new LinkedHashMap<>();
+	private final List<IntronSequence> intronSequenceList = new ArrayList<>();
+	private final List<ExonSequence> exonSequenceList = new ArrayList<>();
 	boolean intronAdded = false; // need to deal with the problem that typically introns are not added when validating the list and adding in introns as the regions not included in exons
 	private Strand strand = Strand.UNDEFINED;
 	private ChromosomeSequence chromosomeSequence;
@@ -179,7 +181,7 @@ public TranscriptSequence getTranscript(String accession) {
 	 * Get the collection of transcription sequences assigned to this gene
 	 * @return transcripts
 	 */
-	public LinkedHashMap<String, TranscriptSequence> getTranscripts() {
+	public Map<String, TranscriptSequence> getTranscripts() {
 		return transcriptSequenceHashMap;
 	}
 
@@ -294,7 +296,7 @@ public ExonSequence addExon(AccessionID accession, int begin, int end) {
 	 * Get the exons as an ArrayList. Modifying this list will not modify the underlying collection
 	 * @return exons
 	 */
-	public ArrayList<ExonSequence> getExonSequences() {
+	public List<ExonSequence> getExonSequences() {
 		return new ArrayList<>(exonSequenceList);
 	}
 
@@ -302,7 +304,7 @@ public ArrayList<ExonSequence> getExonSequences() {
 	 * Get the introns as an ArrayList. Modifying this list will not modify the underlying collection
 	 * @return introns
 	 */
-	public ArrayList<IntronSequence> getIntronSequences() {
+	public List<IntronSequence> getIntronSequences() {
 		return  new ArrayList<>(intronSequenceList);
 	}
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ProteinSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ProteinSequence.java
index 4248bc908c..f4194bc662 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ProteinSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ProteinSequence.java
@@ -42,6 +42,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import org.biojava.nbio.core.sequence.features.Qualifier;
+import java.util.Map;
 
 /**
  * The representation of a ProteinSequence
@@ -163,7 +164,7 @@ private DNASequence getRawParentSequence(String accessId) throws IOException {
 				= new FastaReader<>(is,
 						new PlainFastaHeaderParser<DNASequence, NucleotideCompound>(),
 						new DNASequenceCreator(AmbiguityDNACompoundSet.getDNACompoundSet()));
-		LinkedHashMap<String, DNASequence> seq = parentReader.process();
+		Map<String, DNASequence> seq = parentReader.process();
 
 		DNASequence parentSeq = null;
 		if (seq.size() == 1) {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
index 460ca6ab45..5fa81ecf7f 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/TranscriptSequence.java
@@ -31,6 +31,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * This is the sequence if you want to go from a gene sequence to a protein sequence. Need to start with a
@@ -41,8 +43,8 @@ public class TranscriptSequence extends DNASequence {
 
 	private final static Logger logger = LoggerFactory.getLogger(TranscriptSequence.class);
 
-	private final ArrayList<CDSSequence> cdsSequenceList = new ArrayList<>();
-	private final LinkedHashMap<String, CDSSequence> cdsSequenceHashMap = new LinkedHashMap<>();
+	private final List<CDSSequence> cdsSequenceList = new ArrayList<>();
+	private final Map<String, CDSSequence> cdsSequenceHashMap = new LinkedHashMap<>();
 	private StartCodonSequence startCodonSequence = null;
 	private StopCodonSequence stopCodonSequence = null;
 	private GeneSequence parentGeneSequence = null;
@@ -110,7 +112,7 @@ public CDSSequence removeCDS(String accession) {
 	 * Get the CDS sequences that have been added to the TranscriptSequences
 	 * @return
 	 */
-	public LinkedHashMap<String, CDSSequence> getCDSSequences() {
+	public Map<String, CDSSequence> getCDSSequences() {
 		return cdsSequenceHashMap;
 	}
 
@@ -152,8 +154,8 @@ public CDSSequence addCDS(AccessionID accession, int begin, int end, int phase)
 	 *
 	 * @return
 	 */
-	public ArrayList<ProteinSequence> getProteinCDSSequences() {
-		ArrayList<ProteinSequence> proteinSequenceList = new ArrayList<>();
+	public List<ProteinSequence> getProteinCDSSequences() {
+		List<ProteinSequence> proteinSequenceList = new ArrayList<>();
 		for (int i = 0; i < cdsSequenceList.size(); i++) {
 			CDSSequence cdsSequence = cdsSequenceList.get(i);
 			String codingSequence = cdsSequence.getCodingSequence();
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java
index 0d2ff2de9a..7598f77f33 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java
@@ -25,6 +25,7 @@
 import org.biojava.nbio.core.sequence.loader.UniprotProxySequenceReader;
 
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * If you have a uniprot ID then it is possible to get a collection
@@ -37,7 +38,7 @@
  * @author Paolo Pavan
  */
 public class DBReferenceInfo extends Qualifier {
-	private LinkedHashMap<String, String> properties = new LinkedHashMap<>();
+	private Map<String, String> properties = new LinkedHashMap<>();
 	private String database = "";
 	private String id = "";
 
@@ -66,14 +67,14 @@ public void addProperty(String type, String value){
 	 * Get the properties
 	 * @return the properties
 	 */
-	public LinkedHashMap<String, String> getProperties() {
+	public Map<String, String> getProperties() {
 		return properties;
 	}
 
 	/**
 	 * @param properties the properties to set
 	 */
-	public void setProperties(LinkedHashMap<String, String> properties) {
+	public void setProperties(Map<String, String> properties) {
 		this.properties = properties;
 	}
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java
index d185a6f062..4493766202 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java
@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  *
@@ -51,7 +52,7 @@ public class FastaReaderHelper {
 	 * @return
 	 * @throws IOException
 	 */
-	public static LinkedHashMap<String, DNASequence> readFastaDNASequence(File file, boolean lazySequenceLoad) throws IOException {
+	public static Map<String, DNASequence> readFastaDNASequence(File file, boolean lazySequenceLoad) throws IOException {
 		if (!lazySequenceLoad) {
 			return readFastaDNASequence(file);
 		}
@@ -79,7 +80,7 @@ public static LinkedHashMap<String, DNASequence> readFastaDNASequence(File file,
 	 * @return
 	 * @throws IOException
 	 */
-	public static LinkedHashMap<String, RNASequence> readFastaRNASequence(File file, boolean lazySequenceLoad) throws IOException {
+	public static Map<String, RNASequence> readFastaRNASequence(File file, boolean lazySequenceLoad) throws IOException {
 		if (!lazySequenceLoad) {
 			return readFastaRNASequence(file);
 		}
@@ -106,10 +107,10 @@ public static LinkedHashMap<String, RNASequence> readFastaRNASequence(File file,
 	 * @return
 	 * @throws IOException
 	 */
-	public static LinkedHashMap<String, ProteinSequence> readFastaProteinSequence(
+	public static Map<String, ProteinSequence> readFastaProteinSequence(
 			File file) throws IOException {
 		FileInputStream inStream = new FileInputStream(file);
-		LinkedHashMap<String, ProteinSequence> proteinSequences = readFastaProteinSequence(inStream);
+		Map<String, ProteinSequence> proteinSequences = readFastaProteinSequence(inStream);
 		inStream.close();
 		return proteinSequences;
 	}
@@ -122,7 +123,7 @@ public static LinkedHashMap<String, ProteinSequence> readFastaProteinSequence(
 	 * @return
 	 * @throws IOException
 	 */
-	public static LinkedHashMap<String, ProteinSequence> readFastaProteinSequence(
+	public static Map<String, ProteinSequence> readFastaProteinSequence(
 			InputStream inStream) throws IOException {
 		FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<>(
 				inStream,
@@ -137,7 +138,7 @@ public static LinkedHashMap<String, ProteinSequence> readFastaProteinSequence(
 	 * @return
 	 * @throws IOException
 	 */
-	public static LinkedHashMap<String, DNASequence> readFastaDNASequence(
+	public static Map<String, DNASequence> readFastaDNASequence(
 			InputStream inStream) throws IOException {
 		FastaReader<DNASequence, NucleotideCompound> fastaReader = new FastaReader<>(
 				inStream,
@@ -152,10 +153,10 @@ public static LinkedHashMap<String, DNASequence> readFastaDNASequence(
 	 * @return
 	 * @throws IOException
 	 */
-	public static LinkedHashMap<String, DNASequence> readFastaDNASequence(
+	public static Map<String, DNASequence> readFastaDNASequence(
 			File file) throws IOException {
 		FileInputStream inStream = new FileInputStream(file);
-		LinkedHashMap<String, DNASequence> dnaSequences = readFastaDNASequence(inStream);
+		Map<String, DNASequence> dnaSequences = readFastaDNASequence(inStream);
 		inStream.close();
 		return dnaSequences;
 	}
@@ -166,7 +167,7 @@ public static LinkedHashMap<String, DNASequence> readFastaDNASequence(
 	 * @return
 	 * @throws IOException
 	 */
-	public static LinkedHashMap<String, RNASequence> readFastaRNASequence(
+	public static Map<String, RNASequence> readFastaRNASequence(
 			InputStream inStream) throws IOException {
 		FastaReader<RNASequence, NucleotideCompound> fastaReader = new FastaReader<>(
 				inStream,
@@ -181,10 +182,10 @@ public static LinkedHashMap<String, RNASequence> readFastaRNASequence(
 	 * @return
 	 * @throws IOException
 	 */
-	public static LinkedHashMap<String, RNASequence> readFastaRNASequence(
+	public static Map<String, RNASequence> readFastaRNASequence(
 			File file) throws IOException {
 		FileInputStream inStream = new FileInputStream(file);
-		LinkedHashMap<String, RNASequence> rnaSequences = readFastaRNASequence(inStream);
+		Map<String, RNASequence> rnaSequences = readFastaRNASequence(inStream);
 		inStream.close();
 		return rnaSequences;
 	}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
index c9184dfd13..00829869b9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaStreamer.java
@@ -36,7 +36,7 @@ public class FastaStreamer {
 	private int batchSize = 1_000;
 	private SequenceHeaderParserInterface<ProteinSequence, AminoAcidCompound> headerParser;
 	private SequenceCreatorInterface<AminoAcidCompound> sequenceCreator;
-	private LinkedHashMap<String, ProteinSequence> chunk = new LinkedHashMap<>();
+	private Map<String, ProteinSequence> chunk = new LinkedHashMap<>();
 	private Iterator<Map.Entry<String, ProteinSequence>> iterator = Collections.emptyIterator();
 	private boolean closed = false;
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java
index 2a1d30f146..5146310591 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java
@@ -37,6 +37,7 @@
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  *
@@ -55,7 +56,7 @@ public class GenbankReaderHelper {
 	 * @return
 	 * @throws Exception
 	 */
-	public static LinkedHashMap<String, DNASequence> readGenbankDNASequence(File file, boolean lazySequenceLoad) throws Exception {
+	public static Map<String, DNASequence> readGenbankDNASequence(File file, boolean lazySequenceLoad) throws Exception {
 		if (!lazySequenceLoad) {
 			return readGenbankDNASequence(file);
 		}
@@ -83,7 +84,7 @@ public static LinkedHashMap<String, DNASequence> readGenbankDNASequence(File fil
 	 * @return
 	 * @throws Exception
 	 */
-	public static LinkedHashMap<String, ProteinSequence> readGenbankProteinSequence(File file, boolean lazySequenceLoad) throws Exception {
+	public static Map<String, ProteinSequence> readGenbankProteinSequence(File file, boolean lazySequenceLoad) throws Exception {
 		if (!lazySequenceLoad) {
 			return readGenbankProteinSequence(file);
 		}
@@ -111,7 +112,7 @@ public static LinkedHashMap<String, ProteinSequence> readGenbankProteinSequence(
 	 * @return
 	 * @throws Exception
 	 */
-	public static LinkedHashMap<String, RNASequence> readGenbankRNASequence(File file, boolean lazySequenceLoad) throws Exception {
+	public static Map<String, RNASequence> readGenbankRNASequence(File file, boolean lazySequenceLoad) throws Exception {
 		if (!lazySequenceLoad) {
 			return readGenbankRNASequence(file);
 		}
@@ -138,10 +139,10 @@ public static LinkedHashMap<String, RNASequence> readGenbankRNASequence(File fil
 	 * @return
 	 * @throws Exception
 	 */
-	public static LinkedHashMap<String, ProteinSequence> readGenbankProteinSequence(
+	public static Map<String, ProteinSequence> readGenbankProteinSequence(
 			File file) throws Exception {
 		FileInputStream inStream = new FileInputStream(file);
-		LinkedHashMap<String, ProteinSequence> proteinSequences = readGenbankProteinSequence(inStream);
+		Map<String, ProteinSequence> proteinSequences = readGenbankProteinSequence(inStream);
 		inStream.close();
 		return proteinSequences;
 	}
@@ -154,7 +155,7 @@ public static LinkedHashMap<String, ProteinSequence> readGenbankProteinSequence(
 	 * @return
 	 * @throws Exception
 	 */
-	public static LinkedHashMap<String, ProteinSequence> readGenbankProteinSequence(
+	public static Map<String, ProteinSequence> readGenbankProteinSequence(
 			InputStream inStream) throws Exception {
 		GenbankReader<ProteinSequence, AminoAcidCompound> GenbankReader = new GenbankReader<>(
 				inStream,
@@ -169,7 +170,7 @@ public static LinkedHashMap<String, ProteinSequence> readGenbankProteinSequence(
 	 * @return
 	 * @throws Exception
 	 */
-	public static LinkedHashMap<String, DNASequence> readGenbankDNASequence(
+	public static Map<String, DNASequence> readGenbankDNASequence(
 			InputStream inStream) throws Exception {
 		GenbankReader<DNASequence, NucleotideCompound> GenbankReader = new GenbankReader<>(
 				inStream,
@@ -184,10 +185,10 @@ public static LinkedHashMap<String, DNASequence> readGenbankDNASequence(
 	 * @return
 	 * @throws Exception
 	 */
-	public static LinkedHashMap<String, DNASequence> readGenbankDNASequence(
+	public static Map<String, DNASequence> readGenbankDNASequence(
 			File file) throws Exception {
 		FileInputStream inStream = new FileInputStream(file);
-		LinkedHashMap<String, DNASequence> dnaSequences = readGenbankDNASequence(inStream);
+		Map<String, DNASequence> dnaSequences = readGenbankDNASequence(inStream);
 		inStream.close();
 		return dnaSequences;
 	}
@@ -197,7 +198,7 @@ public static LinkedHashMap<String, DNASequence> readGenbankDNASequence(
 	 * @return
 	 * @throws Exception
 	 */
-	public static LinkedHashMap<String, RNASequence> readGenbankRNASequence(
+	public static Map<String, RNASequence> readGenbankRNASequence(
 			InputStream inStream) throws Exception {
 		GenbankReader<RNASequence, NucleotideCompound> GenbankReader = new GenbankReader<>(
 				inStream,
@@ -212,10 +213,10 @@ public static LinkedHashMap<String, RNASequence> readGenbankRNASequence(
 	 * @return
 	 * @throws Exception
 	 */
-	public static LinkedHashMap<String, RNASequence> readGenbankRNASequence(
+	public static Map<String, RNASequence> readGenbankRNASequence(
 			File file) throws Exception {
 		FileInputStream inStream = new FileInputStream(file);
-		LinkedHashMap<String, RNASequence> rnaSequences = readGenbankRNASequence(inStream);
+		Map<String, RNASequence> rnaSequences = readGenbankRNASequence(inStream);
 		inStream.close();
 		return rnaSequences;
 	}
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
index 62847e7456..90653612e7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
@@ -217,7 +217,7 @@ private void parseFeatureTag(List<String[]> section) {
 						xref.setNeedsQuotes(needsQuotes);
 						gbFeature.addQualifier(key, xref);
 
-						ArrayList<DBReferenceInfo> listDBEntry = new ArrayList<>();
+						List<DBReferenceInfo> listDBEntry = new ArrayList<>();
 						listDBEntry.add(xref);
 						mapDB.put(key, listDBEntry);
 					} else {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
index ee5c3142eb..1556bf838e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
@@ -34,6 +34,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * The default fasta header parser where some headers are well defined based on the source
@@ -71,7 +72,7 @@ public class GenericFastaHeaderParser<S extends AbstractSequence<C>, C extends C
 	 */
 	private String[] getHeaderValues(String header) {
 		String[] data = new String[0];
-		ArrayList<String> values = new ArrayList<>();
+		List<String> values = new ArrayList<>();
 		StringBuffer sb = new StringBuffer();
 		//commented out 1/11/2012 to resolve an issue where headers do contain a length= at the end that are not recognized
 		//if(header.indexOf("length=") != -1){
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
index 18f58ee7c5..036f8d2ab5 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderFormat.java
@@ -76,7 +76,7 @@ private String _write_multi_line(String tag, String text) {
 			text = "";
 		}
 		int max_len = MAX_WIDTH - HEADER_WIDTH;
-		ArrayList<String> lines = _split_multi_line(text, max_len);
+		List<String> lines = _split_multi_line(text, max_len);
 		String output = _write_single_line(tag, lines.get(0));
 		for (int i = 1; i < lines.size(); i++) {
 			output += _write_single_line("", lines.get(i));
@@ -254,7 +254,7 @@ private String _write_original_first_line(S sequence) {
 	 * @param sequence
 	 */
 	private String _write_comment(S sequence) {
-		ArrayList<String> comments = sequence.getNotesList();
+		List<String> comments = sequence.getNotesList();
 		String output = _write_multi_line("COMMENT", comments.remove(0));
 		for (String comment : comments) {
 			output += _write_multi_line("", comment);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
index bc196c9150..7b1dc0524d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
@@ -67,7 +67,7 @@ public class GenericGenbankHeaderParser<S extends AbstractSequence<C>, C extends
 
 	private boolean versionSeen;
 
-	private ArrayList<String> comments = new ArrayList<>();
+	private List<String> comments = new ArrayList<>();
 
 	/**
 	 * Publications by the authors of the sequence that discuss the data reported in
@@ -134,7 +134,7 @@ public int getVersion() {
 		return version;
 	}
 
-	public ArrayList<String> getComments() {
+	public List<String> getComments() {
 		return comments;
 	}
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
index 71e5f9379d..ccc7dc2055 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericInsdcHeaderFormat.java
@@ -208,7 +208,7 @@ private String _insdc_feature_location_string(FeatureInterface<AbstractSequence<
 				
 				StringBuilder sb = new StringBuilder();
 				Formatter formatter = new Formatter(sb, Locale.US);
-				ArrayList<String> locations = new ArrayList<>();
+				List<String> locations = new ArrayList<>();
 				for(Location l  : feature.getLocations().getSubLocations()) {	
 					locations.add(_insdc_location_string_ignoring_strand_and_subfeatures((AbstractLocation) l, record_length));					
 				}
@@ -223,7 +223,7 @@ private String _insdc_feature_location_string(FeatureInterface<AbstractSequence<
 				//This covers typical forward strand features, and also an evil mixed strand:
 				StringBuilder sb = new StringBuilder();
 				Formatter formatter = new Formatter(sb,Locale.US);
-				ArrayList<String> locations = new ArrayList<>();
+				List<String> locations = new ArrayList<>();
 				for(Location l  : feature.getLocations().getSubLocations()) {	
 					locations.add(_insdc_location_string_ignoring_strand_and_subfeatures((AbstractLocation) l, record_length));					
 				}
@@ -248,7 +248,7 @@ private String _insdc_feature_location_string(FeatureInterface<AbstractSequence<
 			}
 			StringBuilder sb = new StringBuilder();
 			Formatter formatter = new Formatter(sb,Locale.US);
-			ArrayList<String> locations = new ArrayList<>();
+			List<String> locations = new ArrayList<>();
 			for(FeatureInterface<AbstractSequence<C>, C> f  : feature.getChildrenFeatures()) {
 				locations.add(_insdc_location_string_ignoring_strand_and_subfeatures(f.getLocations(), record_length));
 			}
@@ -261,7 +261,7 @@ private String _insdc_feature_location_string(FeatureInterface<AbstractSequence<
 		//This covers typical forward strand features, and also an evil mixed strand:
 		StringBuilder sb = new StringBuilder();
 		Formatter formatter = new Formatter(sb,Locale.US);
-		ArrayList<String> locations = new ArrayList<>();
+		List<String> locations = new ArrayList<>();
 		for(FeatureInterface<AbstractSequence<C>, C> f  : feature.getChildrenFeatures()) {
 			locations.add(_insdc_location_string_ignoring_strand_and_subfeatures(f.getLocations(), record_length));
 		}
@@ -404,16 +404,16 @@ raise ValueError("Expected a SeqFeature position object.")
 	 * @param text
 	 * @param max_len
 	 */
-	protected ArrayList<String> _split_multi_line(String text, int max_len) {
+	protected List<String> _split_multi_line(String text, int max_len) {
 		// TODO Auto-generated method stub
-		ArrayList<String> output = new ArrayList<>();
+		List<String> output = new ArrayList<>();
 		text = text.trim();
 		if(text.length() <= max_len) {
 			output.add(text);
 			return output;
 		}
 
-		ArrayList<String> words = new ArrayList<>();
+		List<String> words = new ArrayList<>();
 		Collections.addAll(words, text.split("\\s+"));
 		while(!words.isEmpty()) {
 			text = words.remove(0);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java
index 7ae1fa1632..b97ad43bb9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java
@@ -83,7 +83,7 @@ public void setContents(String sequence) throws CompoundNotFoundException {
 		}
 	}
 
-	public void setContents(String sequence, ArrayList features) throws CompoundNotFoundException{
+	public void setContents(String sequence, List features) throws CompoundNotFoundException{
 		setContents(sequence);
 	}
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
index 020fee4a97..f1cd7a7471 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
@@ -340,14 +340,14 @@ public AccessionID getAccession() {
 	 * @return
 	 * @throws XPathExpressionException
 	 */
-	public ArrayList<AccessionID> getAccessions() throws XPathExpressionException {
-		ArrayList<AccessionID> accessionList = new ArrayList<>();
+	public List<AccessionID> getAccessions() throws XPathExpressionException {
+		List<AccessionID> accessionList = new ArrayList<>();
 		if (uniprotDoc == null) {
 			return accessionList;
 		}
 		Element uniprotElement = uniprotDoc.getDocumentElement();
 		Element entryElement = XMLHelper.selectSingleElement(uniprotElement, "entry");
-		ArrayList<Element> keyWordElementList = XMLHelper.selectElements(entryElement, "accession");
+		List<Element> keyWordElementList = XMLHelper.selectElements(entryElement, "accession");
 		for (Element element : keyWordElementList) {
 			AccessionID accessionID = new AccessionID(element.getTextContent(), DataSource.UNIPROT);
 			accessionList.add(accessionID);
@@ -363,7 +363,7 @@ public ArrayList<AccessionID> getAccessions() throws XPathExpressionException {
 	 * @return
 	 * @throws XPathExpressionException
 	 */
-	public ArrayList<String> getAliases() throws XPathExpressionException {
+	public List<String> getAliases() throws XPathExpressionException {
 
 		return getProteinAliases();
 	}
@@ -372,8 +372,8 @@ public ArrayList<String> getAliases() throws XPathExpressionException {
 	 * @return
 	 * @throws XPathExpressionException
 	 */
-	public ArrayList<String> getProteinAliases() throws XPathExpressionException {
-		ArrayList<String> aliasList = new ArrayList<>();
+	public List<String> getProteinAliases() throws XPathExpressionException {
+		List<String> aliasList = new ArrayList<>();
 		if (uniprotDoc == null) {
 			return aliasList;
 		}
@@ -381,7 +381,7 @@ public ArrayList<String> getProteinAliases() throws XPathExpressionException {
 		Element entryElement = XMLHelper.selectSingleElement(uniprotElement, "entry");
 		Element proteinElement = XMLHelper.selectSingleElement(entryElement, "protein");
 		
-		ArrayList<Element> keyWordElementList;
+		List<Element> keyWordElementList;
 		getProteinAliasesFromNameGroup(aliasList, proteinElement);
 		
 		keyWordElementList = XMLHelper.selectElements(proteinElement, "component");
@@ -439,9 +439,9 @@ public ArrayList<String> getProteinAliases() throws XPathExpressionException {
 	 * @param proteinElement
 	 * @throws XPathExpressionException
 	 */
-	private void getProteinAliasesFromNameGroup(ArrayList<String> aliasList, Element proteinElement)
+	private void getProteinAliasesFromNameGroup(List<String> aliasList, Element proteinElement)
 			throws XPathExpressionException {
-		ArrayList<Element> keyWordElementList = XMLHelper.selectElements(proteinElement, "alternativeName");
+		List<Element> keyWordElementList = XMLHelper.selectElements(proteinElement, "alternativeName");
 		for (Element element : keyWordElementList) {
 			getProteinAliasesFromElement(aliasList, element);
 		}
@@ -457,7 +457,7 @@ private void getProteinAliasesFromNameGroup(ArrayList<String> aliasList, Element
 	 * @param element
 	 * @throws XPathExpressionException
 	 */
-	private void getProteinAliasesFromElement(ArrayList<String> aliasList, Element element)
+	private void getProteinAliasesFromElement(List<String> aliasList, Element element)
 			throws XPathExpressionException {
 		Element fullNameElement = XMLHelper.selectSingleElement(element, "fullName");
 		aliasList.add(fullNameElement.getTextContent());
@@ -475,16 +475,16 @@ private void getProteinAliasesFromElement(ArrayList<String> aliasList, Element e
 	 * @return
 	 * @throws XPathExpressionException
 	 */
-	public ArrayList<String> getGeneAliases() throws XPathExpressionException {
-		ArrayList<String> aliasList = new ArrayList<>();
+	public List<String> getGeneAliases() throws XPathExpressionException {
+		List<String> aliasList = new ArrayList<>();
 		if (uniprotDoc == null) {
 			return aliasList;
 		}
 		Element uniprotElement = uniprotDoc.getDocumentElement();
 		Element entryElement = XMLHelper.selectSingleElement(uniprotElement, "entry");
-		ArrayList<Element> proteinElements = XMLHelper.selectElements(entryElement, "gene");
+		List<Element> proteinElements = XMLHelper.selectElements(entryElement, "gene");
 		for(Element proteinElement : proteinElements) {
-			ArrayList<Element> keyWordElementList = XMLHelper.selectElements(proteinElement, "name");
+			List<Element> keyWordElementList = XMLHelper.selectElements(proteinElement, "name");
 			for (Element element : keyWordElementList) {
 				aliasList.add(element.getTextContent());
 			}
@@ -774,8 +774,8 @@ public String getOrganismName() {
 	 * @return
 	 */
 	@Override
-	public ArrayList<String> getKeyWords() {
-		ArrayList<String> keyWordsList = new ArrayList<>();
+	public List<String> getKeyWords() {
+		List<String> keyWordsList = new ArrayList<>();
 		if (uniprotDoc == null) {
 			return keyWordsList;
 		}
@@ -783,7 +783,7 @@ public ArrayList<String> getKeyWords() {
 			Element uniprotElement = uniprotDoc.getDocumentElement();
 
 			Element entryElement = XMLHelper.selectSingleElement(uniprotElement, "entry");
-			ArrayList<Element> keyWordElementList = XMLHelper.selectElements(entryElement, "keyword");
+			List<Element> keyWordElementList = XMLHelper.selectElements(entryElement, "keyword");
 			for (Element element : keyWordElementList) {
 				keyWordsList.add(element.getTextContent());
 			}
@@ -809,7 +809,7 @@ public Map<String, List<DBReferenceInfo>> getDatabaseReferences()  {
 		try {
 			Element uniprotElement = uniprotDoc.getDocumentElement();
 			Element entryElement = XMLHelper.selectSingleElement(uniprotElement, "entry");
-			ArrayList<Element> dbreferenceElementList = XMLHelper.selectElements(entryElement, "dbReference");
+			List<Element> dbreferenceElementList = XMLHelper.selectElements(entryElement, "dbReference");
 			for (Element element : dbreferenceElementList) {
 				String type = element.getAttribute("type");
 				String id = element.getAttribute("id");
@@ -819,7 +819,7 @@ public Map<String, List<DBReferenceInfo>> getDatabaseReferences()  {
 					databaseReferencesHashMap.put(type, idlist);
 				}
 				DBReferenceInfo dbreferenceInfo = new DBReferenceInfo(type, id);
-				ArrayList<Element> propertyElementList = XMLHelper.selectElements(element, "property");
+				List<Element> propertyElementList = XMLHelper.selectElements(element, "property");
 				for (Element propertyElement : propertyElementList) {
 					String propertyType = propertyElement.getAttribute("type");
 					String propertyValue = propertyElement.getAttribute("value");
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java
index 5797df9502..b5b2d29740 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java
@@ -65,14 +65,14 @@ public abstract class AbstractSequence<C extends Compound> implements Sequence<C
 	private Integer bioEnd = null;
 	private AbstractSequence<?> parentSequence = null;
 	private String source = null;
-	private ArrayList<String> notesList = new ArrayList<>();
+	private List<String> notesList = new ArrayList<>();
 	private Double sequenceScore = null;
 	private FeaturesKeyWordInterface featuresKeyWord = null;
 	private DatabaseReferenceInterface databaseReferences = null;
 	private FeatureRetriever featureRetriever = null;
-	private ArrayList<FeatureInterface<AbstractSequence<C>, C>> features =
+	private List<FeatureInterface<AbstractSequence<C>, C>> features =
 			new ArrayList<>();
-	private LinkedHashMap<String, ArrayList<FeatureInterface<AbstractSequence<C>, C>>> groupedFeatures =
+	private Map<String, List<FeatureInterface<AbstractSequence<C>, C>>> groupedFeatures =
 			new LinkedHashMap<>();
 	private List<String> comments = new ArrayList<>();
 	private List<AbstractReference> references;
@@ -139,7 +139,7 @@ public void setProxySequenceReader(SequenceReader<C> proxyLoader) {
 			}
 			// success of next statement guaranteed because source is a compulsory field
 			//DBReferenceInfo dbQualifier = (DBReferenceInfo)ff.get("source").get(0).getQualifiers().get("db_xref");
-			ArrayList<DBReferenceInfo> dbQualifiers = (ArrayList)ff.get("source").get(0).getQualifiers().get("db_xref");
+			List<DBReferenceInfo> dbQualifiers = (ArrayList)ff.get("source").get(0).getQualifiers().get("db_xref");
 			DBReferenceInfo dbQualifier = dbQualifiers.get(0);
 
 			if (dbQualifier != null) this.setTaxonomy(new TaxonomyID(dbQualifier.getDatabase()+":"+dbQualifier.getId(), DataSource.UNKNOWN));
@@ -303,14 +303,14 @@ public void removeNote(String note) {
 	/**
 	 * @return the notesList
 	 */
-	public ArrayList<String> getNotesList() {
+	public List<String> getNotesList() {
 		return notesList;
 	}
 
 	/**
 	 * @param notesList the notesList to set
 	 */
-	public void setNotesList(ArrayList<String> notesList) {
+	public void setNotesList(List<String> notesList) {
 		this.notesList = notesList;
 	}
 
@@ -353,7 +353,7 @@ public void setReferences(List<AbstractReference> references) {
 	 * @return
 	 */
 	public List<FeatureInterface<AbstractSequence<C>, C>> getFeatures(String featureType, int bioSequencePosition) {
-		ArrayList<FeatureInterface<AbstractSequence<C>, C>> featureHits =
+		List<FeatureInterface<AbstractSequence<C>, C>> featureHits =
 				new ArrayList<>();
 		List<FeatureInterface<AbstractSequence<C>, C>> features = getFeaturesByType(featureType);
 		if (features != null) {
@@ -372,7 +372,7 @@ public List<FeatureInterface<AbstractSequence<C>, C>> getFeatures(String feature
 	 * @return
 	 */
 	public List<FeatureInterface<AbstractSequence<C>, C>> getFeatures(int bioSequencePosition) {
-		ArrayList<FeatureInterface<AbstractSequence<C>, C>> featureHits =
+		List<FeatureInterface<AbstractSequence<C>, C>> featureHits =
 				new ArrayList<>();
 		if (features != null) {
 			for (FeatureInterface<AbstractSequence<C>, C> feature : features) {
@@ -414,7 +414,7 @@ public void addFeature(int bioStart, int bioEnd, FeatureInterface<AbstractSequen
 	 */
 	public void addFeature(FeatureInterface<AbstractSequence<C>, C> feature) {
 		features.add(feature);
-		ArrayList<FeatureInterface<AbstractSequence<C>, C>> featureList = groupedFeatures.get(feature.getType());
+		List<FeatureInterface<AbstractSequence<C>, C>> featureList = groupedFeatures.get(feature.getType());
 		if (featureList == null) {
 			featureList = new ArrayList<>();
 			groupedFeatures.put(feature.getType(), featureList);
@@ -430,7 +430,7 @@ public void addFeature(FeatureInterface<AbstractSequence<C>, C> feature) {
 	 */
 	public void removeFeature(FeatureInterface<AbstractSequence<C>, C> feature) {
 		features.remove(feature);
-		ArrayList<FeatureInterface<AbstractSequence<C>, C>> featureList = groupedFeatures.get(feature.getType());
+		List<FeatureInterface<AbstractSequence<C>, C>> featureList = groupedFeatures.get(feature.getType());
 		if (featureList != null) {
 			featureList.remove(feature);
 			if (featureList.isEmpty()) {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java
index 1b395828b5..ad252374d9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/SingleLinkageClusterer.java
@@ -87,7 +87,7 @@ public String toString() {
 
 	//private Set<Integer> toSkip;
 
-	private ArrayList<Integer> indicesToCheck;
+	private List<Integer> indicesToCheck;
 
 
 	/**
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
index 4344063e1d..64aee3849a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
@@ -44,6 +44,7 @@
 
 import static org.biojava.nbio.core.sequence.io.util.IOUtils.close;
 import static org.biojava.nbio.core.sequence.io.util.IOUtils.openFile;
+import java.util.List;
 
 /**
  * Helper methods to simplify boilerplate XML parsing code for  {@code}org.w3c.dom{@code} XML objects
@@ -206,8 +207,8 @@ public static Element selectSingleElement(Element element, String xpathExpressio
 	 * @return A possibly empty but non-null {@code}ArrayList{@code}
 	 * @throws XPathExpressionException
 	 */
-	public static ArrayList<Element> selectElements(Element element, String xpathExpression) throws XPathExpressionException {
-		ArrayList<Element> resultVector = new ArrayList<>();
+	public static List<Element> selectElements(Element element, String xpathExpression) throws XPathExpressionException {
+		List<Element> resultVector = new ArrayList<>();
 		if (element == null) {
 			return resultVector;
 		}
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
index ecb1e7d1b2..e2cb30459a 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/GeneSequenceTest.java
@@ -129,7 +129,7 @@ void returnedIntronCollectionsAreNotMutable() throws Exception {
         geneSequence.addExon(new AccessionID("a"), 20, 50);
         geneSequence.addExon(new AccessionID("b"), 80, 100);
         geneSequence.addIntronsUsingExons();
-        ArrayList<IntronSequence> introns  =  geneSequence.getIntronSequences();
+        List<IntronSequence> introns  =  geneSequence.getIntronSequences();
         assertEquals(1, introns.size());
         introns.remove(0);
         assertEquals(1, geneSequence.getIntronSequences().size());
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankCookbookTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankCookbookTest.java
index d6018a5eaf..132a36d816 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankCookbookTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankCookbookTest.java
@@ -33,6 +33,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  *
@@ -90,12 +91,12 @@ public void testProcess() throws Throwable {
 		//File protFile = new File("src/test/resources/BondFeature.gb");
 		ClasspathResource protResource = new ClasspathResource("BondFeature.gb");
 
-		LinkedHashMap<String, DNASequence> dnaSequences = GenbankReaderHelper.readGenbankDNASequence(dnaResource.getInputStream());
+		Map<String, DNASequence> dnaSequences = GenbankReaderHelper.readGenbankDNASequence(dnaResource.getInputStream());
 		for (DNASequence sequence : dnaSequences.values()) {
 			logger.debug("DNA Sequence: {}", sequence.getSequenceAsString());
 		}
 
-		LinkedHashMap<String, ProteinSequence> protSequences = GenbankReaderHelper.readGenbankProteinSequence(protResource.getInputStream());
+		Map<String, ProteinSequence> protSequences = GenbankReaderHelper.readGenbankProteinSequence(protResource.getInputStream());
 		for (ProteinSequence sequence : protSequences.values()) {
 			logger.debug("Protein Sequence: {}", sequence.getSequenceAsString());
 		}
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
index cdd466f6f0..0eb3995046 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankWriterTest.java
@@ -63,7 +63,7 @@ public void testProcess() throws Exception {
 
 		InputStream inStream = GenbankWriterTest.class.getResourceAsStream("/NM_000266.gb");
 		//File dnaFile = new File("src/test/resources/NM_000266.gb");
-		LinkedHashMap<String, DNASequence> dnaSequences = GenbankReaderHelper.readGenbankDNASequence( inStream );
+		Map<String, DNASequence> dnaSequences = GenbankReaderHelper.readGenbankDNASequence( inStream );
 		ByteArrayOutputStream fragwriter = new ByteArrayOutputStream();
 		ArrayList<DNASequence> seqs = new ArrayList<DNASequence>();
 		for(DNASequence seq : dnaSequences.values()) {
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
index 0a9ace033f..d9eb23589d 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/util/XMLHelperTest.java
@@ -12,6 +12,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.List;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
@@ -148,7 +149,7 @@ void before() throws SAXException, IOException, ParserConfigurationException {
         @Test
         void selectMultipleElementsWithXPath()
                 throws  XPathExpressionException {
-            ArrayList<Element> selected = XMLHelper.selectElements(root, "/root/list/a");
+            List<Element> selected = XMLHelper.selectElements(root, "/root/list/a");
             assertEquals(2, selected.size());
         }
 
@@ -157,7 +158,7 @@ void selectMultipleElementsWithXPathSearchesWholeTree()
                 throws  XPathExpressionException {
             Element a1  = (Element) doc.getElementsByTagName("a").item(0);
             
-            ArrayList<Element> selected = XMLHelper.selectElements(a1, "/root");
+            List<Element> selected = XMLHelper.selectElements(a1, "/root");
             assertEquals(1, selected.size());
             assertEquals("root", selected.get(0).getTagName());
         }
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/GeneFeatureHelper.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/GeneFeatureHelper.java
index 681ddb0910..0090ce7786 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/GeneFeatureHelper.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/GeneFeatureHelper.java
@@ -32,6 +32,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  *
@@ -43,7 +44,7 @@ public class GeneFeatureHelper {
 
 	static public LinkedHashMap<String, ChromosomeSequence> loadFastaAddGeneFeaturesFromUpperCaseExonFastaFile(File fastaSequenceFile, File uppercaseFastaFile, boolean throwExceptionGeneNotFound) throws Exception {
 		LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList = new LinkedHashMap<>();
-		LinkedHashMap<String, DNASequence> dnaSequenceList = FastaReaderHelper.readFastaDNASequence(fastaSequenceFile);
+		Map<String, DNASequence> dnaSequenceList = FastaReaderHelper.readFastaDNASequence(fastaSequenceFile);
 		for (String accession : dnaSequenceList.keySet()) {
 			DNASequence contigSequence = dnaSequenceList.get(accession);
 			ChromosomeSequence chromsomeSequence = new ChromosomeSequence(contigSequence.getSequenceAsString());
@@ -52,7 +53,7 @@ static public LinkedHashMap<String, ChromosomeSequence> loadFastaAddGeneFeatures
 		}
 
 
-		LinkedHashMap<String, DNASequence> geneSequenceList = FastaReaderHelper.readFastaDNASequence(uppercaseFastaFile);
+		Map<String, DNASequence> geneSequenceList = FastaReaderHelper.readFastaDNASequence(uppercaseFastaFile);
 		for (DNASequence dnaSequence : geneSequenceList.values()) {
 			String geneSequence = dnaSequence.getSequenceAsString();
 			String lcGeneSequence = geneSequence.toLowerCase();
@@ -162,7 +163,7 @@ static public LinkedHashMap<String, ChromosomeSequence> loadFastaAddGeneFeatures
 	 * @throws Exception
 	 */
 	static public void outputFastaSequenceLengthGFF3(File fastaSequenceFile, File gffFile) throws Exception {
-		LinkedHashMap<String, DNASequence> dnaSequenceList = FastaReaderHelper.readFastaDNASequence(fastaSequenceFile);
+		Map<String, DNASequence> dnaSequenceList = FastaReaderHelper.readFastaDNASequence(fastaSequenceFile);
 		String fileName = fastaSequenceFile.getName();
 		FileWriter fw = new FileWriter(gffFile);
 		String newLine = System.getProperty("line.separator");
@@ -182,9 +183,9 @@ static public void outputFastaSequenceLengthGFF3(File fastaSequenceFile, File gf
 	 * @return
 	 * @throws Exception
 	 */
-	static public LinkedHashMap<String, ChromosomeSequence> loadFastaAddGeneFeaturesFromGeneIDGFF2(File fastaSequenceFile, File gffFile) throws Exception {
-		LinkedHashMap<String, DNASequence> dnaSequenceList = FastaReaderHelper.readFastaDNASequence(fastaSequenceFile);
-		LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper.getChromosomeSequenceFromDNASequence(dnaSequenceList);
+	static public Map<String, ChromosomeSequence> loadFastaAddGeneFeaturesFromGeneIDGFF2(File fastaSequenceFile, File gffFile) throws Exception {
+		Map<String, DNASequence> dnaSequenceList = FastaReaderHelper.readFastaDNASequence(fastaSequenceFile);
+		Map<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper.getChromosomeSequenceFromDNASequence(dnaSequenceList);
 		FeatureList listGenes = GeneIDGFF2Reader.read(gffFile.getAbsolutePath());
 		addGeneIDGFF2GeneFeatures(chromosomeSequenceList, listGenes);
 		return chromosomeSequenceList;
@@ -197,7 +198,7 @@ static public LinkedHashMap<String, ChromosomeSequence> loadFastaAddGeneFeatures
 	 * @param listGenes
 	 * @throws Exception
 	 */
-	static public void addGeneIDGFF2GeneFeatures(LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList, FeatureList listGenes) throws Exception {
+	static public void addGeneIDGFF2GeneFeatures(Map<String, ChromosomeSequence> chromosomeSequenceList, FeatureList listGenes) throws Exception {
 		Collection<String> geneIds = listGenes.attributeValues("gene_id");
 		for (String geneid : geneIds) {
 			FeatureList gene = listGenes.selectByAttribute("gene_id", geneid);
@@ -313,7 +314,7 @@ static public void addGeneIDGFF2GeneFeatures(LinkedHashMap<String, ChromosomeSeq
 
 	}
 
-	static public LinkedHashMap<String, ChromosomeSequence> getChromosomeSequenceFromDNASequence(LinkedHashMap<String, DNASequence> dnaSequenceList) {
+	static public Map<String, ChromosomeSequence> getChromosomeSequenceFromDNASequence(Map<String, DNASequence> dnaSequenceList) {
 		LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList = new LinkedHashMap<>();
 		for (String key : dnaSequenceList.keySet()) {
 			DNASequence dnaSequence = dnaSequenceList.get(key);
@@ -334,9 +335,9 @@ static public LinkedHashMap<String, ChromosomeSequence> getChromosomeSequenceFro
 	 * @return
 	 * @throws Exception
 	 */
-	static public LinkedHashMap<String, ChromosomeSequence> loadFastaAddGeneFeaturesFromGmodGFF3(File fastaSequenceFile, File gffFile,boolean lazyloadsequences) throws Exception {
-		LinkedHashMap<String, DNASequence> dnaSequenceList = FastaReaderHelper.readFastaDNASequence(fastaSequenceFile,lazyloadsequences);
-		LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper.getChromosomeSequenceFromDNASequence(dnaSequenceList);
+	static public Map<String, ChromosomeSequence> loadFastaAddGeneFeaturesFromGmodGFF3(File fastaSequenceFile, File gffFile,boolean lazyloadsequences) throws Exception {
+		Map<String, DNASequence> dnaSequenceList = FastaReaderHelper.readFastaDNASequence(fastaSequenceFile,lazyloadsequences);
+		Map<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper.getChromosomeSequenceFromDNASequence(dnaSequenceList);
 		FeatureList listGenes = GFF3Reader.read(gffFile.getAbsolutePath());
 		addGmodGFF3GeneFeatures(chromosomeSequenceList, listGenes);
 		return chromosomeSequenceList;
@@ -348,7 +349,7 @@ static public LinkedHashMap<String, ChromosomeSequence> loadFastaAddGeneFeatures
 	 * @param listGenes
 	 * @throws Exception
 	 */
-	static public void addGmodGFF3GeneFeatures(LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList, FeatureList listGenes) throws Exception {
+	static public void addGmodGFF3GeneFeatures(Map<String, ChromosomeSequence> chromosomeSequenceList, FeatureList listGenes) throws Exception {
 
 
 		// key off mRNA as being a known feature that may or may not have a parent gene
@@ -532,15 +533,15 @@ static public void addGmodGFF3GeneFeatures(LinkedHashMap<String, ChromosomeSeque
 
 	}
 
-	static public LinkedHashMap<String, ChromosomeSequence> loadFastaAddGeneFeaturesFromGlimmerGFF3(File fastaSequenceFile, File gffFile) throws Exception {
-		LinkedHashMap<String, DNASequence> dnaSequenceList = FastaReaderHelper.readFastaDNASequence(fastaSequenceFile);
-		LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper.getChromosomeSequenceFromDNASequence(dnaSequenceList);
+	static public Map<String, ChromosomeSequence> loadFastaAddGeneFeaturesFromGlimmerGFF3(File fastaSequenceFile, File gffFile) throws Exception {
+		Map<String, DNASequence> dnaSequenceList = FastaReaderHelper.readFastaDNASequence(fastaSequenceFile);
+		Map<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper.getChromosomeSequenceFromDNASequence(dnaSequenceList);
 		FeatureList listGenes = GFF3Reader.read(gffFile.getAbsolutePath());
 		addGlimmerGFF3GeneFeatures(chromosomeSequenceList, listGenes);
 		return chromosomeSequenceList;
 	}
 
-	static public void addGlimmerGFF3GeneFeatures(LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList, FeatureList listGenes) throws Exception {
+	static public void addGlimmerGFF3GeneFeatures(Map<String, ChromosomeSequence> chromosomeSequenceList, FeatureList listGenes) throws Exception {
 		FeatureList mRNAFeatures = listGenes.selectByType("mRNA");
 		for (FeatureI f : mRNAFeatures) {
 			Feature mRNAFeature = (Feature) f;
@@ -677,15 +678,15 @@ static public void addGlimmerGFF3GeneFeatures(LinkedHashMap<String, ChromosomeSe
 
 	}
 
-	static public LinkedHashMap<String, ChromosomeSequence> loadFastaAddGeneFeaturesFromGeneMarkGTF(File fastaSequenceFile, File gffFile) throws Exception {
-		LinkedHashMap<String, DNASequence> dnaSequenceList = FastaReaderHelper.readFastaDNASequence(fastaSequenceFile);
-		LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper.getChromosomeSequenceFromDNASequence(dnaSequenceList);
+	static public Map<String, ChromosomeSequence> loadFastaAddGeneFeaturesFromGeneMarkGTF(File fastaSequenceFile, File gffFile) throws Exception {
+		Map<String, DNASequence> dnaSequenceList = FastaReaderHelper.readFastaDNASequence(fastaSequenceFile);
+		Map<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper.getChromosomeSequenceFromDNASequence(dnaSequenceList);
 		FeatureList listGenes = GeneMarkGTFReader.read(gffFile.getAbsolutePath());
 		addGeneMarkGTFGeneFeatures(chromosomeSequenceList, listGenes);
 		return chromosomeSequenceList;
 	}
 
-	static public void addGeneMarkGTFGeneFeatures(LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList, FeatureList listGenes) throws Exception {
+	static public void addGeneMarkGTFGeneFeatures(Map<String, ChromosomeSequence> chromosomeSequenceList, FeatureList listGenes) throws Exception {
 		Collection<String> geneIds = listGenes.attributeValues("gene_id");
 		for (String geneid : geneIds) {
 			//       if(geneid.equals("45_g")){
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
index e8d7666348..bc6893d19d 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
@@ -87,7 +87,7 @@ public void process(LinkedHashMap<String, ArrayList<String>> hits, LinkedHashMap
 
 
 					String predictedProteinSequence = transcriptSequence.getProteinSequence().getSequenceAsString();
-					ArrayList<ProteinSequence> cdsProteinList = transcriptSequence.getProteinCDSSequences();
+					List<ProteinSequence> cdsProteinList = transcriptSequence.getProteinCDSSequences();
 
 					ArrayList<CDSSequence> cdsSequenceList = new ArrayList<>(transcriptSequence.getCDSSequences().values());
 					String testSequence = "";
@@ -228,7 +228,7 @@ PairwiseSequenceAlignerType.LOCAL, new SimpleGapPenalty(),
 										for (DBReferenceInfo note : goList) {
 											notes = notes + " " + note.getId();
 											geneSequence.addNote(note.getId()); // add note/keyword which can be output in fasta header if needed
-											LinkedHashMap<String, String> properties = note.getProperties();
+											Map<String, String> properties = note.getProperties();
 											for (String propertytype : properties.keySet()) {
 												if ("evidence".equals(propertytype)) {
 													continue;
@@ -292,7 +292,7 @@ public static void main(String[] args) {
 		*/
 
 			try {
-				LinkedHashMap<String, ChromosomeSequence> dnaSequenceHashMap = GeneFeatureHelper.loadFastaAddGeneFeaturesFromGlimmerGFF3(new File("/Users/Scooter/scripps/dyadic/analysis/454Scaffolds/454Scaffolds-16.fna"), new File("/Users/Scooter/scripps/dyadic/GlimmerHMM/c1_glimmerhmm-16.gff"));
+				Map<String, ChromosomeSequence> dnaSequenceHashMap = GeneFeatureHelper.loadFastaAddGeneFeaturesFromGlimmerGFF3(new File("/Users/Scooter/scripps/dyadic/analysis/454Scaffolds/454Scaffolds-16.fna"), new File("/Users/Scooter/scripps/dyadic/GlimmerHMM/c1_glimmerhmm-16.gff"));
 				LinkedHashMap<String, GeneSequence> geneSequenceList = GeneFeatureHelper.getGeneSequences(dnaSequenceHashMap.values());
 				FileOutputStream fo = new FileOutputStream("/Users/Scooter/scripps/dyadic/outputGlimmer/genemark_uniprot_match-16.gff3");
 				LinkedHashMap<String, ArrayList<String>> blasthits = BlastHomologyHits.getMatches(new File("/Users/Scooter/scripps/dyadic/blastresults/c1_glimmer_in_uniprot.xml"), 1E-10);
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/geneid/GeneIDXMLReader.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/geneid/GeneIDXMLReader.java
index b509f73ab7..b68074e080 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/geneid/GeneIDXMLReader.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/geneid/GeneIDXMLReader.java
@@ -33,6 +33,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 
 /**
  *
@@ -52,7 +53,7 @@ public GeneIDXMLReader(String geneidXMLFile) throws Exception {
 
 	public LinkedHashMap<String, ProteinSequence> getProteinSequences() throws Exception {
 		LinkedHashMap<String, ProteinSequence> proteinSequenceList = new LinkedHashMap<>();
-		ArrayList<Element> elementList = XMLHelper.selectElements(geneidDoc.getDocumentElement(), "prediction/gene/protein");
+		List<Element> elementList = XMLHelper.selectElements(geneidDoc.getDocumentElement(), "prediction/gene/protein");
 		logger.info("{} hits", elementList.size());
 
 		for (Element proteinElement : elementList) {
@@ -69,7 +70,7 @@ public LinkedHashMap<String, ProteinSequence> getProteinSequences() throws Excep
 
 	public LinkedHashMap<String, DNASequence> getDNACodingSequences() throws Exception {
 		LinkedHashMap<String, DNASequence> dnaSequenceList = new LinkedHashMap<>();
-		ArrayList<Element> elementList = XMLHelper.selectElements(geneidDoc.getDocumentElement(), "prediction/gene/cDNA");
+		List<Element> elementList = XMLHelper.selectElements(geneidDoc.getDocumentElement(), "prediction/gene/cDNA");
 		logger.info("{} hits", elementList.size());
 
 		for (Element dnaElement : elementList) {
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java
index 4d5980fa23..7432729d97 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java
@@ -26,6 +26,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -39,7 +41,7 @@ public class GFF3Writer {
 	 * @param chromosomeSequenceList
 	 * @throws Exception
 	 */
-	public void write(OutputStream outputStream, LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList) throws Exception {
+	public void write(OutputStream outputStream, Map<String, ChromosomeSequence> chromosomeSequenceList) throws Exception {
 
 		outputStream.write("##gff-version 3\n".getBytes());
 		for (String key : chromosomeSequenceList.keySet()) {
@@ -117,7 +119,7 @@ public void write(OutputStream outputStream, LinkedHashMap<String, ChromosomeSeq
 
 	}
 
-	private String getGFF3Note(ArrayList<String> notesList) {
+	private String getGFF3Note(List<String> notesList) {
 		String notes = "";
 
 		if (notesList.size() > 0) {
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/query/BlastXMLQuery.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/query/BlastXMLQuery.java
index 3f3cccf654..06d65933a9 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/query/BlastXMLQuery.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/query/BlastXMLQuery.java
@@ -29,6 +29,7 @@
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 
 /**
  *
@@ -49,19 +50,19 @@ public BlastXMLQuery(String blastFile) throws Exception {
 	public LinkedHashMap<String, ArrayList<String>> getHitsQueryDef(double maxEScore) throws Exception {
 		LinkedHashMap<String, ArrayList<String>> hitsHashMap = new LinkedHashMap<>();
 		logger.info("Query for hits");
-		ArrayList<Element> elementList = XMLHelper.selectElements(blastDoc.getDocumentElement(), "BlastOutput_iterations/Iteration[Iteration_hits]");
+		List<Element> elementList = XMLHelper.selectElements(blastDoc.getDocumentElement(), "BlastOutput_iterations/Iteration[Iteration_hits]");
 		logger.info("{} hits", elementList.size());
 
 		for (Element element : elementList) {
 			Element iterationquerydefElement = XMLHelper.selectSingleElement(element, "Iteration_query-def");
 			String querydef = iterationquerydefElement.getTextContent();
 			Element iterationHitsElement = XMLHelper.selectSingleElement(element, "Iteration_hits");
-			ArrayList<Element> hitList = XMLHelper.selectElements(iterationHitsElement, "Hit");
+			List<Element> hitList = XMLHelper.selectElements(iterationHitsElement, "Hit");
 			for (Element hitElement : hitList) {
 				Element hitaccessionElement = XMLHelper.selectSingleElement(hitElement, "Hit_accession");
 				String hitaccession = hitaccessionElement.getTextContent();
 				Element hithspsElement = XMLHelper.selectSingleElement(hitElement, "Hit_hsps");
-				ArrayList<Element> hspList = XMLHelper.selectElements(hithspsElement, "Hsp");
+				List<Element> hspList = XMLHelper.selectElements(hithspsElement, "Hsp");
 				for (Element hspElement : hspList) {
 					Element evalueElement = XMLHelper.selectSingleElement(hspElement, "Hsp_evalue");
 					String value = evalueElement.getTextContent();
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/util/SplitFasta.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/util/SplitFasta.java
index 9018749f33..374dd378a1 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/util/SplitFasta.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/util/SplitFasta.java
@@ -30,6 +30,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 
 /**
@@ -44,7 +45,7 @@ public void processNucleotides(File fastaFileName,String uniqueid, File outputDi
 		if(!outputDirectory.exists())
 			outputDirectory.mkdirs();
 
-		LinkedHashMap<String,DNASequence> dnaSequenceHashMap = FastaReaderHelper.readFastaDNASequence(fastaFileName);
+		Map<String,DNASequence> dnaSequenceHashMap = FastaReaderHelper.readFastaDNASequence(fastaFileName);
 		for(DNASequence dnaSequence : dnaSequenceHashMap.values()){
 			String fileName = outputDirectory.getAbsolutePath() + File.separatorChar;
 			if(uniqueid.length() > 0){
diff --git a/biojava-genome/src/test/java/org/biojava/nbio/genome/GeneFeatureHelperTest.java b/biojava-genome/src/test/java/org/biojava/nbio/genome/GeneFeatureHelperTest.java
index ba0a5d21a3..e5e1a8379d 100644
--- a/biojava-genome/src/test/java/org/biojava/nbio/genome/GeneFeatureHelperTest.java
+++ b/biojava-genome/src/test/java/org/biojava/nbio/genome/GeneFeatureHelperTest.java
@@ -39,6 +39,7 @@
 import java.nio.file.Files;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  *
@@ -112,7 +113,7 @@ public void testOutputFastaSequenceLengthGFF3() throws Exception {
 
 	@Test
 	public void testAddGFF3Note() throws Exception {
-		LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper
+		Map<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper
 				.loadFastaAddGeneFeaturesFromGmodGFF3(new File("src/test/resources/volvox_all.fna"), new File(
 						"src/test/resources/volvox.gff3"), false);
 		ChromosomeSequence ctgASequence = chromosomeSequenceList.get("ctgA");
@@ -128,10 +129,10 @@ public void testAddGFF3Note() throws Exception {
 	 */
 	@Test
 	public void testGetProteinSequences() throws Exception {
-		LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper
+		Map<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper
 				.loadFastaAddGeneFeaturesFromGmodGFF3(new File("src/test/resources/volvox_all.fna"), new File(
 						"src/test/resources/volvox.gff3"), false);
-		LinkedHashMap<String, ProteinSequence> proteinSequenceList = GeneFeatureHelper
+		Map<String, ProteinSequence> proteinSequenceList = GeneFeatureHelper
 				.getProteinSequences(chromosomeSequenceList.values());
 		// for(ProteinSequence proteinSequence : proteinSequenceList.values()){
 		// logger.info("Output={}", proteinSequence.getSequenceAsString());
@@ -149,10 +150,10 @@ public void testGetProteinSequences() throws Exception {
 	@Test
 	public void testGetGeneSequences() throws Exception {
 		// logger.info("getGeneSequences");
-		LinkedHashMap<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper
+		Map<String, ChromosomeSequence> chromosomeSequenceList = GeneFeatureHelper
 				.loadFastaAddGeneFeaturesFromGmodGFF3(new File("src/test/resources/volvox_all.fna"), new File(
 						"src/test/resources/volvox.gff3"), true);
-		LinkedHashMap<String, GeneSequence> geneSequenceHashMap = GeneFeatureHelper
+		Map<String, GeneSequence> geneSequenceHashMap = GeneFeatureHelper
 				.getGeneSequences(chromosomeSequenceList.values());
 		Collection<GeneSequence> geneSequences = geneSequenceHashMap.values();
 

From 0f4983ccc4d72289ad6439e8351167b44a39e7e7 Mon Sep 17 00:00:00 2001
From: jlerbsc <jean-pierre.lerbscher@jperf.com>
Date: Wed, 12 Jun 2024 16:39:08 +0200
Subject: [PATCH 493/599] Fix issue s1319 Declarations should use Java
 collection interfaces on biojava-core and dependencies

---
 .../biojava/nbio/aaproperties/CommandPrompt.java |  6 +++---
 .../src/main/java/demo/DemoDistanceTree.java     |  3 ++-
 .../biojava/nbio/phylo/TestForesterWrapper.java  |  3 ++-
 .../main/java/demo/DemoSixFrameTranslation.java  |  2 +-
 .../src/main/java/demo/ParseFastaFileDemo.java   |  4 +++-
 .../nbio/core/sequence/io/FastaReader.java       |  9 +++++----
 .../nbio/core/sequence/io/GenbankReader.java     |  9 +++++----
 .../biojava/nbio/core/fasta/TestFASTAReader.java | 13 +++++++------
 .../nbio/core/sequence/io/FastaReaderTest.java   |  9 +++++----
 .../nbio/core/sequence/io/GenbankReaderTest.java | 16 ++++++++--------
 .../structure/io/FastaAFPChainConverter.java     |  4 ++--
 .../nbio/structure/io/FastaStructureParser.java  |  3 ++-
 12 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/CommandPrompt.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/CommandPrompt.java
index 727c83b388..514ccfbc54 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/CommandPrompt.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/CommandPrompt.java
@@ -82,7 +82,7 @@ private static void readInputAndGenerateOutput(String outputLocation, List<Chara
 		else
 			output = System.out;
 		printHeader(output, propertyList, specificList, delimiter);
-		LinkedHashMap<String, ProteinSequence> a = readInputFile(inputLocation, aaTable);
+		Map<String, ProteinSequence> a = readInputFile(inputLocation, aaTable);
 		//Need for the last sequence
 		for(Entry<String, ProteinSequence> entry:a.entrySet()){
 			compute(output, entry.getValue().getOriginalHeader(), entry.getValue().getSequenceAsString().trim(), delimiter, aaTable, propertyList, specificList,
@@ -169,7 +169,7 @@ public static void run(String[] args) throws Exception{
 		readInputAndGenerateOutput(outputLocation, propertyList, specificList, delimiter, inputLocation, aaTable, decimalPlace);
 	}
 
-	private static LinkedHashMap<String, ProteinSequence> readInputFile(String inputLocation, AminoAcidCompositionTable aaTable) throws Exception{
+	private static Map<String, ProteinSequence> readInputFile(String inputLocation, AminoAcidCompositionTable aaTable) throws Exception{
 		FileInputStream inStream = new FileInputStream(inputLocation);
 		CompoundSet<AminoAcidCompound>	set;
 		if(aaTable == null){
@@ -177,7 +177,7 @@ private static LinkedHashMap<String, ProteinSequence> readInputFile(String input
 		}else{
 			set = aaTable.getAminoAcidCompoundSet();
 		}
-		LinkedHashMap<String, ProteinSequence> ret;
+		Map<String, ProteinSequence> ret;
 		if ( inputLocation.toLowerCase().contains(".gb")) {
 			GenbankReader<ProteinSequence, AminoAcidCompound> genbankReader = new GenbankReader<>(
 					inStream, new GenericGenbankHeaderParser<ProteinSequence, AminoAcidCompound>(),
diff --git a/biojava-alignment/src/main/java/demo/DemoDistanceTree.java b/biojava-alignment/src/main/java/demo/DemoDistanceTree.java
index e7e0561a9d..9215fa43dc 100644
--- a/biojava-alignment/src/main/java/demo/DemoDistanceTree.java
+++ b/biojava-alignment/src/main/java/demo/DemoDistanceTree.java
@@ -22,6 +22,7 @@
 
 import java.io.InputStream;
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 import org.biojava.nbio.core.alignment.matrices.SubstitutionMatrixHelper;
 import org.biojava.nbio.core.alignment.template.SubstitutionMatrix;
@@ -64,7 +65,7 @@ public static void main(String[] args) throws Exception {
 				new ProteinSequenceCreator(AminoAcidCompoundSet
 						.getAminoAcidCompoundSet()));
 
-		LinkedHashMap<String, ProteinSequence> proteinSequences =
+		Map<String, ProteinSequence> proteinSequences =
 				fastaReader.process();
 
 		inStream.close();
diff --git a/biojava-alignment/src/test/java/org/biojava/nbio/phylo/TestForesterWrapper.java b/biojava-alignment/src/test/java/org/biojava/nbio/phylo/TestForesterWrapper.java
index c4fe468852..6f7d749a0a 100644
--- a/biojava-alignment/src/test/java/org/biojava/nbio/phylo/TestForesterWrapper.java
+++ b/biojava-alignment/src/test/java/org/biojava/nbio/phylo/TestForesterWrapper.java
@@ -24,6 +24,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 import org.biojava.nbio.core.sequence.MultipleSequenceAlignment;
 import org.biojava.nbio.core.sequence.ProteinSequence;
@@ -61,7 +62,7 @@ public void testMSAconversion() throws Exception {
 				new ProteinSequenceCreator(AminoAcidCompoundSet
 						.getAminoAcidCompoundSet()));
 
-		LinkedHashMap<String, ProteinSequence> proteinSequences = fastaReader
+		Map<String, ProteinSequence> proteinSequences = fastaReader
 				.process();
 
 		inStream.close();
diff --git a/biojava-core/src/main/java/demo/DemoSixFrameTranslation.java b/biojava-core/src/main/java/demo/DemoSixFrameTranslation.java
index cf321baee6..57b1560841 100644
--- a/biojava-core/src/main/java/demo/DemoSixFrameTranslation.java
+++ b/biojava-core/src/main/java/demo/DemoSixFrameTranslation.java
@@ -112,7 +112,7 @@ public static void main(String[] args){
 							new DNASequenceCreator(ambiguityDNACompoundSet));
 
 			// has only one entry in this example, but could be easily extended to parse a FASTA file with multiple sequences
-			LinkedHashMap<String, DNASequence> dnaSequences = proxy.process();
+			Map<String, DNASequence> dnaSequences = proxy.process();
 
 			// Initialize the Transcription Engine
 			TranscriptionEngine engine = new
diff --git a/biojava-core/src/main/java/demo/ParseFastaFileDemo.java b/biojava-core/src/main/java/demo/ParseFastaFileDemo.java
index 7361de9974..9ad1bacbb4 100644
--- a/biojava-core/src/main/java/demo/ParseFastaFileDemo.java
+++ b/biojava-core/src/main/java/demo/ParseFastaFileDemo.java
@@ -24,6 +24,8 @@
 import java.io.File;
 import java.io.InputStream;
 import java.util.LinkedHashMap;
+import java.util.Map;
+
 import org.biojava.nbio.core.sequence.ProteinSequence;
 import org.biojava.nbio.core.sequence.compound.AminoAcidCompound;
 import org.biojava.nbio.core.sequence.compound.AminoAcidCompoundSet;
@@ -99,7 +101,7 @@ public static void main(String[] args) throws Exception {
 				new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>(),
 				new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
 
-		LinkedHashMap<String, ProteinSequence> b;
+		Map<String, ProteinSequence> b;
 
 		int nrSeq = 0;
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java
index bdcc197f7e..f818adddd0 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReader.java
@@ -35,6 +35,7 @@
 import java.io.*;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * Use FastaReaderHelper as an example of how to use this class where FastaReaderHelper should be the
@@ -104,8 +105,8 @@ public FastaReader(File file, SequenceHeaderParserInterface<S,C> headerParser,
 	 * present, starting current fileIndex onwards.
 	 * @throws IOException if an error occurs reading the input file
 	 */
-	public LinkedHashMap<String,S> process() throws IOException {
-		LinkedHashMap<String,S> sequences = process(-1);
+	public Map<String, S> process() throws IOException {
+		Map<String, S> sequences = process(-1);
 		close();
 
 		return sequences;
@@ -131,7 +132,7 @@ public LinkedHashMap<String,S> process() throws IOException {
 	 * present, starting current fileIndex onwards.
 	 * @throws IOException if an error occurs reading the input file
 	 */
-	public LinkedHashMap<String,S> process(int max) throws IOException {
+	public Map<String, S> process(int max) throws IOException {
 
 
 		String line = "";
@@ -148,7 +149,7 @@ public LinkedHashMap<String,S> process(int max) throws IOException {
 		boolean keepGoing = true;
 
 
-		LinkedHashMap<String,S> sequences = new LinkedHashMap<>();
+		Map<String, S> sequences = new LinkedHashMap<>();
 
 		do {
 			line = line.trim(); // nice to have but probably not needed
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
index 1b182f02dc..e2f4e8bf25 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
@@ -48,6 +48,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Use {@link GenbankReaderHelper} as an example of how to use this class where {@link GenbankReaderHelper} should be the
@@ -119,8 +120,8 @@ public GenbankReader(
 	 * @throws CompoundNotFoundException
 	 * @throws OutOfMemoryError if the input resource is larger than the allocated heap.
 	 */
-	public LinkedHashMap<String,S> process() throws IOException, CompoundNotFoundException {
-		LinkedHashMap<String,S> result = process(-1);
+	public Map<String, S> process() throws IOException, CompoundNotFoundException {
+		Map<String, S> result = process(-1);
 		close();
 		return result;
 	}
@@ -147,13 +148,13 @@ public LinkedHashMap<String,S> process() throws IOException, CompoundNotFoundExc
 	 * @throws IOException
 	 * @throws CompoundNotFoundException
 	 */
-	public LinkedHashMap<String,S> process(final int max) throws IOException, CompoundNotFoundException {
+	public Map<String, S> process(final int max) throws IOException, CompoundNotFoundException {
 
 		if(closed){
 			throw new IOException("Cannot perform action: resource has been closed.");
 		}
 
-		LinkedHashMap<String,S> sequences = new LinkedHashMap<>();
+		Map<String, S> sequences = new LinkedHashMap<>();
 		int i=0;
 		while(true) {
 			if(max>0 && i>=max) break;
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/fasta/TestFASTAReader.java b/biojava-core/src/test/java/org/biojava/nbio/core/fasta/TestFASTAReader.java
index 75992962d1..e8a9d34ec9 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/fasta/TestFASTAReader.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/fasta/TestFASTAReader.java
@@ -22,6 +22,7 @@
 
 import java.io.InputStream;
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 import static org.junit.Assert.* ;
 import static org.hamcrest.CoreMatchers.* ;
@@ -46,7 +47,7 @@ private void testProcessAll(String path) throws Exception {
 					inStream,
 					new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>(),
 					new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
-			LinkedHashMap<String, ProteinSequence> sequences = fastaReader.process();
+			Map<String, ProteinSequence> sequences = fastaReader.process();
 			assertThat(sequences,is(notNullValue()));
 			assertThat(sequences.size(),is(1));
 			assertThat(sequences.containsKey("P02768"),is(true));
@@ -86,12 +87,12 @@ private void testProcess1(String path) throws Exception {
 					inStream,
 					new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>(),
 					new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
-			LinkedHashMap<String,ProteinSequence> out1 = fastaReader.process(1);
+			Map<String,ProteinSequence> out1 = fastaReader.process(1);
 			assertThat(out1,is(notNullValue()));
 			assertThat(out1.size(),is(1));
 			assertThat(out1.containsKey("P02768"),is(true));
 			assertThat(out1.get("P02768").getLength(),is(609));
-			LinkedHashMap<String,ProteinSequence> out2 = fastaReader.process(1);
+			Map<String,ProteinSequence> out2 = fastaReader.process(1);
 			assertThat(out2,is(nullValue()));
 		} finally {
 			if(fastaReader != null) fastaReader.close();
@@ -128,17 +129,17 @@ private void testProcess2(String path) throws Exception {
 					inStream,
 					new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>(),
 					new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
-			LinkedHashMap<String,ProteinSequence> out1 = fastaReader.process(1);
+			Map<String,ProteinSequence> out1 = fastaReader.process(1);
 			assertThat(out1,is(notNullValue()));
 			assertThat(out1.size(),is(1));
 			assertThat(out1.containsKey("P02768"),is(true));
 			assertThat(out1.get("P02768").getLength(),is(609));
-			LinkedHashMap<String,ProteinSequence> out2 = fastaReader.process(1);
+			Map<String,ProteinSequence> out2 = fastaReader.process(1);
 			assertThat(out2,is(notNullValue()));
 			assertThat(out2.size(),is(1));
 			assertThat(out2.containsKey("P00698"),is(true));
 			assertThat(out2.get("P00698").getLength(),is(147));
-			LinkedHashMap<String,ProteinSequence> out3 = fastaReader.process(1);
+			Map<String,ProteinSequence> out3 = fastaReader.process(1);
 			assertThat(out3,is(nullValue()));
 		} finally {
 			if(fastaReader != null) fastaReader.close();
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaReaderTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaReaderTest.java
index 0222b54c47..7981d8e6e3 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaReaderTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaReaderTest.java
@@ -30,6 +30,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.logging.Level;
 
 /**
@@ -70,7 +71,7 @@ public void testProcess() throws Exception {
 
 
 		FastaReader<ProteinSequence,AminoAcidCompound> fastaReader = new FastaReader<ProteinSequence,AminoAcidCompound>(inStream, new GenericFastaHeaderParser<ProteinSequence,AminoAcidCompound>(), new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
-		LinkedHashMap<String,ProteinSequence> proteinSequences = fastaReader.process();
+		Map<String,ProteinSequence> proteinSequences = fastaReader.process();
 		inStream.close();
 
 		//Should have 282 sequences
@@ -107,7 +108,7 @@ public void processIntTest() throws Exception {
 		InputStream inStream = this.getClass().getResourceAsStream("/PF00104_small.fasta");
 		Assert.assertNotNull(inStream);
 		FastaReader<ProteinSequence,AminoAcidCompound> fastaReader = new FastaReader<ProteinSequence,AminoAcidCompound>(inStream, new GenericFastaHeaderParser<ProteinSequence,AminoAcidCompound>(), new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
-		LinkedHashMap<String,ProteinSequence> proteinSequences = fastaReader.process(200);
+		Map<String,ProteinSequence> proteinSequences = fastaReader.process(200);
 
 		//Should have 200 sequences
 		//logger.debug("Expecting 200 got " + proteinSequences.size());
@@ -169,7 +170,7 @@ public void testSmallFasta() throws IOException {
 				new GenericFastaHeaderParser<ProteinSequence, AminoAcidCompound>(),
 				new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet()));
 
-		LinkedHashMap<String, ProteinSequence> b;
+		Map<String, ProteinSequence> b;
 
 		int nrSeq = 0;
 
@@ -200,7 +201,7 @@ public void testSmallFasta2() throws IOException {
 
 		int nrSeq = 0;
 
-		LinkedHashMap<String, ProteinSequence> b = fastaReader.process();
+		Map<String, ProteinSequence> b = fastaReader.process();
 
 		Assert.assertNotNull(b);
 
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankReaderTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankReaderTest.java
index 325e07a5ef..e813f863a8 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankReaderTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankReaderTest.java
@@ -68,7 +68,7 @@ public void testProcess() throws Exception {
 						new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet())
 				);
 
-		LinkedHashMap<String, ProteinSequence> proteinSequences = genbankProtein.process();
+		Map<String, ProteinSequence> proteinSequences = genbankProtein.process();
 
 		assertThat(proteinSequences.get("NP_000257").getComments().get(0),is(
 				"VALIDATED REFSEQ: This record has undergone validation or\n" +
@@ -114,7 +114,7 @@ public void testProcess() throws Exception {
 						new GenericGenbankHeaderParser<>(),
 						new DNASequenceCreator(DNACompoundSet.getDNACompoundSet())
 				);
-		LinkedHashMap<String, DNASequence> dnaSequences = genbankDNA.process();
+		Map<String, DNASequence> dnaSequences = genbankDNA.process();
 
 		assertNotNull(dnaSequences);
 		assertEquals(1, dnaSequences.size());
@@ -144,7 +144,7 @@ public void testPartialProcess() throws IOException, CompoundNotFoundException {
 		);
 
 		// First call to process(1) returns the first sequence
-		LinkedHashMap<String, DNASequence> dnaSequences = genbankDNA.process(1);
+		Map<String, DNASequence> dnaSequences = genbankDNA.process(1);
 
 		assertFalse(inStream.isclosed());
 		assertNotNull(dnaSequences);
@@ -177,7 +177,7 @@ public void CDStest() throws Exception {
 						new GenericGenbankHeaderParser<>(),
 						new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet())
 				);
-		LinkedHashMap<String, ProteinSequence> proteinSequences = GenbankProtein.process();
+		Map<String, ProteinSequence> proteinSequences = GenbankProtein.process();
 		assertTrue(inStream.isclosed());
 
 
@@ -206,7 +206,7 @@ private DNASequence readGenbankResource(final String resource) throws IOExceptio
 				new GenericGenbankHeaderParser<>(),
 				new DNASequenceCreator(DNACompoundSet.getDNACompoundSet())
 				);
-		LinkedHashMap<String, DNASequence> dnaSequences = genbankDNA.process();
+		Map<String, DNASequence> dnaSequences = genbankDNA.process();
 		return dnaSequences.values().iterator().next();
 	}
 	
@@ -218,7 +218,7 @@ private RNASequence readGenbankRNAResource(final String resource) throws IOExcep
 				new GenericGenbankHeaderParser<>(),
 				new RNASequenceCreator(RNACompoundSet.getRNACompoundSet())
 				);
-		LinkedHashMap<String, RNASequence> rnaSequences = genbankRNA.process();
+		Map<String, RNASequence> rnaSequences = genbankRNA.process();
 		return rnaSequences.values().iterator().next();	
 	}
 	
@@ -230,7 +230,7 @@ private ProteinSequence readGenbankProteinResource(final String resource) throws
 				new GenericGenbankHeaderParser<>(),
 				new ProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet())
 				);
-		LinkedHashMap<String, ProteinSequence> proteinSequences = genbankProtein.process();
+		Map<String, ProteinSequence> proteinSequences = genbankProtein.process();
 		return proteinSequences.values().iterator().next();	
 	}
 	
@@ -346,7 +346,7 @@ public void testGithub843() throws Exception {
 				new DNASequenceCreator(DNACompoundSet.getDNACompoundSet())
 		);
 
-		LinkedHashMap<String, DNASequence> dnaSequences = genbankDNA.process();
+		Map<String, DNASequence> dnaSequences = genbankDNA.process();
 		assertNotNull(dnaSequences);
 
 		DNASequence dna = new ArrayList<>(dnaSequences.values()).get(0);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaAFPChainConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaAFPChainConverter.java
index b0a8ab0bfb..81bf601ab6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaAFPChainConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaAFPChainConverter.java
@@ -87,7 +87,7 @@ public static AFPChain cpFastaToAfpChain(File fastaFile, Structure structure, in
 		SequenceCreatorInterface<AminoAcidCompound> creator = new CasePreservingProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet());
 		SequenceHeaderParserInterface<ProteinSequence, AminoAcidCompound> headerParser = new GenericFastaHeaderParser<>();
 		FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<>(inStream, headerParser, creator);
-		LinkedHashMap<String, ProteinSequence> sequences = fastaReader.process();
+		Map<String, ProteinSequence> sequences = fastaReader.process();
 		inStream.close();
 		Iterator<ProteinSequence> iter = sequences.values().iterator();
 		ProteinSequence first = iter.next();
@@ -199,7 +199,7 @@ public static AFPChain fastaFileToAfpChain(File fastaFile, Structure structure1,
 		SequenceHeaderParserInterface<ProteinSequence, AminoAcidCompound> headerParser = new GenericFastaHeaderParser<>();
 		FastaReader<ProteinSequence, AminoAcidCompound> fastaReader = new FastaReader<>(
 				inStream, headerParser, creator);
-		LinkedHashMap<String, ProteinSequence> sequences = fastaReader.process();
+		Map<String, ProteinSequence> sequences = fastaReader.process();
 		inStream.close();
 		return fastaToAfpChain(sequences, structure1, structure2);
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaStructureParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaStructureParser.java
index 29baf9d825..0586df8ced 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaStructureParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaStructureParser.java
@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.LinkedHashMap;
+import java.util.Map;
 
 
 /**
@@ -109,7 +110,7 @@ public FastaStructureParser(FastaReader<ProteinSequence, AminoAcidCompound> read
 	 */
 	public void process() throws IOException, StructureException {
 		if(sequences == null) { // only process once, then return cached values
-			LinkedHashMap<String, ProteinSequence> sequenceMap = reader.process();
+			Map<String, ProteinSequence> sequenceMap = reader.process();
 
 			sequences = sequenceMap.values().toArray(new ProteinSequence[0]);
 			accessions = new String[sequences.length];

From 28e0d442de369b005639945543fb97b1f5ead2bd Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 19 Jul 2024 15:02:01 -0700
Subject: [PATCH 494/599] Some cleanups

---
 .../ce/AbstractUserArgumentProcessor.java     | 138 +++++++-----------
 .../align/ce/CeUserArgumentProcessor.java     |   4 +-
 .../structure/align/ce/StartupParameters.java |  49 ++-----
 3 files changed, 66 insertions(+), 125 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java
index 20bc11827e..60242f8fde 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java
@@ -74,11 +74,10 @@
  *
  * @author Andreas
  * @author Spencer
- *
  */
 public abstract class AbstractUserArgumentProcessor implements UserArgumentProcessor {
 
-	public static String newline = System.getProperty("line.separator");
+	public static String newline = System.lineSeparator();
 
 	protected StartupParameters params ;
 
@@ -109,11 +108,6 @@ public void process(String[] argv){
 
 		printAboutMe();
 
-//		if(argv.length == 0 ) {
-//			System.out.println(printHelp());
-//			return;
-//		}
-
 		for (int i = 0 ; i < argv.length; i++){
 			String arg   = argv[i];
 
@@ -144,8 +138,6 @@ public void process(String[] argv){
 
 			String[] tmp = {arg,value};
 
-			//System.out.println(arg + " " + value);
-
 			try {
 
 				CliTools.configureBean(params, tmp);
@@ -177,7 +169,6 @@ public void process(String[] argv){
 		String pdb1  = params.getPdb1();
 		String file1 = params.getFile1();
 
-
 		try {
 			if (pdb1 != null || file1 != null){
 				runPairwise();
@@ -195,90 +186,76 @@ public void process(String[] argv){
 		System.exit(1); return;
 	}
 
-
-
-
-
 	public static void printAboutMe() {
-		try {
-			ResourceManager about = ResourceManager.getResourceManager("about");
-
-			String version = about.getString("project_version");
-			String build   = about.getString("build");
-
-			System.out.println("Protein Comparison Tool " + version + " " + build);
-		} catch (Exception e){
-			e.printStackTrace();
-		}
+		ResourceManager about = ResourceManager.getResourceManager("about");
 
+		String version = about.getString("project_version");
+		String build   = about.getString("build");
 
+		System.out.println("Protein Comparison Tool " + version + " " + build);
 	}
 
-	private void runAlignPairs(AtomCache cache, String alignPairs,
-			String outputFile) {
-		try {
-			File f = new File(alignPairs);
+	private void runAlignPairs(AtomCache cache, String alignPairs, String outputFile) throws IOException, StructureException, ClassNotFoundException, InvocationTargetException, NoSuchMethodException, IllegalAccessException {
 
-			BufferedReader is = new BufferedReader (new InputStreamReader(new FileInputStream(f)));
+		File f = new File(alignPairs);
 
-			BufferedWriter out = new BufferedWriter(new FileWriter(outputFile, true));
+		BufferedReader is = new BufferedReader (new InputStreamReader(new FileInputStream(f)));
 
-			StructureAlignment algorithm =  getAlgorithm();
+		BufferedWriter out = new BufferedWriter(new FileWriter(outputFile, true));
 
-			String header = "# algorithm:" + algorithm.getAlgorithmName();
-			out.write(header);
-			out.write(newline);
+		StructureAlignment algorithm =  getAlgorithm();
 
-			out.write("#Legend: " + newline );
-			String legend = getDbSearchLegend();
-			out.write(legend + newline );
-			System.out.println(legend);
-			String line = null;
-			while ( (line = is.readLine()) != null){
-				if ( line.startsWith("#"))
-					continue;
+		String header = "# algorithm:" + algorithm.getAlgorithmName();
+		out.write(header);
+		out.write(newline);
 
-				String[] spl = line.split(" ");
+		out.write("#Legend: " + newline );
+		String legend = getDbSearchLegend();
+		out.write(legend + newline );
+		System.out.println(legend);
+		String line = null;
+		while ( (line = is.readLine()) != null){
+			if ( line.startsWith("#"))
+				continue;
 
-				if ( spl.length != 2) {
-					System.err.println("wrongly formattted line. Expected format: 4hhb.A 4hhb.B but found " + line);
-					continue;
-				}
+			String[] spl = line.split(" ");
 
-				String pdb1 = spl[0];
-				String pdb2 = spl[1];
+			if ( spl.length != 2) {
+				System.err.println("wrongly formattted line. Expected format: 4hhb.A 4hhb.B but found " + line);
+				continue;
+			}
 
+			String pdb1 = spl[0];
+			String pdb2 = spl[1];
 
-				Structure structure1 = cache.getStructure(pdb1);
-				Structure structure2 = cache.getStructure(pdb2);
 
-				Atom[] ca1;
-				Atom[] ca2;
+			Structure structure1 = cache.getStructure(pdb1);
+			Structure structure2 = cache.getStructure(pdb2);
 
+			Atom[] ca1;
+			Atom[] ca2;
 
-				ca1 = StructureTools.getRepresentativeAtomArray(structure1);
-				ca2 = StructureTools.getRepresentativeAtomArray(structure2);
 
-				Object jparams = getParameters();
+			ca1 = StructureTools.getRepresentativeAtomArray(structure1);
+			ca2 = StructureTools.getRepresentativeAtomArray(structure2);
 
-				AFPChain afpChain;
+			Object jparams = getParameters();
 
-				afpChain = algorithm.align(ca1, ca2, jparams);
-				afpChain.setName1(pdb1);
-				afpChain.setName2(pdb2);
+			AFPChain afpChain;
 
-				String result = getDbSearchResult(afpChain);
-				out.write(result);
-				System.out.print(result);
+			afpChain = algorithm.align(ca1, ca2, jparams);
+			afpChain.setName1(pdb1);
+			afpChain.setName2(pdb2);
 
-				checkWriteFile(afpChain,ca1,ca2,true);
-			}
+			String result = getDbSearchResult(afpChain);
+			out.write(result);
+			System.out.print(result);
 
-			out.close();
-			is.close();
-		} catch(Exception e){
-			e.printStackTrace();
+			checkWriteFile(afpChain,ca1,ca2,true);
 		}
+
+		out.close();
+		is.close();
 	}
 
 
@@ -411,9 +388,6 @@ private void runPairwise() throws ConfigurationException{
 
 			checkWriteFile(afpChain,ca1, ca2, false);
 
-
-
-
 			if ( params.isPrintXML()){
 				String fatcatXML = AFPChainXMLConverter.toXML(afpChain,ca1,ca2);
 				System.out.println(fatcatXML);
@@ -426,26 +400,12 @@ private void runPairwise() throws ConfigurationException{
 				System.out.println(afpChain.toCE(ca1, ca2));
 			}
 
-		} catch (IOException e) {
-			e.printStackTrace();
-			System.exit(1); return;
-		} catch (ClassNotFoundException e) {
-			e.printStackTrace();
-			System.exit(1); return;
-		} catch (NoSuchMethodException e) {
-			e.printStackTrace();
-			System.exit(1); return;
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-			System.exit(1); return;
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-			System.exit(1); return;
-		} catch (StructureException e) {
+		} catch (IOException | ClassNotFoundException | NoSuchMethodException | InvocationTargetException |
+                 IllegalAccessException | StructureException e) {
 			e.printStackTrace();
 			System.exit(1); return;
 		}
-	}
+    }
 
 	/**
 	 * check if the result should be written to the local file system
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeUserArgumentProcessor.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeUserArgumentProcessor.java
index 6f04aa7342..9274ed41eb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeUserArgumentProcessor.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeUserArgumentProcessor.java
@@ -28,7 +28,8 @@
 import org.biojava.nbio.structure.align.StructureAlignment;
 import org.biojava.nbio.structure.align.ce.CeParameters.ScoringStrategy;
 
-/** process the arguments from command line
+/**
+ * Process the arguments from command line
  *
  * @author Andreas Prlic
  *
@@ -154,7 +155,6 @@ public String toString() {
 					.append(showMenu).append(", printPDB=").append(printPDB)
 					.append(", isDomainSplit=").append(isDomainSplit)
 					.append(", alignPairs=").append(alignPairs)
-					.append(", searchFile=").append(searchFile)
 					.append(", saveOutputDir=").append(saveOutputDir)
 					.append(", nrCPU=").append(nrCPU).append("]");
 			return builder.toString();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/StartupParameters.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/StartupParameters.java
index b6ee5e8ec5..bc6201d238 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/StartupParameters.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/StartupParameters.java
@@ -25,7 +25,6 @@
  * A simple bean that contains the parameters that can get set at startup
  *
  * @author Andreas Prlic
- *
  */
 public class StartupParameters {
 
@@ -49,7 +48,6 @@ public class StartupParameters {
 
 	// for DB searches
 	String alignPairs;
-	String searchFile;
 	String saveOutputDir;
 	int nrCPU;
 
@@ -69,19 +67,8 @@ public StartupParameters(){
 			nrCPU = 1;
 	}
 
-	/** An input file to be used for the DB search
-	 *
-	 * @return
-	 */
-	public String getSearchFile() {
-		return searchFile;
-	}
-	public void setSearchFile(String searchFile) {
-		this.searchFile = searchFile;
-	}
-
-
-	/** The file that contains a list of PDB pairs to be aligned
+	/**
+	 * The file that contains a list of PDB pairs to be aligned
 	 *
 	 * @return
 	 */
@@ -109,7 +96,8 @@ public void setShowMenu(boolean showMenu) {
 		this.showMenu = showMenu;
 	}
 
-	/** Display the output string in CE style
+	/**
+	 * Display the output string in CE style
 	 *
 	 * @return flag
 	 */
@@ -117,7 +105,8 @@ public boolean isPrintCE() {
 		return printCE;
 	}
 
-	/** Display the output string in CE style
+	/**
+	 * Display the output string in CE style
 	 *
 	 * @param printCE a flag
 	 */
@@ -129,7 +118,8 @@ public void setPrintCE(boolean printCE) {
 	public String getPdb1() {
 		return pdb1;
 	}
-	/** mandatory argument to set the first PDB (and optionally chain ID) to be aligned.
+	/**
+	 * mandatory argument to set the first PDB (and optionally chain ID) to be aligned.
 	 *
 	 * @param pdb1
 	 */
@@ -140,7 +130,8 @@ public String getPdb2() {
 		return pdb2;
 	}
 
-	/** mandatory argument to set the second PDB (and optionally chain ID) to be aligned.
+	/**
+	 * mandatory argument to set the second PDB (and optionally chain ID) to be aligned.
 	 *  @param pdb2
 	 */
 	public void setPdb2(String pdb2) {
@@ -164,7 +155,8 @@ public String getPdbFilePath() {
 		return pdbFilePath;
 	}
 
-	/** mandatory argument to set the location of PDB files.
+	/**
+	 * mandatory argument to set the location of PDB files.
 	 *
 	 * @param pdbFilePath
 	 */
@@ -232,9 +224,8 @@ public void setFile2(String file2)
 		this.file2 = file2;
 	}
 
-
-
-	/** When writing the results to a file, don;t write as XML but write aligned PDB file
+	/**
+	 * When writing the results to a file, don;t write as XML but write aligned PDB file
 	 *
 	 * @return flag
 	 */
@@ -249,10 +240,6 @@ public void setOutputPDB(boolean printPDB) {
 		this.printPDB = printPDB;
 	}
 
-
-
-
-
 	public boolean isDomainSplit() {
 		return isDomainSplit;
 	}
@@ -273,14 +260,8 @@ public String toString() {
 				+ ", " + newline + " printPDB=" + printPDB
 				+ ", " + newline + " isDomainSplit="
 				+ isDomainSplit + ", " + newline + " alignPairs=" + alignPairs
-				+ ", " + newline + " searchFile=" + searchFile + ", " + newline + " saveOutputDir="
+				+ ", " + newline + " saveOutputDir="
 				+ saveOutputDir + ", " + newline + " nrCPU=" + nrCPU + "]";
 	}
 
-
-
-
-
-
-
 }

From 2e8138c5175ba113a26bb0b1f1cf516283c27ec5 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 19 Jul 2024 15:25:11 -0700
Subject: [PATCH 495/599] Bringing back alignPairs option, should fix #1096

---
 .../ce/AbstractUserArgumentProcessor.java     | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java
index 60242f8fde..dc61972ecb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/AbstractUserArgumentProcessor.java
@@ -175,8 +175,11 @@ public void process(String[] argv){
 				return;
 			}
 
-
-		} catch (ConfigurationException e) {
+			if ( params.getAlignPairs() != null){
+				runAlignPairs();
+				return;
+			}
+		} catch (Exception e) {
 			System.err.println(e.getLocalizedMessage());
 			System.exit(1); return;
 		}
@@ -195,6 +198,33 @@ public static void printAboutMe() {
 		System.out.println("Protein Comparison Tool " + version + " " + build);
 	}
 
+	private void runAlignPairs() throws ConfigurationException, StructureException, IOException, ClassNotFoundException, InvocationTargetException, NoSuchMethodException, IllegalAccessException {
+
+		String pdbFilePath = params.getPdbFilePath();
+
+		if ( pdbFilePath == null || pdbFilePath.equals("")){
+			UserConfiguration c = new UserConfiguration();
+			pdbFilePath = c.getPdbFilePath();
+			System.err.println("You did not specify the -pdbFilePath parameter. Defaulting to "+pdbFilePath+".");
+		}
+
+		AtomCache cache = new AtomCache(pdbFilePath, pdbFilePath);
+
+		String alignPairs = params.getAlignPairs();
+
+		if ( alignPairs == null || alignPairs.equals("")) {
+			throw new ConfigurationException("Please specify -alignPairs!");
+		}
+
+		String outputFile = params.getOutFile();
+
+		if ( outputFile == null || outputFile.equals("")){
+			throw new ConfigurationException("Please specify the mandatory argument -outFile!");
+		}
+
+		runAlignPairs(cache, alignPairs, outputFile);
+	}
+
 	private void runAlignPairs(AtomCache cache, String alignPairs, String outputFile) throws IOException, StructureException, ClassNotFoundException, InvocationTargetException, NoSuchMethodException, IllegalAccessException {
 
 		File f = new File(alignPairs);

From 335d0bba2cea08f7257ece268f48541dd52008fc Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 19 Jul 2024 21:28:29 -0700
Subject: [PATCH 496/599] Obsolete test: mmtf.rcsb.org was discontinued

---
 .../io/mmtf/TestMmtfPerformance.java          | 118 ------------------
 1 file changed, 118 deletions(-)
 delete mode 100644 biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfPerformance.java

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfPerformance.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfPerformance.java
deleted file mode 100644
index e0b576d79a..0000000000
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfPerformance.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package org.biojava.nbio.structure.io.mmtf;
-
-import org.biojava.nbio.structure.io.PDBFileParser;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.*;
-import java.net.URL;
-import java.util.zip.GZIPInputStream;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- * Test the performance of MMTF format in BioJava.
- *
- * @author Andreas Prlic
- * on 1/9/17.
- *
- */
-public class TestMmtfPerformance {
-
-	private static final Logger logger = LoggerFactory.getLogger(TestMmtfPerformance.class);
-
-	private static final int NUMBER_OF_REPEATS = 10;
-
-	private static String convertStreamToString(java.io.InputStream is) {
-		try (
-		java.util.Scanner s = new java.util.Scanner(is)){
-			return s.useDelimiter("\\A").hasNext() ? s.next() : "";
-		}
-	}
-
-	private byte[] getByteArrayFromInputStream(InputStream is) throws IOException {
-		ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-
-		int nRead;
-		byte[] data = new byte[16384];
-
-		while ((nRead = is.read(data, 0, data.length)) != -1) {
-			buffer.write(data, 0, nRead);
-		}
-
-		buffer.flush();
-
-		return buffer.toByteArray();
-	}
-
-	@Test
-	public void test3HBX() throws Exception{
-		String pdbId = "3hbx";
-
-		pdbId = pdbId.toUpperCase();
-
-		URL url = new URL("https://files.rcsb.org/download/"+pdbId+".pdb.gz");
-
-		String pdbFile = convertStreamToString(new GZIPInputStream(url.openStream()));
-
-		long totalTimePDB = 0;
-		long totalTimeMMTF = 0;
-
-		byte[] pdbBytes = pdbFile.getBytes();
-
-		PDBFileParser parser = new PDBFileParser();
-
-		URL mmtfURL = new URL("https://mmtf.rcsb.org/v1.0/full/" + pdbId + ".mmtf.gz");
-
-		byte[] mmtfdata = getByteArrayFromInputStream(new GZIPInputStream((mmtfURL.openStream())));
-
-		// first make sure chemcomp cache is warmed up (chemcomp files are parsed). Like that we count the parsing time without the influence of chemcomp parsing
-		MmtfActions.readFromInputStream(new ByteArrayInputStream(mmtfdata));
-		parser.parsePDBFile(new ByteArrayInputStream(pdbBytes));
-
-		for ( int i =0 ; i< NUMBER_OF_REPEATS ; i++) {
-
-			long mmtfStart = System.nanoTime();
-			MmtfActions.readFromInputStream(new ByteArrayInputStream(mmtfdata));
-			long mmtfEnd = System.nanoTime();
-
-			long pdbStart = System.nanoTime();
-			parser.parsePDBFile(new ByteArrayInputStream(pdbBytes));
-			long pdbEnd = System.nanoTime();
-
-			totalTimePDB += (pdbEnd - pdbStart);
-
-			totalTimeMMTF += (mmtfEnd-mmtfStart);
-		}
-
-		long timePDB = (totalTimePDB/NUMBER_OF_REPEATS);
-		long timeMMTF = (totalTimeMMTF/NUMBER_OF_REPEATS);
-
-		logger.info("average time to parse mmtf: " + timeMMTF/(1000*1000) + " ms.");
-		logger.info("average time to parse PDB : " + timePDB/(1000*1000) + " ms. ");
-
-		assertTrue( "It should not be the case, but it is faster to parse a PDB file ("+timePDB+" ns.) than MMTF ("+( timeMMTF)+" ns.)!",( timePDB) > ( timeMMTF));
-
-	}
-}

From 2274ea3034405f50b7bcde328013893752b983b0 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Sat, 20 Jul 2024 09:16:35 -0700
Subject: [PATCH 497/599] Make test work with bcif, instead of mmtf

---
 .../test/symmetry/TestQuatSymmetryDetectorExamples.java          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java
index 08946e3e0a..012cd4af6f 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/symmetry/TestQuatSymmetryDetectorExamples.java
@@ -147,7 +147,6 @@ public void testPseudosymmetry() throws IOException, StructureException {
 	public void testLocal() throws IOException, StructureException {
 
 		AtomCache atomCache = new AtomCache();
-		atomCache.setFiletype(StructureFiletype.MMTF);
 
 		List<String> testIds = new ArrayList<>();
 		List<String> testStoichiometries = new ArrayList<>();

From 1a98eeb582c35656b92274586bebdf7e4116caf4 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 22 Jul 2024 10:10:52 -0700
Subject: [PATCH 498/599] Removing functionality that uses mmtf.rcsb.org, now
 deprecated

---
 .../nbio/core/util/FileDownloadUtils.java     |  7 ++-
 .../src/main/java/demo/DemoMmtfReader.java    | 47 -------------------
 .../nbio/structure/align/util/AtomCache.java  | 23 ---------
 .../nbio/structure/io/LocalPDBDirectory.java  | 20 ++++----
 .../nbio/structure/io/mmtf/MmtfActions.java   | 16 -------
 5 files changed, 11 insertions(+), 102 deletions(-)
 delete mode 100644 biojava-structure/src/main/java/demo/DemoMmtfReader.java

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index 50fce7b024..3259676ef0 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -171,15 +171,14 @@ public static void createValidationFiles(URL url, File localDestination, URL has
 	public static void createValidationFiles(URLConnection resourceUrlConnection, File localDestination, URL hashURL, Hash hash){
 		long size = resourceUrlConnection.getContentLengthLong();
 		if(size == -1) {
-			logger.warn("could not find expected file size for resource {}.", resourceUrlConnection.getURL());
+			logger.debug("Could not find expected file size for resource {}. Size validation metadata file won't be available for this download.", resourceUrlConnection.getURL());
 		} else {
 			logger.debug("Content-Length: {}", size);
 			File sizeFile = new File(localDestination.getParentFile(), localDestination.getName() + SIZE_EXT);
 			try (PrintStream sizePrintStream = new PrintStream(sizeFile)) {
 				sizePrintStream.print(size);
-				sizePrintStream.close();
 			} catch (FileNotFoundException e) {
-				logger.warn("could not write size validation file due to exception: {}", e.getMessage());
+				logger.warn("Could not write size validation metadata file due to exception: {}", e.getMessage());
 			}
 		}
 		
@@ -192,7 +191,7 @@ public static void createValidationFiles(URLConnection resourceUrlConnection, Fi
 			File hashFile = new File(localDestination.getParentFile(), String.format("%s%s_%s", localDestination.getName(), HASH_EXT, hash));
 			downloadFile(hashURL, hashFile);
 		} catch (IOException e) {
-			logger.warn("could not write validation hash file due to exception: {}", e.getMessage());
+			logger.warn("Could not write validation hash file due to exception: {}", e.getMessage());
 		}
 	}
 	
diff --git a/biojava-structure/src/main/java/demo/DemoMmtfReader.java b/biojava-structure/src/main/java/demo/DemoMmtfReader.java
deleted file mode 100644
index 0dc4b76ab1..0000000000
--- a/biojava-structure/src/main/java/demo/DemoMmtfReader.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *                    BioJava development code
- *
- * This code may be freely distributed and modified under the
- * terms of the GNU Lesser General Public Licence.  This should
- * be distributed with the code.  If you do not have a copy,
- * see:
- *
- *      http://www.gnu.org/copyleft/lesser.html
- *
- * Copyright for this code is held jointly by the individual
- * authors.  These should be listed in @author doc comments.
- *
- * For more information on the BioJava project and its aims,
- * or to join the biojava-l mailing list, visit the home page
- * at:
- *
- *      http://www.biojava.org/
- *
- */
-package demo;
-
-import java.io.IOException;
-
-import org.biojava.nbio.structure.Structure;
-import org.biojava.nbio.structure.StructureException;
-import org.biojava.nbio.structure.io.mmtf.MmtfActions;
-
-/**
- * Class to show how to read a Biojava structure using MMTF
- * @author Anthony Bradley
- *
- */
-public class DemoMmtfReader {
-
-	/**
-	 * Main function to run the demo
-	 * @param args no args to specify
-	 * @throws IOException
-	 * @throws StructureException
-	 */
-	public static void main(String[] args) throws IOException, StructureException {
-		Structure structure = MmtfActions.readFromWeb("4cup");
-		System.out.println(structure.getChains().size());
-	}
-
-}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
index 258fdbf7f3..63fc089a97 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
@@ -38,7 +38,6 @@
 import org.biojava.nbio.structure.io.FileParsingParameters;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.FetchBehavior;
 import org.biojava.nbio.structure.io.LocalPDBDirectory.ObsoleteBehavior;
-import org.biojava.nbio.structure.io.MMTFFileReader;
 import org.biojava.nbio.structure.io.PDBFileReader;
 import org.biojava.nbio.core.util.FileDownloadUtils;
 import org.biojava.nbio.structure.io.StructureFiletype;
@@ -829,34 +828,12 @@ public Structure getStructureForPdbId(PdbId pdbId) throws IOException {
 			case BCIF:
 				logger.debug("loading from bcif");
 				return loadStructureFromBcifByPdbId(pdbId);
-			case MMTF:
-				logger.debug("loading from mmtf");
-				return loadStructureFromMmtfByPdbId(pdbId);
 			case PDB: default:
 				logger.debug("loading from pdb");
 				return loadStructureFromPdbByPdbId(pdbId);
 		}
 	}
 
-	
-	protected Structure loadStructureFromMmtfByPdbId(String pdbId) throws IOException {
-		return loadStructureFromMmtfByPdbId(new PdbId(pdbId));
-	}
-
-	/**
-	 * Load a {@link Structure} from MMTF either from the local file system.
-	 * @param pdbId the input PDB id
-	 * @return the {@link Structure} object of the parsed structure
-	 * @throws IOException error reading from Web or file system
-	 */
-	protected Structure loadStructureFromMmtfByPdbId(PdbId pdbId) throws IOException {
-		logger.debug("Loading structure {} from mmtf file.", pdbId);
-		MMTFFileReader reader = new MMTFFileReader();
-		reader.setFetchBehavior(fetchBehavior);
-		reader.setObsoleteBehavior(obsoleteBehavior);
-		return reader.getStructureById(pdbId);
-	}
-
 	protected Structure loadStructureFromCifByPdbId(String pdbId) throws IOException {
 		return loadStructureFromCifByPdbId(new PdbId(pdbId));
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index 5de75efee5..5297443a34 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -133,13 +133,11 @@ public static enum FetchBehavior {
 			Date d = formatter.parse(LAST_REMEDIATION_DATE_STRING);
 			t = d.getTime();
 		} catch (ParseException e){
-			logger.error("Unexpected error! could not parse LAST_REMEDIATION_DATE: "+e.getMessage());
+			logger.error("Unexpected error! could not parse LAST_REMEDIATION_DATE: {}", e.getMessage());
 		}
 		LAST_REMEDIATION_DATE = t;
 	}
 
-	protected static final String lineSplit = System.getProperty("file.separator");
-
 	/** Minimum size for a valid structure file (CIF or PDB), in bytes */
 	public static final long MIN_PDB_FILE_SIZE = 40;  // Empty gzip files are 20bytes. Add a few more for buffer.
 
@@ -267,8 +265,8 @@ public FileParsingParameters getFileParsingParameters(){
 	 * if {@link #isAutoFetch()} is false. Note that an obsolete entry may still be
 	 * returned even this is FETCH_CURRENT if the entry is found locally.
 	 *
-	 * @param fetchFileEvenIfObsolete Whether to fetch obsolete records
-	 * @see #setFetchCurrent(boolean)
+	 * @param behavior Whether to fetch obsolete records
+	 * @see #setFetchBehavior(FetchBehavior)
 	 * @since 4.0.0
 	 */
 	public void setObsoleteBehavior(ObsoleteBehavior behavior) {
@@ -530,9 +528,9 @@ protected File downloadStructure(PdbId pdbId) throws IOException {
 	}
 
 	/**
-	 * Download a file from the ftp server +/- its validation metadata, replacing any existing files if needed
+	 * Download a file from the http server +/- its validation metadata, replacing any existing files if needed
 	 * @param pdbId PDB ID
-	 * @param pathOnServer Path on the FTP server, e.g. data/structures/divided/pdb
+	 * @param pathOnServer Path on the http server, e.g. data/structures/divided/pdb
 	 * @param obsolete Whether or not file should be saved to the obsolete location locally
 	 * @param existingFile if not null and checkServerFileDate is true, the last modified date of the
 	 * server file and this file will be compared to decide whether to download or not
@@ -548,9 +546,7 @@ private File downloadStructure(PdbId pdbId, String pathOnServer, boolean obsolet
 		String ftp;
 
 		String filename = getFilename(id);
-		if (filename.endsWith(".mmtf.gz")){
-			ftp = CodecUtils.getMmtfEntryUrl(id, true, false);
-		} else if (filename.endsWith(".bcif") || filename.endsWith(".bcif.gz")) {
+		if (filename.endsWith(".bcif") || filename.endsWith(".bcif.gz")) {
 			// TODO this should be configurable
 			ftp = DEFAULT_BCIF_FILE_SERVER + filename;
 		} else {
@@ -578,8 +574,8 @@ private File downloadStructure(PdbId pdbId, String pathOnServer, boolean obsolet
 			}
 		}
 
-		logger.info("Fetching " + ftp);
-		logger.info("Writing to "+ realFile);
+		logger.info("Fetching {}", ftp);
+		logger.info("Writing to {}", realFile);
 
 		FileDownloadUtils.createValidationFiles(url, realFile, null, FileDownloadUtils.Hash.UNKNOWN);
 		FileDownloadUtils.downloadFile(url, realFile);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfActions.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfActions.java
index 7b9cd4642f..0b8572ab8c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfActions.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfActions.java
@@ -85,22 +85,6 @@ public static void writeToOutputStream(Structure structure, OutputStream outputS
 		outputStream.write(outputBytes,0,outputBytes.length);
 	}
 
-
-	/**
-	 * Get a Biojava structure from the mmtf REST service.
-	 * @param pdbId the PDB code of the required structure
-	 * @return a Structure object relating to the input byte array
-	 * @throws IOException
-	 */
-	public static Structure readFromWeb(String pdbId) throws IOException {
-		// Get the reader - this is the bit that people need to implement.
-		MmtfStructureReader mmtfStructureReader = new MmtfStructureReader();
-		// Do the inflation
-		new StructureDataToAdapter(new GenericDecoder(ReaderUtils.getDataFromUrl(pdbId)), mmtfStructureReader);
-		// Get the structue
-		return mmtfStructureReader.getStructure();
-	}
-
 	/**
 	 * Read a Biojava structure from an {@link InputStream}
 	 * @param inStream the {@link InputStream} to read from

From 8b348bc1e2fce6d699beb4618f5b04b2c33ab94e Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 9 Aug 2024 10:44:22 -0700
Subject: [PATCH 499/599] Updating changelog ahead of release

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c05fae5f75..e34223eba2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 BioJava Changelog
 -----------------
 
+BioJava 7.1.2
+==============================
+### Fixed
+* Brought back a command line argument for protein comparison tool #1096
+* Upgraded the log facade framework to slf4j2 #1094
+* Code smell fixes (Sonar issues S2293, S1319) #1095 #1091
+* Various small fixes
+### Removed
+* Removed capability of automatic download/caching of PDB archive files in MMTF format, following deprecation 
+by RCSB PDB. Code to encode/decode in MMTF format is still in place #1099
+
 BioJava 7.1.1
 ==============================
 ### Fixed

From bf16dfeddc09299d49850dc51cd639fad89a994d Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 9 Aug 2024 10:54:00 -0700
Subject: [PATCH 500/599] [maven-release-plugin] prepare release biojava-7.1.2

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index adbe089c75..aef222e1a8 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a79449454e..1700878845 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.2</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 3b467df321..6f7758ccc7 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index bff2faa563..a61abf567a 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 507f23abbd..e092568e29 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.2-SNAPSHOT</version>
+    <version>7.1.2</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.2-SNAPSHOT</version>
+    	<version>7.1.2</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index dc5985beaa..6d7de8bde4 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.2</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 03f1097109..421b6ea311 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.2-SNAPSHOT</version>
+    <version>7.1.2</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 88c0cbbc82..86693d4fdc 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.2</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 4344b5e112..1afca9d6a6 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.2</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 1f954eebf6..0a23831c12 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index cde4be0064..e0baa5bc6b 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.2</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 3ebb91b3b6..21588e746b 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.2-SNAPSHOT</version>
+        <version>7.1.2</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index a9f68e6030..a3c7a30c66 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2-SNAPSHOT</version>
+		<version>7.1.2</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2-SNAPSHOT</version>
+			<version>7.1.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 74e3783b70..73f7d66d0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.2-SNAPSHOT</version>
+	<version>7.1.2</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.1.2</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 5ad25aec26ea2ea6b1808a83a3ebd16f657c7224 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 9 Aug 2024 10:54:03 -0700
Subject: [PATCH 501/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index aef222e1a8..8d8f2c3854 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 1700878845..fbb5cb9555 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 6f7758ccc7..489fc53c83 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index a61abf567a..1fc26f73cf 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index e092568e29..fa88f6868e 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.2</version>
+    <version>7.1.3-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.2</version>
+    	<version>7.1.3-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 6d7de8bde4..07f675b45e 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 421b6ea311..00821c79ac 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.2</version>
+    <version>7.1.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 86693d4fdc..b56aef3aaf 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 1afca9d6a6..91243a7ec5 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 0a23831c12..434d4f07e4 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.2</version>
+		<version>7.1.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index e0baa5bc6b..33d3052c49 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 21588e746b..7304c9798f 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.2</version>
+        <version>7.1.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index a3c7a30c66..33b7001c04 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.2</version>
+		<version>7.1.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.2</version>
+			<version>7.1.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 73f7d66d0f..5ac72dfa52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.2</version>
+	<version>7.1.3-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.1.2</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 95489c09bac2fc0ed1efbcdf578846df1377dfa0 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 9 Aug 2024 11:09:26 -0700
Subject: [PATCH 502/599] Latest release in README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cccff99106..bac2e659d0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-7.1.1-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.1.1) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-7.1.2-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.1.2) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>7.1.1</version>
+        <version>7.1.2</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From 53bdc012964668fb3fa398f55a029994cccf73b4 Mon Sep 17 00:00:00 2001
From: Michael L Heuer <heuermh@acm.org>
Date: Mon, 26 Aug 2024 12:47:08 -0500
Subject: [PATCH 503/599] update guava dependency version to 33.3.0-jre

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5ac72dfa52..033472b08d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -475,7 +475,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>33.1.0-jre</version>
+				<version>33.3.0-jre</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

From 403241f1c45b9ceef58450cd1e6d42ad41ef9a80 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Fri, 30 Aug 2024 15:27:04 +0200
Subject: [PATCH 504/599] Fix some typos

Most are in docstrings. One misspelled public method has been deprecated.
---
 .../biojava/nbio/structure/align/gui/MenuCreator.java |  2 +-
 .../align/gui/MultipleAlignmentJmolDisplay.java       | 11 ++++++++++-
 .../nbio/structure/align/gui/MySaveFileListener.java  |  2 +-
 .../align/gui/jmol/MultipleAlignmentJmol.java         |  2 +-
 .../JmolSymmetryScriptGeneratorPointGroup.java        | 11 ++++++-----
 .../biojava/nbio/structure/align/multiple/Block.java  |  8 ++++----
 .../align/multiple/mc/MultipleMcOptimizer.java        |  2 +-
 .../align/multiple/util/MultipleAlignmentTools.java   |  2 +-
 .../structure/symmetry/core/QuatSymmetrySubunits.java |  4 ++--
 .../structure/symmetry/internal/SymmOptimizer.java    |  2 +-
 10 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MenuCreator.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MenuCreator.java
index a481d00b91..6a0e3c6e1a 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MenuCreator.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MenuCreator.java
@@ -76,7 +76,7 @@ public class MenuCreator {
 	 * Menus included:
 	 * <ul><li>File: open, save, export, import, exit.
 	 * <li>Align: new pairwise alignment, new multiple alignment.
-	 * <li>View: aligment panel, aligned pairs, text format,
+	 * <li>View: alignment panel, aligned pairs, text format,
 	 * FatCat format, distance matrices, dot plot.
 	 * <li>Help
 	 * </ul>
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MultipleAlignmentJmolDisplay.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MultipleAlignmentJmolDisplay.java
index a0b6111a0e..0e7f333e1e 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MultipleAlignmentJmolDisplay.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MultipleAlignmentJmolDisplay.java
@@ -92,6 +92,15 @@ else if (pos < ca.length) {
 		return lst;
 	}
 
+	/**
+	 * @deprecated Replace with {@see showMultipleAlignmentPanel}
+	 */
+	@Deprecated
+	public static void showMultipleAligmentPanel(MultipleAlignment multAln,
+			AbstractAlignmentJmol jmol) throws StructureException {
+		showMultipleAlignmentPanel(multAln, jmol);
+	}
+
 	/**
 	 * Creates a new Frame with the MultipleAlignment Sequence Panel.
 	 * The panel can communicate with the Jmol 3D visualization by
@@ -102,7 +111,7 @@ else if (pos < ca.length) {
 
 	 * @throws StructureException
 	 */
-	public static void showMultipleAligmentPanel(MultipleAlignment multAln,
+	public static void showMultipleAlignmentPanel(MultipleAlignment multAln,
 			AbstractAlignmentJmol jmol) throws StructureException {
 
 		MultipleAligPanel me = new MultipleAligPanel(multAln, jmol);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MySaveFileListener.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MySaveFileListener.java
index f93fba29df..c5c7566eda 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MySaveFileListener.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MySaveFileListener.java
@@ -47,7 +47,7 @@
  * and from a Jmol view an XML format is saved.
  *
  * @author Aleix Lafita
- * @version 2.0 - adapted for MultipleAligments
+ * @version 2.0 - adapted for MultipleAlignments
  *
  */
 public class MySaveFileListener implements ActionListener {
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/MultipleAlignmentJmol.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/MultipleAlignmentJmol.java
index a9d65c3948..fe1f69346a 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/MultipleAlignmentJmol.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/MultipleAlignmentJmol.java
@@ -385,7 +385,7 @@ public void actionPerformed(ActionEvent ae) {
 						.showAlignmentImage(multAln, result);
 
 			} else if (cmd.equals(MenuCreator.ALIGNMENT_PANEL)) {
-				MultipleAlignmentJmolDisplay.showMultipleAligmentPanel(multAln,
+				MultipleAlignmentJmolDisplay.showMultipleAlignmentPanel(multAln,
 						this);
 
 			} else if (cmd.equals(MenuCreator.FATCAT_TEXT)) {
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorPointGroup.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorPointGroup.java
index 7fd90d2497..d895450dc6 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorPointGroup.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorPointGroup.java
@@ -684,7 +684,8 @@ private String drawSymmetryAxes() {
 		return s.toString();
 	}
 
-	private Vector3d getAligmentVector(Point3d point, Vector3d axis) {
+
+	private Vector3d getAlignmentVector(Point3d point, Vector3d axis) {
 		// for system with a single Cn axis
 		if (rotationGroup.getPointGroup().startsWith("C") || rotationGroup.getPointGroup().startsWith("D")) {
 			// if axis is orthogonal to principal axis, use principal axis as reference axis
@@ -760,14 +761,14 @@ private String getSymmetryAxis(int i, int j, String pointGroup, int n, Vector3d
 		if (drawPolygon) {
 			double polygonRadius = getMeanExtension() * 0.06;
 			if (n == 2) {
-				referenceAxis = getAligmentVector(p1, axis);
+				referenceAxis = getAlignmentVector(p1, axis);
 				s.append(getC2PolygonJmol(i, p1, referenceAxis, axis, color, polygonRadius, name));
-				referenceAxis = getAligmentVector(p2, axis);
+				referenceAxis = getAlignmentVector(p2, axis);
 				s.append(getC2PolygonJmol(j, p2,  referenceAxis, axis, color, polygonRadius, name));
 			} else if (n > 2) {
-				referenceAxis = getAligmentVector(p1, axis);
+				referenceAxis = getAlignmentVector(p1, axis);
 				s.append(getPolygonJmol(i, p1, referenceAxis, axis, n, color, polygonRadius, name));
-				referenceAxis = getAligmentVector(p2, axis);
+				referenceAxis = getAlignmentVector(p2, axis);
 				s.append(getPolygonJmol(j, p2, referenceAxis, axis, n, color, polygonRadius, name));
 			}
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/Block.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/Block.java
index 8e79653de6..c41e31e1c5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/Block.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/Block.java
@@ -124,8 +124,8 @@ public interface Block extends ScoresCache {
 
 	/**
 	 * Calculates and returns the first position of the specified structure in
-	 * the alignment that is not null. This will return the aligment index, not
-	 * the reisude aligned in that position.
+	 * the alignment that is not null. This will return the alignment index, not
+	 * the residue aligned in that position.
 	 *
 	 * @param str
 	 *            structure index
@@ -148,8 +148,8 @@ public interface Block extends ScoresCache {
 
 	/**
 	 * Calculates and returns the last position of the specified structure in
-	 * the alignment that is not null. This will return the aligment index, not
-	 * the reisude aligned in that position.
+	 * the alignment that is not null. This will return the alignment index, not
+	 * the residue aligned in that position.
 	 *
 	 * @param str
 	 *            structure index
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java
index 83b2247bbe..664f251899 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java
@@ -210,7 +210,7 @@ private void initialize() throws StructureException {
 			}
 		}
 
-		// Set the superposition and score for the seed aligment
+		// Set the superposition and score for the seed alignment
 		checkGaps();
 		msa.clear();
 		imposer.superimpose(msa);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
index 836d5c922a..1ddc3fb2d7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
@@ -721,7 +721,7 @@ public static List<Atom[]> transformAtoms(MultipleAlignment alignment) {
 
 	/**
 	 * Calculate a List of alignment indicies that correspond to the core of a
-	 * Block, which means that all structures have a residue in that positon.
+	 * Block, which means that all structures have a residue in that position.
 	 *
 	 * @param block
 	 *            alignment Block
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetrySubunits.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetrySubunits.java
index 98eb315855..1e9511ca88 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetrySubunits.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetrySubunits.java
@@ -213,7 +213,7 @@ private void run() {
 		calcOriginalCenters();
 		calcCentroid();
 		calcCenters();
-		calcMomentsOfIntertia();
+		calcMomentsOfInertia();
 	}
 
 	private void calcOriginalCenters() {
@@ -272,7 +272,7 @@ public Point3d getUpperBound() {
 		return upper;
 	}
 
-	private void calcMomentsOfIntertia() {
+	private void calcMomentsOfInertia() {
 		for (Point3d[] trace : caCoords) {
 			for (Point3d p : trace) {
 				momentsOfInertia.addPoint(p, 1.0f);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java
index a974bf1659..8ea264ba67 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java
@@ -101,7 +101,7 @@ public class SymmOptimizer {
 	private List<Double> mcScoreHistory;
 
 	/**
-	 * Constructor with a seed MultipleAligment storing a refined symmetry
+	 * Constructor with a seed MultipleAlignment storing a refined symmetry
 	 * alignment of the repeats. To perform the optimization use the call or
 	 * optimize methods after instantiation.
 	 *

From e9e0f007298c8c90c9b78a906b9f37b5e6dd72b8 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Fri, 30 Aug 2024 11:29:36 +0200
Subject: [PATCH 505/599] Add test for rcsb/symmetry#118

---
 .../symmetry/internal/TestCeSymm.java         |   25 +-
 .../test/resources/AF-V9WDR2-F1-model_v4.cif  | 2012 +++++++++++++++++
 2 files changed, 2036 insertions(+), 1 deletion(-)
 create mode 100644 biojava-structure/src/test/resources/AF-V9WDR2-F1-model_v4.cif

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/symmetry/internal/TestCeSymm.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/symmetry/internal/TestCeSymm.java
index a21019711b..d31e3c89f0 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/symmetry/internal/TestCeSymm.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/symmetry/internal/TestCeSymm.java
@@ -22,6 +22,7 @@
 
 import static org.junit.Assert.*;
 import static org.junit.Assume.assumeNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -60,7 +61,7 @@ public void testEasyCases() throws IOException, StructureException {
 			CeSymmResult result = CeSymm.analyze(atoms);
 
 			assertTrue(result.isSignificant());
-			assertEquals(result.getNumRepeats(), orders[i]);
+			assertEquals(orders[i], result.getNumRepeats());
 		}
 	}
 
@@ -75,4 +76,26 @@ public void testAlphafold() throws IOException, StructureException {
 		CeSymmResult result = CeSymm.analyze(atoms);
 		assertNotNull(result);
 	}
+
+	@Test
+	public void testShort() throws IOException, StructureException {
+		// ERIC2_c35200, a near-perfect 15 residue beta-solenoid
+		// At 15 residues this should reliably trigger rcsb/symmetry#118
+		URL url = this.getClass().getResource("/AF-V9WDR2-F1-model_v4.cif");
+		assumeNotNull(url);
+		String file = url.getPath();
+		Structure s = StructureIO.getStructure(file);
+		assertNull(s.getPdbId());
+		Atom[] atoms = StructureTools.getRepresentativeAtomArray(s);
+		CESymmParameters params = new CESymmParameters();
+		params.setMinCoreLength(10); // Ensure it gets refined (should be 15 long)
+		CeSymmResult result = CeSymm.analyze(atoms, params);
+		assertNotNull(result);
+		assertTrue(result.isSignificant());
+		assertEquals(9, result.getNumRepeats());
+		assertEquals("R",result.getSymmGroup());
+		assertNotNull(result.getAxes());
+		assertNotEquals("Error", result.getReason());
+
+	}
 }
diff --git a/biojava-structure/src/test/resources/AF-V9WDR2-F1-model_v4.cif b/biojava-structure/src/test/resources/AF-V9WDR2-F1-model_v4.cif
new file mode 100644
index 0000000000..c959135a6e
--- /dev/null
+++ b/biojava-structure/src/test/resources/AF-V9WDR2-F1-model_v4.cif
@@ -0,0 +1,2012 @@
+data_AF-V9WDR2-F1
+#
+_entry.id AF-V9WDR2-F1
+#
+loop_
+_atom_type.symbol
+C 
+N 
+O 
+S 
+#
+loop_
+_audit_author.name
+_audit_author.pdbx_ordinal
+"Jumper, John"               1  
+"Evans, Richard"             2  
+"Pritzel, Alexander"         3  
+"Green, Tim"                 4  
+"Figurnov, Michael"          5  
+"Ronneberger, Olaf"          6  
+"Tunyasuvunakool, Kathryn"   7  
+"Bates, Russ"                8  
+"Zidek, Augustin"            9  
+"Potapenko, Anna"            10 
+"Bridgland, Alex"            11 
+"Meyer, Clemens"             12 
+"Kohl, Simon A. A."          13 
+"Ballard, Andrew J."         14 
+"Cowie, Andrew"              15 
+"Romera-Paredes, Bernardino" 16 
+"Nikolov, Stanislav"         17 
+"Jain, Rishub"               18 
+"Adler, Jonas"               19 
+"Back, Trevor"               20 
+"Petersen, Stig"             21 
+"Reiman, David"              22 
+"Clancy, Ellen"              23 
+"Zielinski, Michal"          24 
+"Steinegger, Martin"         25 
+"Pacholska, Michalina"       26 
+"Berghammer, Tamas"          27 
+"Silver, David"              28 
+"Vinyals, Oriol"             29 
+"Senior, Andrew W."          30 
+"Kavukcuoglu, Koray"         31 
+"Kohli, Pushmeet"            32 
+"Hassabis, Demis"            33 
+#
+_audit_conform.dict_location https://raw.githubusercontent.com/ihmwg/ModelCIF/master/dist/mmcif_ma.dic
+_audit_conform.dict_name     mmcif_ma.dic
+_audit_conform.dict_version  1.3.9
+#
+loop_
+_chem_comp.formula
+_chem_comp.formula_weight
+_chem_comp.id
+_chem_comp.mon_nstd_flag
+_chem_comp.name
+_chem_comp.pdbx_synonyms
+_chem_comp.type
+"C3 H7 N O2"    89.093  ALA y ALANINE         ? "L-PEPTIDE LINKING" 
+"C6 H15 N4 O2"  175.209 ARG y ARGININE        ? "L-PEPTIDE LINKING" 
+"C4 H8 N2 O3"   132.118 ASN y ASPARAGINE      ? "L-PEPTIDE LINKING" 
+"C4 H7 N O4"    133.103 ASP y "ASPARTIC ACID" ? "L-PEPTIDE LINKING" 
+"C3 H7 N O2 S"  121.158 CYS y CYSTEINE        ? "L-PEPTIDE LINKING" 
+"C5 H10 N2 O3"  146.144 GLN y GLUTAMINE       ? "L-PEPTIDE LINKING" 
+"C5 H9 N O4"    147.129 GLU y "GLUTAMIC ACID" ? "L-PEPTIDE LINKING" 
+"C2 H5 N O2"    75.067  GLY y GLYCINE         ? "PEPTIDE LINKING"   
+"C6 H10 N3 O2"  156.162 HIS y HISTIDINE       ? "L-PEPTIDE LINKING" 
+"C6 H13 N O2"   131.173 ILE y ISOLEUCINE      ? "L-PEPTIDE LINKING" 
+"C6 H15 N2 O2"  147.195 LYS y LYSINE          ? "L-PEPTIDE LINKING" 
+"C5 H11 N O2 S" 149.211 MET y METHIONINE      ? "L-PEPTIDE LINKING" 
+"C9 H11 N O2"   165.189 PHE y PHENYLALANINE   ? "L-PEPTIDE LINKING" 
+"C3 H7 N O3"    105.093 SER y SERINE          ? "L-PEPTIDE LINKING" 
+"C4 H9 N O3"    119.119 THR y THREONINE       ? "L-PEPTIDE LINKING" 
+"C5 H11 N O2"   117.146 VAL y VALINE          ? "L-PEPTIDE LINKING" 
+#
+_citation.book_publisher          ?
+_citation.country                 UK
+_citation.id                      primary
+_citation.journal_full            Nature
+_citation.journal_id_ASTM         NATUAS
+_citation.journal_id_CSD          0006
+_citation.journal_id_ISSN         0028-0836
+_citation.journal_volume          596
+_citation.page_first              583
+_citation.page_last               589
+_citation.pdbx_database_id_DOI    10.1038/s41586-021-03819-2
+_citation.pdbx_database_id_PubMed 34265844
+_citation.title                   "Highly accurate protein structure prediction with AlphaFold"
+_citation.year                    2021
+#
+loop_
+_citation_author.citation_id
+_citation_author.name
+_citation_author.ordinal
+1 "Jumper, John"               1  
+1 "Evans, Richard"             2  
+1 "Pritzel, Alexander"         3  
+1 "Green, Tim"                 4  
+1 "Figurnov, Michael"          5  
+1 "Ronneberger, Olaf"          6  
+1 "Tunyasuvunakool, Kathryn"   7  
+1 "Bates, Russ"                8  
+1 "Zidek, Augustin"            9  
+1 "Potapenko, Anna"            10 
+1 "Bridgland, Alex"            11 
+1 "Meyer, Clemens"             12 
+1 "Kohl, Simon A. A."          13 
+1 "Ballard, Andrew J."         14 
+1 "Cowie, Andrew"              15 
+1 "Romera-Paredes, Bernardino" 16 
+1 "Nikolov, Stanislav"         17 
+1 "Jain, Rishub"               18 
+1 "Adler, Jonas"               19 
+1 "Back, Trevor"               20 
+1 "Petersen, Stig"             21 
+1 "Reiman, David"              22 
+1 "Clancy, Ellen"              23 
+1 "Zielinski, Michal"          24 
+1 "Steinegger, Martin"         25 
+1 "Pacholska, Michalina"       26 
+1 "Berghammer, Tamas"          27 
+1 "Silver, David"              28 
+1 "Vinyals, Oriol"             29 
+1 "Senior, Andrew W."          30 
+1 "Kavukcuoglu, Koray"         31 
+1 "Kohli, Pushmeet"            32 
+1 "Hassabis, Demis"            33 
+#
+_database_2.database_code AF-V9WDR2-F1
+_database_2.database_id   AlphaFoldDB
+#
+_entity.details                  ?
+_entity.formula_weight           ?
+_entity.id                       1
+_entity.pdbx_description         "Uncharacterized protein"
+_entity.pdbx_ec                  ?
+_entity.pdbx_fragment            ?
+_entity.pdbx_mutation            ?
+_entity.pdbx_number_of_molecules 1
+_entity.src_method               man
+_entity.type                     polymer
+#
+_entity_poly.entity_id                    1
+_entity_poly.nstd_linkage                 no
+_entity_poly.nstd_monomer                 no
+_entity_poly.pdbx_seq_one_letter_code     
+;MIMKNKNKQNRKAFADTEFASEAGANRTAADTEFASEAGANRTVADTEFASEAGANTTAADTEFASEAGANRTAADTEFA
+SEAGANRTAADTEFASEAGANTTAADTEFASEAGANRTAADTEFASEVRANRTSADTEFANEVTSKQNRCGH
+;
+_entity_poly.pdbx_seq_one_letter_code_can 
+;MIMKNKNKQNRKAFADTEFASEAGANRTAADTEFASEAGANRTVADTEFASEAGANTTAADTEFASEAGANRTAADTEFA
+SEAGANRTAADTEFASEAGANTTAADTEFASEAGANRTAADTEFASEVRANRTSADTEFANEVTSKQNRCGH
+;
+_entity_poly.pdbx_strand_id               A
+_entity_poly.type                         polypeptide(L)
+#
+loop_
+_entity_poly_seq.entity_id
+_entity_poly_seq.hetero
+_entity_poly_seq.mon_id
+_entity_poly_seq.num
+1 n MET 1   
+1 n ILE 2   
+1 n MET 3   
+1 n LYS 4   
+1 n ASN 5   
+1 n LYS 6   
+1 n ASN 7   
+1 n LYS 8   
+1 n GLN 9   
+1 n ASN 10  
+1 n ARG 11  
+1 n LYS 12  
+1 n ALA 13  
+1 n PHE 14  
+1 n ALA 15  
+1 n ASP 16  
+1 n THR 17  
+1 n GLU 18  
+1 n PHE 19  
+1 n ALA 20  
+1 n SER 21  
+1 n GLU 22  
+1 n ALA 23  
+1 n GLY 24  
+1 n ALA 25  
+1 n ASN 26  
+1 n ARG 27  
+1 n THR 28  
+1 n ALA 29  
+1 n ALA 30  
+1 n ASP 31  
+1 n THR 32  
+1 n GLU 33  
+1 n PHE 34  
+1 n ALA 35  
+1 n SER 36  
+1 n GLU 37  
+1 n ALA 38  
+1 n GLY 39  
+1 n ALA 40  
+1 n ASN 41  
+1 n ARG 42  
+1 n THR 43  
+1 n VAL 44  
+1 n ALA 45  
+1 n ASP 46  
+1 n THR 47  
+1 n GLU 48  
+1 n PHE 49  
+1 n ALA 50  
+1 n SER 51  
+1 n GLU 52  
+1 n ALA 53  
+1 n GLY 54  
+1 n ALA 55  
+1 n ASN 56  
+1 n THR 57  
+1 n THR 58  
+1 n ALA 59  
+1 n ALA 60  
+1 n ASP 61  
+1 n THR 62  
+1 n GLU 63  
+1 n PHE 64  
+1 n ALA 65  
+1 n SER 66  
+1 n GLU 67  
+1 n ALA 68  
+1 n GLY 69  
+1 n ALA 70  
+1 n ASN 71  
+1 n ARG 72  
+1 n THR 73  
+1 n ALA 74  
+1 n ALA 75  
+1 n ASP 76  
+1 n THR 77  
+1 n GLU 78  
+1 n PHE 79  
+1 n ALA 80  
+1 n SER 81  
+1 n GLU 82  
+1 n ALA 83  
+1 n GLY 84  
+1 n ALA 85  
+1 n ASN 86  
+1 n ARG 87  
+1 n THR 88  
+1 n ALA 89  
+1 n ALA 90  
+1 n ASP 91  
+1 n THR 92  
+1 n GLU 93  
+1 n PHE 94  
+1 n ALA 95  
+1 n SER 96  
+1 n GLU 97  
+1 n ALA 98  
+1 n GLY 99  
+1 n ALA 100 
+1 n ASN 101 
+1 n THR 102 
+1 n THR 103 
+1 n ALA 104 
+1 n ALA 105 
+1 n ASP 106 
+1 n THR 107 
+1 n GLU 108 
+1 n PHE 109 
+1 n ALA 110 
+1 n SER 111 
+1 n GLU 112 
+1 n ALA 113 
+1 n GLY 114 
+1 n ALA 115 
+1 n ASN 116 
+1 n ARG 117 
+1 n THR 118 
+1 n ALA 119 
+1 n ALA 120 
+1 n ASP 121 
+1 n THR 122 
+1 n GLU 123 
+1 n PHE 124 
+1 n ALA 125 
+1 n SER 126 
+1 n GLU 127 
+1 n VAL 128 
+1 n ARG 129 
+1 n ALA 130 
+1 n ASN 131 
+1 n ARG 132 
+1 n THR 133 
+1 n SER 134 
+1 n ALA 135 
+1 n ASP 136 
+1 n THR 137 
+1 n GLU 138 
+1 n PHE 139 
+1 n ALA 140 
+1 n ASN 141 
+1 n GLU 142 
+1 n VAL 143 
+1 n THR 144 
+1 n SER 145 
+1 n LYS 146 
+1 n GLN 147 
+1 n ASN 148 
+1 n ARG 149 
+1 n CYS 150 
+1 n GLY 151 
+1 n HIS 152 
+#
+loop_
+_ma_data.content_type
+_ma_data.id
+_ma_data.name
+"model coordinates" 1 Model             
+"input structure"   2 "Input structure" 
+#
+_ma_model_list.data_id          1
+_ma_model_list.model_group_id   1
+_ma_model_list.model_group_name "AlphaFold Monomer v2.0 model"
+_ma_model_list.model_id         1
+_ma_model_list.model_name       "Top ranked model"
+_ma_model_list.model_type       "Ab initio model"
+_ma_model_list.ordinal_id       1
+#
+loop_
+_ma_protocol_step.method_type
+_ma_protocol_step.ordinal_id
+_ma_protocol_step.protocol_id
+_ma_protocol_step.step_id
+"coevolution MSA" 1 1 1 
+"template search" 2 1 2 
+modeling          3 1 3 
+#
+loop_
+_ma_qa_metric.id
+_ma_qa_metric.mode
+_ma_qa_metric.name
+_ma_qa_metric.software_group_id
+_ma_qa_metric.type
+1 global pLDDT 1 pLDDT 
+2 local  pLDDT 1 pLDDT 
+#
+_ma_qa_metric_global.metric_id    1
+_ma_qa_metric_global.metric_value 90.14
+_ma_qa_metric_global.model_id     1
+_ma_qa_metric_global.ordinal_id   1
+#
+loop_
+_ma_qa_metric_local.label_asym_id
+_ma_qa_metric_local.label_comp_id
+_ma_qa_metric_local.label_seq_id
+_ma_qa_metric_local.metric_id
+_ma_qa_metric_local.metric_value
+_ma_qa_metric_local.model_id
+_ma_qa_metric_local.ordinal_id
+A MET 1   2 34.44 1 1   
+A ILE 2   2 38.03 1 2   
+A MET 3   2 39.03 1 3   
+A LYS 4   2 45.03 1 4   
+A ASN 5   2 42.38 1 5   
+A LYS 6   2 47.50 1 6   
+A ASN 7   2 44.88 1 7   
+A LYS 8   2 44.59 1 8   
+A GLN 9   2 48.12 1 9   
+A ASN 10  2 55.12 1 10  
+A ARG 11  2 56.03 1 11  
+A LYS 12  2 73.56 1 12  
+A ALA 13  2 77.81 1 13  
+A PHE 14  2 80.12 1 14  
+A ALA 15  2 80.38 1 15  
+A ASP 16  2 87.81 1 16  
+A THR 17  2 90.19 1 17  
+A GLU 18  2 91.25 1 18  
+A PHE 19  2 90.44 1 19  
+A ALA 20  2 88.88 1 20  
+A SER 21  2 92.38 1 21  
+A GLU 22  2 87.19 1 22  
+A ALA 23  2 90.38 1 23  
+A GLY 24  2 86.38 1 24  
+A ALA 25  2 84.62 1 25  
+A ASN 26  2 89.00 1 26  
+A ARG 27  2 88.31 1 27  
+A THR 28  2 91.44 1 28  
+A ALA 29  2 90.12 1 29  
+A ALA 30  2 90.31 1 30  
+A ASP 31  2 92.75 1 31  
+A THR 32  2 95.44 1 32  
+A GLU 33  2 95.38 1 33  
+A PHE 34  2 95.44 1 34  
+A ALA 35  2 94.94 1 35  
+A SER 36  2 96.62 1 36  
+A GLU 37  2 94.25 1 37  
+A ALA 38  2 95.38 1 38  
+A GLY 39  2 92.50 1 39  
+A ALA 40  2 92.38 1 40  
+A ASN 41  2 93.56 1 41  
+A ARG 42  2 93.56 1 42  
+A THR 43  2 95.69 1 43  
+A VAL 44  2 94.94 1 44  
+A ALA 45  2 95.31 1 45  
+A ASP 46  2 96.00 1 46  
+A THR 47  2 97.12 1 47  
+A GLU 48  2 97.81 1 48  
+A PHE 49  2 97.81 1 49  
+A ALA 50  2 97.12 1 50  
+A SER 51  2 98.19 1 51  
+A GLU 52  2 97.38 1 52  
+A ALA 53  2 97.81 1 53  
+A GLY 54  2 96.44 1 54  
+A ALA 55  2 96.31 1 55  
+A ASN 56  2 97.44 1 56  
+A THR 57  2 96.94 1 57  
+A THR 58  2 98.06 1 58  
+A ALA 59  2 96.69 1 59  
+A ALA 60  2 97.00 1 60  
+A ASP 61  2 97.75 1 61  
+A THR 62  2 97.94 1 62  
+A GLU 63  2 98.44 1 63  
+A PHE 64  2 98.50 1 64  
+A ALA 65  2 97.81 1 65  
+A SER 66  2 98.56 1 66  
+A GLU 67  2 98.00 1 67  
+A ALA 68  2 98.38 1 68  
+A GLY 69  2 97.75 1 69  
+A ALA 70  2 97.75 1 70  
+A ASN 71  2 98.25 1 71  
+A ARG 72  2 97.94 1 72  
+A THR 73  2 98.50 1 73  
+A ALA 74  2 96.81 1 74  
+A ALA 75  2 97.69 1 75  
+A ASP 76  2 98.12 1 76  
+A THR 77  2 98.19 1 77  
+A GLU 78  2 98.62 1 78  
+A PHE 79  2 98.56 1 79  
+A ALA 80  2 97.94 1 80  
+A SER 81  2 98.62 1 81  
+A GLU 82  2 98.19 1 82  
+A ALA 83  2 98.50 1 83  
+A GLY 84  2 98.00 1 84  
+A ALA 85  2 98.06 1 85  
+A ASN 86  2 98.44 1 86  
+A ARG 87  2 98.12 1 87  
+A THR 88  2 98.50 1 88  
+A ALA 89  2 97.12 1 89  
+A ALA 90  2 97.75 1 90  
+A ASP 91  2 98.25 1 91  
+A THR 92  2 98.06 1 92  
+A GLU 93  2 98.56 1 93  
+A PHE 94  2 98.56 1 94  
+A ALA 95  2 97.81 1 95  
+A SER 96  2 98.56 1 96  
+A GLU 97  2 98.25 1 97  
+A ALA 98  2 98.44 1 98  
+A GLY 99  2 97.88 1 99  
+A ALA 100 2 98.12 1 100 
+A ASN 101 2 98.44 1 101 
+A THR 102 2 97.62 1 102 
+A THR 103 2 98.12 1 103 
+A ALA 104 2 96.81 1 104 
+A ALA 105 2 97.00 1 105 
+A ASP 106 2 97.88 1 106 
+A THR 107 2 97.62 1 107 
+A GLU 108 2 98.44 1 108 
+A PHE 109 2 98.31 1 109 
+A ALA 110 2 97.31 1 110 
+A SER 111 2 98.31 1 111 
+A GLU 112 2 97.62 1 112 
+A ALA 113 2 98.06 1 113 
+A GLY 114 2 97.62 1 114 
+A ALA 115 2 97.62 1 115 
+A ASN 116 2 97.75 1 116 
+A ARG 117 2 96.31 1 117 
+A THR 118 2 97.12 1 118 
+A ALA 119 2 94.94 1 119 
+A ALA 120 2 95.56 1 120 
+A ASP 121 2 96.00 1 121 
+A THR 122 2 95.94 1 122 
+A GLU 123 2 97.62 1 123 
+A PHE 124 2 97.56 1 124 
+A ALA 125 2 96.31 1 125 
+A SER 126 2 97.81 1 126 
+A GLU 127 2 96.75 1 127 
+A VAL 128 2 97.75 1 128 
+A ARG 129 2 97.06 1 129 
+A ALA 130 2 96.44 1 130 
+A ASN 131 2 96.19 1 131 
+A ARG 132 2 94.06 1 132 
+A THR 133 2 95.19 1 133 
+A SER 134 2 91.88 1 134 
+A ALA 135 2 93.06 1 135 
+A ASP 136 2 92.88 1 136 
+A THR 137 2 93.31 1 137 
+A GLU 138 2 95.25 1 138 
+A PHE 139 2 95.06 1 139 
+A ALA 140 2 94.06 1 140 
+A ASN 141 2 95.62 1 141 
+A GLU 142 2 93.50 1 142 
+A VAL 143 2 94.88 1 143 
+A THR 144 2 93.44 1 144 
+A SER 145 2 93.50 1 145 
+A LYS 146 2 91.69 1 146 
+A GLN 147 2 89.00 1 147 
+A ASN 148 2 91.25 1 148 
+A ARG 149 2 85.00 1 149 
+A CYS 150 2 71.25 1 150 
+A GLY 151 2 59.62 1 151 
+A HIS 152 2 47.81 1 152 
+#
+_ma_software_group.group_id    1
+_ma_software_group.ordinal_id  1
+_ma_software_group.software_id 1
+#
+_ma_target_entity.data_id   1
+_ma_target_entity.entity_id 1
+_ma_target_entity.origin    "reference database"
+#
+_ma_target_entity_instance.asym_id   A
+_ma_target_entity_instance.details   .
+_ma_target_entity_instance.entity_id 1
+#
+_ma_target_ref_db_details.db_accession                 V9WDR2
+_ma_target_ref_db_details.db_code                      V9WDR2_9BACL
+_ma_target_ref_db_details.db_name                      UNP
+_ma_target_ref_db_details.gene_name                    ERIC2_c35200
+_ma_target_ref_db_details.ncbi_taxonomy_id             697284
+_ma_target_ref_db_details.organism_scientific          "Paenibacillus larvae subsp. larvae DSM 25430"
+_ma_target_ref_db_details.seq_db_align_begin           1
+_ma_target_ref_db_details.seq_db_align_end             152
+_ma_target_ref_db_details.seq_db_isoform               ?
+_ma_target_ref_db_details.seq_db_sequence_checksum     35E70E5C15D19AFF
+_ma_target_ref_db_details.seq_db_sequence_version_date 2014-03-19
+_ma_target_ref_db_details.target_entity_id             1
+#
+loop_
+_ma_template_details.ordinal_id
+_ma_template_details.target_asym_id
+_ma_template_details.template_auth_asym_id
+_ma_template_details.template_data_id
+_ma_template_details.template_entity_type
+_ma_template_details.template_id
+_ma_template_details.template_model_num
+_ma_template_details.template_origin
+_ma_template_details.template_trans_matrix_id
+1 A J 2 polymer 1 1 "reference database" 1 
+2 A A 2 polymer 2 1 "reference database" 1 
+#
+loop_
+_ma_template_ref_db_details.db_accession_code
+_ma_template_ref_db_details.db_name
+_ma_template_ref_db_details.template_id
+6J9E PDB 1 
+2MC6 PDB 2 
+#
+_ma_template_trans_matrix.id               1
+_ma_template_trans_matrix.rot_matrix[1][1] 1.0
+_ma_template_trans_matrix.rot_matrix[1][2] 0.0
+_ma_template_trans_matrix.rot_matrix[1][3] 0.0
+_ma_template_trans_matrix.rot_matrix[2][1] 0.0
+_ma_template_trans_matrix.rot_matrix[2][2] 1.0
+_ma_template_trans_matrix.rot_matrix[2][3] 0.0
+_ma_template_trans_matrix.rot_matrix[3][1] 0.0
+_ma_template_trans_matrix.rot_matrix[3][2] 0.0
+_ma_template_trans_matrix.rot_matrix[3][3] 1.0
+_ma_template_trans_matrix.tr_vector[1]     0.0
+_ma_template_trans_matrix.tr_vector[2]     0.0
+_ma_template_trans_matrix.tr_vector[3]     0.0
+#
+loop_
+_pdbx_audit_revision_details.data_content_type
+_pdbx_audit_revision_details.description
+_pdbx_audit_revision_details.ordinal
+_pdbx_audit_revision_details.provider
+_pdbx_audit_revision_details.revision_ordinal
+_pdbx_audit_revision_details.type
+"Structure model" "Format fixes, new metadata, initial UniProt release" 3 repository 3 Remediation 
+"Structure model" "Improved prediction accuracy, small format fixes"    4 repository 4 Remediation 
+#
+loop_
+_pdbx_audit_revision_history.data_content_type
+_pdbx_audit_revision_history.major_revision
+_pdbx_audit_revision_history.minor_revision
+_pdbx_audit_revision_history.ordinal
+_pdbx_audit_revision_history.revision_date
+"Structure model" 3 0 3 2022-06-01 
+"Structure model" 4 0 4 2022-09-30 
+#
+loop_
+_pdbx_data_usage.details
+_pdbx_data_usage.id
+_pdbx_data_usage.name
+_pdbx_data_usage.type
+_pdbx_data_usage.url
+"Data in this file is available under a CC-BY-4.0 license." 1 CC-BY-4.0 license    https://creativecommons.org/licenses/by/4.0/ 
+;ALPHAFOLD DATA, COPYRIGHT (2021) DEEPMIND TECHNOLOGIES LIMITED. THE INFORMATION
+PROVIDED IS THEORETICAL MODELLING ONLY AND CAUTION SHOULD BE EXERCISED IN ITS
+USE. IT IS PROVIDED "AS-IS" WITHOUT ANY WARRANTY OF ANY KIND, WHETHER EXPRESSED
+OR IMPLIED. NO WARRANTY IS GIVEN THAT USE OF THE INFORMATION SHALL NOT INFRINGE
+THE RIGHTS OF ANY THIRD PARTY. DISCLAIMER: THE INFORMATION IS NOT INTENDED TO BE
+A SUBSTITUTE FOR PROFESSIONAL MEDICAL ADVICE, DIAGNOSIS, OR TREATMENT, AND DOES
+NOT CONSTITUTE MEDICAL OR OTHER PROFESSIONAL ADVICE. IT IS AVAILABLE FOR
+ACADEMIC AND COMMERCIAL PURPOSES, UNDER CC-BY 4.0 LICENCE.
+;
+2 ?         disclaimer ?                                            
+#
+_pdbx_database_status.entry_id                      AF-V9WDR2-F1
+_pdbx_database_status.recvd_initial_deposition_date 2022-06-01
+_pdbx_database_status.status_code                   REL
+#
+loop_
+_pdbx_poly_seq_scheme.asym_id
+_pdbx_poly_seq_scheme.auth_seq_num
+_pdbx_poly_seq_scheme.entity_id
+_pdbx_poly_seq_scheme.hetero
+_pdbx_poly_seq_scheme.mon_id
+_pdbx_poly_seq_scheme.pdb_ins_code
+_pdbx_poly_seq_scheme.pdb_mon_id
+_pdbx_poly_seq_scheme.pdb_seq_num
+_pdbx_poly_seq_scheme.pdb_strand_id
+_pdbx_poly_seq_scheme.seq_id
+A 1   1 n MET . MET 1   A 1   
+A 2   1 n ILE . ILE 2   A 2   
+A 3   1 n MET . MET 3   A 3   
+A 4   1 n LYS . LYS 4   A 4   
+A 5   1 n ASN . ASN 5   A 5   
+A 6   1 n LYS . LYS 6   A 6   
+A 7   1 n ASN . ASN 7   A 7   
+A 8   1 n LYS . LYS 8   A 8   
+A 9   1 n GLN . GLN 9   A 9   
+A 10  1 n ASN . ASN 10  A 10  
+A 11  1 n ARG . ARG 11  A 11  
+A 12  1 n LYS . LYS 12  A 12  
+A 13  1 n ALA . ALA 13  A 13  
+A 14  1 n PHE . PHE 14  A 14  
+A 15  1 n ALA . ALA 15  A 15  
+A 16  1 n ASP . ASP 16  A 16  
+A 17  1 n THR . THR 17  A 17  
+A 18  1 n GLU . GLU 18  A 18  
+A 19  1 n PHE . PHE 19  A 19  
+A 20  1 n ALA . ALA 20  A 20  
+A 21  1 n SER . SER 21  A 21  
+A 22  1 n GLU . GLU 22  A 22  
+A 23  1 n ALA . ALA 23  A 23  
+A 24  1 n GLY . GLY 24  A 24  
+A 25  1 n ALA . ALA 25  A 25  
+A 26  1 n ASN . ASN 26  A 26  
+A 27  1 n ARG . ARG 27  A 27  
+A 28  1 n THR . THR 28  A 28  
+A 29  1 n ALA . ALA 29  A 29  
+A 30  1 n ALA . ALA 30  A 30  
+A 31  1 n ASP . ASP 31  A 31  
+A 32  1 n THR . THR 32  A 32  
+A 33  1 n GLU . GLU 33  A 33  
+A 34  1 n PHE . PHE 34  A 34  
+A 35  1 n ALA . ALA 35  A 35  
+A 36  1 n SER . SER 36  A 36  
+A 37  1 n GLU . GLU 37  A 37  
+A 38  1 n ALA . ALA 38  A 38  
+A 39  1 n GLY . GLY 39  A 39  
+A 40  1 n ALA . ALA 40  A 40  
+A 41  1 n ASN . ASN 41  A 41  
+A 42  1 n ARG . ARG 42  A 42  
+A 43  1 n THR . THR 43  A 43  
+A 44  1 n VAL . VAL 44  A 44  
+A 45  1 n ALA . ALA 45  A 45  
+A 46  1 n ASP . ASP 46  A 46  
+A 47  1 n THR . THR 47  A 47  
+A 48  1 n GLU . GLU 48  A 48  
+A 49  1 n PHE . PHE 49  A 49  
+A 50  1 n ALA . ALA 50  A 50  
+A 51  1 n SER . SER 51  A 51  
+A 52  1 n GLU . GLU 52  A 52  
+A 53  1 n ALA . ALA 53  A 53  
+A 54  1 n GLY . GLY 54  A 54  
+A 55  1 n ALA . ALA 55  A 55  
+A 56  1 n ASN . ASN 56  A 56  
+A 57  1 n THR . THR 57  A 57  
+A 58  1 n THR . THR 58  A 58  
+A 59  1 n ALA . ALA 59  A 59  
+A 60  1 n ALA . ALA 60  A 60  
+A 61  1 n ASP . ASP 61  A 61  
+A 62  1 n THR . THR 62  A 62  
+A 63  1 n GLU . GLU 63  A 63  
+A 64  1 n PHE . PHE 64  A 64  
+A 65  1 n ALA . ALA 65  A 65  
+A 66  1 n SER . SER 66  A 66  
+A 67  1 n GLU . GLU 67  A 67  
+A 68  1 n ALA . ALA 68  A 68  
+A 69  1 n GLY . GLY 69  A 69  
+A 70  1 n ALA . ALA 70  A 70  
+A 71  1 n ASN . ASN 71  A 71  
+A 72  1 n ARG . ARG 72  A 72  
+A 73  1 n THR . THR 73  A 73  
+A 74  1 n ALA . ALA 74  A 74  
+A 75  1 n ALA . ALA 75  A 75  
+A 76  1 n ASP . ASP 76  A 76  
+A 77  1 n THR . THR 77  A 77  
+A 78  1 n GLU . GLU 78  A 78  
+A 79  1 n PHE . PHE 79  A 79  
+A 80  1 n ALA . ALA 80  A 80  
+A 81  1 n SER . SER 81  A 81  
+A 82  1 n GLU . GLU 82  A 82  
+A 83  1 n ALA . ALA 83  A 83  
+A 84  1 n GLY . GLY 84  A 84  
+A 85  1 n ALA . ALA 85  A 85  
+A 86  1 n ASN . ASN 86  A 86  
+A 87  1 n ARG . ARG 87  A 87  
+A 88  1 n THR . THR 88  A 88  
+A 89  1 n ALA . ALA 89  A 89  
+A 90  1 n ALA . ALA 90  A 90  
+A 91  1 n ASP . ASP 91  A 91  
+A 92  1 n THR . THR 92  A 92  
+A 93  1 n GLU . GLU 93  A 93  
+A 94  1 n PHE . PHE 94  A 94  
+A 95  1 n ALA . ALA 95  A 95  
+A 96  1 n SER . SER 96  A 96  
+A 97  1 n GLU . GLU 97  A 97  
+A 98  1 n ALA . ALA 98  A 98  
+A 99  1 n GLY . GLY 99  A 99  
+A 100 1 n ALA . ALA 100 A 100 
+A 101 1 n ASN . ASN 101 A 101 
+A 102 1 n THR . THR 102 A 102 
+A 103 1 n THR . THR 103 A 103 
+A 104 1 n ALA . ALA 104 A 104 
+A 105 1 n ALA . ALA 105 A 105 
+A 106 1 n ASP . ASP 106 A 106 
+A 107 1 n THR . THR 107 A 107 
+A 108 1 n GLU . GLU 108 A 108 
+A 109 1 n PHE . PHE 109 A 109 
+A 110 1 n ALA . ALA 110 A 110 
+A 111 1 n SER . SER 111 A 111 
+A 112 1 n GLU . GLU 112 A 112 
+A 113 1 n ALA . ALA 113 A 113 
+A 114 1 n GLY . GLY 114 A 114 
+A 115 1 n ALA . ALA 115 A 115 
+A 116 1 n ASN . ASN 116 A 116 
+A 117 1 n ARG . ARG 117 A 117 
+A 118 1 n THR . THR 118 A 118 
+A 119 1 n ALA . ALA 119 A 119 
+A 120 1 n ALA . ALA 120 A 120 
+A 121 1 n ASP . ASP 121 A 121 
+A 122 1 n THR . THR 122 A 122 
+A 123 1 n GLU . GLU 123 A 123 
+A 124 1 n PHE . PHE 124 A 124 
+A 125 1 n ALA . ALA 125 A 125 
+A 126 1 n SER . SER 126 A 126 
+A 127 1 n GLU . GLU 127 A 127 
+A 128 1 n VAL . VAL 128 A 128 
+A 129 1 n ARG . ARG 129 A 129 
+A 130 1 n ALA . ALA 130 A 130 
+A 131 1 n ASN . ASN 131 A 131 
+A 132 1 n ARG . ARG 132 A 132 
+A 133 1 n THR . THR 133 A 133 
+A 134 1 n SER . SER 134 A 134 
+A 135 1 n ALA . ALA 135 A 135 
+A 136 1 n ASP . ASP 136 A 136 
+A 137 1 n THR . THR 137 A 137 
+A 138 1 n GLU . GLU 138 A 138 
+A 139 1 n PHE . PHE 139 A 139 
+A 140 1 n ALA . ALA 140 A 140 
+A 141 1 n ASN . ASN 141 A 141 
+A 142 1 n GLU . GLU 142 A 142 
+A 143 1 n VAL . VAL 143 A 143 
+A 144 1 n THR . THR 144 A 144 
+A 145 1 n SER . SER 145 A 145 
+A 146 1 n LYS . LYS 146 A 146 
+A 147 1 n GLN . GLN 147 A 147 
+A 148 1 n ASN . ASN 148 A 148 
+A 149 1 n ARG . ARG 149 A 149 
+A 150 1 n CYS . CYS 150 A 150 
+A 151 1 n GLY . GLY 151 A 151 
+A 152 1 n HIS . HIS 152 A 152 
+#
+loop_
+_software.classification
+_software.date
+_software.description
+_software.name
+_software.pdbx_ordinal
+_software.type
+_software.version
+other ? "Structure prediction" AlphaFold 1 package v2.0 
+other ? "Secondary structure"  dssp      2 library 4    
+#
+_struct_asym.entity_id 1
+_struct_asym.id        A
+#
+loop_
+_struct_conf.beg_auth_asym_id
+_struct_conf.beg_auth_comp_id
+_struct_conf.beg_auth_seq_id
+_struct_conf.beg_label_asym_id
+_struct_conf.beg_label_comp_id
+_struct_conf.beg_label_seq_id
+_struct_conf.conf_type_id
+_struct_conf.end_auth_asym_id
+_struct_conf.end_auth_comp_id
+_struct_conf.end_auth_seq_id
+_struct_conf.end_label_asym_id
+_struct_conf.end_label_comp_id
+_struct_conf.end_label_seq_id
+_struct_conf.id
+_struct_conf.pdbx_beg_PDB_ins_code
+_struct_conf.pdbx_end_PDB_ins_code
+A ARG 11  A ARG 11  STRN         A ALA 23  A ALA 23  STRN1         ? ? 
+A GLY 24  A GLY 24  BEND         A GLY 24  A GLY 24  BEND1         ? ? 
+A ASN 26  A ASN 26  STRN         A ALA 38  A ALA 38  STRN2         ? ? 
+A GLY 39  A GLY 39  BEND         A GLY 39  A GLY 39  BEND2         ? ? 
+A ASN 41  A ASN 41  STRN         A THR 43  A THR 43  STRN3         ? ? 
+A ALA 45  A ALA 45  BEND         A ALA 45  A ALA 45  BEND3         ? ? 
+A ASP 46  A ASP 46  STRN         A ALA 53  A ALA 53  STRN4         ? ? 
+A GLY 54  A GLY 54  BEND         A GLY 54  A GLY 54  BEND4         ? ? 
+A ASN 56  A ASN 56  STRN         A THR 58  A THR 58  STRN5         ? ? 
+A ALA 60  A ALA 60  BEND         A ALA 60  A ALA 60  BEND5         ? ? 
+A ASP 61  A ASP 61  STRN         A ALA 68  A ALA 68  STRN6         ? ? 
+A GLY 69  A GLY 69  BEND         A GLY 69  A GLY 69  BEND6         ? ? 
+A ASN 71  A ASN 71  STRN         A THR 73  A THR 73  STRN7         ? ? 
+A ALA 75  A ALA 75  BEND         A ALA 75  A ALA 75  BEND7         ? ? 
+A ASP 76  A ASP 76  STRN         A ALA 83  A ALA 83  STRN8         ? ? 
+A GLY 84  A GLY 84  BEND         A GLY 84  A GLY 84  BEND8         ? ? 
+A ASN 86  A ASN 86  STRN         A THR 88  A THR 88  STRN9         ? ? 
+A ALA 90  A ALA 90  BEND         A ALA 90  A ALA 90  BEND9         ? ? 
+A ASP 91  A ASP 91  STRN         A ALA 98  A ALA 98  STRN10        ? ? 
+A GLY 99  A GLY 99  BEND         A GLY 99  A GLY 99  BEND10        ? ? 
+A ASN 101 A ASN 101 STRN         A THR 103 A THR 103 STRN11        ? ? 
+A ALA 105 A ALA 105 BEND         A ALA 105 A ALA 105 BEND11        ? ? 
+A ASP 106 A ASP 106 STRN         A ALA 113 A ALA 113 STRN12        ? ? 
+A GLY 114 A GLY 114 BEND         A GLY 114 A GLY 114 BEND12        ? ? 
+A ASN 116 A ASN 116 STRN         A THR 118 A THR 118 STRN13        ? ? 
+A ALA 120 A ALA 120 BEND         A ALA 120 A ALA 120 BEND13        ? ? 
+A ASP 121 A ASP 121 STRN         A VAL 128 A VAL 128 STRN14        ? ? 
+A ARG 129 A ARG 129 BEND         A ARG 129 A ARG 129 BEND14        ? ? 
+A ASN 131 A ASN 131 STRN         A SER 134 A SER 134 STRN15        ? ? 
+A ALA 135 A ALA 135 BEND         A ALA 135 A ALA 135 BEND15        ? ? 
+A ASP 136 A ASP 136 STRN         A VAL 143 A VAL 143 STRN16        ? ? 
+A THR 144 A THR 144 BEND         A THR 144 A THR 144 BEND16        ? ? 
+A LYS 146 A LYS 146 STRN         A ARG 149 A ARG 149 STRN17        ? ? 
+A CYS 150 A CYS 150 HELX_LH_PP_P A GLY 151 A GLY 151 HELX_LH_PP_P1 ? ? 
+#
+loop_
+_struct_conf_type.criteria
+_struct_conf_type.id
+DSSP STRN         
+DSSP BEND         
+DSSP HELX_LH_PP_P 
+#
+_struct_ref.db_code                  V9WDR2_9BACL
+_struct_ref.db_name                  UNP
+_struct_ref.entity_id                1
+_struct_ref.id                       1
+_struct_ref.pdbx_align_begin         1
+_struct_ref.pdbx_align_end           152
+_struct_ref.pdbx_db_accession        V9WDR2
+_struct_ref.pdbx_db_isoform          ?
+_struct_ref.pdbx_seq_one_letter_code 
+;MIMKNKNKQNRKAFADTEFASEAGANRTAADTEFASEAGANRTVADTEFASEAGANTTAADTEFASEAGANRTAADTEFA
+SEAGANRTAADTEFASEAGANTTAADTEFASEAGANRTAADTEFASEVRANRTSADTEFANEVTSKQNRCGH
+;
+#
+_struct_ref_seq.align_id                    1
+_struct_ref_seq.db_align_beg                1
+_struct_ref_seq.db_align_end                152
+_struct_ref_seq.pdbx_PDB_id_code            AF-V9WDR2-F1
+_struct_ref_seq.pdbx_auth_seq_align_beg     1
+_struct_ref_seq.pdbx_auth_seq_align_end     152
+_struct_ref_seq.pdbx_db_accession           V9WDR2
+_struct_ref_seq.pdbx_db_align_beg_ins_code  ?
+_struct_ref_seq.pdbx_db_align_end_ins_code  ?
+_struct_ref_seq.pdbx_seq_align_beg_ins_code ?
+_struct_ref_seq.pdbx_seq_align_end_ins_code ?
+_struct_ref_seq.pdbx_strand_id              A
+_struct_ref_seq.ref_id                      1
+_struct_ref_seq.seq_align_beg               1
+_struct_ref_seq.seq_align_end               152
+#
+loop_
+_atom_site.group_PDB
+_atom_site.id
+_atom_site.type_symbol
+_atom_site.label_atom_id
+_atom_site.label_alt_id
+_atom_site.label_comp_id
+_atom_site.label_asym_id
+_atom_site.label_entity_id
+_atom_site.label_seq_id
+_atom_site.pdbx_PDB_ins_code
+_atom_site.Cartn_x
+_atom_site.Cartn_y
+_atom_site.Cartn_z
+_atom_site.occupancy
+_atom_site.B_iso_or_equiv
+_atom_site.pdbx_formal_charge
+_atom_site.auth_seq_id
+_atom_site.auth_comp_id
+_atom_site.auth_asym_id
+_atom_site.auth_atom_id
+_atom_site.pdbx_PDB_model_num
+_atom_site.pdbx_sifts_xref_db_acc
+_atom_site.pdbx_sifts_xref_db_name
+_atom_site.pdbx_sifts_xref_db_num
+_atom_site.pdbx_sifts_xref_db_res
+ATOM 1    N N   . MET A 1 1   ? -4.984  -19.848 45.023  1.0 34.44 ? 1   MET A N   1 V9WDR2 UNP 1   M 
+ATOM 2    C CA  . MET A 1 1   ? -4.373  -18.588 44.547  1.0 34.44 ? 1   MET A CA  1 V9WDR2 UNP 1   M 
+ATOM 3    C C   . MET A 1 1   ? -4.055  -18.774 43.067  1.0 34.44 ? 1   MET A C   1 V9WDR2 UNP 1   M 
+ATOM 4    C CB  . MET A 1 1   ? -3.142  -18.277 45.423  1.0 34.44 ? 1   MET A CB  1 V9WDR2 UNP 1   M 
+ATOM 5    O O   . MET A 1 1   ? -3.075  -19.425 42.745  1.0 34.44 ? 1   MET A O   1 V9WDR2 UNP 1   M 
+ATOM 6    C CG  . MET A 1 1   ? -2.706  -16.810 45.457  1.0 34.44 ? 1   MET A CG  1 V9WDR2 UNP 1   M 
+ATOM 7    S SD  . MET A 1 1   ? -1.706  -16.488 46.937  1.0 34.44 ? 1   MET A SD  1 V9WDR2 UNP 1   M 
+ATOM 8    C CE  . MET A 1 1   ? -1.283  -14.738 46.734  1.0 34.44 ? 1   MET A CE  1 V9WDR2 UNP 1   M 
+ATOM 9    N N   . ILE A 1 2   ? -4.958  -18.367 42.169  1.0 38.03 ? 2   ILE A N   1 V9WDR2 UNP 2   I 
+ATOM 10   C CA  . ILE A 1 2   ? -4.807  -18.602 40.723  1.0 38.03 ? 2   ILE A CA  1 V9WDR2 UNP 2   I 
+ATOM 11   C C   . ILE A 1 2   ? -4.126  -17.371 40.130  1.0 38.03 ? 2   ILE A C   1 V9WDR2 UNP 2   I 
+ATOM 12   C CB  . ILE A 1 2   ? -6.163  -18.933 40.049  1.0 38.03 ? 2   ILE A CB  1 V9WDR2 UNP 2   I 
+ATOM 13   O O   . ILE A 1 2   ? -4.718  -16.292 40.093  1.0 38.03 ? 2   ILE A O   1 V9WDR2 UNP 2   I 
+ATOM 14   C CG1 . ILE A 1 2   ? -6.749  -20.233 40.653  1.0 38.03 ? 2   ILE A CG1 1 V9WDR2 UNP 2   I 
+ATOM 15   C CG2 . ILE A 1 2   ? -5.997  -19.071 38.522  1.0 38.03 ? 2   ILE A CG2 1 V9WDR2 UNP 2   I 
+ATOM 16   C CD1 . ILE A 1 2   ? -8.159  -20.585 40.161  1.0 38.03 ? 2   ILE A CD1 1 V9WDR2 UNP 2   I 
+ATOM 17   N N   . MET A 1 3   ? -2.874  -17.527 39.701  1.0 39.03 ? 3   MET A N   1 V9WDR2 UNP 3   M 
+ATOM 18   C CA  . MET A 1 3   ? -2.173  -16.510 38.922  1.0 39.03 ? 3   MET A CA  1 V9WDR2 UNP 3   M 
+ATOM 19   C C   . MET A 1 3   ? -2.892  -16.363 37.579  1.0 39.03 ? 3   MET A C   1 V9WDR2 UNP 3   M 
+ATOM 20   C CB  . MET A 1 3   ? -0.698  -16.894 38.716  1.0 39.03 ? 3   MET A CB  1 V9WDR2 UNP 3   M 
+ATOM 21   O O   . MET A 1 3   ? -2.768  -17.209 36.696  1.0 39.03 ? 3   MET A O   1 V9WDR2 UNP 3   M 
+ATOM 22   C CG  . MET A 1 3   ? 0.110   -16.899 40.016  1.0 39.03 ? 3   MET A CG  1 V9WDR2 UNP 3   M 
+ATOM 23   S SD  . MET A 1 3   ? 1.854   -17.302 39.747  1.0 39.03 ? 3   MET A SD  1 V9WDR2 UNP 3   M 
+ATOM 24   C CE  . MET A 1 3   ? 2.256   -18.070 41.338  1.0 39.03 ? 3   MET A CE  1 V9WDR2 UNP 3   M 
+ATOM 25   N N   . LYS A 1 4   ? -3.683  -15.298 37.426  1.0 45.03 ? 4   LYS A N   1 V9WDR2 UNP 4   K 
+ATOM 26   C CA  . LYS A 1 4   ? -4.209  -14.903 36.119  1.0 45.03 ? 4   LYS A CA  1 V9WDR2 UNP 4   K 
+ATOM 27   C C   . LYS A 1 4   ? -3.031  -14.403 35.283  1.0 45.03 ? 4   LYS A C   1 V9WDR2 UNP 4   K 
+ATOM 28   C CB  . LYS A 1 4   ? -5.328  -13.857 36.259  1.0 45.03 ? 4   LYS A CB  1 V9WDR2 UNP 4   K 
+ATOM 29   O O   . LYS A 1 4   ? -2.419  -13.389 35.614  1.0 45.03 ? 4   LYS A O   1 V9WDR2 UNP 4   K 
+ATOM 30   C CG  . LYS A 1 4   ? -6.620  -14.469 36.831  1.0 45.03 ? 4   LYS A CG  1 V9WDR2 UNP 4   K 
+ATOM 31   C CD  . LYS A 1 4   ? -7.749  -13.429 36.904  1.0 45.03 ? 4   LYS A CD  1 V9WDR2 UNP 4   K 
+ATOM 32   C CE  . LYS A 1 4   ? -9.048  -14.074 37.411  1.0 45.03 ? 4   LYS A CE  1 V9WDR2 UNP 4   K 
+ATOM 33   N NZ  . LYS A 1 4   ? -10.164 -13.095 37.503  1.0 45.03 ? 4   LYS A NZ  1 V9WDR2 UNP 4   K 
+ATOM 34   N N   . ASN A 1 5   ? -2.710  -15.155 34.235  1.0 42.38 ? 5   ASN A N   1 V9WDR2 UNP 5   N 
+ATOM 35   C CA  . ASN A 1 5   ? -1.707  -14.825 33.232  1.0 42.38 ? 5   ASN A CA  1 V9WDR2 UNP 5   N 
+ATOM 36   C C   . ASN A 1 5   ? -1.987  -13.418 32.662  1.0 42.38 ? 5   ASN A C   1 V9WDR2 UNP 5   N 
+ATOM 37   C CB  . ASN A 1 5   ? -1.761  -15.948 32.173  1.0 42.38 ? 5   ASN A CB  1 V9WDR2 UNP 5   N 
+ATOM 38   O O   . ASN A 1 5   ? -3.040  -13.181 32.071  1.0 42.38 ? 5   ASN A O   1 V9WDR2 UNP 5   N 
+ATOM 39   C CG  . ASN A 1 5   ? -0.670  -15.851 31.125  1.0 42.38 ? 5   ASN A CG  1 V9WDR2 UNP 5   N 
+ATOM 40   N ND2 . ASN A 1 5   ? -0.554  -16.835 30.265  1.0 42.38 ? 5   ASN A ND2 1 V9WDR2 UNP 5   N 
+ATOM 41   O OD1 . ASN A 1 5   ? 0.077   -14.890 31.072  1.0 42.38 ? 5   ASN A OD1 1 V9WDR2 UNP 5   N 
+ATOM 42   N N   . LYS A 1 6   ? -1.061  -12.476 32.886  1.0 47.50 ? 6   LYS A N   1 V9WDR2 UNP 6   K 
+ATOM 43   C CA  . LYS A 1 6   ? -1.152  -11.066 32.465  1.0 47.50 ? 6   LYS A CA  1 V9WDR2 UNP 6   K 
+ATOM 44   C C   . LYS A 1 6   ? -0.837  -10.848 30.974  1.0 47.50 ? 6   LYS A C   1 V9WDR2 UNP 6   K 
+ATOM 45   C CB  . LYS A 1 6   ? -0.270  -10.174 33.365  1.0 47.50 ? 6   LYS A CB  1 V9WDR2 UNP 6   K 
+ATOM 46   O O   . LYS A 1 6   ? -0.666  -9.703  30.564  1.0 47.50 ? 6   LYS A O   1 V9WDR2 UNP 6   K 
+ATOM 47   C CG  . LYS A 1 6   ? -0.824  -9.952  34.782  1.0 47.50 ? 6   LYS A CG  1 V9WDR2 UNP 6   K 
+ATOM 48   C CD  . LYS A 1 6   ? 0.055   -8.921  35.512  1.0 47.50 ? 6   LYS A CD  1 V9WDR2 UNP 6   K 
+ATOM 49   C CE  . LYS A 1 6   ? -0.459  -8.609  36.922  1.0 47.50 ? 6   LYS A CE  1 V9WDR2 UNP 6   K 
+ATOM 50   N NZ  . LYS A 1 6   ? 0.400   -7.596  37.592  1.0 47.50 ? 6   LYS A NZ  1 V9WDR2 UNP 6   K 
+ATOM 51   N N   . ASN A 1 7   ? -0.805  -11.897 30.149  1.0 44.88 ? 7   ASN A N   1 V9WDR2 UNP 7   N 
+ATOM 52   C CA  . ASN A 1 7   ? -0.631  -11.779 28.697  1.0 44.88 ? 7   ASN A CA  1 V9WDR2 UNP 7   N 
+ATOM 53   C C   . ASN A 1 7   ? -1.951  -11.465 27.957  1.0 44.88 ? 7   ASN A C   1 V9WDR2 UNP 7   N 
+ATOM 54   C CB  . ASN A 1 7   ? 0.119   -13.009 28.159  1.0 44.88 ? 7   ASN A CB  1 V9WDR2 UNP 7   N 
+ATOM 55   O O   . ASN A 1 7   ? -2.340  -12.127 27.000  1.0 44.88 ? 7   ASN A O   1 V9WDR2 UNP 7   N 
+ATOM 56   C CG  . ASN A 1 7   ? 0.746   -12.713 26.805  1.0 44.88 ? 7   ASN A CG  1 V9WDR2 UNP 7   N 
+ATOM 57   N ND2 . ASN A 1 7   ? 1.404   -13.671 26.199  1.0 44.88 ? 7   ASN A ND2 1 V9WDR2 UNP 7   N 
+ATOM 58   O OD1 . ASN A 1 7   ? 0.691   -11.607 26.300  1.0 44.88 ? 7   ASN A OD1 1 V9WDR2 UNP 7   N 
+ATOM 59   N N   . LYS A 1 8   ? -2.686  -10.475 28.470  1.0 44.59 ? 8   LYS A N   1 V9WDR2 UNP 8   K 
+ATOM 60   C CA  . LYS A 1 8   ? -3.946  -9.947  27.923  1.0 44.59 ? 8   LYS A CA  1 V9WDR2 UNP 8   K 
+ATOM 61   C C   . LYS A 1 8   ? -3.755  -8.486  27.484  1.0 44.59 ? 8   LYS A C   1 V9WDR2 UNP 8   K 
+ATOM 62   C CB  . LYS A 1 8   ? -5.083  -10.162 28.951  1.0 44.59 ? 8   LYS A CB  1 V9WDR2 UNP 8   K 
+ATOM 63   O O   . LYS A 1 8   ? -4.651  -7.667  27.654  1.0 44.59 ? 8   LYS A O   1 V9WDR2 UNP 8   K 
+ATOM 64   C CG  . LYS A 1 8   ? -6.322  -10.825 28.334  1.0 44.59 ? 8   LYS A CG  1 V9WDR2 UNP 8   K 
+ATOM 65   C CD  . LYS A 1 8   ? -7.481  -10.870 29.340  1.0 44.59 ? 8   LYS A CD  1 V9WDR2 UNP 8   K 
+ATOM 66   C CE  . LYS A 1 8   ? -8.605  -11.764 28.803  1.0 44.59 ? 8   LYS A CE  1 V9WDR2 UNP 8   K 
+ATOM 67   N NZ  . LYS A 1 8   ? -9.854  -11.635 29.595  1.0 44.59 ? 8   LYS A NZ  1 V9WDR2 UNP 8   K 
+ATOM 68   N N   . GLN A 1 9   ? -2.546  -8.142  27.041  1.0 48.12 ? 9   GLN A N   1 V9WDR2 UNP 9   Q 
+ATOM 69   C CA  . GLN A 1 9   ? -2.172  -6.767  26.720  1.0 48.12 ? 9   GLN A CA  1 V9WDR2 UNP 9   Q 
+ATOM 70   C C   . GLN A 1 9   ? -2.788  -6.366  25.371  1.0 48.12 ? 9   GLN A C   1 V9WDR2 UNP 9   Q 
+ATOM 71   C CB  . GLN A 1 9   ? -0.639  -6.608  26.733  1.0 48.12 ? 9   GLN A CB  1 V9WDR2 UNP 9   Q 
+ATOM 72   O O   . GLN A 1 9   ? -2.524  -7.004  24.358  1.0 48.12 ? 9   GLN A O   1 V9WDR2 UNP 9   Q 
+ATOM 73   C CG  . GLN A 1 9   ? 0.026   -6.971  28.075  1.0 48.12 ? 9   GLN A CG  1 V9WDR2 UNP 9   Q 
+ATOM 74   C CD  . GLN A 1 9   ? -0.430  -6.113  29.254  1.0 48.12 ? 9   GLN A CD  1 V9WDR2 UNP 9   Q 
+ATOM 75   N NE2 . GLN A 1 9   ? -0.540  -6.677  30.438  1.0 48.12 ? 9   GLN A NE2 1 V9WDR2 UNP 9   Q 
+ATOM 76   O OE1 . GLN A 1 9   ? -0.723  -4.938  29.153  1.0 48.12 ? 9   GLN A OE1 1 V9WDR2 UNP 9   Q 
+ATOM 77   N N   . ASN A 1 10  ? -3.620  -5.322  25.405  1.0 55.12 ? 10  ASN A N   1 V9WDR2 UNP 10  N 
+ATOM 78   C CA  . ASN A 1 10  ? -4.056  -4.505  24.270  1.0 55.12 ? 10  ASN A CA  1 V9WDR2 UNP 10  N 
+ATOM 79   C C   . ASN A 1 10  ? -4.683  -5.232  23.075  1.0 55.12 ? 10  ASN A C   1 V9WDR2 UNP 10  N 
+ATOM 80   C CB  . ASN A 1 10  ? -2.877  -3.606  23.838  1.0 55.12 ? 10  ASN A CB  1 V9WDR2 UNP 10  N 
+ATOM 81   O O   . ASN A 1 10  ? -4.072  -5.297  22.026  1.0 55.12 ? 10  ASN A O   1 V9WDR2 UNP 10  N 
+ATOM 82   C CG  . ASN A 1 10  ? -2.715  -2.368  24.685  1.0 55.12 ? 10  ASN A CG  1 V9WDR2 UNP 10  N 
+ATOM 83   N ND2 . ASN A 1 10  ? -1.611  -1.676  24.552  1.0 55.12 ? 10  ASN A ND2 1 V9WDR2 UNP 10  N 
+ATOM 84   O OD1 . ASN A 1 10  ? -3.587  -2.003  25.460  1.0 55.12 ? 10  ASN A OD1 1 V9WDR2 UNP 10  N 
+ATOM 85   N N   . ARG A 1 11  ? -5.930  -5.700  23.174  1.0 56.03 ? 11  ARG A N   1 V9WDR2 UNP 11  R 
+ATOM 86   C CA  . ARG A 1 11  ? -6.805  -5.787  21.990  1.0 56.03 ? 11  ARG A CA  1 V9WDR2 UNP 11  R 
+ATOM 87   C C   . ARG A 1 11  ? -8.107  -5.073  22.307  1.0 56.03 ? 11  ARG A C   1 V9WDR2 UNP 11  R 
+ATOM 88   C CB  . ARG A 1 11  ? -7.030  -7.234  21.513  1.0 56.03 ? 11  ARG A CB  1 V9WDR2 UNP 11  R 
+ATOM 89   O O   . ARG A 1 11  ? -8.853  -5.528  23.173  1.0 56.03 ? 11  ARG A O   1 V9WDR2 UNP 11  R 
+ATOM 90   C CG  . ARG A 1 11  ? -6.021  -7.624  20.420  1.0 56.03 ? 11  ARG A CG  1 V9WDR2 UNP 11  R 
+ATOM 91   C CD  . ARG A 1 11  ? -6.353  -8.976  19.779  1.0 56.03 ? 11  ARG A CD  1 V9WDR2 UNP 11  R 
+ATOM 92   N NE  . ARG A 1 11  ? -6.050  -10.107 20.680  1.0 56.03 ? 11  ARG A NE  1 V9WDR2 UNP 11  R 
+ATOM 93   N NH1 . ARG A 1 11  ? -6.962  -11.755 19.368  1.0 56.03 ? 11  ARG A NH1 1 V9WDR2 UNP 11  R 
+ATOM 94   N NH2 . ARG A 1 11  ? -5.897  -12.306 21.252  1.0 56.03 ? 11  ARG A NH2 1 V9WDR2 UNP 11  R 
+ATOM 95   C CZ  . ARG A 1 11  ? -6.309  -11.379 20.432  1.0 56.03 ? 11  ARG A CZ  1 V9WDR2 UNP 11  R 
+ATOM 96   N N   . LYS A 1 12  ? -8.332  -3.937  21.652  1.0 73.56 ? 12  LYS A N   1 V9WDR2 UNP 12  K 
+ATOM 97   C CA  . LYS A 1 12  ? -9.582  -3.174  21.713  1.0 73.56 ? 12  LYS A CA  1 V9WDR2 UNP 12  K 
+ATOM 98   C C   . LYS A 1 12  ? -10.297 -3.329  20.373  1.0 73.56 ? 12  LYS A C   1 V9WDR2 UNP 12  K 
+ATOM 99   C CB  . LYS A 1 12  ? -9.298  -1.697  22.006  1.0 73.56 ? 12  LYS A CB  1 V9WDR2 UNP 12  K 
+ATOM 100  O O   . LYS A 1 12  ? -9.627  -3.272  19.348  1.0 73.56 ? 12  LYS A O   1 V9WDR2 UNP 12  K 
+ATOM 101  C CG  . LYS A 1 12  ? -8.531  -1.408  23.308  1.0 73.56 ? 12  LYS A CG  1 V9WDR2 UNP 12  K 
+ATOM 102  C CD  . LYS A 1 12  ? -8.327  0.111   23.424  1.0 73.56 ? 12  LYS A CD  1 V9WDR2 UNP 12  K 
+ATOM 103  C CE  . LYS A 1 12  ? -7.247  0.515   24.432  1.0 73.56 ? 12  LYS A CE  1 V9WDR2 UNP 12  K 
+ATOM 104  N NZ  . LYS A 1 12  ? -6.620  1.803   24.021  1.0 73.56 ? 12  LYS A NZ  1 V9WDR2 UNP 12  K 
+ATOM 105  N N   . ALA A 1 13  ? -11.607 -3.553  20.414  1.0 77.81 ? 13  ALA A N   1 V9WDR2 UNP 13  A 
+ATOM 106  C CA  . ALA A 1 13  ? -12.470 -3.613  19.241  1.0 77.81 ? 13  ALA A CA  1 V9WDR2 UNP 13  A 
+ATOM 107  C C   . ALA A 1 13  ? -13.385 -2.383  19.241  1.0 77.81 ? 13  ALA A C   1 V9WDR2 UNP 13  A 
+ATOM 108  C CB  . ALA A 1 13  ? -13.250 -4.932  19.237  1.0 77.81 ? 13  ALA A CB  1 V9WDR2 UNP 13  A 
+ATOM 109  O O   . ALA A 1 13  ? -14.021 -2.112  20.263  1.0 77.81 ? 13  ALA A O   1 V9WDR2 UNP 13  A 
+ATOM 110  N N   . PHE A 1 14  ? -13.436 -1.660  18.128  1.0 80.12 ? 14  PHE A N   1 V9WDR2 UNP 14  F 
+ATOM 111  C CA  . PHE A 1 14  ? -14.290 -0.488  17.927  1.0 80.12 ? 14  PHE A CA  1 V9WDR2 UNP 14  F 
+ATOM 112  C C   . PHE A 1 14  ? -15.118 -0.675  16.653  1.0 80.12 ? 14  PHE A C   1 V9WDR2 UNP 14  F 
+ATOM 113  C CB  . PHE A 1 14  ? -13.419 0.772   17.871  1.0 80.12 ? 14  PHE A CB  1 V9WDR2 UNP 14  F 
+ATOM 114  O O   . PHE A 1 14  ? -14.660 -1.358  15.743  1.0 80.12 ? 14  PHE A O   1 V9WDR2 UNP 14  F 
+ATOM 115  C CG  . PHE A 1 14  ? -12.605 1.007   19.132  1.0 80.12 ? 14  PHE A CG  1 V9WDR2 UNP 14  F 
+ATOM 116  C CD1 . PHE A 1 14  ? -13.190 1.651   20.236  1.0 80.12 ? 14  PHE A CD1 1 V9WDR2 UNP 14  F 
+ATOM 117  C CD2 . PHE A 1 14  ? -11.262 0.593   19.196  1.0 80.12 ? 14  PHE A CD2 1 V9WDR2 UNP 14  F 
+ATOM 118  C CE1 . PHE A 1 14  ? -12.431 1.908   21.391  1.0 80.12 ? 14  PHE A CE1 1 V9WDR2 UNP 14  F 
+ATOM 119  C CE2 . PHE A 1 14  ? -10.488 0.892   20.331  1.0 80.12 ? 14  PHE A CE2 1 V9WDR2 UNP 14  F 
+ATOM 120  C CZ  . PHE A 1 14  ? -11.074 1.546   21.430  1.0 80.12 ? 14  PHE A CZ  1 V9WDR2 UNP 14  F 
+ATOM 121  N N   . ALA A 1 15  ? -16.330 -0.119  16.612  1.0 80.38 ? 15  ALA A N   1 V9WDR2 UNP 15  A 
+ATOM 122  C CA  . ALA A 1 15  ? -17.080 -0.025  15.361  1.0 80.38 ? 15  ALA A CA  1 V9WDR2 UNP 15  A 
+ATOM 123  C C   . ALA A 1 15  ? -16.466 1.118   14.548  1.0 80.38 ? 15  ALA A C   1 V9WDR2 UNP 15  A 
+ATOM 124  C CB  . ALA A 1 15  ? -18.579 0.117   15.656  1.0 80.38 ? 15  ALA A CB  1 V9WDR2 UNP 15  A 
+ATOM 125  O O   . ALA A 1 15  ? -15.577 0.862   13.746  1.0 80.38 ? 15  ALA A O   1 V9WDR2 UNP 15  A 
+ATOM 126  N N   . ASP A 1 16  ? -16.759 2.357   14.937  1.0 87.81 ? 16  ASP A N   1 V9WDR2 UNP 16  D 
+ATOM 127  C CA  . ASP A 1 16  ? -16.306 3.541   14.206  1.0 87.81 ? 16  ASP A CA  1 V9WDR2 UNP 16  D 
+ATOM 128  C C   . ASP A 1 16  ? -15.365 4.357   15.090  1.0 87.81 ? 16  ASP A C   1 V9WDR2 UNP 16  D 
+ATOM 129  C CB  . ASP A 1 16  ? -17.507 4.379   13.735  1.0 87.81 ? 16  ASP A CB  1 V9WDR2 UNP 16  D 
+ATOM 130  O O   . ASP A 1 16  ? -15.596 4.527   16.296  1.0 87.81 ? 16  ASP A O   1 V9WDR2 UNP 16  D 
+ATOM 131  C CG  . ASP A 1 16  ? -18.658 3.534   13.173  1.0 87.81 ? 16  ASP A CG  1 V9WDR2 UNP 16  D 
+ATOM 132  O OD1 . ASP A 1 16  ? -18.384 2.448   12.626  1.0 87.81 ? 16  ASP A OD1 1 V9WDR2 UNP 16  D 
+ATOM 133  O OD2 . ASP A 1 16  ? -19.820 3.877   13.493  1.0 87.81 ? 16  ASP A OD2 1 V9WDR2 UNP 16  D 
+ATOM 134  N N   . THR A 1 17  ? -14.263 4.830   14.516  1.0 90.19 ? 17  THR A N   1 V9WDR2 UNP 17  T 
+ATOM 135  C CA  . THR A 1 17  ? -13.298 5.662   15.233  1.0 90.19 ? 17  THR A CA  1 V9WDR2 UNP 17  T 
+ATOM 136  C C   . THR A 1 17  ? -12.857 6.849   14.395  1.0 90.19 ? 17  THR A C   1 V9WDR2 UNP 17  T 
+ATOM 137  C CB  . THR A 1 17  ? -12.046 4.868   15.631  1.0 90.19 ? 17  THR A CB  1 V9WDR2 UNP 17  T 
+ATOM 138  O O   . THR A 1 17  ? -12.113 6.686   13.447  1.0 90.19 ? 17  THR A O   1 V9WDR2 UNP 17  T 
+ATOM 139  C CG2 . THR A 1 17  ? -11.279 5.643   16.708  1.0 90.19 ? 17  THR A CG2 1 V9WDR2 UNP 17  T 
+ATOM 140  O OG1 . THR A 1 17  ? -12.384 3.591   16.145  1.0 90.19 ? 17  THR A OG1 1 V9WDR2 UNP 17  T 
+ATOM 141  N N   . GLU A 1 18  ? -13.174 8.060   14.830  1.0 91.25 ? 18  GLU A N   1 V9WDR2 UNP 18  E 
+ATOM 142  C CA  . GLU A 1 18  ? -12.619 9.270   14.205  1.0 91.25 ? 18  GLU A CA  1 V9WDR2 UNP 18  E 
+ATOM 143  C C   . GLU A 1 18  ? -11.085 9.306   14.357  1.0 91.25 ? 18  GLU A C   1 V9WDR2 UNP 18  E 
+ATOM 144  C CB  . GLU A 1 18  ? -13.241 10.495  14.883  1.0 91.25 ? 18  GLU A CB  1 V9WDR2 UNP 18  E 
+ATOM 145  O O   . GLU A 1 18  ? -10.344 9.444   13.396  1.0 91.25 ? 18  GLU A O   1 V9WDR2 UNP 18  E 
+ATOM 146  C CG  . GLU A 1 18  ? -14.773 10.540  14.818  1.0 91.25 ? 18  GLU A CG  1 V9WDR2 UNP 18  E 
+ATOM 147  C CD  . GLU A 1 18  ? -15.318 11.115  13.510  1.0 91.25 ? 18  GLU A CD  1 V9WDR2 UNP 18  E 
+ATOM 148  O OE1 . GLU A 1 18  ? -16.140 10.402  12.892  1.0 91.25 ? 18  GLU A OE1 1 V9WDR2 UNP 18  E 
+ATOM 149  O OE2 . GLU A 1 18  ? -15.100 12.331  13.338  1.0 91.25 ? 18  GLU A OE2 1 V9WDR2 UNP 18  E 
+ATOM 150  N N   . PHE A 1 19  ? -10.568 9.083   15.574  1.0 90.44 ? 19  PHE A N   1 V9WDR2 UNP 19  F 
+ATOM 151  C CA  . PHE A 1 19  ? -9.128  9.149   15.850  1.0 90.44 ? 19  PHE A CA  1 V9WDR2 UNP 19  F 
+ATOM 152  C C   . PHE A 1 19  ? -8.605  7.924   16.606  1.0 90.44 ? 19  PHE A C   1 V9WDR2 UNP 19  F 
+ATOM 153  C CB  . PHE A 1 19  ? -8.798  10.447  16.602  1.0 90.44 ? 19  PHE A CB  1 V9WDR2 UNP 19  F 
+ATOM 154  O O   . PHE A 1 19  ? -9.034  7.612   17.724  1.0 90.44 ? 19  PHE A O   1 V9WDR2 UNP 19  F 
+ATOM 155  C CG  . PHE A 1 19  ? -9.130  11.707  15.826  1.0 90.44 ? 19  PHE A CG  1 V9WDR2 UNP 19  F 
+ATOM 156  C CD1 . PHE A 1 19  ? -8.223  12.210  14.874  1.0 90.44 ? 19  PHE A CD1 1 V9WDR2 UNP 19  F 
+ATOM 157  C CD2 . PHE A 1 19  ? -10.376 12.340  16.002  1.0 90.44 ? 19  PHE A CD2 1 V9WDR2 UNP 19  F 
+ATOM 158  C CE1 . PHE A 1 19  ? -8.568  13.325  14.090  1.0 90.44 ? 19  PHE A CE1 1 V9WDR2 UNP 19  F 
+ATOM 159  C CE2 . PHE A 1 19  ? -10.725 13.445  15.208  1.0 90.44 ? 19  PHE A CE2 1 V9WDR2 UNP 19  F 
+ATOM 160  C CZ  . PHE A 1 19  ? -9.824  13.933  14.247  1.0 90.44 ? 19  PHE A CZ  1 V9WDR2 UNP 19  F 
+ATOM 161  N N   . ALA A 1 20  ? -7.601  7.268   16.033  1.0 88.88 ? 20  ALA A N   1 V9WDR2 UNP 20  A 
+ATOM 162  C CA  . ALA A 1 20  ? -6.832  6.195   16.640  1.0 88.88 ? 20  ALA A CA  1 V9WDR2 UNP 20  A 
+ATOM 163  C C   . ALA A 1 20  ? -5.346  6.570   16.677  1.0 88.88 ? 20  ALA A C   1 V9WDR2 UNP 20  A 
+ATOM 164  C CB  . ALA A 1 20  ? -7.075  4.904   15.849  1.0 88.88 ? 20  ALA A CB  1 V9WDR2 UNP 20  A 
+ATOM 165  O O   . ALA A 1 20  ? -4.713  6.759   15.646  1.0 88.88 ? 20  ALA A O   1 V9WDR2 UNP 20  A 
+ATOM 166  N N   . SER A 1 21  ? -4.766  6.638   17.875  1.0 92.38 ? 21  SER A N   1 V9WDR2 UNP 21  S 
+ATOM 167  C CA  . SER A 1 21  ? -3.317  6.750   18.040  1.0 92.38 ? 21  SER A CA  1 V9WDR2 UNP 21  S 
+ATOM 168  C C   . SER A 1 21  ? -2.840  5.690   19.017  1.0 92.38 ? 21  SER A C   1 V9WDR2 UNP 21  S 
+ATOM 169  C CB  . SER A 1 21  ? -2.910  8.159   18.465  1.0 92.38 ? 21  SER A CB  1 V9WDR2 UNP 21  S 
+ATOM 170  O O   . SER A 1 21  ? -3.323  5.624   20.150  1.0 92.38 ? 21  SER A O   1 V9WDR2 UNP 21  S 
+ATOM 171  O OG  . SER A 1 21  ? -1.500  8.258   18.525  1.0 92.38 ? 21  SER A OG  1 V9WDR2 UNP 21  S 
+ATOM 172  N N   . GLU A 1 22  ? -1.942  4.823   18.562  1.0 87.19 ? 22  GLU A N   1 V9WDR2 UNP 22  E 
+ATOM 173  C CA  . GLU A 1 22  ? -1.471  3.676   19.331  1.0 87.19 ? 22  GLU A CA  1 V9WDR2 UNP 22  E 
+ATOM 174  C C   . GLU A 1 22  ? 0.049   3.508   19.166  1.0 87.19 ? 22  GLU A C   1 V9WDR2 UNP 22  E 
+ATOM 175  C CB  . GLU A 1 22  ? -2.247  2.404   18.925  1.0 87.19 ? 22  GLU A CB  1 V9WDR2 UNP 22  E 
+ATOM 176  O O   . GLU A 1 22  ? 0.609   3.622   18.075  1.0 87.19 ? 22  GLU A O   1 V9WDR2 UNP 22  E 
+ATOM 177  C CG  . GLU A 1 22  ? -3.749  2.344   19.333  1.0 87.19 ? 22  GLU A CG  1 V9WDR2 UNP 22  E 
+ATOM 178  C CD  . GLU A 1 22  ? -4.070  2.157   20.842  1.0 87.19 ? 22  GLU A CD  1 V9WDR2 UNP 22  E 
+ATOM 179  O OE1 . GLU A 1 22  ? -5.277  2.091   21.225  1.0 87.19 ? 22  GLU A OE1 1 V9WDR2 UNP 22  E 
+ATOM 180  O OE2 . GLU A 1 22  ? -3.138  2.004   21.663  1.0 87.19 ? 22  GLU A OE2 1 V9WDR2 UNP 22  E 
+ATOM 181  N N   . ALA A 1 23  ? 0.728   3.211   20.276  1.0 90.38 ? 23  ALA A N   1 V9WDR2 UNP 23  A 
+ATOM 182  C CA  . ALA A 1 23  ? 2.153   2.899   20.300  1.0 90.38 ? 23  ALA A CA  1 V9WDR2 UNP 23  A 
+ATOM 183  C C   . ALA A 1 23  ? 2.367   1.565   21.023  1.0 90.38 ? 23  ALA A C   1 V9WDR2 UNP 23  A 
+ATOM 184  C CB  . ALA A 1 23  ? 2.927   4.057   20.942  1.0 90.38 ? 23  ALA A CB  1 V9WDR2 UNP 23  A 
+ATOM 185  O O   . ALA A 1 23  ? 2.037   1.436   22.205  1.0 90.38 ? 23  ALA A O   1 V9WDR2 UNP 23  A 
+ATOM 186  N N   . GLY A 1 24  ? 2.891   0.556   20.321  1.0 86.38 ? 24  GLY A N   1 V9WDR2 UNP 24  G 
+ATOM 187  C CA  . GLY A 1 24  ? 3.130   -0.775  20.900  1.0 86.38 ? 24  GLY A CA  1 V9WDR2 UNP 24  G 
+ATOM 188  C C   . GLY A 1 24  ? 1.865   -1.536  21.329  1.0 86.38 ? 24  GLY A C   1 V9WDR2 UNP 24  G 
+ATOM 189  O O   . GLY A 1 24  ? 1.930   -2.383  22.224  1.0 86.38 ? 24  GLY A O   1 V9WDR2 UNP 24  G 
+ATOM 190  N N   . ALA A 1 25  ? 0.703   -1.219  20.753  1.0 84.62 ? 25  ALA A N   1 V9WDR2 UNP 25  A 
+ATOM 191  C CA  . ALA A 1 25  ? -0.584  -1.829  21.089  1.0 84.62 ? 25  ALA A CA  1 V9WDR2 UNP 25  A 
+ATOM 192  C C   . ALA A 1 25  ? -1.178  -2.596  19.903  1.0 84.62 ? 25  ALA A C   1 V9WDR2 UNP 25  A 
+ATOM 193  C CB  . ALA A 1 25  ? -1.533  -0.726  21.560  1.0 84.62 ? 25  ALA A CB  1 V9WDR2 UNP 25  A 
+ATOM 194  O O   . ALA A 1 25  ? -0.813  -2.329  18.763  1.0 84.62 ? 25  ALA A O   1 V9WDR2 UNP 25  A 
+ATOM 195  N N   . ASN A 1 26  ? -2.120  -3.513  20.170  1.0 89.00 ? 26  ASN A N   1 V9WDR2 UNP 26  N 
+ATOM 196  C CA  . ASN A 1 26  ? -2.925  -4.107  19.107  1.0 89.00 ? 26  ASN A CA  1 V9WDR2 UNP 26  N 
+ATOM 197  C C   . ASN A 1 26  ? -4.351  -3.542  19.108  1.0 89.00 ? 26  ASN A C   1 V9WDR2 UNP 26  N 
+ATOM 198  C CB  . ASN A 1 26  ? -2.895  -5.646  19.095  1.0 89.00 ? 26  ASN A CB  1 V9WDR2 UNP 26  N 
+ATOM 199  O O   . ASN A 1 26  ? -4.991  -3.397  20.159  1.0 89.00 ? 26  ASN A O   1 V9WDR2 UNP 26  N 
+ATOM 200  C CG  . ASN A 1 26  ? -1.516  -6.259  19.227  1.0 89.00 ? 26  ASN A CG  1 V9WDR2 UNP 26  N 
+ATOM 201  N ND2 . ASN A 1 26  ? -1.418  -7.440  19.789  1.0 89.00 ? 26  ASN A ND2 1 V9WDR2 UNP 26  N 
+ATOM 202  O OD1 . ASN A 1 26  ? -0.499  -5.730  18.825  1.0 89.00 ? 26  ASN A OD1 1 V9WDR2 UNP 26  N 
+ATOM 203  N N   . ARG A 1 27  ? -4.877  -3.274  17.915  1.0 88.31 ? 27  ARG A N   1 V9WDR2 UNP 27  R 
+ATOM 204  C CA  . ARG A 1 27  ? -6.211  -2.705  17.721  1.0 88.31 ? 27  ARG A CA  1 V9WDR2 UNP 27  R 
+ATOM 205  C C   . ARG A 1 27  ? -6.984  -3.457  16.647  1.0 88.31 ? 27  ARG A C   1 V9WDR2 UNP 27  R 
+ATOM 206  C CB  . ARG A 1 27  ? -6.060  -1.212  17.389  1.0 88.31 ? 27  ARG A CB  1 V9WDR2 UNP 27  R 
+ATOM 207  O O   . ARG A 1 27  ? -6.421  -3.899  15.652  1.0 88.31 ? 27  ARG A O   1 V9WDR2 UNP 27  R 
+ATOM 208  C CG  . ARG A 1 27  ? -7.415  -0.504  17.263  1.0 88.31 ? 27  ARG A CG  1 V9WDR2 UNP 27  R 
+ATOM 209  C CD  . ARG A 1 27  ? -7.223  0.979   16.960  1.0 88.31 ? 27  ARG A CD  1 V9WDR2 UNP 27  R 
+ATOM 210  N NE  . ARG A 1 27  ? -8.528  1.663   16.945  1.0 88.31 ? 27  ARG A NE  1 V9WDR2 UNP 27  R 
+ATOM 211  N NH1 . ARG A 1 27  ? -8.137  3.200   18.617  1.0 88.31 ? 27  ARG A NH1 1 V9WDR2 UNP 27  R 
+ATOM 212  N NH2 . ARG A 1 27  ? -10.132 3.081   17.671  1.0 88.31 ? 27  ARG A NH2 1 V9WDR2 UNP 27  R 
+ATOM 213  C CZ  . ARG A 1 27  ? -8.920  2.640   17.735  1.0 88.31 ? 27  ARG A CZ  1 V9WDR2 UNP 27  R 
+ATOM 214  N N   . THR A 1 28  ? -8.288  -3.562  16.861  1.0 91.44 ? 28  THR A N   1 V9WDR2 UNP 28  T 
+ATOM 215  C CA  . THR A 1 28  ? -9.250  -3.932  15.831  1.0 91.44 ? 28  THR A CA  1 V9WDR2 UNP 28  T 
+ATOM 216  C C   . THR A 1 28  ? -10.310 -2.835  15.733  1.0 91.44 ? 28  THR A C   1 V9WDR2 UNP 28  T 
+ATOM 217  C CB  . THR A 1 28  ? -9.848  -5.319  16.089  1.0 91.44 ? 28  THR A CB  1 V9WDR2 UNP 28  T 
+ATOM 218  O O   . THR A 1 28  ? -10.817 -2.382  16.760  1.0 91.44 ? 28  THR A O   1 V9WDR2 UNP 28  T 
+ATOM 219  C CG2 . THR A 1 28  ? -10.705 -5.799  14.921  1.0 91.44 ? 28  THR A CG2 1 V9WDR2 UNP 28  T 
+ATOM 220  O OG1 . THR A 1 28  ? -8.810  -6.267  16.264  1.0 91.44 ? 28  THR A OG1 1 V9WDR2 UNP 28  T 
+ATOM 221  N N   . ALA A 1 29  ? -10.634 -2.382  14.532  1.0 90.12 ? 29  ALA A N   1 V9WDR2 UNP 29  A 
+ATOM 222  C CA  . ALA A 1 29  ? -11.752 -1.472  14.280  1.0 90.12 ? 29  ALA A CA  1 V9WDR2 UNP 29  A 
+ATOM 223  C C   . ALA A 1 29  ? -12.519 -1.935  13.032  1.0 90.12 ? 29  ALA A C   1 V9WDR2 UNP 29  A 
+ATOM 224  C CB  . ALA A 1 29  ? -11.230 -0.033  14.181  1.0 90.12 ? 29  ALA A CB  1 V9WDR2 UNP 29  A 
+ATOM 225  O O   . ALA A 1 29  ? -11.959 -2.707  12.257  1.0 90.12 ? 29  ALA A O   1 V9WDR2 UNP 29  A 
+ATOM 226  N N   . ALA A 1 30  ? -13.779 -1.528  12.866  1.0 90.31 ? 30  ALA A N   1 V9WDR2 UNP 30  A 
+ATOM 227  C CA  . ALA A 1 30  ? -14.408 -1.606  11.550  1.0 90.31 ? 30  ALA A CA  1 V9WDR2 UNP 30  A 
+ATOM 228  C C   . ALA A 1 30  ? -13.888 -0.427  10.728  1.0 90.31 ? 30  ALA A C   1 V9WDR2 UNP 30  A 
+ATOM 229  C CB  . ALA A 1 30  ? -15.936 -1.679  11.664  1.0 90.31 ? 30  ALA A CB  1 V9WDR2 UNP 30  A 
+ATOM 230  O O   . ALA A 1 30  ? -13.056 -0.645  9.857   1.0 90.31 ? 30  ALA A O   1 V9WDR2 UNP 30  A 
+ATOM 231  N N   . ASP A 1 31  ? -14.191 0.794   11.169  1.0 92.75 ? 31  ASP A N   1 V9WDR2 UNP 31  D 
+ATOM 232  C CA  . ASP A 1 31  ? -13.874 2.006   10.419  1.0 92.75 ? 31  ASP A CA  1 V9WDR2 UNP 31  D 
+ATOM 233  C C   . ASP A 1 31  ? -12.980 2.934   11.243  1.0 92.75 ? 31  ASP A C   1 V9WDR2 UNP 31  D 
+ATOM 234  C CB  . ASP A 1 31  ? -15.175 2.693   9.969   1.0 92.75 ? 31  ASP A CB  1 V9WDR2 UNP 31  D 
+ATOM 235  O O   . ASP A 1 31  ? -13.087 3.039   12.478  1.0 92.75 ? 31  ASP A O   1 V9WDR2 UNP 31  D 
+ATOM 236  C CG  . ASP A 1 31  ? -16.095 1.750   9.175   1.0 92.75 ? 31  ASP A CG  1 V9WDR2 UNP 31  D 
+ATOM 237  O OD1 . ASP A 1 31  ? -15.565 0.793   8.574   1.0 92.75 ? 31  ASP A OD1 1 V9WDR2 UNP 31  D 
+ATOM 238  O OD2 . ASP A 1 31  ? -17.328 1.926   9.269   1.0 92.75 ? 31  ASP A OD2 1 V9WDR2 UNP 31  D 
+ATOM 239  N N   . THR A 1 32  ? -12.030 3.595   10.586  1.0 95.44 ? 32  THR A N   1 V9WDR2 UNP 32  T 
+ATOM 240  C CA  . THR A 1 32  ? -11.206 4.628   11.219  1.0 95.44 ? 32  THR A CA  1 V9WDR2 UNP 32  T 
+ATOM 241  C C   . THR A 1 32  ? -10.917 5.780   10.267  1.0 95.44 ? 32  THR A C   1 V9WDR2 UNP 32  T 
+ATOM 242  C CB  . THR A 1 32  ? -9.897  4.046   11.761  1.0 95.44 ? 32  THR A CB  1 V9WDR2 UNP 32  T 
+ATOM 243  O O   . THR A 1 32  ? -10.283 5.567   9.248   1.0 95.44 ? 32  THR A O   1 V9WDR2 UNP 32  T 
+ATOM 244  C CG2 . THR A 1 32  ? -9.020  5.065   12.488  1.0 95.44 ? 32  THR A CG2 1 V9WDR2 UNP 32  T 
+ATOM 245  O OG1 . THR A 1 32  ? -10.163 3.009   12.693  1.0 95.44 ? 32  THR A OG1 1 V9WDR2 UNP 32  T 
+ATOM 246  N N   . GLU A 1 33  ? -11.293 7.002   10.625  1.0 95.38 ? 33  GLU A N   1 V9WDR2 UNP 33  E 
+ATOM 247  C CA  . GLU A 1 33  ? -10.997 8.183   9.799   1.0 95.38 ? 33  GLU A CA  1 V9WDR2 UNP 33  E 
+ATOM 248  C C   . GLU A 1 33  ? -9.491  8.497   9.851   1.0 95.38 ? 33  GLU A C   1 V9WDR2 UNP 33  E 
+ATOM 249  C CB  . GLU A 1 33  ? -11.855 9.349   10.302  1.0 95.38 ? 33  GLU A CB  1 V9WDR2 UNP 33  E 
+ATOM 250  O O   . GLU A 1 33  ? -8.803  8.483   8.839   1.0 95.38 ? 33  GLU A O   1 V9WDR2 UNP 33  E 
+ATOM 251  C CG  . GLU A 1 33  ? -12.002 10.508  9.306   1.0 95.38 ? 33  GLU A CG  1 V9WDR2 UNP 33  E 
+ATOM 252  C CD  . GLU A 1 33  ? -12.645 11.751  9.949   1.0 95.38 ? 33  GLU A CD  1 V9WDR2 UNP 33  E 
+ATOM 253  O OE1 . GLU A 1 33  ? -12.783 12.802  9.277   1.0 95.38 ? 33  GLU A OE1 1 V9WDR2 UNP 33  E 
+ATOM 254  O OE2 . GLU A 1 33  ? -12.889 11.703  11.178  1.0 95.38 ? 33  GLU A OE2 1 V9WDR2 UNP 33  E 
+ATOM 255  N N   . PHE A 1 34  ? -8.925  8.649   11.054  1.0 95.44 ? 34  PHE A N   1 V9WDR2 UNP 34  F 
+ATOM 256  C CA  . PHE A 1 34  ? -7.506  8.954   11.249  1.0 95.44 ? 34  PHE A CA  1 V9WDR2 UNP 34  F 
+ATOM 257  C C   . PHE A 1 34  ? -6.802  7.932   12.144  1.0 95.44 ? 34  PHE A C   1 V9WDR2 UNP 34  F 
+ATOM 258  C CB  . PHE A 1 34  ? -7.361  10.364  11.828  1.0 95.44 ? 34  PHE A CB  1 V9WDR2 UNP 34  F 
+ATOM 259  O O   . PHE A 1 34  ? -7.110  7.792   13.332  1.0 95.44 ? 34  PHE A O   1 V9WDR2 UNP 34  F 
+ATOM 260  C CG  . PHE A 1 34  ? -7.950  11.462  10.967  1.0 95.44 ? 34  PHE A CG  1 V9WDR2 UNP 34  F 
+ATOM 261  C CD1 . PHE A 1 34  ? -7.235  11.954  9.860   1.0 95.44 ? 34  PHE A CD1 1 V9WDR2 UNP 34  F 
+ATOM 262  C CD2 . PHE A 1 34  ? -9.223  11.984  11.260  1.0 95.44 ? 34  PHE A CD2 1 V9WDR2 UNP 34  F 
+ATOM 263  C CE1 . PHE A 1 34  ? -7.802  12.941  9.035   1.0 95.44 ? 34  PHE A CE1 1 V9WDR2 UNP 34  F 
+ATOM 264  C CE2 . PHE A 1 34  ? -9.767  12.998  10.460  1.0 95.44 ? 34  PHE A CE2 1 V9WDR2 UNP 34  F 
+ATOM 265  C CZ  . PHE A 1 34  ? -9.076  13.453  9.328   1.0 95.44 ? 34  PHE A CZ  1 V9WDR2 UNP 34  F 
+ATOM 266  N N   . ALA A 1 35  ? -5.780  7.269   11.608  1.0 94.94 ? 35  ALA A N   1 V9WDR2 UNP 35  A 
+ATOM 267  C CA  . ALA A 1 35  ? -4.913  6.338   12.318  1.0 94.94 ? 35  ALA A CA  1 V9WDR2 UNP 35  A 
+ATOM 268  C C   . ALA A 1 35  ? -3.453  6.820   12.329  1.0 94.94 ? 35  ALA A C   1 V9WDR2 UNP 35  A 
+ATOM 269  C CB  . ALA A 1 35  ? -5.062  4.942   11.705  1.0 94.94 ? 35  ALA A CB  1 V9WDR2 UNP 35  A 
+ATOM 270  O O   . ALA A 1 35  ? -2.875  7.158   11.297  1.0 94.94 ? 35  ALA A O   1 V9WDR2 UNP 35  A 
+ATOM 271  N N   . SER A 1 36  ? -2.830  6.810   13.508  1.0 96.62 ? 36  SER A N   1 V9WDR2 UNP 36  S 
+ATOM 272  C CA  . SER A 1 36  ? -1.396  7.048   13.676  1.0 96.62 ? 36  SER A CA  1 V9WDR2 UNP 36  S 
+ATOM 273  C C   . SER A 1 36  ? -0.776  5.978   14.567  1.0 96.62 ? 36  SER A C   1 V9WDR2 UNP 36  S 
+ATOM 274  C CB  . SER A 1 36  ? -1.140  8.448   14.227  1.0 96.62 ? 36  SER A CB  1 V9WDR2 UNP 36  S 
+ATOM 275  O O   . SER A 1 36  ? -1.115  5.860   15.748  1.0 96.62 ? 36  SER A O   1 V9WDR2 UNP 36  S 
+ATOM 276  O OG  . SER A 1 36  ? 0.253   8.685   14.325  1.0 96.62 ? 36  SER A OG  1 V9WDR2 UNP 36  S 
+ATOM 277  N N   . GLU A 1 37  ? 0.142   5.198   14.004  1.0 94.25 ? 37  GLU A N   1 V9WDR2 UNP 37  E 
+ATOM 278  C CA  . GLU A 1 37  ? 0.661   3.993   14.642  1.0 94.25 ? 37  GLU A CA  1 V9WDR2 UNP 37  E 
+ATOM 279  C C   . GLU A 1 37  ? 2.183   3.947   14.671  1.0 94.25 ? 37  GLU A C   1 V9WDR2 UNP 37  E 
+ATOM 280  C CB  . GLU A 1 37  ? 0.114   2.747   13.952  1.0 94.25 ? 37  GLU A CB  1 V9WDR2 UNP 37  E 
+ATOM 281  O O   . GLU A 1 37  ? 2.854   4.136   13.659  1.0 94.25 ? 37  GLU A O   1 V9WDR2 UNP 37  E 
+ATOM 282  C CG  . GLU A 1 37  ? -1.417  2.725   13.998  1.0 94.25 ? 37  GLU A CG  1 V9WDR2 UNP 37  E 
+ATOM 283  C CD  . GLU A 1 37  ? -2.005  1.322   13.948  1.0 94.25 ? 37  GLU A CD  1 V9WDR2 UNP 37  E 
+ATOM 284  O OE1 . GLU A 1 37  ? -3.127  1.206   14.490  1.0 94.25 ? 37  GLU A OE1 1 V9WDR2 UNP 37  E 
+ATOM 285  O OE2 . GLU A 1 37  ? -1.333  0.369   13.494  1.0 94.25 ? 37  GLU A OE2 1 V9WDR2 UNP 37  E 
+ATOM 286  N N   . ALA A 1 38  ? 2.734   3.634   15.844  1.0 95.38 ? 38  ALA A N   1 V9WDR2 UNP 38  A 
+ATOM 287  C CA  . ALA A 1 38  ? 4.167   3.443   16.030  1.0 95.38 ? 38  ALA A CA  1 V9WDR2 UNP 38  A 
+ATOM 288  C C   . ALA A 1 38  ? 4.447   2.092   16.698  1.0 95.38 ? 38  ALA A C   1 V9WDR2 UNP 38  A 
+ATOM 289  C CB  . ALA A 1 38  ? 4.733   4.628   16.817  1.0 95.38 ? 38  ALA A CB  1 V9WDR2 UNP 38  A 
+ATOM 290  O O   . ALA A 1 38  ? 4.137   1.890   17.876  1.0 95.38 ? 38  ALA A O   1 V9WDR2 UNP 38  A 
+ATOM 291  N N   . GLY A 1 39  ? 5.029   1.144   15.960  1.0 92.50 ? 39  GLY A N   1 V9WDR2 UNP 39  G 
+ATOM 292  C CA  . GLY A 1 39  ? 5.297   -0.199  16.491  1.0 92.50 ? 39  GLY A CA  1 V9WDR2 UNP 39  G 
+ATOM 293  C C   . GLY A 1 39  ? 4.040   -0.951  16.950  1.0 92.50 ? 39  GLY A C   1 V9WDR2 UNP 39  G 
+ATOM 294  O O   . GLY A 1 39  ? 4.124   -1.775  17.862  1.0 92.50 ? 39  GLY A O   1 V9WDR2 UNP 39  G 
+ATOM 295  N N   . ALA A 1 40  ? 2.872   -0.609  16.405  1.0 92.38 ? 40  ALA A N   1 V9WDR2 UNP 40  A 
+ATOM 296  C CA  . ALA A 1 40  ? 1.581   -1.194  16.757  1.0 92.38 ? 40  ALA A CA  1 V9WDR2 UNP 40  A 
+ATOM 297  C C   . ALA A 1 40  ? 1.172   -2.281  15.748  1.0 92.38 ? 40  ALA A C   1 V9WDR2 UNP 40  A 
+ATOM 298  C CB  . ALA A 1 40  ? 0.554   -0.060  16.850  1.0 92.38 ? 40  ALA A CB  1 V9WDR2 UNP 40  A 
+ATOM 299  O O   . ALA A 1 40  ? 1.777   -2.397  14.682  1.0 92.38 ? 40  ALA A O   1 V9WDR2 UNP 40  A 
+ATOM 300  N N   . ASN A 1 41  ? 0.156   -3.080  16.093  1.0 93.56 ? 41  ASN A N   1 V9WDR2 UNP 41  N 
+ATOM 301  C CA  . ASN A 1 41  ? -0.509  -3.948  15.122  1.0 93.56 ? 41  ASN A CA  1 V9WDR2 UNP 41  N 
+ATOM 302  C C   . ASN A 1 41  ? -1.987  -3.578  14.988  1.0 93.56 ? 41  ASN A C   1 V9WDR2 UNP 41  N 
+ATOM 303  C CB  . ASN A 1 41  ? -0.353  -5.441  15.454  1.0 93.56 ? 41  ASN A CB  1 V9WDR2 UNP 41  N 
+ATOM 304  O O   . ASN A 1 41  ? -2.717  -3.607  15.986  1.0 93.56 ? 41  ASN A O   1 V9WDR2 UNP 41  N 
+ATOM 305  C CG  . ASN A 1 41  ? 1.080   -5.887  15.657  1.0 93.56 ? 41  ASN A CG  1 V9WDR2 UNP 41  N 
+ATOM 306  N ND2 . ASN A 1 41  ? 1.442   -6.267  16.856  1.0 93.56 ? 41  ASN A ND2 1 V9WDR2 UNP 41  N 
+ATOM 307  O OD1 . ASN A 1 41  ? 1.906   -5.933  14.767  1.0 93.56 ? 41  ASN A OD1 1 V9WDR2 UNP 41  N 
+ATOM 308  N N   . ARG A 1 42  ? -2.465  -3.334  13.769  1.0 93.56 ? 42  ARG A N   1 V9WDR2 UNP 42  R 
+ATOM 309  C CA  . ARG A 1 42  ? -3.877  -3.017  13.528  1.0 93.56 ? 42  ARG A CA  1 V9WDR2 UNP 42  R 
+ATOM 310  C C   . ARG A 1 42  ? -4.527  -3.952  12.536  1.0 93.56 ? 42  ARG A C   1 V9WDR2 UNP 42  R 
+ATOM 311  C CB  . ARG A 1 42  ? -4.034  -1.551  13.119  1.0 93.56 ? 42  ARG A CB  1 V9WDR2 UNP 42  R 
+ATOM 312  O O   . ARG A 1 42  ? -3.950  -4.318  11.522  1.0 93.56 ? 42  ARG A O   1 V9WDR2 UNP 42  R 
+ATOM 313  C CG  . ARG A 1 42  ? -5.504  -1.104  13.137  1.0 93.56 ? 42  ARG A CG  1 V9WDR2 UNP 42  R 
+ATOM 314  C CD  . ARG A 1 42  ? -5.752  0.387   12.916  1.0 93.56 ? 42  ARG A CD  1 V9WDR2 UNP 42  R 
+ATOM 315  N NE  . ARG A 1 42  ? -5.499  0.795   11.533  1.0 93.56 ? 42  ARG A NE  1 V9WDR2 UNP 42  R 
+ATOM 316  N NH1 . ARG A 1 42  ? -7.397  2.076   11.222  1.0 93.56 ? 42  ARG A NH1 1 V9WDR2 UNP 42  R 
+ATOM 317  N NH2 . ARG A 1 42  ? -6.008  1.741   9.553   1.0 93.56 ? 42  ARG A NH2 1 V9WDR2 UNP 42  R 
+ATOM 318  C CZ  . ARG A 1 42  ? -6.298  1.532   10.792  1.0 93.56 ? 42  ARG A CZ  1 V9WDR2 UNP 42  R 
+ATOM 319  N N   . THR A 1 43  ? -5.774  -4.282  12.832  1.0 95.69 ? 43  THR A N   1 V9WDR2 UNP 43  T 
+ATOM 320  C CA  . THR A 1 43  ? -6.723  -4.792  11.849  1.0 95.69 ? 43  THR A CA  1 V9WDR2 UNP 43  T 
+ATOM 321  C C   . THR A 1 43  ? -7.874  -3.804  11.745  1.0 95.69 ? 43  THR A C   1 V9WDR2 UNP 43  T 
+ATOM 322  C CB  . THR A 1 43  ? -7.218  -6.189  12.223  1.0 95.69 ? 43  THR A CB  1 V9WDR2 UNP 43  T 
+ATOM 323  O O   . THR A 1 43  ? -8.468  -3.448  12.764  1.0 95.69 ? 43  THR A O   1 V9WDR2 UNP 43  T 
+ATOM 324  C CG2 . THR A 1 43  ? -8.036  -6.823  11.103  1.0 95.69 ? 43  THR A CG2 1 V9WDR2 UNP 43  T 
+ATOM 325  O OG1 . THR A 1 43  ? -6.124  -7.042  12.490  1.0 95.69 ? 43  THR A OG1 1 V9WDR2 UNP 43  T 
+ATOM 326  N N   . VAL A 1 44  ? -8.181  -3.351  10.544  1.0 94.94 ? 44  VAL A N   1 V9WDR2 UNP 44  V 
+ATOM 327  C CA  . VAL A 1 44  ? -9.313  -2.473  10.255  1.0 94.94 ? 44  VAL A CA  1 V9WDR2 UNP 44  V 
+ATOM 328  C C   . VAL A 1 44  ? -10.036 -2.998  9.015   1.0 94.94 ? 44  VAL A C   1 V9WDR2 UNP 44  V 
+ATOM 329  C CB  . VAL A 1 44  ? -8.829  -1.022  10.135  1.0 94.94 ? 44  VAL A CB  1 V9WDR2 UNP 44  V 
+ATOM 330  O O   . VAL A 1 44  ? -9.414  -3.726  8.243   1.0 94.94 ? 44  VAL A O   1 V9WDR2 UNP 44  V 
+ATOM 331  C CG1 . VAL A 1 44  ? -8.008  -0.815  8.860   1.0 94.94 ? 44  VAL A CG1 1 V9WDR2 UNP 44  V 
+ATOM 332  C CG2 . VAL A 1 44  ? -9.995  -0.043  10.222  1.0 94.94 ? 44  VAL A CG2 1 V9WDR2 UNP 44  V 
+ATOM 333  N N   . ALA A 1 45  ? -11.322 -2.704  8.842   1.0 95.31 ? 45  ALA A N   1 V9WDR2 UNP 45  A 
+ATOM 334  C CA  . ALA A 1 45  ? -11.922 -2.834  7.518   1.0 95.31 ? 45  ALA A CA  1 V9WDR2 UNP 45  A 
+ATOM 335  C C   . ALA A 1 45  ? -11.460 -1.633  6.689   1.0 95.31 ? 45  ALA A C   1 V9WDR2 UNP 45  A 
+ATOM 336  C CB  . ALA A 1 45  ? -13.445 -2.990  7.615   1.0 95.31 ? 45  ALA A CB  1 V9WDR2 UNP 45  A 
+ATOM 337  O O   . ALA A 1 45  ? -10.574 -1.801  5.855   1.0 95.31 ? 45  ALA A O   1 V9WDR2 UNP 45  A 
+ATOM 338  N N   . ASP A 1 46  ? -11.894 -0.430  7.066   1.0 96.00 ? 46  ASP A N   1 V9WDR2 UNP 46  D 
+ATOM 339  C CA  . ASP A 1 46  ? -11.712 0.757   6.234   1.0 96.00 ? 46  ASP A CA  1 V9WDR2 UNP 46  D 
+ATOM 340  C C   . ASP A 1 46  ? -10.944 1.855   6.971   1.0 96.00 ? 46  ASP A C   1 V9WDR2 UNP 46  D 
+ATOM 341  C CB  . ASP A 1 46  ? -13.083 1.245   5.736   1.0 96.00 ? 46  ASP A CB  1 V9WDR2 UNP 46  D 
+ATOM 342  O O   . ASP A 1 46  ? -11.102 2.082   8.182   1.0 96.00 ? 46  ASP A O   1 V9WDR2 UNP 46  D 
+ATOM 343  C CG  . ASP A 1 46  ? -13.874 0.149   4.999   1.0 96.00 ? 46  ASP A CG  1 V9WDR2 UNP 46  D 
+ATOM 344  O OD1 . ASP A 1 46  ? -13.232 -0.800  4.498   1.0 96.00 ? 46  ASP A OD1 1 V9WDR2 UNP 46  D 
+ATOM 345  O OD2 . ASP A 1 46  ? -15.123 0.215   5.014   1.0 96.00 ? 46  ASP A OD2 1 V9WDR2 UNP 46  D 
+ATOM 346  N N   . THR A 1 47  ? -10.053 2.553   6.267   1.0 97.12 ? 47  THR A N   1 V9WDR2 UNP 47  T 
+ATOM 347  C CA  . THR A 1 47  ? -9.393  3.741   6.817   1.0 97.12 ? 47  THR A CA  1 V9WDR2 UNP 47  T 
+ATOM 348  C C   . THR A 1 47  ? -9.164  4.841   5.808   1.0 97.12 ? 47  THR A C   1 V9WDR2 UNP 47  T 
+ATOM 349  C CB  . THR A 1 47  ? -8.086  3.378   7.518   1.0 97.12 ? 47  THR A CB  1 V9WDR2 UNP 47  T 
+ATOM 350  O O   . THR A 1 47  ? -8.559  4.617   4.769   1.0 97.12 ? 47  THR A O   1 V9WDR2 UNP 47  T 
+ATOM 351  C CG2 . THR A 1 47  ? -7.254  4.557   8.029   1.0 97.12 ? 47  THR A CG2 1 V9WDR2 UNP 47  T 
+ATOM 352  O OG1 . THR A 1 47  ? -8.454  2.633   8.655   1.0 97.12 ? 47  THR A OG1 1 V9WDR2 UNP 47  T 
+ATOM 353  N N   . GLU A 1 48  ? -9.559  6.055   6.176   1.0 97.81 ? 48  GLU A N   1 V9WDR2 UNP 48  E 
+ATOM 354  C CA  . GLU A 1 48  ? -9.361  7.228   5.326   1.0 97.81 ? 48  GLU A CA  1 V9WDR2 UNP 48  E 
+ATOM 355  C C   . GLU A 1 48  ? -7.890  7.665   5.353   1.0 97.81 ? 48  GLU A C   1 V9WDR2 UNP 48  E 
+ATOM 356  C CB  . GLU A 1 48  ? -10.320 8.338   5.778   1.0 97.81 ? 48  GLU A CB  1 V9WDR2 UNP 48  E 
+ATOM 357  O O   . GLU A 1 48  ? -7.227  7.717   4.327   1.0 97.81 ? 48  GLU A O   1 V9WDR2 UNP 48  E 
+ATOM 358  C CG  . GLU A 1 48  ? -10.580 9.355   4.663   1.0 97.81 ? 48  GLU A CG  1 V9WDR2 UNP 48  E 
+ATOM 359  C CD  . GLU A 1 48  ? -11.533 10.483  5.089   1.0 97.81 ? 48  GLU A CD  1 V9WDR2 UNP 48  E 
+ATOM 360  O OE1 . GLU A 1 48  ? -11.513 11.575  4.469   1.0 97.81 ? 48  GLU A OE1 1 V9WDR2 UNP 48  E 
+ATOM 361  O OE2 . GLU A 1 48  ? -12.264 10.278  6.083   1.0 97.81 ? 48  GLU A OE2 1 V9WDR2 UNP 48  E 
+ATOM 362  N N   . PHE A 1 49  ? -7.312  7.872   6.538   1.0 97.81 ? 49  PHE A N   1 V9WDR2 UNP 49  F 
+ATOM 363  C CA  . PHE A 1 49  ? -5.925  8.311   6.692   1.0 97.81 ? 49  PHE A CA  1 V9WDR2 UNP 49  F 
+ATOM 364  C C   . PHE A 1 49  ? -5.146  7.427   7.661   1.0 97.81 ? 49  PHE A C   1 V9WDR2 UNP 49  F 
+ATOM 365  C CB  . PHE A 1 49  ? -5.896  9.768   7.164   1.0 97.81 ? 49  PHE A CB  1 V9WDR2 UNP 49  F 
+ATOM 366  O O   . PHE A 1 49  ? -5.452  7.354   8.852   1.0 97.81 ? 49  PHE A O   1 V9WDR2 UNP 49  F 
+ATOM 367  C CG  . PHE A 1 49  ? -6.559  10.749  6.220   1.0 97.81 ? 49  PHE A CG  1 V9WDR2 UNP 49  F 
+ATOM 368  C CD1 . PHE A 1 49  ? -5.848  11.272  5.123   1.0 97.81 ? 49  PHE A CD1 1 V9WDR2 UNP 49  F 
+ATOM 369  C CD2 . PHE A 1 49  ? -7.897  11.126  6.428   1.0 97.81 ? 49  PHE A CD2 1 V9WDR2 UNP 49  F 
+ATOM 370  C CE1 . PHE A 1 49  ? -6.483  12.148  4.225   1.0 97.81 ? 49  PHE A CE1 1 V9WDR2 UNP 49  F 
+ATOM 371  C CE2 . PHE A 1 49  ? -8.516  12.028  5.550   1.0 97.81 ? 49  PHE A CE2 1 V9WDR2 UNP 49  F 
+ATOM 372  C CZ  . PHE A 1 49  ? -7.823  12.515  4.433   1.0 97.81 ? 49  PHE A CZ  1 V9WDR2 UNP 49  F 
+ATOM 373  N N   . ALA A 1 50  ? -4.061  6.816   7.190   1.0 97.12 ? 50  ALA A N   1 V9WDR2 UNP 50  A 
+ATOM 374  C CA  . ALA A 1 50  ? -3.180  5.980   7.995   1.0 97.12 ? 50  ALA A CA  1 V9WDR2 UNP 50  A 
+ATOM 375  C C   . ALA A 1 50  ? -1.716  6.429   7.902   1.0 97.12 ? 50  ALA A C   1 V9WDR2 UNP 50  A 
+ATOM 376  C CB  . ALA A 1 50  ? -3.371  4.524   7.569   1.0 97.12 ? 50  ALA A CB  1 V9WDR2 UNP 50  A 
+ATOM 377  O O   . ALA A 1 50  ? -1.096  6.391   6.839   1.0 97.12 ? 50  ALA A O   1 V9WDR2 UNP 50  A 
+ATOM 378  N N   . SER A 1 51  ? -1.134  6.793   9.047   1.0 98.19 ? 51  SER A N   1 V9WDR2 UNP 51  S 
+ATOM 379  C CA  . SER A 1 51  ? 0.292   7.090   9.196   1.0 98.19 ? 51  SER A CA  1 V9WDR2 UNP 51  S 
+ATOM 380  C C   . SER A 1 51  ? 0.963   6.060   10.100  1.0 98.19 ? 51  SER A C   1 V9WDR2 UNP 51  S 
+ATOM 381  C CB  . SER A 1 51  ? 0.482   8.505   9.735   1.0 98.19 ? 51  SER A CB  1 V9WDR2 UNP 51  S 
+ATOM 382  O O   . SER A 1 51  ? 0.610   5.923   11.271  1.0 98.19 ? 51  SER A O   1 V9WDR2 UNP 51  S 
+ATOM 383  O OG  . SER A 1 51  ? 1.860   8.827   9.789   1.0 98.19 ? 51  SER A OG  1 V9WDR2 UNP 51  S 
+ATOM 384  N N   . GLU A 1 52  ? 1.942   5.338   9.565   1.0 97.38 ? 52  GLU A N   1 V9WDR2 UNP 52  E 
+ATOM 385  C CA  . GLU A 1 52  ? 2.520   4.161   10.208  1.0 97.38 ? 52  GLU A CA  1 V9WDR2 UNP 52  E 
+ATOM 386  C C   . GLU A 1 52  ? 4.045   4.220   10.242  1.0 97.38 ? 52  GLU A C   1 V9WDR2 UNP 52  E 
+ATOM 387  C CB  . GLU A 1 52  ? 2.046   2.899   9.483   1.0 97.38 ? 52  GLU A CB  1 V9WDR2 UNP 52  E 
+ATOM 388  O O   . GLU A 1 52  ? 4.708   4.421   9.225   1.0 97.38 ? 52  GLU A O   1 V9WDR2 UNP 52  E 
+ATOM 389  C CG  . GLU A 1 52  ? 0.542   2.694   9.698   1.0 97.38 ? 52  GLU A CG  1 V9WDR2 UNP 52  E 
+ATOM 390  C CD  . GLU A 1 52  ? -0.004  1.465   8.987   1.0 97.38 ? 52  GLU A CD  1 V9WDR2 UNP 52  E 
+ATOM 391  O OE1 . GLU A 1 52  ? -1.233  1.451   8.746   1.0 97.38 ? 52  GLU A OE1 1 V9WDR2 UNP 52  E 
+ATOM 392  O OE2 . GLU A 1 52  ? 0.766   0.538   8.666   1.0 97.38 ? 52  GLU A OE2 1 V9WDR2 UNP 52  E 
+ATOM 393  N N   . ALA A 1 53  ? 4.615   4.001   11.425  1.0 97.81 ? 53  ALA A N   1 V9WDR2 UNP 53  A 
+ATOM 394  C CA  . ALA A 1 53  ? 6.052   3.917   11.641  1.0 97.81 ? 53  ALA A CA  1 V9WDR2 UNP 53  A 
+ATOM 395  C C   . ALA A 1 53  ? 6.403   2.605   12.350  1.0 97.81 ? 53  ALA A C   1 V9WDR2 UNP 53  A 
+ATOM 396  C CB  . ALA A 1 53  ? 6.509   5.155   12.418  1.0 97.81 ? 53  ALA A CB  1 V9WDR2 UNP 53  A 
+ATOM 397  O O   . ALA A 1 53  ? 6.111   2.422   13.535  1.0 97.81 ? 53  ALA A O   1 V9WDR2 UNP 53  A 
+ATOM 398  N N   . GLY A 1 54  ? 7.029   1.667   11.637  1.0 96.44 ? 54  GLY A N   1 V9WDR2 UNP 54  G 
+ATOM 399  C CA  . GLY A 1 54  ? 7.355   0.351   12.200  1.0 96.44 ? 54  GLY A CA  1 V9WDR2 UNP 54  G 
+ATOM 400  C C   . GLY A 1 54  ? 6.139   -0.466  12.653  1.0 96.44 ? 54  GLY A C   1 V9WDR2 UNP 54  G 
+ATOM 401  O O   . GLY A 1 54  ? 6.291   -1.339  13.507  1.0 96.44 ? 54  GLY A O   1 V9WDR2 UNP 54  G 
+ATOM 402  N N   . ALA A 1 55  ? 4.940   -0.141  12.165  1.0 96.31 ? 55  ALA A N   1 V9WDR2 UNP 55  A 
+ATOM 403  C CA  . ALA A 1 55  ? 3.699   -0.833  12.501  1.0 96.31 ? 55  ALA A CA  1 V9WDR2 UNP 55  A 
+ATOM 404  C C   . ALA A 1 55  ? 3.449   -2.018  11.553  1.0 96.31 ? 55  ALA A C   1 V9WDR2 UNP 55  A 
+ATOM 405  C CB  . ALA A 1 55  ? 2.549   0.182   12.487  1.0 96.31 ? 55  ALA A CB  1 V9WDR2 UNP 55  A 
+ATOM 406  O O   . ALA A 1 55  ? 4.068   -2.102  10.492  1.0 96.31 ? 55  ALA A O   1 V9WDR2 UNP 55  A 
+ATOM 407  N N   . ASN A 1 56  ? 2.551   -2.927  11.946  1.0 97.44 ? 56  ASN A N   1 V9WDR2 UNP 56  N 
+ATOM 408  C CA  . ASN A 1 56  ? 2.006   -3.938  11.042  1.0 97.44 ? 56  ASN A CA  1 V9WDR2 UNP 56  N 
+ATOM 409  C C   . ASN A 1 56  ? 0.494   -3.779  10.926  1.0 97.44 ? 56  ASN A C   1 V9WDR2 UNP 56  N 
+ATOM 410  C CB  . ASN A 1 56  ? 2.349   -5.371  11.464  1.0 97.44 ? 56  ASN A CB  1 V9WDR2 UNP 56  N 
+ATOM 411  O O   . ASN A 1 56  ? -0.217  -3.907  11.928  1.0 97.44 ? 56  ASN A O   1 V9WDR2 UNP 56  N 
+ATOM 412  C CG  . ASN A 1 56  ? 3.816   -5.582  11.747  1.0 97.44 ? 56  ASN A CG  1 V9WDR2 UNP 56  N 
+ATOM 413  N ND2 . ASN A 1 56  ? 4.163   -5.822  12.987  1.0 97.44 ? 56  ASN A ND2 1 V9WDR2 UNP 56  N 
+ATOM 414  O OD1 . ASN A 1 56  ? 4.673   -5.563  10.882  1.0 97.44 ? 56  ASN A OD1 1 V9WDR2 UNP 56  N 
+ATOM 415  N N   . THR A 1 57  ? -0.008  -3.561  9.720   1.0 96.94 ? 57  THR A N   1 V9WDR2 UNP 57  T 
+ATOM 416  C CA  . THR A 1 57  ? -1.427  -3.289  9.515   1.0 96.94 ? 57  THR A CA  1 V9WDR2 UNP 57  T 
+ATOM 417  C C   . THR A 1 57  ? -2.056  -4.202  8.484   1.0 96.94 ? 57  THR A C   1 V9WDR2 UNP 57  T 
+ATOM 418  C CB  . THR A 1 57  ? -1.682  -1.808  9.230   1.0 96.94 ? 57  THR A CB  1 V9WDR2 UNP 57  T 
+ATOM 419  O O   . THR A 1 57  ? -1.440  -4.642  7.516   1.0 96.94 ? 57  THR A O   1 V9WDR2 UNP 57  T 
+ATOM 420  C CG2 . THR A 1 57  ? -1.275  -1.017  10.480  1.0 96.94 ? 57  THR A CG2 1 V9WDR2 UNP 57  T 
+ATOM 421  O OG1 . THR A 1 57  ? -0.959  -1.413  8.089   1.0 96.94 ? 57  THR A OG1 1 V9WDR2 UNP 57  T 
+ATOM 422  N N   . THR A 1 58  ? -3.310  -4.541  8.749   1.0 98.06 ? 58  THR A N   1 V9WDR2 UNP 58  T 
+ATOM 423  C CA  . THR A 1 58  ? -4.194  -5.224  7.817   1.0 98.06 ? 58  THR A CA  1 V9WDR2 UNP 58  T 
+ATOM 424  C C   . THR A 1 58  ? -5.445  -4.376  7.666   1.0 98.06 ? 58  THR A C   1 V9WDR2 UNP 58  T 
+ATOM 425  C CB  . THR A 1 58  ? -4.529  -6.642  8.284   1.0 98.06 ? 58  THR A CB  1 V9WDR2 UNP 58  T 
+ATOM 426  O O   . THR A 1 58  ? -6.126  -4.129  8.665   1.0 98.06 ? 58  THR A O   1 V9WDR2 UNP 58  T 
+ATOM 427  C CG2 . THR A 1 58  ? -5.327  -7.412  7.234   1.0 98.06 ? 58  THR A CG2 1 V9WDR2 UNP 58  T 
+ATOM 428  O OG1 . THR A 1 58  ? -3.342  -7.368  8.527   1.0 98.06 ? 58  THR A OG1 1 V9WDR2 UNP 58  T 
+ATOM 429  N N   . ALA A 1 59  ? -5.722  -3.939  6.446   1.0 96.69 ? 59  ALA A N   1 V9WDR2 UNP 59  A 
+ATOM 430  C CA  . ALA A 1 59  ? -6.935  -3.237  6.056   1.0 96.69 ? 59  ALA A CA  1 V9WDR2 UNP 59  A 
+ATOM 431  C C   . ALA A 1 59  ? -7.640  -4.019  4.939   1.0 96.69 ? 59  ALA A C   1 V9WDR2 UNP 59  A 
+ATOM 432  C CB  . ALA A 1 59  ? -6.578  -1.804  5.651   1.0 96.69 ? 59  ALA A CB  1 V9WDR2 UNP 59  A 
+ATOM 433  O O   . ALA A 1 59  ? -7.001  -4.819  4.253   1.0 96.69 ? 59  ALA A O   1 V9WDR2 UNP 59  A 
+ATOM 434  N N   . ALA A 1 60  ? -8.945  -3.826  4.778   1.0 97.00 ? 60  ALA A N   1 V9WDR2 UNP 60  A 
+ATOM 435  C CA  . ALA A 1 60  ? -9.571  -4.065  3.486   1.0 97.00 ? 60  ALA A CA  1 V9WDR2 UNP 60  A 
+ATOM 436  C C   . ALA A 1 60  ? -9.218  -2.874  2.593   1.0 97.00 ? 60  ALA A C   1 V9WDR2 UNP 60  A 
+ATOM 437  C CB  . ALA A 1 60  ? -11.078 -4.294  3.655   1.0 97.00 ? 60  ALA A CB  1 V9WDR2 UNP 60  A 
+ATOM 438  O O   . ALA A 1 60  ? -8.388  -3.032  1.702   1.0 97.00 ? 60  ALA A O   1 V9WDR2 UNP 60  A 
+ATOM 439  N N   . ASP A 1 61  ? -9.678  -1.682  2.972   1.0 97.75 ? 61  ASP A N   1 V9WDR2 UNP 61  D 
+ATOM 440  C CA  . ASP A 1 61  ? -9.566  -0.491  2.137   1.0 97.75 ? 61  ASP A CA  1 V9WDR2 UNP 61  D 
+ATOM 441  C C   . ASP A 1 61  ? -8.795  0.621   2.858   1.0 97.75 ? 61  ASP A C   1 V9WDR2 UNP 61  D 
+ATOM 442  C CB  . ASP A 1 61  ? -10.970 -0.053  1.683   1.0 97.75 ? 61  ASP A CB  1 V9WDR2 UNP 61  D 
+ATOM 443  O O   . ASP A 1 61  ? -8.899  0.822   4.077   1.0 97.75 ? 61  ASP A O   1 V9WDR2 UNP 61  D 
+ATOM 444  C CG  . ASP A 1 61  ? -11.734 -1.162  0.932   1.0 97.75 ? 61  ASP A CG  1 V9WDR2 UNP 61  D 
+ATOM 445  O OD1 . ASP A 1 61  ? -11.065 -2.061  0.376   1.0 97.75 ? 61  ASP A OD1 1 V9WDR2 UNP 61  D 
+ATOM 446  O OD2 . ASP A 1 61  ? -12.985 -1.144  0.950   1.0 97.75 ? 61  ASP A OD2 1 V9WDR2 UNP 61  D 
+ATOM 447  N N   . THR A 1 62  ? -7.955  1.345   2.119   1.0 97.94 ? 62  THR A N   1 V9WDR2 UNP 62  T 
+ATOM 448  C CA  . THR A 1 62  ? -7.251  2.528   2.630   1.0 97.94 ? 62  THR A CA  1 V9WDR2 UNP 62  T 
+ATOM 449  C C   . THR A 1 62  ? -7.199  3.636   1.588   1.0 97.94 ? 62  THR A C   1 V9WDR2 UNP 62  T 
+ATOM 450  C CB  . THR A 1 62  ? -5.844  2.171   3.131   1.0 97.94 ? 62  THR A CB  1 V9WDR2 UNP 62  T 
+ATOM 451  O O   . THR A 1 62  ? -6.617  3.454   0.525   1.0 97.94 ? 62  THR A O   1 V9WDR2 UNP 62  T 
+ATOM 452  C CG2 . THR A 1 62  ? -5.080  3.375   3.689   1.0 97.94 ? 62  THR A CG2 1 V9WDR2 UNP 62  T 
+ATOM 453  O OG1 . THR A 1 62  ? -5.959  1.251   4.199   1.0 97.94 ? 62  THR A OG1 1 V9WDR2 UNP 62  T 
+ATOM 454  N N   . GLU A 1 63  ? -7.740  4.810   1.905   1.0 98.44 ? 63  GLU A N   1 V9WDR2 UNP 63  E 
+ATOM 455  C CA  . GLU A 1 63  ? -7.710  5.949   0.977   1.0 98.44 ? 63  GLU A CA  1 V9WDR2 UNP 63  E 
+ATOM 456  C C   . GLU A 1 63  ? -6.307  6.573   0.941   1.0 98.44 ? 63  GLU A C   1 V9WDR2 UNP 63  E 
+ATOM 457  C CB  . GLU A 1 63  ? -8.808  6.955   1.356   1.0 98.44 ? 63  GLU A CB  1 V9WDR2 UNP 63  E 
+ATOM 458  O O   . GLU A 1 63  ? -5.655  6.619   -0.097  1.0 98.44 ? 63  GLU A O   1 V9WDR2 UNP 63  E 
+ATOM 459  C CG  . GLU A 1 63  ? -9.081  7.963   0.232   1.0 98.44 ? 63  GLU A CG  1 V9WDR2 UNP 63  E 
+ATOM 460  C CD  . GLU A 1 63  ? -10.205 8.962   0.566   1.0 98.44 ? 63  GLU A CD  1 V9WDR2 UNP 63  E 
+ATOM 461  O OE1 . GLU A 1 63  ? -10.260 10.052  -0.054  1.0 98.44 ? 63  GLU A OE1 1 V9WDR2 UNP 63  E 
+ATOM 462  O OE2 . GLU A 1 63  ? -11.007 8.655   1.475   1.0 98.44 ? 63  GLU A OE2 1 V9WDR2 UNP 63  E 
+ATOM 463  N N   . PHE A 1 64  ? -5.766  6.956   2.100   1.0 98.50 ? 64  PHE A N   1 V9WDR2 UNP 64  F 
+ATOM 464  C CA  . PHE A 1 64  ? -4.447  7.572   2.220   1.0 98.50 ? 64  PHE A CA  1 V9WDR2 UNP 64  F 
+ATOM 465  C C   . PHE A 1 64  ? -3.541  6.834   3.197   1.0 98.50 ? 64  PHE A C   1 V9WDR2 UNP 64  F 
+ATOM 466  C CB  . PHE A 1 64  ? -4.569  9.039   2.624   1.0 98.50 ? 64  PHE A CB  1 V9WDR2 UNP 64  F 
+ATOM 467  O O   . PHE A 1 64  ? -3.806  6.688   4.392   1.0 98.50 ? 64  PHE A O   1 V9WDR2 UNP 64  F 
+ATOM 468  C CG  . PHE A 1 64  ? -5.297  9.893   1.614   1.0 98.50 ? 64  PHE A CG  1 V9WDR2 UNP 64  F 
+ATOM 469  C CD1 . PHE A 1 64  ? -4.619  10.393  0.487   1.0 98.50 ? 64  PHE A CD1 1 V9WDR2 UNP 64  F 
+ATOM 470  C CD2 . PHE A 1 64  ? -6.662  10.170  1.791   1.0 98.50 ? 64  PHE A CD2 1 V9WDR2 UNP 64  F 
+ATOM 471  C CE1 . PHE A 1 64  ? -5.313  11.152  -0.472  1.0 98.50 ? 64  PHE A CE1 1 V9WDR2 UNP 64  F 
+ATOM 472  C CE2 . PHE A 1 64  ? -7.342  10.959  0.853   1.0 98.50 ? 64  PHE A CE2 1 V9WDR2 UNP 64  F 
+ATOM 473  C CZ  . PHE A 1 64  ? -6.680  11.423  -0.293  1.0 98.50 ? 64  PHE A CZ  1 V9WDR2 UNP 64  F 
+ATOM 474  N N   . ALA A 1 65  ? -2.376  6.461   2.692   1.0 97.81 ? 65  ALA A N   1 V9WDR2 UNP 65  A 
+ATOM 475  C CA  . ALA A 1 65  ? -1.426  5.590   3.343   1.0 97.81 ? 65  ALA A CA  1 V9WDR2 UNP 65  A 
+ATOM 476  C C   . ALA A 1 65  ? -0.027  6.223   3.345   1.0 97.81 ? 65  ALA A C   1 V9WDR2 UNP 65  A 
+ATOM 477  C CB  . ALA A 1 65  ? -1.483  4.271   2.560   1.0 97.81 ? 65  ALA A CB  1 V9WDR2 UNP 65  A 
+ATOM 478  O O   . ALA A 1 65  ? 0.592   6.392   2.300   1.0 97.81 ? 65  ALA A O   1 V9WDR2 UNP 65  A 
+ATOM 479  N N   . SER A 1 66  ? 0.526   6.512   4.525   1.0 98.56 ? 66  SER A N   1 V9WDR2 UNP 66  S 
+ATOM 480  C CA  . SER A 1 66  ? 1.925   6.927   4.687   1.0 98.56 ? 66  SER A CA  1 V9WDR2 UNP 66  S 
+ATOM 481  C C   . SER A 1 66  ? 2.663   5.967   5.612   1.0 98.56 ? 66  SER A C   1 V9WDR2 UNP 66  S 
+ATOM 482  C CB  . SER A 1 66  ? 2.008   8.361   5.212   1.0 98.56 ? 66  SER A CB  1 V9WDR2 UNP 66  S 
+ATOM 483  O O   . SER A 1 66  ? 2.339   5.864   6.792   1.0 98.56 ? 66  SER A O   1 V9WDR2 UNP 66  S 
+ATOM 484  O OG  . SER A 1 66  ? 3.362   8.771   5.335   1.0 98.56 ? 66  SER A OG  1 V9WDR2 UNP 66  S 
+ATOM 485  N N   . GLU A 1 67  ? 3.706   5.319   5.104   1.0 98.00 ? 67  GLU A N   1 V9WDR2 UNP 67  E 
+ATOM 486  C CA  . GLU A 1 67  ? 4.420   4.245   5.797   1.0 98.00 ? 67  GLU A CA  1 V9WDR2 UNP 67  E 
+ATOM 487  C C   . GLU A 1 67  ? 5.928   4.506   5.854   1.0 98.00 ? 67  GLU A C   1 V9WDR2 UNP 67  E 
+ATOM 488  C CB  . GLU A 1 67  ? 4.175   2.920   5.077   1.0 98.00 ? 67  GLU A CB  1 V9WDR2 UNP 67  E 
+ATOM 489  O O   . GLU A 1 67  ? 6.575   4.789   4.844   1.0 98.00 ? 67  GLU A O   1 V9WDR2 UNP 67  E 
+ATOM 490  C CG  . GLU A 1 67  ? 2.723   2.443   5.122   1.0 98.00 ? 67  GLU A CG  1 V9WDR2 UNP 67  E 
+ATOM 491  C CD  . GLU A 1 67  ? 2.557   1.124   4.349   1.0 98.00 ? 67  GLU A CD  1 V9WDR2 UNP 67  E 
+ATOM 492  O OE1 . GLU A 1 67  ? 1.718   1.086   3.412   1.0 98.00 ? 67  GLU A OE1 1 V9WDR2 UNP 67  E 
+ATOM 493  O OE2 . GLU A 1 67  ? 3.269   0.169   4.717   1.0 98.00 ? 67  GLU A OE2 1 V9WDR2 UNP 67  E 
+ATOM 494  N N   . ALA A 1 68  ? 6.513   4.357   7.039   1.0 98.38 ? 68  ALA A N   1 V9WDR2 UNP 68  A 
+ATOM 495  C CA  . ALA A 1 68  ? 7.953   4.421   7.255   1.0 98.38 ? 68  ALA A CA  1 V9WDR2 UNP 68  A 
+ATOM 496  C C   . ALA A 1 68  ? 8.426   3.174   8.008   1.0 98.38 ? 68  ALA A C   1 V9WDR2 UNP 68  A 
+ATOM 497  C CB  . ALA A 1 68  ? 8.289   5.722   7.990   1.0 98.38 ? 68  ALA A CB  1 V9WDR2 UNP 68  A 
+ATOM 498  O O   . ALA A 1 68  ? 8.158   3.009   9.202   1.0 98.38 ? 68  ALA A O   1 V9WDR2 UNP 68  A 
+ATOM 499  N N   . GLY A 1 69  ? 9.133   2.276   7.318   1.0 97.75 ? 69  GLY A N   1 V9WDR2 UNP 69  G 
+ATOM 500  C CA  . GLY A 1 69  ? 9.581   1.013   7.912   1.0 97.75 ? 69  GLY A CA  1 V9WDR2 UNP 69  G 
+ATOM 501  C C   . GLY A 1 69  ? 8.445   0.116   8.415   1.0 97.75 ? 69  GLY A C   1 V9WDR2 UNP 69  G 
+ATOM 502  O O   . GLY A 1 69  ? 8.677   -0.679  9.323   1.0 97.75 ? 69  GLY A O   1 V9WDR2 UNP 69  G 
+ATOM 503  N N   . ALA A 1 70  ? 7.227   0.295   7.902   1.0 97.75 ? 70  ALA A N   1 V9WDR2 UNP 70  A 
+ATOM 504  C CA  . ALA A 1 70  ? 6.041   -0.459  8.292   1.0 97.75 ? 70  ALA A CA  1 V9WDR2 UNP 70  A 
+ATOM 505  C C   . ALA A 1 70  ? 5.828   -1.680  7.384   1.0 97.75 ? 70  ALA A C   1 V9WDR2 UNP 70  A 
+ATOM 506  C CB  . ALA A 1 70  ? 4.838   0.493   8.289   1.0 97.75 ? 70  ALA A CB  1 V9WDR2 UNP 70  A 
+ATOM 507  O O   . ALA A 1 70  ? 6.496   -1.823  6.356   1.0 97.75 ? 70  ALA A O   1 V9WDR2 UNP 70  A 
+ATOM 508  N N   . ASN A 1 71  ? 4.918   -2.565  7.795   1.0 98.25 ? 71  ASN A N   1 V9WDR2 UNP 71  N 
+ATOM 509  C CA  . ASN A 1 71  ? 4.402   -3.627  6.943   1.0 98.25 ? 71  ASN A CA  1 V9WDR2 UNP 71  N 
+ATOM 510  C C   . ASN A 1 71  ? 2.884   -3.505  6.822   1.0 98.25 ? 71  ASN A C   1 V9WDR2 UNP 71  N 
+ATOM 511  C CB  . ASN A 1 71  ? 4.788   -5.018  7.464   1.0 98.25 ? 71  ASN A CB  1 V9WDR2 UNP 71  N 
+ATOM 512  O O   . ASN A 1 71  ? 2.185   -3.607  7.832   1.0 98.25 ? 71  ASN A O   1 V9WDR2 UNP 71  N 
+ATOM 513  C CG  . ASN A 1 71  ? 6.275   -5.198  7.676   1.0 98.25 ? 71  ASN A CG  1 V9WDR2 UNP 71  N 
+ATOM 514  N ND2 . ASN A 1 71  ? 6.692   -5.395  8.903   1.0 98.25 ? 71  ASN A ND2 1 V9WDR2 UNP 71  N 
+ATOM 515  O OD1 . ASN A 1 71  ? 7.090   -5.200  6.767   1.0 98.25 ? 71  ASN A OD1 1 V9WDR2 UNP 71  N 
+ATOM 516  N N   . ARG A 1 72  ? 2.370   -3.382  5.603   1.0 97.94 ? 72  ARG A N   1 V9WDR2 UNP 72  R 
+ATOM 517  C CA  . ARG A 1 72  ? 0.931   -3.303  5.357   1.0 97.94 ? 72  ARG A CA  1 V9WDR2 UNP 72  R 
+ATOM 518  C C   . ARG A 1 72  ? 0.438   -4.429  4.461   1.0 97.94 ? 72  ARG A C   1 V9WDR2 UNP 72  R 
+ATOM 519  C CB  . ARG A 1 72  ? 0.586   -1.904  4.835   1.0 97.94 ? 72  ARG A CB  1 V9WDR2 UNP 72  R 
+ATOM 520  O O   . ARG A 1 72  ? 1.092   -4.844  3.506   1.0 97.94 ? 72  ARG A O   1 V9WDR2 UNP 72  R 
+ATOM 521  C CG  . ARG A 1 72  ? -0.927  -1.738  4.623   1.0 97.94 ? 72  ARG A CG  1 V9WDR2 UNP 72  R 
+ATOM 522  C CD  . ARG A 1 72  ? -1.304  -0.292  4.324   1.0 97.94 ? 72  ARG A CD  1 V9WDR2 UNP 72  R 
+ATOM 523  N NE  . ARG A 1 72  ? -1.150  0.585   5.505   1.0 97.94 ? 72  ARG A NE  1 V9WDR2 UNP 72  R 
+ATOM 524  N NH1 . ARG A 1 72  ? -0.317  2.379   4.395   1.0 97.94 ? 72  ARG A NH1 1 V9WDR2 UNP 72  R 
+ATOM 525  N NH2 . ARG A 1 72  ? -1.013  2.685   6.419   1.0 97.94 ? 72  ARG A NH2 1 V9WDR2 UNP 72  R 
+ATOM 526  C CZ  . ARG A 1 72  ? -0.836  1.861   5.442   1.0 97.94 ? 72  ARG A CZ  1 V9WDR2 UNP 72  R 
+ATOM 527  N N   . THR A 1 73  ? -0.756  -4.913  4.765   1.0 98.50 ? 73  THR A N   1 V9WDR2 UNP 73  T 
+ATOM 528  C CA  . THR A 1 73  ? -1.576  -5.702  3.848   1.0 98.50 ? 73  THR A CA  1 V9WDR2 UNP 73  T 
+ATOM 529  C C   . THR A 1 73  ? -2.913  -4.997  3.669   1.0 98.50 ? 73  THR A C   1 V9WDR2 UNP 73  T 
+ATOM 530  C CB  . THR A 1 73  ? -1.756  -7.138  4.348   1.0 98.50 ? 73  THR A CB  1 V9WDR2 UNP 73  T 
+ATOM 531  O O   . THR A 1 73  ? -3.596  -4.751  4.660   1.0 98.50 ? 73  THR A O   1 V9WDR2 UNP 73  T 
+ATOM 532  C CG2 . THR A 1 73  ? -2.507  -8.008  3.342   1.0 98.50 ? 73  THR A CG2 1 V9WDR2 UNP 73  T 
+ATOM 533  O OG1 . THR A 1 73  ? -0.490  -7.733  4.551   1.0 98.50 ? 73  THR A OG1 1 V9WDR2 UNP 73  T 
+ATOM 534  N N   . ALA A 1 74  ? -3.276  -4.681  2.433   1.0 96.81 ? 74  ALA A N   1 V9WDR2 UNP 74  A 
+ATOM 535  C CA  . ALA A 1 74  ? -4.579  -4.132  2.068   1.0 96.81 ? 74  ALA A CA  1 V9WDR2 UNP 74  A 
+ATOM 536  C C   . ALA A 1 74  ? -5.200  -4.976  0.947   1.0 96.81 ? 74  ALA A C   1 V9WDR2 UNP 74  A 
+ATOM 537  C CB  . ALA A 1 74  ? -4.425  -2.652  1.705   1.0 96.81 ? 74  ALA A CB  1 V9WDR2 UNP 74  A 
+ATOM 538  O O   . ALA A 1 74  ? -4.479  -5.708  0.266   1.0 96.81 ? 74  ALA A O   1 V9WDR2 UNP 74  A 
+ATOM 539  N N   . ALA A 1 75  ? -6.518  -4.921  0.775   1.0 97.69 ? 75  ALA A N   1 V9WDR2 UNP 75  A 
+ATOM 540  C CA  . ALA A 1 75  ? -7.109  -5.272  -0.510  1.0 97.69 ? 75  ALA A CA  1 V9WDR2 UNP 75  A 
+ATOM 541  C C   . ALA A 1 75  ? -6.856  -4.098  -1.459  1.0 97.69 ? 75  ALA A C   1 V9WDR2 UNP 75  A 
+ATOM 542  C CB  . ALA A 1 75  ? -8.591  -5.631  -0.346  1.0 97.69 ? 75  ALA A CB  1 V9WDR2 UNP 75  A 
+ATOM 543  O O   . ALA A 1 75  ? -6.045  -4.241  -2.370  1.0 97.69 ? 75  ALA A O   1 V9WDR2 UNP 75  A 
+ATOM 544  N N   . ASP A 1 76  ? -7.386  -2.924  -1.119  1.0 98.12 ? 76  ASP A N   1 V9WDR2 UNP 76  D 
+ATOM 545  C CA  . ASP A 1 76  ? -7.357  -1.758  -1.994  1.0 98.12 ? 76  ASP A CA  1 V9WDR2 UNP 76  D 
+ATOM 546  C C   . ASP A 1 76  ? -6.657  -0.574  -1.315  1.0 98.12 ? 76  ASP A C   1 V9WDR2 UNP 76  D 
+ATOM 547  C CB  . ASP A 1 76  ? -8.790  -1.436  -2.458  1.0 98.12 ? 76  ASP A CB  1 V9WDR2 UNP 76  D 
+ATOM 548  O O   . ASP A 1 76  ? -6.765  -0.341  -0.104  1.0 98.12 ? 76  ASP A O   1 V9WDR2 UNP 76  D 
+ATOM 549  C CG  . ASP A 1 76  ? -9.460  -2.617  -3.191  1.0 98.12 ? 76  ASP A CG  1 V9WDR2 UNP 76  D 
+ATOM 550  O OD1 . ASP A 1 76  ? -8.718  -3.450  -3.758  1.0 98.12 ? 76  ASP A OD1 1 V9WDR2 UNP 76  D 
+ATOM 551  O OD2 . ASP A 1 76  ? -10.707 -2.718  -3.166  1.0 98.12 ? 76  ASP A OD2 1 V9WDR2 UNP 76  D 
+ATOM 552  N N   . THR A 1 77  ? -5.868  0.177   -2.084  1.0 98.19 ? 77  THR A N   1 V9WDR2 UNP 77  T 
+ATOM 553  C CA  . THR A 1 77  ? -5.250  1.424   -1.616  1.0 98.19 ? 77  THR A CA  1 V9WDR2 UNP 77  T 
+ATOM 554  C C   . THR A 1 77  ? -5.276  2.496   -2.697  1.0 98.19 ? 77  THR A C   1 V9WDR2 UNP 77  T 
+ATOM 555  C CB  . THR A 1 77  ? -3.820  1.193   -1.105  1.0 98.19 ? 77  THR A CB  1 V9WDR2 UNP 77  T 
+ATOM 556  O O   . THR A 1 77  ? -4.690  2.312   -3.759  1.0 98.19 ? 77  THR A O   1 V9WDR2 UNP 77  T 
+ATOM 557  C CG2 . THR A 1 77  ? -3.179  2.464   -0.542  1.0 98.19 ? 77  THR A CG2 1 V9WDR2 UNP 77  T 
+ATOM 558  O OG1 . THR A 1 77  ? -3.843  0.266   -0.038  1.0 98.19 ? 77  THR A OG1 1 V9WDR2 UNP 77  T 
+ATOM 559  N N   . GLU A 1 78  ? -5.895  3.641   -2.418  1.0 98.62 ? 78  GLU A N   1 V9WDR2 UNP 78  E 
+ATOM 560  C CA  . GLU A 1 78  ? -5.974  4.734   -3.397  1.0 98.62 ? 78  GLU A CA  1 V9WDR2 UNP 78  E 
+ATOM 561  C C   . GLU A 1 78  ? -4.633  5.476   -3.488  1.0 98.62 ? 78  GLU A C   1 V9WDR2 UNP 78  E 
+ATOM 562  C CB  . GLU A 1 78  ? -7.155  5.660   -3.059  1.0 98.62 ? 78  GLU A CB  1 V9WDR2 UNP 78  E 
+ATOM 563  O O   . GLU A 1 78  ? -3.992  5.508   -4.535  1.0 98.62 ? 78  GLU A O   1 V9WDR2 UNP 78  E 
+ATOM 564  C CG  . GLU A 1 78  ? -7.537  6.545   -4.253  1.0 98.62 ? 78  GLU A CG  1 V9WDR2 UNP 78  E 
+ATOM 565  C CD  . GLU A 1 78  ? -8.745  7.464   -3.985  1.0 98.62 ? 78  GLU A CD  1 V9WDR2 UNP 78  E 
+ATOM 566  O OE1 . GLU A 1 78  ? -8.897  8.494   -4.687  1.0 98.62 ? 78  GLU A OE1 1 V9WDR2 UNP 78  E 
+ATOM 567  O OE2 . GLU A 1 78  ? -9.518  7.155   -3.054  1.0 98.62 ? 78  GLU A OE2 1 V9WDR2 UNP 78  E 
+ATOM 568  N N   . PHE A 1 79  ? -4.124  5.988   -2.365  1.0 98.56 ? 79  PHE A N   1 V9WDR2 UNP 79  F 
+ATOM 569  C CA  . PHE A 1 79  ? -2.868  6.734   -2.313  1.0 98.56 ? 79  PHE A CA  1 V9WDR2 UNP 79  F 
+ATOM 570  C C   . PHE A 1 79  ? -1.903  6.167   -1.286  1.0 98.56 ? 79  PHE A C   1 V9WDR2 UNP 79  F 
+ATOM 571  C CB  . PHE A 1 79  ? -3.138  8.200   -1.985  1.0 98.56 ? 79  PHE A CB  1 V9WDR2 UNP 79  F 
+ATOM 572  O O   . PHE A 1 79  ? -2.141  6.220   -0.081  1.0 98.56 ? 79  PHE A O   1 V9WDR2 UNP 79  F 
+ATOM 573  C CG  . PHE A 1 79  ? -3.946  8.924   -3.030  1.0 98.56 ? 79  PHE A CG  1 V9WDR2 UNP 79  F 
+ATOM 574  C CD1 . PHE A 1 79  ? -3.320  9.434   -4.182  1.0 98.56 ? 79  PHE A CD1 1 V9WDR2 UNP 79  F 
+ATOM 575  C CD2 . PHE A 1 79  ? -5.332  9.072   -2.857  1.0 98.56 ? 79  PHE A CD2 1 V9WDR2 UNP 79  F 
+ATOM 576  C CE1 . PHE A 1 79  ? -4.084  10.079  -5.169  1.0 98.56 ? 79  PHE A CE1 1 V9WDR2 UNP 79  F 
+ATOM 577  C CE2 . PHE A 1 79  ? -6.086  9.744   -3.829  1.0 98.56 ? 79  PHE A CE2 1 V9WDR2 UNP 79  F 
+ATOM 578  C CZ  . PHE A 1 79  ? -5.472  10.220  -4.997  1.0 98.56 ? 79  PHE A CZ  1 V9WDR2 UNP 79  F 
+ATOM 579  N N   . ALA A 1 80  ? -0.736  5.736   -1.748  1.0 97.94 ? 80  ALA A N   1 V9WDR2 UNP 80  A 
+ATOM 580  C CA  . ALA A 1 80  ? 0.263   5.089   -0.922  1.0 97.94 ? 80  ALA A CA  1 V9WDR2 UNP 80  A 
+ATOM 581  C C   . ALA A 1 80  ? 1.641   5.757   -1.059  1.0 97.94 ? 80  ALA A C   1 V9WDR2 UNP 80  A 
+ATOM 582  C CB  . ALA A 1 80  ? 0.251   3.599   -1.277  1.0 97.94 ? 80  ALA A CB  1 V9WDR2 UNP 80  A 
+ATOM 583  O O   . ALA A 1 80  ? 2.200   5.884   -2.147  1.0 97.94 ? 80  ALA A O   1 V9WDR2 UNP 80  A 
+ATOM 584  N N   . SER A 1 81  ? 2.228   6.158   0.067   1.0 98.62 ? 81  SER A N   1 V9WDR2 UNP 81  S 
+ATOM 585  C CA  . SER A 1 81  ? 3.579   6.711   0.159   1.0 98.62 ? 81  SER A CA  1 V9WDR2 UNP 81  S 
+ATOM 586  C C   . SER A 1 81  ? 4.421   5.892   1.130   1.0 98.62 ? 81  SER A C   1 V9WDR2 UNP 81  S 
+ATOM 587  C CB  . SER A 1 81  ? 3.526   8.180   0.582   1.0 98.62 ? 81  SER A CB  1 V9WDR2 UNP 81  S 
+ATOM 588  O O   . SER A 1 81  ? 4.110   5.813   2.318   1.0 98.62 ? 81  SER A O   1 V9WDR2 UNP 81  S 
+ATOM 589  O OG  . SER A 1 81  ? 4.837   8.698   0.744   1.0 98.62 ? 81  SER A OG  1 V9WDR2 UNP 81  S 
+ATOM 590  N N   . GLU A 1 82  ? 5.537   5.346   0.655   1.0 98.19 ? 82  GLU A N   1 V9WDR2 UNP 82  E 
+ATOM 591  C CA  . GLU A 1 82  ? 6.414   4.471   1.435   1.0 98.19 ? 82  GLU A CA  1 V9WDR2 UNP 82  E 
+ATOM 592  C C   . GLU A 1 82  ? 7.860   4.918   1.471   1.0 98.19 ? 82  GLU A C   1 V9WDR2 UNP 82  E 
+ATOM 593  C CB  . GLU A 1 82  ? 6.435   3.068   0.855   1.0 98.19 ? 82  GLU A CB  1 V9WDR2 UNP 82  E 
+ATOM 594  O O   . GLU A 1 82  ? 8.471   5.233   0.449   1.0 98.19 ? 82  GLU A O   1 V9WDR2 UNP 82  E 
+ATOM 595  C CG  . GLU A 1 82  ? 5.212   2.313   1.311   1.0 98.19 ? 82  GLU A CG  1 V9WDR2 UNP 82  E 
+ATOM 596  C CD  . GLU A 1 82  ? 5.090   0.995   0.552   1.0 98.19 ? 82  GLU A CD  1 V9WDR2 UNP 82  E 
+ATOM 597  O OE1 . GLU A 1 82  ? 4.484   0.067   1.090   1.0 98.19 ? 82  GLU A OE1 1 V9WDR2 UNP 82  E 
+ATOM 598  O OE2 . GLU A 1 82  ? 5.472   0.942   -0.628  1.0 98.19 ? 82  GLU A OE2 1 V9WDR2 UNP 82  E 
+ATOM 599  N N   . ALA A 1 83  ? 8.448   4.797   2.656   1.0 98.50 ? 83  ALA A N   1 V9WDR2 UNP 83  A 
+ATOM 600  C CA  . ALA A 1 83  ? 9.882   4.870   2.859   1.0 98.50 ? 83  ALA A CA  1 V9WDR2 UNP 83  A 
+ATOM 601  C C   . ALA A 1 83  ? 10.371  3.630   3.617   1.0 98.50 ? 83  ALA A C   1 V9WDR2 UNP 83  A 
+ATOM 602  C CB  . ALA A 1 83  ? 10.200  6.182   3.579   1.0 98.50 ? 83  ALA A CB  1 V9WDR2 UNP 83  A 
+ATOM 603  O O   . ALA A 1 83  ? 10.107  3.469   4.811   1.0 98.50 ? 83  ALA A O   1 V9WDR2 UNP 83  A 
+ATOM 604  N N   . GLY A 1 84  ? 11.112  2.752   2.936   1.0 98.00 ? 84  GLY A N   1 V9WDR2 UNP 84  G 
+ATOM 605  C CA  . GLY A 1 84  ? 11.689  1.553   3.553   1.0 98.00 ? 84  GLY A CA  1 V9WDR2 UNP 84  G 
+ATOM 606  C C   . GLY A 1 84  ? 10.660  0.569   4.119   1.0 98.00 ? 84  GLY A C   1 V9WDR2 UNP 84  G 
+ATOM 607  O O   . GLY A 1 84  ? 10.976  -0.142  5.069   1.0 98.00 ? 84  GLY A O   1 V9WDR2 UNP 84  G 
+ATOM 608  N N   . ALA A 1 85  ? 9.433   0.583   3.600   1.0 98.06 ? 85  ALA A N   1 V9WDR2 UNP 85  A 
+ATOM 609  C CA  . ALA A 1 85  ? 8.318   -0.239  4.061   1.0 98.06 ? 85  ALA A CA  1 V9WDR2 UNP 85  A 
+ATOM 610  C C   . ALA A 1 85  ? 8.109   -1.467  3.162   1.0 98.06 ? 85  ALA A C   1 V9WDR2 UNP 85  A 
+ATOM 611  C CB  . ALA A 1 85  ? 7.082   0.655   4.102   1.0 98.06 ? 85  ALA A CB  1 V9WDR2 UNP 85  A 
+ATOM 612  O O   . ALA A 1 85  ? 8.720   -1.569  2.093   1.0 98.06 ? 85  ALA A O   1 V9WDR2 UNP 85  A 
+ATOM 613  N N   . ASN A 1 86  ? 7.256   -2.391  3.607   1.0 98.44 ? 86  ASN A N   1 V9WDR2 UNP 86  N 
+ATOM 614  C CA  . ASN A 1 86  ? 6.788   -3.497  2.781   1.0 98.44 ? 86  ASN A CA  1 V9WDR2 UNP 86  N 
+ATOM 615  C C   . ASN A 1 86  ? 5.260   -3.499  2.692   1.0 98.44 ? 86  ASN A C   1 V9WDR2 UNP 86  N 
+ATOM 616  C CB  . ASN A 1 86  ? 7.295   -4.853  3.301   1.0 98.44 ? 86  ASN A CB  1 V9WDR2 UNP 86  N 
+ATOM 617  O O   . ASN A 1 86  ? 4.594   -3.581  3.724   1.0 98.44 ? 86  ASN A O   1 V9WDR2 UNP 86  N 
+ATOM 618  C CG  . ASN A 1 86  ? 8.785   -4.903  3.574   1.0 98.44 ? 86  ASN A CG  1 V9WDR2 UNP 86  N 
+ATOM 619  N ND2 . ASN A 1 86  ? 9.163   -5.049  4.821   1.0 98.44 ? 86  ASN A ND2 1 V9WDR2 UNP 86  N 
+ATOM 620  O OD1 . ASN A 1 86  ? 9.638   -4.847  2.699   1.0 98.44 ? 86  ASN A OD1 1 V9WDR2 UNP 86  N 
+ATOM 621  N N   . ARG A 1 87  ? 4.708   -3.537  1.479   1.0 98.12 ? 87  ARG A N   1 V9WDR2 UNP 87  R 
+ATOM 622  C CA  . ARG A 1 87  ? 3.258   -3.640  1.279   1.0 98.12 ? 87  ARG A CA  1 V9WDR2 UNP 87  R 
+ATOM 623  C C   . ARG A 1 87  ? 2.877   -4.805  0.393   1.0 98.12 ? 87  ARG A C   1 V9WDR2 UNP 87  R 
+ATOM 624  C CB  . ARG A 1 87  ? 2.692   -2.309  0.777   1.0 98.12 ? 87  ARG A CB  1 V9WDR2 UNP 87  R 
+ATOM 625  O O   . ARG A 1 87  ? 3.547   -5.130  -0.585  1.0 98.12 ? 87  ARG A O   1 V9WDR2 UNP 87  R 
+ATOM 626  C CG  . ARG A 1 87  ? 1.167   -2.267  0.571   1.0 98.12 ? 87  ARG A CG  1 V9WDR2 UNP 87  R 
+ATOM 627  C CD  . ARG A 1 87  ? 0.679   -1.031  -0.189  1.0 98.12 ? 87  ARG A CD  1 V9WDR2 UNP 87  R 
+ATOM 628  N NE  . ARG A 1 87  ? 1.335   0.201   0.257   1.0 98.12 ? 87  ARG A NE  1 V9WDR2 UNP 87  R 
+ATOM 629  N NH1 . ARG A 1 87  ? 2.842   0.450   -1.489  1.0 98.12 ? 87  ARG A NH1 1 V9WDR2 UNP 87  R 
+ATOM 630  N NH2 . ARG A 1 87  ? 2.568   2.042   0.004   1.0 98.12 ? 87  ARG A NH2 1 V9WDR2 UNP 87  R 
+ATOM 631  C CZ  . ARG A 1 87  ? 2.239   0.872   -0.418  1.0 98.12 ? 87  ARG A CZ  1 V9WDR2 UNP 87  R 
+ATOM 632  N N   . THR A 1 88  ? 1.749   -5.407  0.736   1.0 98.50 ? 88  THR A N   1 V9WDR2 UNP 88  T 
+ATOM 633  C CA  . THR A 1 88  ? 0.972   -6.259  -0.157  1.0 98.50 ? 88  THR A CA  1 V9WDR2 UNP 88  T 
+ATOM 634  C C   . THR A 1 88  ? -0.411  -5.645  -0.355  1.0 98.50 ? 88  THR A C   1 V9WDR2 UNP 88  T 
+ATOM 635  C CB  . THR A 1 88  ? 0.894   -7.684  0.391   1.0 98.50 ? 88  THR A CB  1 V9WDR2 UNP 88  T 
+ATOM 636  O O   . THR A 1 88  ? -1.085  -5.369  0.634   1.0 98.50 ? 88  THR A O   1 V9WDR2 UNP 88  T 
+ATOM 637  C CG2 . THR A 1 88  ? 0.203   -8.637  -0.579  1.0 98.50 ? 88  THR A CG2 1 V9WDR2 UNP 88  T 
+ATOM 638  O OG1 . THR A 1 88  ? 2.206   -8.170  0.592   1.0 98.50 ? 88  THR A OG1 1 V9WDR2 UNP 88  T 
+ATOM 639  N N   . ALA A 1 89  ? -0.817  -5.436  -1.602  1.0 97.12 ? 89  ALA A N   1 V9WDR2 UNP 89  A 
+ATOM 640  C CA  . ALA A 1 89  ? -2.160  -5.009  -1.982  1.0 97.12 ? 89  ALA A CA  1 V9WDR2 UNP 89  A 
+ATOM 641  C C   . ALA A 1 89  ? -2.717  -5.941  -3.070  1.0 97.12 ? 89  ALA A C   1 V9WDR2 UNP 89  A 
+ATOM 642  C CB  . ALA A 1 89  ? -2.135  -3.538  -2.405  1.0 97.12 ? 89  ALA A CB  1 V9WDR2 UNP 89  A 
+ATOM 643  O O   . ALA A 1 89  ? -1.945  -6.645  -3.726  1.0 97.12 ? 89  ALA A O   1 V9WDR2 UNP 89  A 
+ATOM 644  N N   . ALA A 1 90  ? -4.034  -5.982  -3.250  1.0 97.75 ? 90  ALA A N   1 V9WDR2 UNP 90  A 
+ATOM 645  C CA  . ALA A 1 90  ? -4.599  -6.429  -4.517  1.0 97.75 ? 90  ALA A CA  1 V9WDR2 UNP 90  A 
+ATOM 646  C C   . ALA A 1 90  ? -4.451  -5.282  -5.519  1.0 97.75 ? 90  ALA A C   1 V9WDR2 UNP 90  A 
+ATOM 647  C CB  . ALA A 1 90  ? -6.047  -6.900  -4.329  1.0 97.75 ? 90  ALA A CB  1 V9WDR2 UNP 90  A 
+ATOM 648  O O   . ALA A 1 90  ? -3.647  -5.404  -6.442  1.0 97.75 ? 90  ALA A O   1 V9WDR2 UNP 90  A 
+ATOM 649  N N   . ASP A 1 91  ? -5.070  -4.140  -5.224  1.0 98.25 ? 91  ASP A N   1 V9WDR2 UNP 91  D 
+ATOM 650  C CA  . ASP A 1 91  ? -5.121  -3.003  -6.135  1.0 98.25 ? 91  ASP A CA  1 V9WDR2 UNP 91  D 
+ATOM 651  C C   . ASP A 1 91  ? -4.493  -1.754  -5.505  1.0 98.25 ? 91  ASP A C   1 V9WDR2 UNP 91  D 
+ATOM 652  C CB  . ASP A 1 91  ? -6.571  -2.790  -6.608  1.0 98.25 ? 91  ASP A CB  1 V9WDR2 UNP 91  D 
+ATOM 653  O O   . ASP A 1 91  ? -4.578  -1.499  -4.297  1.0 98.25 ? 91  ASP A O   1 V9WDR2 UNP 91  D 
+ATOM 654  C CG  . ASP A 1 91  ? -7.144  -4.025  -7.334  1.0 98.25 ? 91  ASP A CG  1 V9WDR2 UNP 91  D 
+ATOM 655  O OD1 . ASP A 1 91  ? -6.336  -4.790  -7.907  1.0 98.25 ? 91  ASP A OD1 1 V9WDR2 UNP 91  D 
+ATOM 656  O OD2 . ASP A 1 91  ? -8.380  -4.224  -7.321  1.0 98.25 ? 91  ASP A OD2 1 V9WDR2 UNP 91  D 
+ATOM 657  N N   . THR A 1 92  ? -3.786  -0.969  -6.318  1.0 98.06 ? 92  THR A N   1 V9WDR2 UNP 92  T 
+ATOM 658  C CA  . THR A 1 92  ? -3.234  0.324   -5.900  1.0 98.06 ? 92  THR A CA  1 V9WDR2 UNP 92  T 
+ATOM 659  C C   . THR A 1 92  ? -3.361  1.361   -7.007  1.0 98.06 ? 92  THR A C   1 V9WDR2 UNP 92  T 
+ATOM 660  C CB  . THR A 1 92  ? -1.778  0.191   -5.434  1.0 98.06 ? 92  THR A CB  1 V9WDR2 UNP 92  T 
+ATOM 661  O O   . THR A 1 92  ? -2.806  1.180   -8.088  1.0 98.06 ? 92  THR A O   1 V9WDR2 UNP 92  T 
+ATOM 662  C CG2 . THR A 1 92  ? -1.191  1.512   -4.930  1.0 98.06 ? 92  THR A CG2 1 V9WDR2 UNP 92  T 
+ATOM 663  O OG1 . THR A 1 92  ? -1.717  -0.708  -4.346  1.0 98.06 ? 92  THR A OG1 1 V9WDR2 UNP 92  T 
+ATOM 664  N N   . GLU A 1 93  ? -4.039  2.475   -6.740  1.0 98.56 ? 93  GLU A N   1 V9WDR2 UNP 93  E 
+ATOM 665  C CA  . GLU A 1 93  ? -4.202  3.530   -7.750  1.0 98.56 ? 93  GLU A CA  1 V9WDR2 UNP 93  E 
+ATOM 666  C C   . GLU A 1 93  ? -2.918  4.361   -7.878  1.0 98.56 ? 93  GLU A C   1 V9WDR2 UNP 93  E 
+ATOM 667  C CB  . GLU A 1 93  ? -5.443  4.381   -7.440  1.0 98.56 ? 93  GLU A CB  1 V9WDR2 UNP 93  E 
+ATOM 668  O O   . GLU A 1 93  ? -2.315  4.438   -8.946  1.0 98.56 ? 93  GLU A O   1 V9WDR2 UNP 93  E 
+ATOM 669  C CG  . GLU A 1 93  ? -5.877  5.198   -8.666  1.0 98.56 ? 93  GLU A CG  1 V9WDR2 UNP 93  E 
+ATOM 670  C CD  . GLU A 1 93  ? -7.136  6.054   -8.425  1.0 98.56 ? 93  GLU A CD  1 V9WDR2 UNP 93  E 
+ATOM 671  O OE1 . GLU A 1 93  ? -7.345  7.046   -9.166  1.0 98.56 ? 93  GLU A OE1 1 V9WDR2 UNP 93  E 
+ATOM 672  O OE2 . GLU A 1 93  ? -7.894  5.725   -7.489  1.0 98.56 ? 93  GLU A OE2 1 V9WDR2 UNP 93  E 
+ATOM 673  N N   . PHE A 1 94  ? -2.410  4.902   -6.768  1.0 98.56 ? 94  PHE A N   1 V9WDR2 UNP 94  F 
+ATOM 674  C CA  . PHE A 1 94  ? -1.196  5.714   -6.742  1.0 98.56 ? 94  PHE A CA  1 V9WDR2 UNP 94  F 
+ATOM 675  C C   . PHE A 1 94  ? -0.197  5.221   -5.696  1.0 98.56 ? 94  PHE A C   1 V9WDR2 UNP 94  F 
+ATOM 676  C CB  . PHE A 1 94  ? -1.555  7.181   -6.482  1.0 98.56 ? 94  PHE A CB  1 V9WDR2 UNP 94  F 
+ATOM 677  O O   . PHE A 1 94  ? -0.442  5.283   -4.492  1.0 98.56 ? 94  PHE A O   1 V9WDR2 UNP 94  F 
+ATOM 678  C CG  . PHE A 1 94  ? -2.416  7.817   -7.550  1.0 98.56 ? 94  PHE A CG  1 V9WDR2 UNP 94  F 
+ATOM 679  C CD1 . PHE A 1 94  ? -1.829  8.353   -8.712  1.0 98.56 ? 94  PHE A CD1 1 V9WDR2 UNP 94  F 
+ATOM 680  C CD2 . PHE A 1 94  ? -3.810  7.872   -7.384  1.0 98.56 ? 94  PHE A CD2 1 V9WDR2 UNP 94  F 
+ATOM 681  C CE1 . PHE A 1 94  ? -2.636  8.913   -9.719  1.0 98.56 ? 94  PHE A CE1 1 V9WDR2 UNP 94  F 
+ATOM 682  C CE2 . PHE A 1 94  ? -4.609  8.468   -8.371  1.0 98.56 ? 94  PHE A CE2 1 V9WDR2 UNP 94  F 
+ATOM 683  C CZ  . PHE A 1 94  ? -4.031  8.958   -9.551  1.0 98.56 ? 94  PHE A CZ  1 V9WDR2 UNP 94  F 
+ATOM 684  N N   . ALA A 1 95  ? 0.999   4.841   -6.145  1.0 97.81 ? 95  ALA A N   1 V9WDR2 UNP 95  A 
+ATOM 685  C CA  . ALA A 1 95  ? 2.110   4.442   -5.289  1.0 97.81 ? 95  ALA A CA  1 V9WDR2 UNP 95  A 
+ATOM 686  C C   . ALA A 1 95  ? 3.343   5.333   -5.493  1.0 97.81 ? 95  ALA A C   1 V9WDR2 UNP 95  A 
+ATOM 687  C CB  . ALA A 1 95  ? 2.431   2.967   -5.538  1.0 97.81 ? 95  ALA A CB  1 V9WDR2 UNP 95  A 
+ATOM 688  O O   . ALA A 1 95  ? 3.851   5.502   -6.603  1.0 97.81 ? 95  ALA A O   1 V9WDR2 UNP 95  A 
+ATOM 689  N N   . SER A 1 96  ? 3.884   5.856   -4.393  1.0 98.56 ? 96  SER A N   1 V9WDR2 UNP 96  S 
+ATOM 690  C CA  . SER A 1 96  ? 5.182   6.526   -4.336  1.0 98.56 ? 96  SER A CA  1 V9WDR2 UNP 96  S 
+ATOM 691  C C   . SER A 1 96  ? 6.097   5.808   -3.349  1.0 98.56 ? 96  SER A C   1 V9WDR2 UNP 96  S 
+ATOM 692  C CB  . SER A 1 96  ? 5.008   7.998   -3.967  1.0 98.56 ? 96  SER A CB  1 V9WDR2 UNP 96  S 
+ATOM 693  O O   . SER A 1 96  ? 5.865   5.819   -2.142  1.0 98.56 ? 96  SER A O   1 V9WDR2 UNP 96  S 
+ATOM 694  O OG  . SER A 1 96  ? 6.278   8.613   -3.816  1.0 98.56 ? 96  SER A OG  1 V9WDR2 UNP 96  S 
+ATOM 695  N N   . GLU A 1 97  ? 7.181   5.229   -3.849  1.0 98.25 ? 97  GLU A N   1 V9WDR2 UNP 97  E 
+ATOM 696  C CA  . GLU A 1 97  ? 7.997   4.272   -3.108  1.0 98.25 ? 97  GLU A CA  1 V9WDR2 UNP 97  E 
+ATOM 697  C C   . GLU A 1 97  ? 9.470   4.681   -3.081  1.0 98.25 ? 97  GLU A C   1 V9WDR2 UNP 97  E 
+ATOM 698  C CB  . GLU A 1 97  ? 7.858   2.892   -3.752  1.0 98.25 ? 97  GLU A CB  1 V9WDR2 UNP 97  E 
+ATOM 699  O O   . GLU A 1 97  ? 10.115  4.849   -4.118  1.0 98.25 ? 97  GLU A O   1 V9WDR2 UNP 97  E 
+ATOM 700  C CG  . GLU A 1 97  ? 6.424   2.354   -3.693  1.0 98.25 ? 97  GLU A CG  1 V9WDR2 UNP 97  E 
+ATOM 701  C CD  . GLU A 1 97  ? 6.317   1.008   -4.409  1.0 98.25 ? 97  GLU A CD  1 V9WDR2 UNP 97  E 
+ATOM 702  O OE1 . GLU A 1 97  ? 5.309   0.795   -5.119  1.0 98.25 ? 97  GLU A OE1 1 V9WDR2 UNP 97  E 
+ATOM 703  O OE2 . GLU A 1 97  ? 7.260   0.195   -4.317  1.0 98.25 ? 97  GLU A OE2 1 V9WDR2 UNP 97  E 
+ATOM 704  N N   . ALA A 1 98  ? 10.041  4.792   -1.882  1.0 98.44 ? 98  ALA A N   1 V9WDR2 UNP 98  A 
+ATOM 705  C CA  . ALA A 1 98  ? 11.459  5.057   -1.676  1.0 98.44 ? 98  ALA A CA  1 V9WDR2 UNP 98  A 
+ATOM 706  C C   . ALA A 1 98  ? 12.101  3.930   -0.859  1.0 98.44 ? 98  ALA A C   1 V9WDR2 UNP 98  A 
+ATOM 707  C CB  . ALA A 1 98  ? 11.616  6.434   -1.024  1.0 98.44 ? 98  ALA A CB  1 V9WDR2 UNP 98  A 
+ATOM 708  O O   . ALA A 1 98  ? 11.889  3.816   0.350   1.0 98.44 ? 98  ALA A O   1 V9WDR2 UNP 98  A 
+ATOM 709  N N   . GLY A 1 99  ? 12.911  3.092   -1.509  1.0 97.88 ? 99  GLY A N   1 V9WDR2 UNP 99  G 
+ATOM 710  C CA  . GLY A 1 99  ? 13.550  1.951   -0.844  1.0 97.88 ? 99  GLY A CA  1 V9WDR2 UNP 99  G 
+ATOM 711  C C   . GLY A 1 99  ? 12.567  0.922   -0.276  1.0 97.88 ? 99  GLY A C   1 V9WDR2 UNP 99  G 
+ATOM 712  O O   . GLY A 1 99  ? 12.921  0.226   0.673   1.0 97.88 ? 99  GLY A O   1 V9WDR2 UNP 99  G 
+ATOM 713  N N   . ALA A 1 100 ? 11.340  0.879   -0.796  1.0 98.12 ? 100 ALA A N   1 V9WDR2 UNP 100 A 
+ATOM 714  C CA  . ALA A 1 100 ? 10.280  -0.014  -0.341  1.0 98.12 ? 100 ALA A CA  1 V9WDR2 UNP 100 A 
+ATOM 715  C C   . ALA A 1 100 ? 10.281  -1.340  -1.115  1.0 98.12 ? 100 ALA A C   1 V9WDR2 UNP 100 A 
+ATOM 716  C CB  . ALA A 1 100 ? 8.944   0.725   -0.466  1.0 98.12 ? 100 ALA A CB  1 V9WDR2 UNP 100 A 
+ATOM 717  O O   . ALA A 1 100 ? 10.928  -1.452  -2.162  1.0 98.12 ? 100 ALA A O   1 V9WDR2 UNP 100 A 
+ATOM 718  N N   . ASN A 1 101 ? 9.562   -2.335  -0.591  1.0 98.44 ? 101 ASN A N   1 V9WDR2 UNP 101 N 
+ATOM 719  C CA  . ASN A 1 101 ? 9.231   -3.548  -1.333  1.0 98.44 ? 101 ASN A CA  1 V9WDR2 UNP 101 N 
+ATOM 720  C C   . ASN A 1 101 ? 7.718   -3.720  -1.420  1.0 98.44 ? 101 ASN A C   1 V9WDR2 UNP 101 N 
+ATOM 721  C CB  . ASN A 1 101 ? 9.875   -4.800  -0.730  1.0 98.44 ? 101 ASN A CB  1 V9WDR2 UNP 101 N 
+ATOM 722  O O   . ASN A 1 101 ? 7.051   -3.906  -0.403  1.0 98.44 ? 101 ASN A O   1 V9WDR2 UNP 101 N 
+ATOM 723  C CG  . ASN A 1 101 ? 11.365  -4.670  -0.524  1.0 98.44 ? 101 ASN A CG  1 V9WDR2 UNP 101 N 
+ATOM 724  N ND2 . ASN A 1 101 ? 11.791  -4.664  0.716   1.0 98.44 ? 101 ASN A ND2 1 V9WDR2 UNP 101 N 
+ATOM 725  O OD1 . ASN A 1 101 ? 12.167  -4.597  -1.445  1.0 98.44 ? 101 ASN A OD1 1 V9WDR2 UNP 101 N 
+ATOM 726  N N   . THR A 1 102 ? 7.187   -3.729  -2.632  1.0 97.62 ? 102 THR A N   1 V9WDR2 UNP 102 T 
+ATOM 727  C CA  . THR A 1 102 ? 5.747   -3.793  -2.861  1.0 97.62 ? 102 THR A CA  1 V9WDR2 UNP 102 T 
+ATOM 728  C C   . THR A 1 102 ? 5.364   -5.002  -3.687  1.0 97.62 ? 102 THR A C   1 V9WDR2 UNP 102 T 
+ATOM 729  C CB  . THR A 1 102 ? 5.226   -2.497  -3.479  1.0 97.62 ? 102 THR A CB  1 V9WDR2 UNP 102 T 
+ATOM 730  O O   . THR A 1 102 ? 6.095   -5.485  -4.557  1.0 97.62 ? 102 THR A O   1 V9WDR2 UNP 102 T 
+ATOM 731  C CG2 . THR A 1 102 ? 5.369   -1.375  -2.465  1.0 97.62 ? 102 THR A CG2 1 V9WDR2 UNP 102 T 
+ATOM 732  O OG1 . THR A 1 102 ? 5.967   -2.188  -4.628  1.0 97.62 ? 102 THR A OG1 1 V9WDR2 UNP 102 T 
+ATOM 733  N N   . THR A 1 103 ? 4.204   -5.554  -3.365  1.0 98.12 ? 103 THR A N   1 V9WDR2 UNP 103 T 
+ATOM 734  C CA  . THR A 1 103 ? 3.535   -6.567  -4.169  1.0 98.12 ? 103 THR A CA  1 V9WDR2 UNP 103 T 
+ATOM 735  C C   . THR A 1 103 ? 2.092   -6.142  -4.362  1.0 98.12 ? 103 THR A C   1 V9WDR2 UNP 103 T 
+ATOM 736  C CB  . THR A 1 103 ? 3.650   -7.954  -3.534  1.0 98.12 ? 103 THR A CB  1 V9WDR2 UNP 103 T 
+ATOM 737  O O   . THR A 1 103 ? 1.389   -5.947  -3.375  1.0 98.12 ? 103 THR A O   1 V9WDR2 UNP 103 T 
+ATOM 738  C CG2 . THR A 1 103 ? 3.000   -9.041  -4.388  1.0 98.12 ? 103 THR A CG2 1 V9WDR2 UNP 103 T 
+ATOM 739  O OG1 . THR A 1 103 ? 5.021   -8.277  -3.422  1.0 98.12 ? 103 THR A OG1 1 V9WDR2 UNP 103 T 
+ATOM 740  N N   . ALA A 1 104 ? 1.671   -6.004  -5.611  1.0 96.81 ? 104 ALA A N   1 V9WDR2 UNP 104 A 
+ATOM 741  C CA  . ALA A 1 104 ? 0.291   -5.740  -5.996  1.0 96.81 ? 104 ALA A CA  1 V9WDR2 UNP 104 A 
+ATOM 742  C C   . ALA A 1 104 ? -0.157  -6.770  -7.042  1.0 96.81 ? 104 ALA A C   1 V9WDR2 UNP 104 A 
+ATOM 743  C CB  . ALA A 1 104 ? 0.165   -4.290  -6.470  1.0 96.81 ? 104 ALA A CB  1 V9WDR2 UNP 104 A 
+ATOM 744  O O   . ALA A 1 104 ? 0.686   -7.406  -7.678  1.0 96.81 ? 104 ALA A O   1 V9WDR2 UNP 104 A 
+ATOM 745  N N   . ALA A 1 105 ? -1.460  -6.972  -7.213  1.0 97.00 ? 105 ALA A N   1 V9WDR2 UNP 105 A 
+ATOM 746  C CA  . ALA A 1 105 ? -1.960  -7.533  -8.462  1.0 97.00 ? 105 ALA A CA  1 V9WDR2 UNP 105 A 
+ATOM 747  C C   . ALA A 1 105 ? -1.900  -6.428  -9.520  1.0 97.00 ? 105 ALA A C   1 V9WDR2 UNP 105 A 
+ATOM 748  C CB  . ALA A 1 105 ? -3.362  -8.123  -8.269  1.0 97.00 ? 105 ALA A CB  1 V9WDR2 UNP 105 A 
+ATOM 749  O O   . ALA A 1 105 ? -1.099  -6.539  -10.448 1.0 97.00 ? 105 ALA A O   1 V9WDR2 UNP 105 A 
+ATOM 750  N N   . ASP A 1 106 ? -2.596  -5.320  -9.272  1.0 97.88 ? 106 ASP A N   1 V9WDR2 UNP 106 D 
+ATOM 751  C CA  . ASP A 1 106 ? -2.724  -4.225  -10.226 1.0 97.88 ? 106 ASP A CA  1 V9WDR2 UNP 106 D 
+ATOM 752  C C   . ASP A 1 106 ? -2.212  -2.904  -9.636  1.0 97.88 ? 106 ASP A C   1 V9WDR2 UNP 106 D 
+ATOM 753  C CB  . ASP A 1 106 ? -4.177  -4.154  -10.733 1.0 97.88 ? 106 ASP A CB  1 V9WDR2 UNP 106 D 
+ATOM 754  O O   . ASP A 1 106 ? -2.334  -2.612  -8.441  1.0 97.88 ? 106 ASP A O   1 V9WDR2 UNP 106 D 
+ATOM 755  C CG  . ASP A 1 106 ? -4.621  -5.458  -11.428 1.0 97.88 ? 106 ASP A CG  1 V9WDR2 UNP 106 D 
+ATOM 756  O OD1 . ASP A 1 106 ? -3.736  -6.153  -11.979 1.0 97.88 ? 106 ASP A OD1 1 V9WDR2 UNP 106 D 
+ATOM 757  O OD2 . ASP A 1 106 ? -5.831  -5.775  -11.429 1.0 97.88 ? 106 ASP A OD2 1 V9WDR2 UNP 106 D 
+ATOM 758  N N   . THR A 1 107 ? -1.564  -2.094  -10.472 1.0 97.62 ? 107 THR A N   1 V9WDR2 UNP 107 T 
+ATOM 759  C CA  . THR A 1 107 ? -1.125  -0.746  -10.094 1.0 97.62 ? 107 THR A CA  1 V9WDR2 UNP 107 T 
+ATOM 760  C C   . THR A 1 107 ? -1.329  0.233   -11.239 1.0 97.62 ? 107 THR A C   1 V9WDR2 UNP 107 T 
+ATOM 761  C CB  . THR A 1 107 ? 0.335   -0.729  -9.618  1.0 97.62 ? 107 THR A CB  1 V9WDR2 UNP 107 T 
+ATOM 762  O O   . THR A 1 107 ? -0.743  0.059   -12.308 1.0 97.62 ? 107 THR A O   1 V9WDR2 UNP 107 T 
+ATOM 763  C CG2 . THR A 1 107 ? 0.778   0.646   -9.115  1.0 97.62 ? 107 THR A CG2 1 V9WDR2 UNP 107 T 
+ATOM 764  O OG1 . THR A 1 107 ? 0.504   -1.622  -8.540  1.0 97.62 ? 107 THR A OG1 1 V9WDR2 UNP 107 T 
+ATOM 765  N N   . GLU A 1 108 ? -2.106  1.292   -11.023 1.0 98.44 ? 108 GLU A N   1 V9WDR2 UNP 108 E 
+ATOM 766  C CA  . GLU A 1 108 ? -2.356  2.283   -12.076 1.0 98.44 ? 108 GLU A CA  1 V9WDR2 UNP 108 E 
+ATOM 767  C C   . GLU A 1 108 ? -1.146  3.211   -12.244 1.0 98.44 ? 108 GLU A C   1 V9WDR2 UNP 108 E 
+ATOM 768  C CB  . GLU A 1 108 ? -3.666  3.039   -11.805 1.0 98.44 ? 108 GLU A CB  1 V9WDR2 UNP 108 E 
+ATOM 769  O O   . GLU A 1 108 ? -0.526  3.259   -13.307 1.0 98.44 ? 108 GLU A O   1 V9WDR2 UNP 108 E 
+ATOM 770  C CG  . GLU A 1 108 ? -4.144  3.770   -13.069 1.0 98.44 ? 108 GLU A CG  1 V9WDR2 UNP 108 E 
+ATOM 771  C CD  . GLU A 1 108 ? -5.473  4.524   -12.882 1.0 98.44 ? 108 GLU A CD  1 V9WDR2 UNP 108 E 
+ATOM 772  O OE1 . GLU A 1 108 ? -5.759  5.443   -13.690 1.0 98.44 ? 108 GLU A OE1 1 V9WDR2 UNP 108 E 
+ATOM 773  O OE2 . GLU A 1 108 ? -6.208  4.187   -11.932 1.0 98.44 ? 108 GLU A OE2 1 V9WDR2 UNP 108 E 
+ATOM 774  N N   . PHE A 1 109 ? -0.717  3.873   -11.169 1.0 98.31 ? 109 PHE A N   1 V9WDR2 UNP 109 F 
+ATOM 775  C CA  . PHE A 1 109 ? 0.409   4.801   -11.179 1.0 98.31 ? 109 PHE A CA  1 V9WDR2 UNP 109 F 
+ATOM 776  C C   . PHE A 1 109 ? 1.453   4.461   -10.126 1.0 98.31 ? 109 PHE A C   1 V9WDR2 UNP 109 F 
+ATOM 777  C CB  . PHE A 1 109 ? -0.080  6.233   -10.977 1.0 98.31 ? 109 PHE A CB  1 V9WDR2 UNP 109 F 
+ATOM 778  O O   . PHE A 1 109 ? 1.201   4.432   -8.924  1.0 98.31 ? 109 PHE A O   1 V9WDR2 UNP 109 F 
+ATOM 779  C CG  . PHE A 1 109 ? -0.970  6.740   -12.085 1.0 98.31 ? 109 PHE A CG  1 V9WDR2 UNP 109 F 
+ATOM 780  C CD1 . PHE A 1 109 ? -0.409  7.251   -13.271 1.0 98.31 ? 109 PHE A CD1 1 V9WDR2 UNP 109 F 
+ATOM 781  C CD2 . PHE A 1 109 ? -2.365  6.691   -11.934 1.0 98.31 ? 109 PHE A CD2 1 V9WDR2 UNP 109 F 
+ATOM 782  C CE1 . PHE A 1 109 ? -1.244  7.692   -14.313 1.0 98.31 ? 109 PHE A CE1 1 V9WDR2 UNP 109 F 
+ATOM 783  C CE2 . PHE A 1 109 ? -3.194  7.165   -12.959 1.0 98.31 ? 109 PHE A CE2 1 V9WDR2 UNP 109 F 
+ATOM 784  C CZ  . PHE A 1 109 ? -2.640  7.636   -14.159 1.0 98.31 ? 109 PHE A CZ  1 V9WDR2 UNP 109 F 
+ATOM 785  N N   . ALA A 1 110 ? 2.689   4.320   -10.584 1.0 97.31 ? 110 ALA A N   1 V9WDR2 UNP 110 A 
+ATOM 786  C CA  . ALA A 1 110 ? 3.825   3.962   -9.760  1.0 97.31 ? 110 ALA A CA  1 V9WDR2 UNP 110 A 
+ATOM 787  C C   . ALA A 1 110 ? 5.004   4.920   -9.963  1.0 97.31 ? 110 ALA A C   1 V9WDR2 UNP 110 A 
+ATOM 788  C CB  . ALA A 1 110 ? 4.199   2.529   -10.124 1.0 97.31 ? 110 ALA A CB  1 V9WDR2 UNP 110 A 
+ATOM 789  O O   . ALA A 1 110 ? 5.500   5.102   -11.076 1.0 97.31 ? 110 ALA A O   1 V9WDR2 UNP 110 A 
+ATOM 790  N N   . SER A 1 111 ? 5.528   5.466   -8.866  1.0 98.31 ? 111 SER A N   1 V9WDR2 UNP 111 S 
+ATOM 791  C CA  . SER A 1 111 ? 6.783   6.217   -8.831  1.0 98.31 ? 111 SER A CA  1 V9WDR2 UNP 111 S 
+ATOM 792  C C   . SER A 1 111 ? 7.756   5.579   -7.846  1.0 98.31 ? 111 SER A C   1 V9WDR2 UNP 111 S 
+ATOM 793  C CB  . SER A 1 111 ? 6.517   7.682   -8.484  1.0 98.31 ? 111 SER A CB  1 V9WDR2 UNP 111 S 
+ATOM 794  O O   . SER A 1 111 ? 7.487   5.525   -6.651  1.0 98.31 ? 111 SER A O   1 V9WDR2 UNP 111 S 
+ATOM 795  O OG  . SER A 1 111 ? 7.742   8.388   -8.368  1.0 98.31 ? 111 SER A OG  1 V9WDR2 UNP 111 S 
+ATOM 796  N N   . GLU A 1 112 ? 8.921   5.141   -8.321  1.0 97.62 ? 112 GLU A N   1 V9WDR2 UNP 112 E 
+ATOM 797  C CA  . GLU A 1 112 ? 9.907   4.420   -7.511  1.0 97.62 ? 112 GLU A CA  1 V9WDR2 UNP 112 E 
+ATOM 798  C C   . GLU A 1 112 ? 11.277  5.079   -7.489  1.0 97.62 ? 112 GLU A C   1 V9WDR2 UNP 112 E 
+ATOM 799  C CB  . GLU A 1 112 ? 10.133  3.010   -8.037  1.0 97.62 ? 112 GLU A CB  1 V9WDR2 UNP 112 E 
+ATOM 800  O O   . GLU A 1 112 ? 11.841  5.443   -8.524  1.0 97.62 ? 112 GLU A O   1 V9WDR2 UNP 112 E 
+ATOM 801  C CG  . GLU A 1 112 ? 8.877   2.167   -7.996  1.0 97.62 ? 112 GLU A CG  1 V9WDR2 UNP 112 E 
+ATOM 802  C CD  . GLU A 1 112 ? 9.197   0.721   -8.363  1.0 97.62 ? 112 GLU A CD  1 V9WDR2 UNP 112 E 
+ATOM 803  O OE1 . GLU A 1 112 ? 8.546   -0.175  -7.824  1.0 97.62 ? 112 GLU A OE1 1 V9WDR2 UNP 112 E 
+ATOM 804  O OE2 . GLU A 1 112 ? 10.059  0.488   -9.224  1.0 97.62 ? 112 GLU A OE2 1 V9WDR2 UNP 112 E 
+ATOM 805  N N   . ALA A 1 113 ? 11.885  5.107   -6.307  1.0 98.06 ? 113 ALA A N   1 V9WDR2 UNP 113 A 
+ATOM 806  C CA  . ALA A 1 113 ? 13.285  5.440   -6.117  1.0 98.06 ? 113 ALA A CA  1 V9WDR2 UNP 113 A 
+ATOM 807  C C   . ALA A 1 113 ? 13.973  4.371   -5.261  1.0 98.06 ? 113 ALA A C   1 V9WDR2 UNP 113 A 
+ATOM 808  C CB  . ALA A 1 113 ? 13.379  6.843   -5.512  1.0 98.06 ? 113 ALA A CB  1 V9WDR2 UNP 113 A 
+ATOM 809  O O   . ALA A 1 113 ? 13.775  4.297   -4.047  1.0 98.06 ? 113 ALA A O   1 V9WDR2 UNP 113 A 
+ATOM 810  N N   . GLY A 1 114 ? 14.820  3.544   -5.878  1.0 97.62 ? 114 GLY A N   1 V9WDR2 UNP 114 G 
+ATOM 811  C CA  . GLY A 1 114 ? 15.536  2.491   -5.150  1.0 97.62 ? 114 GLY A CA  1 V9WDR2 UNP 114 G 
+ATOM 812  C C   . GLY A 1 114 ? 14.639  1.390   -4.574  1.0 97.62 ? 114 GLY A C   1 V9WDR2 UNP 114 G 
+ATOM 813  O O   . GLY A 1 114 ? 15.062  0.736   -3.625  1.0 97.62 ? 114 GLY A O   1 V9WDR2 UNP 114 G 
+ATOM 814  N N   . ALA A 1 115 ? 13.416  1.236   -5.085  1.0 97.62 ? 115 ALA A N   1 V9WDR2 UNP 115 A 
+ATOM 815  C CA  . ALA A 1 115 ? 12.423  0.280   -4.599  1.0 97.62 ? 115 ALA A CA  1 V9WDR2 UNP 115 A 
+ATOM 816  C C   . ALA A 1 115 ? 12.445  -1.036  -5.398  1.0 97.62 ? 115 ALA A C   1 V9WDR2 UNP 115 A 
+ATOM 817  C CB  . ALA A 1 115 ? 11.047  0.959   -4.629  1.0 97.62 ? 115 ALA A CB  1 V9WDR2 UNP 115 A 
+ATOM 818  O O   . ALA A 1 115 ? 13.075  -1.122  -6.459  1.0 97.62 ? 115 ALA A O   1 V9WDR2 UNP 115 A 
+ATOM 819  N N   . ASN A 1 116 ? 11.764  -2.055  -4.871  1.0 97.75 ? 116 ASN A N   1 V9WDR2 UNP 116 N 
+ATOM 820  C CA  . ASN A 1 116 ? 11.449  -3.275  -5.605  1.0 97.75 ? 116 ASN A CA  1 V9WDR2 UNP 116 N 
+ATOM 821  C C   . ASN A 1 116 ? 9.934   -3.489  -5.642  1.0 97.75 ? 116 ASN A C   1 V9WDR2 UNP 116 N 
+ATOM 822  C CB  . ASN A 1 116 ? 12.122  -4.510  -4.980  1.0 97.75 ? 116 ASN A CB  1 V9WDR2 UNP 116 N 
+ATOM 823  O O   . ASN A 1 116 ? 9.335   -3.694  -4.588  1.0 97.75 ? 116 ASN A O   1 V9WDR2 UNP 116 N 
+ATOM 824  C CG  . ASN A 1 116 ? 13.621  -4.408  -4.814  1.0 97.75 ? 116 ASN A CG  1 V9WDR2 UNP 116 N 
+ATOM 825  N ND2 . ASN A 1 116 ? 14.086  -4.337  -3.591  1.0 97.75 ? 116 ASN A ND2 1 V9WDR2 UNP 116 N 
+ATOM 826  O OD1 . ASN A 1 116 ? 14.404  -4.465  -5.751  1.0 97.75 ? 116 ASN A OD1 1 V9WDR2 UNP 116 N 
+ATOM 827  N N   . ARG A 1 117 ? 9.343   -3.577  -6.834  1.0 96.31 ? 117 ARG A N   1 V9WDR2 UNP 117 R 
+ATOM 828  C CA  . ARG A 1 117 ? 7.926   -3.929  -6.992  1.0 96.31 ? 117 ARG A CA  1 V9WDR2 UNP 117 R 
+ATOM 829  C C   . ARG A 1 117 ? 7.737   -5.223  -7.750  1.0 96.31 ? 117 ARG A C   1 V9WDR2 UNP 117 R 
+ATOM 830  C CB  . ARG A 1 117 ? 7.148   -2.768  -7.618  1.0 96.31 ? 117 ARG A CB  1 V9WDR2 UNP 117 R 
+ATOM 831  O O   . ARG A 1 117 ? 8.431   -5.509  -8.725  1.0 96.31 ? 117 ARG A O   1 V9WDR2 UNP 117 R 
+ATOM 832  C CG  . ARG A 1 117 ? 5.640   -3.044  -7.784  1.0 96.31 ? 117 ARG A CG  1 V9WDR2 UNP 117 R 
+ATOM 833  C CD  . ARG A 1 117 ? 4.839   -1.888  -8.390  1.0 96.31 ? 117 ARG A CD  1 V9WDR2 UNP 117 R 
+ATOM 834  N NE  . ARG A 1 117 ? 5.189   -0.591  -7.802  1.0 96.31 ? 117 ARG A NE  1 V9WDR2 UNP 117 R 
+ATOM 835  N NH1 . ARG A 1 117 ? 6.447   0.214   -9.546  1.0 96.31 ? 117 ARG A NH1 1 V9WDR2 UNP 117 R 
+ATOM 836  N NH2 . ARG A 1 117 ? 6.041   1.452   -7.686  1.0 96.31 ? 117 ARG A NH2 1 V9WDR2 UNP 117 R 
+ATOM 837  C CZ  . ARG A 1 117 ? 5.901   0.355   -8.362  1.0 96.31 ? 117 ARG A CZ  1 V9WDR2 UNP 117 R 
+ATOM 838  N N   . THR A 1 118 ? 6.744   -5.988  -7.327  1.0 97.12 ? 118 THR A N   1 V9WDR2 UNP 118 T 
+ATOM 839  C CA  . THR A 1 118 ? 6.126   -7.034  -8.141  1.0 97.12 ? 118 THR A CA  1 V9WDR2 UNP 118 T 
+ATOM 840  C C   . THR A 1 118 ? 4.662   -6.677  -8.362  1.0 97.12 ? 118 THR A C   1 V9WDR2 UNP 118 T 
+ATOM 841  C CB  . THR A 1 118 ? 6.282   -8.403  -7.476  1.0 97.12 ? 118 THR A CB  1 V9WDR2 UNP 118 T 
+ATOM 842  O O   . THR A 1 118 ? 3.946   -6.471  -7.391  1.0 97.12 ? 118 THR A O   1 V9WDR2 UNP 118 T 
+ATOM 843  C CG2 . THR A 1 118 ? 5.763   -9.538  -8.354  1.0 97.12 ? 118 THR A CG2 1 V9WDR2 UNP 118 T 
+ATOM 844  O OG1 . THR A 1 118 ? 7.658   -8.637  -7.251  1.0 97.12 ? 118 THR A OG1 1 V9WDR2 UNP 118 T 
+ATOM 845  N N   . ALA A 1 119 ? 4.228   -6.601  -9.614  1.0 94.94 ? 119 ALA A N   1 V9WDR2 UNP 119 A 
+ATOM 846  C CA  . ALA A 1 119 ? 2.822   -6.453  -9.981  1.0 94.94 ? 119 ALA A CA  1 V9WDR2 UNP 119 A 
+ATOM 847  C C   . ALA A 1 119 ? 2.464   -7.497  -11.043 1.0 94.94 ? 119 ALA A C   1 V9WDR2 UNP 119 A 
+ATOM 848  C CB  . ALA A 1 119 ? 2.544   -5.012  -10.415 1.0 94.94 ? 119 ALA A CB  1 V9WDR2 UNP 119 A 
+ATOM 849  O O   . ALA A 1 119 ? 3.360   -7.972  -11.738 1.0 94.94 ? 119 ALA A O   1 V9WDR2 UNP 119 A 
+ATOM 850  N N   . ALA A 1 120 ? 1.205   -7.898  -11.182 1.0 95.56 ? 120 ALA A N   1 V9WDR2 UNP 120 A 
+ATOM 851  C CA  . ALA A 1 120 ? 0.778   -8.554  -12.414 1.0 95.56 ? 120 ALA A CA  1 V9WDR2 UNP 120 A 
+ATOM 852  C C   . ALA A 1 120 ? 0.743   -7.497  -13.522 1.0 95.56 ? 120 ALA A C   1 V9WDR2 UNP 120 A 
+ATOM 853  C CB  . ALA A 1 120 ? -0.561  -9.273  -12.210 1.0 95.56 ? 120 ALA A CB  1 V9WDR2 UNP 120 A 
+ATOM 854  O O   . ALA A 1 120 ? 1.549   -7.581  -14.457 1.0 95.56 ? 120 ALA A O   1 V9WDR2 UNP 120 A 
+ATOM 855  N N   . ASP A 1 121 ? -0.046  -6.444  -13.308 1.0 96.00 ? 121 ASP A N   1 V9WDR2 UNP 121 D 
+ATOM 856  C CA  . ASP A 1 121 ? -0.283  -5.394  -14.289 1.0 96.00 ? 121 ASP A CA  1 V9WDR2 UNP 121 D 
+ATOM 857  C C   . ASP A 1 121 ? 0.137   -4.021  -13.746 1.0 96.00 ? 121 ASP A C   1 V9WDR2 UNP 121 D 
+ATOM 858  C CB  . ASP A 1 121 ? -1.744  -5.455  -14.773 1.0 96.00 ? 121 ASP A CB  1 V9WDR2 UNP 121 D 
+ATOM 859  O O   . ASP A 1 121 ? 0.065   -3.717  -12.552 1.0 96.00 ? 121 ASP A O   1 V9WDR2 UNP 121 D 
+ATOM 860  C CG  . ASP A 1 121 ? -2.103  -6.813  -15.415 1.0 96.00 ? 121 ASP A CG  1 V9WDR2 UNP 121 D 
+ATOM 861  O OD1 . ASP A 1 121 ? -1.166  -7.489  -15.905 1.0 96.00 ? 121 ASP A OD1 1 V9WDR2 UNP 121 D 
+ATOM 862  O OD2 . ASP A 1 121 ? -3.296  -7.176  -15.477 1.0 96.00 ? 121 ASP A OD2 1 V9WDR2 UNP 121 D 
+ATOM 863  N N   . THR A 1 122 ? 0.675   -3.176  -14.626 1.0 95.94 ? 122 THR A N   1 V9WDR2 UNP 122 T 
+ATOM 864  C CA  . THR A 1 122 ? 1.033   -1.794  -14.285 1.0 95.94 ? 122 THR A CA  1 V9WDR2 UNP 122 T 
+ATOM 865  C C   . THR A 1 122 ? 0.722   -0.864  -15.446 1.0 95.94 ? 122 THR A C   1 V9WDR2 UNP 122 T 
+ATOM 866  C CB  . THR A 1 122 ? 2.514   -1.652  -13.903 1.0 95.94 ? 122 THR A CB  1 V9WDR2 UNP 122 T 
+ATOM 867  O O   . THR A 1 122 ? 1.297   -1.030  -16.522 1.0 95.94 ? 122 THR A O   1 V9WDR2 UNP 122 T 
+ATOM 868  C CG2 . THR A 1 122 ? 2.844   -0.268  -13.344 1.0 95.94 ? 122 THR A CG2 1 V9WDR2 UNP 122 T 
+ATOM 869  O OG1 . THR A 1 122 ? 2.896   -2.593  -12.922 1.0 95.94 ? 122 THR A OG1 1 V9WDR2 UNP 122 T 
+ATOM 870  N N   . GLU A 1 123 ? -0.123  0.144   -15.252 1.0 97.62 ? 123 GLU A N   1 V9WDR2 UNP 123 E 
+ATOM 871  C CA  . GLU A 1 123 ? -0.450  1.066   -16.346 1.0 97.62 ? 123 GLU A CA  1 V9WDR2 UNP 123 E 
+ATOM 872  C C   . GLU A 1 123 ? 0.695   2.062   -16.575 1.0 97.62 ? 123 GLU A C   1 V9WDR2 UNP 123 E 
+ATOM 873  C CB  . GLU A 1 123 ? -1.811  1.737   -16.112 1.0 97.62 ? 123 GLU A CB  1 V9WDR2 UNP 123 E 
+ATOM 874  O O   . GLU A 1 123 ? 1.279   2.113   -17.659 1.0 97.62 ? 123 GLU A O   1 V9WDR2 UNP 123 E 
+ATOM 875  C CG  . GLU A 1 123 ? -2.347  2.325   -17.426 1.0 97.62 ? 123 GLU A CG  1 V9WDR2 UNP 123 E 
+ATOM 876  C CD  . GLU A 1 123 ? -3.727  2.990   -17.289 1.0 97.62 ? 123 GLU A CD  1 V9WDR2 UNP 123 E 
+ATOM 877  O OE1 . GLU A 1 123 ? -4.058  3.841   -18.153 1.0 97.62 ? 123 GLU A OE1 1 V9WDR2 UNP 123 E 
+ATOM 878  O OE2 . GLU A 1 123 ? -4.454  2.632   -16.343 1.0 97.62 ? 123 GLU A OE2 1 V9WDR2 UNP 123 E 
+ATOM 879  N N   . PHE A 1 124 ? 1.115   2.774   -15.527 1.0 97.56 ? 124 PHE A N   1 V9WDR2 UNP 124 F 
+ATOM 880  C CA  . PHE A 1 124 ? 2.176   3.773   -15.587 1.0 97.56 ? 124 PHE A CA  1 V9WDR2 UNP 124 F 
+ATOM 881  C C   . PHE A 1 124 ? 3.237   3.559   -14.510 1.0 97.56 ? 124 PHE A C   1 V9WDR2 UNP 124 F 
+ATOM 882  C CB  . PHE A 1 124 ? 1.575   5.174   -15.452 1.0 97.56 ? 124 PHE A CB  1 V9WDR2 UNP 124 F 
+ATOM 883  O O   . PHE A 1 124 ? 2.965   3.616   -13.314 1.0 97.56 ? 124 PHE A O   1 V9WDR2 UNP 124 F 
+ATOM 884  C CG  . PHE A 1 124 ? 0.633   5.558   -16.570 1.0 97.56 ? 124 PHE A CG  1 V9WDR2 UNP 124 F 
+ATOM 885  C CD1 . PHE A 1 124 ? 1.136   6.085   -17.774 1.0 97.56 ? 124 PHE A CD1 1 V9WDR2 UNP 124 F 
+ATOM 886  C CD2 . PHE A 1 124 ? -0.752  5.391   -16.406 1.0 97.56 ? 124 PHE A CD2 1 V9WDR2 UNP 124 F 
+ATOM 887  C CE1 . PHE A 1 124 ? 0.259   6.416   -18.823 1.0 97.56 ? 124 PHE A CE1 1 V9WDR2 UNP 124 F 
+ATOM 888  C CE2 . PHE A 1 124 ? -1.627  5.757   -17.438 1.0 97.56 ? 124 PHE A CE2 1 V9WDR2 UNP 124 F 
+ATOM 889  C CZ  . PHE A 1 124 ? -1.125  6.238   -18.657 1.0 97.56 ? 124 PHE A CZ  1 V9WDR2 UNP 124 F 
+ATOM 890  N N   . ALA A 1 125 ? 4.493   3.426   -14.934 1.0 96.31 ? 125 ALA A N   1 V9WDR2 UNP 125 A 
+ATOM 891  C CA  . ALA A 1 125 ? 5.645   3.347   -14.042 1.0 96.31 ? 125 ALA A CA  1 V9WDR2 UNP 125 A 
+ATOM 892  C C   . ALA A 1 125 ? 6.689   4.429   -14.354 1.0 96.31 ? 125 ALA A C   1 V9WDR2 UNP 125 A 
+ATOM 893  C CB  . ALA A 1 125 ? 6.232   1.934   -14.112 1.0 96.31 ? 125 ALA A CB  1 V9WDR2 UNP 125 A 
+ATOM 894  O O   . ALA A 1 125 ? 7.085   4.639   -15.502 1.0 96.31 ? 125 ALA A O   1 V9WDR2 UNP 125 A 
+ATOM 895  N N   . SER A 1 126 ? 7.192   5.090   -13.315 1.0 97.81 ? 126 SER A N   1 V9WDR2 UNP 126 S 
+ATOM 896  C CA  . SER A 1 126 ? 8.355   5.975   -13.364 1.0 97.81 ? 126 SER A CA  1 V9WDR2 UNP 126 S 
+ATOM 897  C C   . SER A 1 126 ? 9.367   5.536   -12.317 1.0 97.81 ? 126 SER A C   1 V9WDR2 UNP 126 S 
+ATOM 898  C CB  . SER A 1 126 ? 7.931   7.427   -13.143 1.0 97.81 ? 126 SER A CB  1 V9WDR2 UNP 126 S 
+ATOM 899  O O   . SER A 1 126 ? 9.114   5.621   -11.120 1.0 97.81 ? 126 SER A O   1 V9WDR2 UNP 126 S 
+ATOM 900  O OG  . SER A 1 126 ? 9.074   8.261   -13.035 1.0 97.81 ? 126 SER A OG  1 V9WDR2 UNP 126 S 
+ATOM 901  N N   . GLU A 1 127 ? 10.543  5.107   -12.752 1.0 96.75 ? 127 GLU A N   1 V9WDR2 UNP 127 E 
+ATOM 902  C CA  . GLU A 1 127 ? 11.485  4.405   -11.892 1.0 96.75 ? 127 GLU A CA  1 V9WDR2 UNP 127 E 
+ATOM 903  C C   . GLU A 1 127 ? 12.882  5.015   -11.954 1.0 96.75 ? 127 GLU A C   1 V9WDR2 UNP 127 E 
+ATOM 904  C CB  . GLU A 1 127 ? 11.563  2.939   -12.311 1.0 96.75 ? 127 GLU A CB  1 V9WDR2 UNP 127 E 
+ATOM 905  O O   . GLU A 1 127 ? 13.444  5.233   -13.029 1.0 96.75 ? 127 GLU A O   1 V9WDR2 UNP 127 E 
+ATOM 906  C CG  . GLU A 1 127 ? 10.241  2.174   -12.190 1.0 96.75 ? 127 GLU A CG  1 V9WDR2 UNP 127 E 
+ATOM 907  C CD  . GLU A 1 127 ? 10.398  0.721   -12.656 1.0 96.75 ? 127 GLU A CD  1 V9WDR2 UNP 127 E 
+ATOM 908  O OE1 . GLU A 1 127 ? 9.352   0.108   -12.958 1.0 96.75 ? 127 GLU A OE1 1 V9WDR2 UNP 127 E 
+ATOM 909  O OE2 . GLU A 1 127 ? 11.554  0.255   -12.815 1.0 96.75 ? 127 GLU A OE2 1 V9WDR2 UNP 127 E 
+ATOM 910  N N   . VAL A 1 128 ? 13.503  5.192   -10.789 1.0 97.75 ? 128 VAL A N   1 V9WDR2 UNP 128 V 
+ATOM 911  C CA  . VAL A 1 128 ? 14.907  5.584   -10.659 1.0 97.75 ? 128 VAL A CA  1 V9WDR2 UNP 128 V 
+ATOM 912  C C   . VAL A 1 128 ? 15.636  4.588   -9.769  1.0 97.75 ? 128 VAL A C   1 V9WDR2 UNP 128 V 
+ATOM 913  C CB  . VAL A 1 128 ? 15.052  7.019   -10.125 1.0 97.75 ? 128 VAL A CB  1 V9WDR2 UNP 128 V 
+ATOM 914  O O   . VAL A 1 128 ? 15.389  4.517   -8.566  1.0 97.75 ? 128 VAL A O   1 V9WDR2 UNP 128 V 
+ATOM 915  C CG1 . VAL A 1 128 ? 16.533  7.429   -10.079 1.0 97.75 ? 128 VAL A CG1 1 V9WDR2 UNP 128 V 
+ATOM 916  C CG2 . VAL A 1 128 ? 14.308  8.040   -10.996 1.0 97.75 ? 128 VAL A CG2 1 V9WDR2 UNP 128 V 
+ATOM 917  N N   . ARG A 1 129 ? 16.606  3.861   -10.335 1.0 97.06 ? 129 ARG A N   1 V9WDR2 UNP 129 R 
+ATOM 918  C CA  . ARG A 1 129 ? 17.394  2.845   -9.608  1.0 97.06 ? 129 ARG A CA  1 V9WDR2 UNP 129 R 
+ATOM 919  C C   . ARG A 1 129 ? 16.521  1.765   -8.962  1.0 97.06 ? 129 ARG A C   1 V9WDR2 UNP 129 R 
+ATOM 920  C CB  . ARG A 1 129 ? 18.334  3.497   -8.575  1.0 97.06 ? 129 ARG A CB  1 V9WDR2 UNP 129 R 
+ATOM 921  O O   . ARG A 1 129 ? 16.886  1.256   -7.905  1.0 97.06 ? 129 ARG A O   1 V9WDR2 UNP 129 R 
+ATOM 922  C CG  . ARG A 1 129 ? 19.309  4.495   -9.190  1.0 97.06 ? 129 ARG A CG  1 V9WDR2 UNP 129 R 
+ATOM 923  C CD  . ARG A 1 129 ? 20.096  5.173   -8.073  1.0 97.06 ? 129 ARG A CD  1 V9WDR2 UNP 129 R 
+ATOM 924  N NE  . ARG A 1 129 ? 21.070  6.119   -8.636  1.0 97.06 ? 129 ARG A NE  1 V9WDR2 UNP 129 R 
+ATOM 925  N NH1 . ARG A 1 129 ? 22.138  6.610   -6.671  1.0 97.06 ? 129 ARG A NH1 1 V9WDR2 UNP 129 R 
+ATOM 926  N NH2 . ARG A 1 129 ? 22.796  7.593   -8.572  1.0 97.06 ? 129 ARG A NH2 1 V9WDR2 UNP 129 R 
+ATOM 927  C CZ  . ARG A 1 129 ? 21.996  6.767   -7.959  1.0 97.06 ? 129 ARG A CZ  1 V9WDR2 UNP 129 R 
+ATOM 928  N N   . ALA A 1 130 ? 15.385  1.451   -9.570  1.0 96.44 ? 130 ALA A N   1 V9WDR2 UNP 130 A 
+ATOM 929  C CA  . ALA A 1 130 ? 14.425  0.496   -9.036  1.0 96.44 ? 130 ALA A CA  1 V9WDR2 UNP 130 A 
+ATOM 930  C C   . ALA A 1 130 ? 14.462  -0.832  -9.803  1.0 96.44 ? 130 ALA A C   1 V9WDR2 UNP 130 A 
+ATOM 931  C CB  . ALA A 1 130 ? 13.048  1.154   -9.018  1.0 96.44 ? 130 ALA A CB  1 V9WDR2 UNP 130 A 
+ATOM 932  O O   . ALA A 1 130 ? 15.147  -0.964  -10.827 1.0 96.44 ? 130 ALA A O   1 V9WDR2 UNP 130 A 
+ATOM 933  N N   . ASN A 1 131 ? 13.781  -1.836  -9.265  1.0 96.19 ? 131 ASN A N   1 V9WDR2 UNP 131 N 
+ATOM 934  C CA  . ASN A 1 131 ? 13.653  -3.142  -9.890  1.0 96.19 ? 131 ASN A CA  1 V9WDR2 UNP 131 N 
+ATOM 935  C C   . ASN A 1 131 ? 12.198  -3.597  -9.838  1.0 96.19 ? 131 ASN A C   1 V9WDR2 UNP 131 N 
+ATOM 936  C CB  . ASN A 1 131 ? 14.596  -4.115  -9.180  1.0 96.19 ? 131 ASN A CB  1 V9WDR2 UNP 131 N 
+ATOM 937  O O   . ASN A 1 131 ? 11.693  -3.960  -8.776  1.0 96.19 ? 131 ASN A O   1 V9WDR2 UNP 131 N 
+ATOM 938  C CG  . ASN A 1 131 ? 14.530  -5.534  -9.710  1.0 96.19 ? 131 ASN A CG  1 V9WDR2 UNP 131 N 
+ATOM 939  N ND2 . ASN A 1 131 ? 14.726  -6.494  -8.841  1.0 96.19 ? 131 ASN A ND2 1 V9WDR2 UNP 131 N 
+ATOM 940  O OD1 . ASN A 1 131 ? 14.388  -5.823  -10.887 1.0 96.19 ? 131 ASN A OD1 1 V9WDR2 UNP 131 N 
+ATOM 941  N N   . ARG A 1 132 ? 11.557  -3.637  -10.999 1.0 94.06 ? 132 ARG A N   1 V9WDR2 UNP 132 R 
+ATOM 942  C CA  . ARG A 1 132 ? 10.170  -4.054  -11.130 1.0 94.06 ? 132 ARG A CA  1 V9WDR2 UNP 132 R 
+ATOM 943  C C   . ARG A 1 132 ? 10.069  -5.406  -11.811 1.0 94.06 ? 132 ARG A C   1 V9WDR2 UNP 132 R 
+ATOM 944  C CB  . ARG A 1 132 ? 9.394   -2.950  -11.843 1.0 94.06 ? 132 ARG A CB  1 V9WDR2 UNP 132 R 
+ATOM 945  O O   . ARG A 1 132 ? 10.797  -5.707  -12.753 1.0 94.06 ? 132 ARG A O   1 V9WDR2 UNP 132 R 
+ATOM 946  C CG  . ARG A 1 132 ? 7.887   -3.250  -11.889 1.0 94.06 ? 132 ARG A CG  1 V9WDR2 UNP 132 R 
+ATOM 947  C CD  . ARG A 1 132 ? 7.124   -2.056  -12.454 1.0 94.06 ? 132 ARG A CD  1 V9WDR2 UNP 132 R 
+ATOM 948  N NE  . ARG A 1 132 ? 7.612   -1.736  -13.797 1.0 94.06 ? 132 ARG A NE  1 V9WDR2 UNP 132 R 
+ATOM 949  N NH1 . ARG A 1 132 ? 5.912   -2.636  -14.957 1.0 94.06 ? 132 ARG A NH1 1 V9WDR2 UNP 132 R 
+ATOM 950  N NH2 . ARG A 1 132 ? 7.710   -1.839  -16.048 1.0 94.06 ? 132 ARG A NH2 1 V9WDR2 UNP 132 R 
+ATOM 951  C CZ  . ARG A 1 132 ? 7.079   -2.077  -14.936 1.0 94.06 ? 132 ARG A CZ  1 V9WDR2 UNP 132 R 
+ATOM 952  N N   . THR A 1 133 ? 9.141   -6.228  -11.347 1.0 95.19 ? 133 THR A N   1 V9WDR2 UNP 133 T 
+ATOM 953  C CA  . THR A 1 133 ? 8.708   -7.440  -12.041 1.0 95.19 ? 133 THR A CA  1 V9WDR2 UNP 133 T 
+ATOM 954  C C   . THR A 1 133 ? 7.232   -7.307  -12.375 1.0 95.19 ? 133 THR A C   1 V9WDR2 UNP 133 T 
+ATOM 955  C CB  . THR A 1 133 ? 8.997   -8.692  -11.207 1.0 95.19 ? 133 THR A CB  1 V9WDR2 UNP 133 T 
+ATOM 956  O O   . THR A 1 133 ? 6.437   -7.096  -11.465 1.0 95.19 ? 133 THR A O   1 V9WDR2 UNP 133 T 
+ATOM 957  C CG2 . THR A 1 133 ? 8.679   -9.979  -11.969 1.0 95.19 ? 133 THR A CG2 1 V9WDR2 UNP 133 T 
+ATOM 958  O OG1 . THR A 1 133 ? 10.375  -8.708  -10.877 1.0 95.19 ? 133 THR A OG1 1 V9WDR2 UNP 133 T 
+ATOM 959  N N   . SER A 1 134 ? 6.875   -7.416  -13.655 1.0 91.88 ? 134 SER A N   1 V9WDR2 UNP 134 S 
+ATOM 960  C CA  . SER A 1 134 ? 5.478   -7.385  -14.101 1.0 91.88 ? 134 SER A CA  1 V9WDR2 UNP 134 S 
+ATOM 961  C C   . SER A 1 134 ? 5.190   -8.368  -15.226 1.0 91.88 ? 134 SER A C   1 V9WDR2 UNP 134 S 
+ATOM 962  C CB  . SER A 1 134 ? 5.023   -5.975  -14.473 1.0 91.88 ? 134 SER A CB  1 V9WDR2 UNP 134 S 
+ATOM 963  O O   . SER A 1 134 ? 6.098   -8.750  -15.970 1.0 91.88 ? 134 SER A O   1 V9WDR2 UNP 134 S 
+ATOM 964  O OG  . SER A 1 134 ? 5.783   -5.516  -15.578 1.0 91.88 ? 134 SER A OG  1 V9WDR2 UNP 134 S 
+ATOM 965  N N   . ALA A 1 135 ? 3.945   -8.826  -15.335 1.0 93.06 ? 135 ALA A N   1 V9WDR2 UNP 135 A 
+ATOM 966  C CA  . ALA A 1 135 ? 3.494   -9.559  -16.511 1.0 93.06 ? 135 ALA A CA  1 V9WDR2 UNP 135 A 
+ATOM 967  C C   . ALA A 1 135 ? 3.233   -8.568  -17.651 1.0 93.06 ? 135 ALA A C   1 V9WDR2 UNP 135 A 
+ATOM 968  C CB  . ALA A 1 135 ? 2.272   -10.413 -16.158 1.0 93.06 ? 135 ALA A CB  1 V9WDR2 UNP 135 A 
+ATOM 969  O O   . ALA A 1 135 ? 3.911   -8.653  -18.681 1.0 93.06 ? 135 ALA A O   1 V9WDR2 UNP 135 A 
+ATOM 970  N N   . ASP A 1 136 ? 2.375   -7.575  -17.404 1.0 92.88 ? 136 ASP A N   1 V9WDR2 UNP 136 D 
+ATOM 971  C CA  . ASP A 1 136 ? 2.019   -6.548  -18.375 1.0 92.88 ? 136 ASP A CA  1 V9WDR2 UNP 136 D 
+ATOM 972  C C   . ASP A 1 136 ? 2.343   -5.133  -17.893 1.0 92.88 ? 136 ASP A C   1 V9WDR2 UNP 136 D 
+ATOM 973  C CB  . ASP A 1 136 ? 0.563   -6.713  -18.836 1.0 92.88 ? 136 ASP A CB  1 V9WDR2 UNP 136 D 
+ATOM 974  O O   . ASP A 1 136 ? 2.459   -4.818  -16.704 1.0 92.88 ? 136 ASP A O   1 V9WDR2 UNP 136 D 
+ATOM 975  C CG  . ASP A 1 136 ? 0.407   -7.927  -19.764 1.0 92.88 ? 136 ASP A CG  1 V9WDR2 UNP 136 D 
+ATOM 976  O OD1 . ASP A 1 136 ? 1.241   -8.029  -20.700 1.0 92.88 ? 136 ASP A OD1 1 V9WDR2 UNP 136 D 
+ATOM 977  O OD2 . ASP A 1 136 ? -0.530  -8.735  -19.598 1.0 92.88 ? 136 ASP A OD2 1 V9WDR2 UNP 136 D 
+ATOM 978  N N   . THR A 1 137 ? 2.646   -4.263  -18.855 1.0 93.31 ? 137 THR A N   1 V9WDR2 UNP 137 T 
+ATOM 979  C CA  . THR A 1 137 ? 2.934   -2.850  -18.599 1.0 93.31 ? 137 THR A CA  1 V9WDR2 UNP 137 T 
+ATOM 980  C C   . THR A 1 137 ? 2.608   -2.013  -19.808 1.0 93.31 ? 137 THR A C   1 V9WDR2 UNP 137 T 
+ATOM 981  C CB  . THR A 1 137 ? 4.398   -2.595  -18.245 1.0 93.31 ? 137 THR A CB  1 V9WDR2 UNP 137 T 
+ATOM 982  O O   . THR A 1 137 ? 3.141   -2.286  -20.887 1.0 93.31 ? 137 THR A O   1 V9WDR2 UNP 137 T 
+ATOM 983  C CG2 . THR A 1 137 ? 4.651   -1.179  -17.723 1.0 93.31 ? 137 THR A CG2 1 V9WDR2 UNP 137 T 
+ATOM 984  O OG1 . THR A 1 137 ? 4.740   -3.509  -17.239 1.0 93.31 ? 137 THR A OG1 1 V9WDR2 UNP 137 T 
+ATOM 985  N N   . GLU A 1 138 ? 1.804   -0.973  -19.622 1.0 95.25 ? 138 GLU A N   1 V9WDR2 UNP 138 E 
+ATOM 986  C CA  . GLU A 1 138 ? 1.454   -0.083  -20.726 1.0 95.25 ? 138 GLU A CA  1 V9WDR2 UNP 138 E 
+ATOM 987  C C   . GLU A 1 138 ? 2.535   0.974   -20.960 1.0 95.25 ? 138 GLU A C   1 V9WDR2 UNP 138 E 
+ATOM 988  C CB  . GLU A 1 138 ? 0.080   0.556   -20.517 1.0 95.25 ? 138 GLU A CB  1 V9WDR2 UNP 138 E 
+ATOM 989  O O   . GLU A 1 138 ? 3.058   1.110   -22.071 1.0 95.25 ? 138 GLU A O   1 V9WDR2 UNP 138 E 
+ATOM 990  C CG  . GLU A 1 138 ? -1.046  -0.474  -20.337 1.0 95.25 ? 138 GLU A CG  1 V9WDR2 UNP 138 E 
+ATOM 991  C CD  . GLU A 1 138 ? -2.423  0.088   -20.730 1.0 95.25 ? 138 GLU A CD  1 V9WDR2 UNP 138 E 
+ATOM 992  O OE1 . GLU A 1 138 ? -3.324  -0.749  -20.966 1.0 95.25 ? 138 GLU A OE1 1 V9WDR2 UNP 138 E 
+ATOM 993  O OE2 . GLU A 1 138 ? -2.523  1.312   -20.971 1.0 95.25 ? 138 GLU A OE2 1 V9WDR2 UNP 138 E 
+ATOM 994  N N   . PHE A 1 139 ? 2.937   1.677   -19.899 1.0 95.06 ? 139 PHE A N   1 V9WDR2 UNP 139 F 
+ATOM 995  C CA  . PHE A 1 139 ? 3.892   2.774   -19.968 1.0 95.06 ? 139 PHE A CA  1 V9WDR2 UNP 139 F 
+ATOM 996  C C   . PHE A 1 139 ? 4.933   2.686   -18.853 1.0 95.06 ? 139 PHE A C   1 V9WDR2 UNP 139 F 
+ATOM 997  C CB  . PHE A 1 139 ? 3.134   4.104   -19.914 1.0 95.06 ? 139 PHE A CB  1 V9WDR2 UNP 139 F 
+ATOM 998  O O   . PHE A 1 139 ? 4.616   2.595   -17.671 1.0 95.06 ? 139 PHE A O   1 V9WDR2 UNP 139 F 
+ATOM 999  C CG  . PHE A 1 139 ? 2.113   4.272   -21.022 1.0 95.06 ? 139 PHE A CG  1 V9WDR2 UNP 139 F 
+ATOM 1000 C CD1 . PHE A 1 139 ? 2.523   4.642   -22.317 1.0 95.06 ? 139 PHE A CD1 1 V9WDR2 UNP 139 F 
+ATOM 1001 C CD2 . PHE A 1 139 ? 0.755   4.002   -20.773 1.0 95.06 ? 139 PHE A CD2 1 V9WDR2 UNP 139 F 
+ATOM 1002 C CE1 . PHE A 1 139 ? 1.577   4.753   -23.354 1.0 95.06 ? 139 PHE A CE1 1 V9WDR2 UNP 139 F 
+ATOM 1003 C CE2 . PHE A 1 139 ? -0.189  4.110   -21.805 1.0 95.06 ? 139 PHE A CE2 1 V9WDR2 UNP 139 F 
+ATOM 1004 C CZ  . PHE A 1 139 ? 0.220   4.488   -23.095 1.0 95.06 ? 139 PHE A CZ  1 V9WDR2 UNP 139 F 
+ATOM 1005 N N   . ALA A 1 140 ? 6.209   2.777   -19.230 1.0 94.06 ? 140 ALA A N   1 V9WDR2 UNP 140 A 
+ATOM 1006 C CA  . ALA A 1 140 ? 7.316   2.806   -18.283 1.0 94.06 ? 140 ALA A CA  1 V9WDR2 UNP 140 A 
+ATOM 1007 C C   . ALA A 1 140 ? 8.369   3.845   -18.681 1.0 94.06 ? 140 ALA A C   1 V9WDR2 UNP 140 A 
+ATOM 1008 C CB  . ALA A 1 140 ? 7.915   1.403   -18.146 1.0 94.06 ? 140 ALA A CB  1 V9WDR2 UNP 140 A 
+ATOM 1009 O O   . ALA A 1 140 ? 8.757   3.953   -19.848 1.0 94.06 ? 140 ALA A O   1 V9WDR2 UNP 140 A 
+ATOM 1010 N N   . ASN A 1 141 ? 8.855   4.589   -17.691 1.0 95.62 ? 141 ASN A N   1 V9WDR2 UNP 141 N 
+ATOM 1011 C CA  . ASN A 1 141 ? 10.019  5.455   -17.794 1.0 95.62 ? 141 ASN A CA  1 V9WDR2 UNP 141 N 
+ATOM 1012 C C   . ASN A 1 141 ? 11.068  5.017   -16.770 1.0 95.62 ? 141 ASN A C   1 V9WDR2 UNP 141 N 
+ATOM 1013 C CB  . ASN A 1 141 ? 9.586   6.912   -17.597 1.0 95.62 ? 141 ASN A CB  1 V9WDR2 UNP 141 N 
+ATOM 1014 O O   . ASN A 1 141 ? 10.866  5.147   -15.566 1.0 95.62 ? 141 ASN A O   1 V9WDR2 UNP 141 N 
+ATOM 1015 C CG  . ASN A 1 141 ? 10.733  7.890   -17.772 1.0 95.62 ? 141 ASN A CG  1 V9WDR2 UNP 141 N 
+ATOM 1016 N ND2 . ASN A 1 141 ? 10.494  9.146   -17.483 1.0 95.62 ? 141 ASN A ND2 1 V9WDR2 UNP 141 N 
+ATOM 1017 O OD1 . ASN A 1 141 ? 11.838  7.578   -18.189 1.0 95.62 ? 141 ASN A OD1 1 V9WDR2 UNP 141 N 
+ATOM 1018 N N   . GLU A 1 142 ? 12.201  4.516   -17.252 1.0 93.50 ? 142 GLU A N   1 V9WDR2 UNP 142 E 
+ATOM 1019 C CA  . GLU A 1 142 ? 13.223  3.888   -16.420 1.0 93.50 ? 142 GLU A CA  1 V9WDR2 UNP 142 E 
+ATOM 1020 C C   . GLU A 1 142 ? 14.549  4.652   -16.494 1.0 93.50 ? 142 GLU A C   1 V9WDR2 UNP 142 E 
+ATOM 1021 C CB  . GLU A 1 142 ? 13.410  2.430   -16.858 1.0 93.50 ? 142 GLU A CB  1 V9WDR2 UNP 142 E 
+ATOM 1022 O O   . GLU A 1 142 ? 15.162  4.793   -17.555 1.0 93.50 ? 142 GLU A O   1 V9WDR2 UNP 142 E 
+ATOM 1023 C CG  . GLU A 1 142 ? 12.197  1.546   -16.522 1.0 93.50 ? 142 GLU A CG  1 V9WDR2 UNP 142 E 
+ATOM 1024 C CD  . GLU A 1 142 ? 12.361  0.111   -17.049 1.0 93.50 ? 142 GLU A CD  1 V9WDR2 UNP 142 E 
+ATOM 1025 O OE1 . GLU A 1 142 ? 11.324  -0.506  -17.369 1.0 93.50 ? 142 GLU A OE1 1 V9WDR2 UNP 142 E 
+ATOM 1026 O OE2 . GLU A 1 142 ? 13.523  -0.358  -17.166 1.0 93.50 ? 142 GLU A OE2 1 V9WDR2 UNP 142 E 
+ATOM 1027 N N   . VAL A 1 143 ? 15.053  5.094   -15.341 1.0 94.88 ? 143 VAL A N   1 V9WDR2 UNP 143 V 
+ATOM 1028 C CA  . VAL A 1 143 ? 16.378  5.704   -15.200 1.0 94.88 ? 143 VAL A CA  1 V9WDR2 UNP 143 V 
+ATOM 1029 C C   . VAL A 1 143 ? 17.232  4.816   -14.316 1.0 94.88 ? 143 VAL A C   1 V9WDR2 UNP 143 V 
+ATOM 1030 C CB  . VAL A 1 143 ? 16.302  7.135   -14.642 1.0 94.88 ? 143 VAL A CB  1 V9WDR2 UNP 143 V 
+ATOM 1031 O O   . VAL A 1 143 ? 17.099  4.798   -13.093 1.0 94.88 ? 143 VAL A O   1 V9WDR2 UNP 143 V 
+ATOM 1032 C CG1 . VAL A 1 143 ? 17.707  7.758   -14.552 1.0 94.88 ? 143 VAL A CG1 1 V9WDR2 UNP 143 V 
+ATOM 1033 C CG2 . VAL A 1 143 ? 15.440  8.042   -15.526 1.0 94.88 ? 143 VAL A CG2 1 V9WDR2 UNP 143 V 
+ATOM 1034 N N   . THR A 1 144 ? 18.187  4.108   -14.920 1.0 93.44 ? 144 THR A N   1 V9WDR2 UNP 144 T 
+ATOM 1035 C CA  . THR A 1 144 ? 19.050  3.146   -14.205 1.0 93.44 ? 144 THR A CA  1 V9WDR2 UNP 144 T 
+ATOM 1036 C C   . THR A 1 144 ? 18.264  2.062   -13.451 1.0 93.44 ? 144 THR A C   1 V9WDR2 UNP 144 T 
+ATOM 1037 C CB  . THR A 1 144 ? 20.115  3.839   -13.319 1.0 93.44 ? 144 THR A CB  1 V9WDR2 UNP 144 T 
+ATOM 1038 O O   . THR A 1 144 ? 18.753  1.545   -12.448 1.0 93.44 ? 144 THR A O   1 V9WDR2 UNP 144 T 
+ATOM 1039 C CG2 . THR A 1 144 ? 21.057  4.715   -14.144 1.0 93.44 ? 144 THR A CG2 1 V9WDR2 UNP 144 T 
+ATOM 1040 O OG1 . THR A 1 144 ? 19.586  4.699   -12.334 1.0 93.44 ? 144 THR A OG1 1 V9WDR2 UNP 144 T 
+ATOM 1041 N N   . SER A 1 145 ? 17.069  1.727   -13.939 1.0 93.50 ? 145 SER A N   1 V9WDR2 UNP 145 S 
+ATOM 1042 C CA  . SER A 1 145 ? 16.173  0.714   -13.371 1.0 93.50 ? 145 SER A CA  1 V9WDR2 UNP 145 S 
+ATOM 1043 C C   . SER A 1 145 ? 16.198  -0.578  -14.188 1.0 93.50 ? 145 SER A C   1 V9WDR2 UNP 145 S 
+ATOM 1044 C CB  . SER A 1 145 ? 14.750  1.270   -13.249 1.0 93.50 ? 145 SER A CB  1 V9WDR2 UNP 145 S 
+ATOM 1045 O O   . SER A 1 145 ? 16.890  -0.666  -15.210 1.0 93.50 ? 145 SER A O   1 V9WDR2 UNP 145 S 
+ATOM 1046 O OG  . SER A 1 145 ? 14.786  2.470   -12.499 1.0 93.50 ? 145 SER A OG  1 V9WDR2 UNP 145 S 
+ATOM 1047 N N   . LYS A 1 146 ? 15.517  -1.609  -13.687 1.0 91.69 ? 146 LYS A N   1 V9WDR2 UNP 146 K 
+ATOM 1048 C CA  . LYS A 1 146 ? 15.361  -2.895  -14.368 1.0 91.69 ? 146 LYS A CA  1 V9WDR2 UNP 146 K 
+ATOM 1049 C C   . LYS A 1 146 ? 13.910  -3.349  -14.302 1.0 91.69 ? 146 LYS A C   1 V9WDR2 UNP 146 K 
+ATOM 1050 C CB  . LYS A 1 146 ? 16.246  -3.965  -13.712 1.0 91.69 ? 146 LYS A CB  1 V9WDR2 UNP 146 K 
+ATOM 1051 O O   . LYS A 1 146 ? 13.405  -3.566  -13.207 1.0 91.69 ? 146 LYS A O   1 V9WDR2 UNP 146 K 
+ATOM 1052 C CG  . LYS A 1 146 ? 17.745  -3.715  -13.896 1.0 91.69 ? 146 LYS A CG  1 V9WDR2 UNP 146 K 
+ATOM 1053 C CD  . LYS A 1 146 ? 18.516  -4.848  -13.219 1.0 91.69 ? 146 LYS A CD  1 V9WDR2 UNP 146 K 
+ATOM 1054 C CE  . LYS A 1 146 ? 20.018  -4.606  -13.342 1.0 91.69 ? 146 LYS A CE  1 V9WDR2 UNP 146 K 
+ATOM 1055 N NZ  . LYS A 1 146 ? 20.757  -5.648  -12.595 1.0 91.69 ? 146 LYS A NZ  1 V9WDR2 UNP 146 K 
+ATOM 1056 N N   . GLN A 1 147 ? 13.319  -3.627  -15.459 1.0 89.00 ? 147 GLN A N   1 V9WDR2 UNP 147 Q 
+ATOM 1057 C CA  . GLN A 1 147 ? 12.096  -4.415  -15.553 1.0 89.00 ? 147 GLN A CA  1 V9WDR2 UNP 147 Q 
+ATOM 1058 C C   . GLN A 1 147 ? 12.399  -5.887  -15.881 1.0 89.00 ? 147 GLN A C   1 V9WDR2 UNP 147 Q 
+ATOM 1059 C CB  . GLN A 1 147 ? 11.149  -3.779  -16.574 1.0 89.00 ? 147 GLN A CB  1 V9WDR2 UNP 147 Q 
+ATOM 1060 O O   . GLN A 1 147 ? 13.073  -6.201  -16.867 1.0 89.00 ? 147 GLN A O   1 V9WDR2 UNP 147 Q 
+ATOM 1061 C CG  . GLN A 1 147 ? 9.794   -4.502  -16.607 1.0 89.00 ? 147 GLN A CG  1 V9WDR2 UNP 147 Q 
+ATOM 1062 C CD  . GLN A 1 147 ? 8.852   -3.991  -17.689 1.0 89.00 ? 147 GLN A CD  1 V9WDR2 UNP 147 Q 
+ATOM 1063 N NE2 . GLN A 1 147 ? 7.634   -4.484  -17.722 1.0 89.00 ? 147 GLN A NE2 1 V9WDR2 UNP 147 Q 
+ATOM 1064 O OE1 . GLN A 1 147 ? 9.165   -3.165  -18.527 1.0 89.00 ? 147 GLN A OE1 1 V9WDR2 UNP 147 Q 
+ATOM 1065 N N   . ASN A 1 148 ? 11.831  -6.800  -15.093 1.0 91.25 ? 148 ASN A N   1 V9WDR2 UNP 148 N 
+ATOM 1066 C CA  . ASN A 1 148 ? 11.749  -8.228  -15.389 1.0 91.25 ? 148 ASN A CA  1 V9WDR2 UNP 148 N 
+ATOM 1067 C C   . ASN A 1 148 ? 10.321  -8.581  -15.818 1.0 91.25 ? 148 ASN A C   1 V9WDR2 UNP 148 N 
+ATOM 1068 C CB  . ASN A 1 148 ? 12.180  -9.052  -14.167 1.0 91.25 ? 148 ASN A CB  1 V9WDR2 UNP 148 N 
+ATOM 1069 O O   . ASN A 1 148 ? 9.359   -8.134  -15.199 1.0 91.25 ? 148 ASN A O   1 V9WDR2 UNP 148 N 
+ATOM 1070 C CG  . ASN A 1 148 ? 13.558  -8.677  -13.661 1.0 91.25 ? 148 ASN A CG  1 V9WDR2 UNP 148 N 
+ATOM 1071 N ND2 . ASN A 1 148 ? 13.659  -8.408  -12.382 1.0 91.25 ? 148 ASN A ND2 1 V9WDR2 UNP 148 N 
+ATOM 1072 O OD1 . ASN A 1 148 ? 14.536  -8.616  -14.394 1.0 91.25 ? 148 ASN A OD1 1 V9WDR2 UNP 148 N 
+ATOM 1073 N N   . ARG A 1 149 ? 10.180  -9.419  -16.849 1.0 85.00 ? 149 ARG A N   1 V9WDR2 UNP 149 R 
+ATOM 1074 C CA  . ARG A 1 149 ? 8.873   -9.941  -17.263 1.0 85.00 ? 149 ARG A CA  1 V9WDR2 UNP 149 R 
+ATOM 1075 C C   . ARG A 1 149 ? 8.609   -11.316 -16.666 1.0 85.00 ? 149 ARG A C   1 V9WDR2 UNP 149 R 
+ATOM 1076 C CB  . ARG A 1 149 ? 8.698   -9.904  -18.787 1.0 85.00 ? 149 ARG A CB  1 V9WDR2 UNP 149 R 
+ATOM 1077 O O   . ARG A 1 149 ? 9.486   -12.181 -16.731 1.0 85.00 ? 149 ARG A O   1 V9WDR2 UNP 149 R 
+ATOM 1078 C CG  . ARG A 1 149 ? 8.394   -8.469  -19.243 1.0 85.00 ? 149 ARG A CG  1 V9WDR2 UNP 149 R 
+ATOM 1079 C CD  . ARG A 1 149 ? 7.898   -8.407  -20.691 1.0 85.00 ? 149 ARG A CD  1 V9WDR2 UNP 149 R 
+ATOM 1080 N NE  . ARG A 1 149 ? 8.973   -8.110  -21.660 1.0 85.00 ? 149 ARG A NE  1 V9WDR2 UNP 149 R 
+ATOM 1081 N NH1 . ARG A 1 149 ? 7.561   -7.651  -23.406 1.0 85.00 ? 149 ARG A NH1 1 V9WDR2 UNP 149 R 
+ATOM 1082 N NH2 . ARG A 1 149 ? 9.754   -7.278  -23.635 1.0 85.00 ? 149 ARG A NH2 1 V9WDR2 UNP 149 R 
+ATOM 1083 C CZ  . ARG A 1 149 ? 8.761   -7.689  -22.894 1.0 85.00 ? 149 ARG A CZ  1 V9WDR2 UNP 149 R 
+ATOM 1084 N N   . CYS A 1 150 ? 7.412   -11.528 -16.122 1.0 71.25 ? 150 CYS A N   1 V9WDR2 UNP 150 C 
+ATOM 1085 C CA  . CYS A 1 150 ? 6.962   -12.863 -15.726 1.0 71.25 ? 150 CYS A CA  1 V9WDR2 UNP 150 C 
+ATOM 1086 C C   . CYS A 1 150 ? 6.687   -13.706 -16.985 1.0 71.25 ? 150 CYS A C   1 V9WDR2 UNP 150 C 
+ATOM 1087 C CB  . CYS A 1 150 ? 5.750   -12.756 -14.784 1.0 71.25 ? 150 CYS A CB  1 V9WDR2 UNP 150 C 
+ATOM 1088 O O   . CYS A 1 150 ? 5.969   -13.277 -17.884 1.0 71.25 ? 150 CYS A O   1 V9WDR2 UNP 150 C 
+ATOM 1089 S SG  . CYS A 1 150 ? 6.230   -13.311 -13.120 1.0 71.25 ? 150 CYS A SG  1 V9WDR2 UNP 150 C 
+ATOM 1090 N N   . GLY A 1 151 ? 7.311   -14.883 -17.092 1.0 59.62 ? 151 GLY A N   1 V9WDR2 UNP 151 G 
+ATOM 1091 C CA  . GLY A 1 151 ? 7.154   -15.765 -18.254 1.0 59.62 ? 151 GLY A CA  1 V9WDR2 UNP 151 G 
+ATOM 1092 C C   . GLY A 1 151 ? 5.750   -16.372 -18.330 1.0 59.62 ? 151 GLY A C   1 V9WDR2 UNP 151 G 
+ATOM 1093 O O   . GLY A 1 151 ? 5.236   -16.827 -17.312 1.0 59.62 ? 151 GLY A O   1 V9WDR2 UNP 151 G 
+ATOM 1094 N N   . HIS A 1 152 ? 5.160   -16.373 -19.529 1.0 47.81 ? 152 HIS A N   1 V9WDR2 UNP 152 H 
+ATOM 1095 C CA  . HIS A 1 152 ? 3.987   -17.185 -19.880 1.0 47.81 ? 152 HIS A CA  1 V9WDR2 UNP 152 H 
+ATOM 1096 C C   . HIS A 1 152 ? 4.379   -18.643 -20.147 1.0 47.81 ? 152 HIS A C   1 V9WDR2 UNP 152 H 
+ATOM 1097 C CB  . HIS A 1 152 ? 3.276   -16.589 -21.106 1.0 47.81 ? 152 HIS A CB  1 V9WDR2 UNP 152 H 
+ATOM 1098 O O   . HIS A 1 152 ? 5.435   -18.860 -20.790 1.0 47.81 ? 152 HIS A O   1 V9WDR2 UNP 152 H 
+ATOM 1099 C CG  . HIS A 1 152 ? 2.374   -15.414 -20.827 1.0 47.81 ? 152 HIS A CG  1 V9WDR2 UNP 152 H 
+ATOM 1100 C CD2 . HIS A 1 152 ? 1.294   -15.052 -21.584 1.0 47.81 ? 152 HIS A CD2 1 V9WDR2 UNP 152 H 
+ATOM 1101 N ND1 . HIS A 1 152 ? 2.443   -14.525 -19.777 1.0 47.81 ? 152 HIS A ND1 1 V9WDR2 UNP 152 H 
+ATOM 1102 C CE1 . HIS A 1 152 ? 1.430   -13.647 -19.904 1.0 47.81 ? 152 HIS A CE1 1 V9WDR2 UNP 152 H 
+ATOM 1103 N NE2 . HIS A 1 152 ? 0.703   -13.937 -20.996 1.0 47.81 ? 152 HIS A NE2 1 V9WDR2 UNP 152 H 
+ATOM 1104 O OXT . HIS A 1 152 ? 3.588   -19.517 -19.735 1.0 47.81 ? 152 HIS A OXT 1 V9WDR2 UNP 152 H 
+#

From 57a487df1836052fa618182e91c8d3e83aa14c21 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Fri, 30 Aug 2024 15:40:00 +0200
Subject: [PATCH 506/599] Fix CE-Symm bug relating to short subunits.

[rcsb/symmetry#118](https://github.com/rcsb/symmetry/issues/118)

The problem was actually downstream from CE-Symm in the QuatSymmDetector
code used for assigning a symmetry group. The code was re-aligning
subunits using CE. This fails for short alignments of <15 residues
(two AFP with default settings). Thus no atoms get aligned and an
exception was thrown whenever an output format required information
about the symmetry group.

This fix re-uses the original CE-Symm alignment for the symmetry group
detection. This might change CE-Symm and QuatSymm results for proteins
with small subunits or borderline scores.

Changes:
- New `SubunitClustererMethod.MANUAL` enum value
- Improve `SymmetryTools.getQuaternarySymmetry`
---
 .../multiple/util/MultipleAlignmentTools.java | 43 +++++++++++++++++++
 .../structure/cluster/SubunitCluster.java     | 16 +++++++
 .../cluster/SubunitClustererMethod.java       |  8 +++-
 .../symmetry/utils/SymmetryTools.java         | 18 ++++----
 4 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
index 1ddc3fb2d7..52f926a5c6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
@@ -57,6 +57,7 @@
 import org.biojava.nbio.structure.align.multiple.BlockSet;
 import org.biojava.nbio.structure.align.multiple.MultipleAlignment;
 import org.biojava.nbio.structure.align.util.AlignmentTools;
+import org.biojava.nbio.structure.cluster.SubunitCluster;
 import org.biojava.nbio.structure.jama.Matrix;
 import org.forester.evoinference.matrix.distance.BasicSymmetricalDistanceMatrix;
 import org.forester.phylogeny.Phylogeny;
@@ -964,4 +965,46 @@ public static Phylogeny getStructuralTree(MultipleAlignment msta) {
 		return tree;
 	}
 
+	/**
+	 * Convert an MSA into a matrix of equivalent residues.
+	 *
+	 * This concatenates all blocks, meaning that the indices might not be
+	 * sequential.
+	 *
+	 * Indices should be consistent with `msa.getAtomArrays()`.
+	 * @param msa Multiple alignment
+	 * @param coreOnly Include only core (ungapped) columns. Otherwise gaps are
+	 *        represented with null.
+	 * @return
+	 */
+	public static List<List<Integer>> getEquivalentResidues(MultipleAlignment msa, boolean coreOnly) {
+		List<List<Integer>> eqr = new ArrayList<>();
+		for (int str = 0; str < msa.size(); str++) {
+			eqr.add(new ArrayList<>());
+		}
+
+		for(Block block: msa.getBlocks()) {
+			List<List<Integer>> aln = block.getAlignRes();
+			for (int col = 0; col < block.length(); col++) {
+				// skip non-core columns
+				if(coreOnly) {
+					boolean core = true;
+					for (int str = 0; str < block.size(); str++) {
+						if (aln.get(str).get(col) == null) {
+							core = false;
+							break;
+						}
+					}
+					if(!core) {
+						continue;
+					}
+				}
+				// add column to eqr
+				for (int str = 0; str < block.size(); str++) {
+					eqr.get(str).add(aln.get(str).get(col));
+				}
+			}
+		}
+		return eqr;
+	}
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
index 7851b8dbf3..5e6a0cc0fd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
@@ -158,6 +158,22 @@ public SubunitCluster(SubunitCluster other, List<Integer> subunitsToRetain) {
 		setAlpha(other.getAlpha());
 	}
 
+	/**
+	 * Create the cluster manually by specifying subunits and the equivalent residues
+	 * @param subunits List of aligned subunits
+	 * @param subunitEQR Double list giving the aligned residue indices in each subunit
+	 */
+	public SubunitCluster(List<Subunit> subunits, List<List<Integer>> subunitEQR) {
+		if(subunits.size() != subunitEQR.size()) {
+			throw new IllegalArgumentException("Mismatched subunit length");
+		}
+		this.subunits = subunits;
+		this.subunitEQR = subunitEQR;
+		this.representative = 0;
+		this.method = SubunitClustererMethod.MANUAL;
+		this.pseudoStoichiometric = false;
+	}
+
 	/**
 	 * Subunits contained in the SubunitCluster.
 	 *
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitClustererMethod.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitClustererMethod.java
index 40cd9fba6a..cd36611259 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitClustererMethod.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitClustererMethod.java
@@ -59,6 +59,10 @@ public enum SubunitClustererMethod {
 	 * sequence and structure clustering differ, the cluster contains
 	 * pseudosymmetry (by definition).
 	 */
-	SEQUENCE_STRUCTURE
-}
+	SEQUENCE_STRUCTURE,
 
+	/**
+	 * Some other method was used when clustering.
+	 */
+	MANUAL,
+}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/SymmetryTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/SymmetryTools.java
index 431babdd5f..4913ac5cc5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/SymmetryTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/SymmetryTools.java
@@ -53,8 +53,10 @@
 import org.biojava.nbio.structure.align.multiple.MultipleAlignmentImpl;
 import org.biojava.nbio.structure.align.multiple.util.CoreSuperimposer;
 import org.biojava.nbio.structure.align.multiple.util.MultipleAlignmentScorer;
+import org.biojava.nbio.structure.align.multiple.util.MultipleAlignmentTools;
 import org.biojava.nbio.structure.align.multiple.util.MultipleSuperimposer;
 import org.biojava.nbio.structure.cluster.Subunit;
+import org.biojava.nbio.structure.cluster.SubunitCluster;
 import org.biojava.nbio.structure.cluster.SubunitClustererMethod;
 import org.biojava.nbio.structure.cluster.SubunitClustererParameters;
 import org.biojava.nbio.structure.geometry.SuperPositions;
@@ -62,6 +64,7 @@
 import org.biojava.nbio.structure.symmetry.core.QuatSymmetryDetector;
 import org.biojava.nbio.structure.symmetry.core.QuatSymmetryParameters;
 import org.biojava.nbio.structure.symmetry.core.QuatSymmetryResults;
+import org.biojava.nbio.structure.symmetry.core.Stoichiometry;
 import org.biojava.nbio.structure.symmetry.internal.CeSymmResult;
 import org.biojava.nbio.structure.symmetry.internal.SymmetryAxes;
 import org.jgrapht.Graph;
@@ -706,21 +709,18 @@ public static QuatSymmetryResults getQuaternarySymmetry(CeSymmResult result)
 			throws StructureException {
 
 		// Obtain the subunits of the repeats
-		List<Atom[]> atoms = toRepeatsAlignment(result).getAtomArrays();
+		MultipleAlignment msa = toRepeatsAlignment(result);
+		List<Atom[]> atoms = msa.getAtomArrays();
 		List<Subunit> subunits = atoms.stream()
 				.map(a -> new Subunit(a, null, null, null))
 				.collect(Collectors.toList());
-
-		// The clustering thresholds are set to 0 so that all always merged
-		SubunitClustererParameters cp = new SubunitClustererParameters();
-		cp.setClustererMethod(SubunitClustererMethod.STRUCTURE);
-		cp.setRMSDThreshold(10.0);
-		cp.setStructureCoverageThreshold(0.0);
+		List<List<Integer>> eqr = MultipleAlignmentTools.getEquivalentResidues(msa, true);
+		SubunitCluster cluster = new SubunitCluster(subunits, eqr);
+		Stoichiometry composition = new Stoichiometry(Arrays.asList(cluster));
 
 		QuatSymmetryParameters sp = new QuatSymmetryParameters();
-
 		QuatSymmetryResults gSymmetry = QuatSymmetryDetector
-				.calcGlobalSymmetry(subunits, sp, cp);
+				.calcGlobalSymmetry(composition, sp);
 
 		return gSymmetry;
 	}

From bfbe710fdce2a14b85419448c193f3d6b35f812d Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Fri, 30 Aug 2024 15:53:01 +0200
Subject: [PATCH 507/599] Fix test result.

Better refinement now finds slightly larger helical rotation,
moving it from R to H.
---
 .../biojava/nbio/structure/symmetry/internal/TestCeSymm.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/symmetry/internal/TestCeSymm.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/symmetry/internal/TestCeSymm.java
index d31e3c89f0..9d3b67e3ef 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/symmetry/internal/TestCeSymm.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/symmetry/internal/TestCeSymm.java
@@ -93,7 +93,7 @@ public void testShort() throws IOException, StructureException {
 		assertNotNull(result);
 		assertTrue(result.isSignificant());
 		assertEquals(9, result.getNumRepeats());
-		assertEquals("R",result.getSymmGroup());
+		assertEquals("H",result.getSymmGroup());
 		assertNotNull(result.getAxes());
 		assertNotEquals("Error", result.getReason());
 

From 5b35c70b65bc477c5eebdd98083465dabb4a23c5 Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Fri, 30 Aug 2024 17:53:23 +0200
Subject: [PATCH 508/599] Add additional error checks to QuatSymmetry functions

---
 .../org/biojava/nbio/structure/cluster/SubunitCluster.java  | 6 ++++++
 .../nbio/structure/symmetry/core/QuatSymmetrySubunits.java  | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
index 5e6a0cc0fd..9a87e92f88 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
@@ -512,6 +512,12 @@ public boolean mergeStructure(SubunitCluster other, SubunitClustererParameters p
 				other.subunits.get(other.representative)
 						.getRepresentativeAtoms());
 
+		if (afp.getOptLength() < 1) {
+			// alignment failed (eg if chains were too short)
+			throw new StructureException(
+					String.format("Subunits failed to align using %s", params.getSuperpositionAlgorithm()));
+		}
+
 		// Convert AFPChain to MultipleAlignment for convenience
 		MultipleAlignment msa = new MultipleAlignmentEnsembleImpl(
 				afp,
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetrySubunits.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetrySubunits.java
index 1e9511ca88..b0bef7f1e6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetrySubunits.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSymmetrySubunits.java
@@ -76,6 +76,10 @@ public QuatSymmetrySubunits(List<SubunitCluster> clusters) {
 				clusterIds.add(c);
 				Atom[] atoms = clusters.get(c).getAlignedAtomsSubunit(s);
 
+				if( atoms.length == 0) {
+					throw new IllegalArgumentException("No aligned atoms in subunit");
+				}
+
 				Point3d[] points = Calc.atomsToPoints(atoms);
 
 				caCoords.add(points);

From 7786545cf887eb4075c2de02db0532db841cd07c Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 6 Sep 2024 14:57:11 -0700
Subject: [PATCH 509/599] [maven-release-plugin] prepare release biojava-7.1.3

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 8d8f2c3854..b90d4e549d 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index fbb5cb9555..2f7b2f8c54 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.3</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 489fc53c83..3c9aeb4724 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 1fc26f73cf..89ff5eb825 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index fa88f6868e..f52bfae964 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.3-SNAPSHOT</version>
+    <version>7.1.3</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.3-SNAPSHOT</version>
+    	<version>7.1.3</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 07f675b45e..7e2ef39ce0 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.3</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 00821c79ac..5f26925d6d 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.3-SNAPSHOT</version>
+    <version>7.1.3</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index b56aef3aaf..86280e7e43 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.3</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 91243a7ec5..59ad785ce2 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.3</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 434d4f07e4..82e81ca96d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 33d3052c49..a87300b8fa 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.3</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 7304c9798f..c14bebebc3 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.3-SNAPSHOT</version>
+        <version>7.1.3</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 33b7001c04..e3df9b3aa3 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3-SNAPSHOT</version>
+		<version>7.1.3</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3-SNAPSHOT</version>
+			<version>7.1.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 033472b08d..006f1d2133 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.3-SNAPSHOT</version>
+	<version>7.1.3</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.1.3</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 65b734a7f9feafeb19216384b46677558f8c0c04 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 6 Sep 2024 14:57:13 -0700
Subject: [PATCH 510/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index b90d4e549d..474d4e32cf 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 2f7b2f8c54..d0024aaf6f 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 3c9aeb4724..9b8af63ea1 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 89ff5eb825..5de6f9ec8a 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index f52bfae964..f0be361c82 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.3</version>
+    <version>7.1.4-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.3</version>
+    	<version>7.1.4-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 7e2ef39ce0..2a8b240f62 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 5f26925d6d..43e55d9d11 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.3</version>
+    <version>7.1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 86280e7e43..d5815b33b3 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 59ad785ce2..2c31c5b87f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 82e81ca96d..d60945af3d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.3</version>
+		<version>7.1.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index a87300b8fa..7572967f73 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index c14bebebc3..8827137d94 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.3</version>
+        <version>7.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index e3df9b3aa3..e02301197a 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.3</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.3</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 006f1d2133..85e22b680c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.3</version>
+	<version>7.1.4-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.1.3</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From d69435b698cca7111544babf6799e93aac7ffd4f Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 6 Sep 2024 15:23:24 -0700
Subject: [PATCH 511/599] Updating after release

---
 CHANGELOG.md | 5 +++++
 README.md    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e34223eba2..14fb2b0610 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 BioJava Changelog
 -----------------
 
+BioJava 7.1.3
+==============================
+### Fixed
+* Bug in symmetry detection #1101 and rcsb/symmetry#118
+
 BioJava 7.1.2
 ==============================
 ### Fixed
diff --git a/README.md b/README.md
index bac2e659d0..92473664be 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-7.1.2-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.1.2) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-7.1.3-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.1.3) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>7.1.2</version>
+        <version>7.1.3</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From 5ed782bf2c4d30da89aaf35d633854df124c6af3 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 3 Jan 2025 10:17:05 -0800
Subject: [PATCH 512/599] Use official url instead of github

---
 .../biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java
index e362c2a35f..5190bd38c1 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/io/mmtf/TestMmtfRoundTrip.java
@@ -354,8 +354,8 @@ private void checkBioAssemblies1(Structure structOne, Structure structTwo) throw
 
 	@Test
 	public void testStructWithBranchedEntitiesRoundTrip() throws IOException {
-		// Example carbohydrate remediation file to be released in July 2020
-		URL url = new URL("https://raw.githubusercontent.com/pdbxmmcifwg/carbohydrate-extension/master/examples/models/1B5F-carb.cif");
+		// Example carbohydrate remediation, remediated in July 2020
+		URL url = new URL("https://files.rcsb.org/download/1B5F.cif.gz");
 		InputStream inStream = url.openStream();
 
 		Structure structure = CifStructureConverter.fromInputStream(inStream);
@@ -366,7 +366,7 @@ public void testStructWithBranchedEntitiesRoundTrip() throws IOException {
 		new StructureDataToAdapter(writerToEncoder, mmtfStructureReader);
 		Structure structure2 = mmtfStructureReader.getStructure();
 
-		assertEquals(7, structure2.getEntityInfos().size());
+		assertEquals(6, structure2.getEntityInfos().size());
 
 		assertEquals(2, structure2.getEntityById(1).getChains().size());
 		assertEquals(2, structure2.getEntityById(2).getChains().size());

From 26e1a4d6bfd9dfab84426e22156422f27ff1da49 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 3 Jan 2025 10:43:21 -0800
Subject: [PATCH 513/599] Plugin update: site and javadoc. Removed deprecated
 findbugs that was producing errors on `mvn site`

---
 pom.xml | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 85e22b680c..4e486ea368 100644
--- a/pom.xml
+++ b/pom.xml
@@ -275,11 +275,6 @@
 					</executions>
 
 				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>findbugs-maven-plugin</artifactId>
-					<version>3.0.5</version>
-				</plugin>
 
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
@@ -324,10 +319,16 @@
 					<version>3.0.0-M1</version>
 				</plugin>
 
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<version>3.11.2</version>
+				</plugin>
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.9.1</version>
+					<version>3.21.0</version>
 				</plugin>
 
 				<plugin>
@@ -375,10 +376,6 @@
 
 			</plugin>
 
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
@@ -512,10 +509,6 @@
 					</reportSet>
 				</reportSets>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -608,7 +601,6 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.2.0</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>

From 27a88ff9780f0c67561b046ad44540f779ff4c02 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 3 Jan 2025 10:45:17 -0800
Subject: [PATCH 514/599] Javadoc fix: <p>

---
 .../java/org/biojava/nbio/aaproperties/Constraints.java    | 2 +-
 .../org/biojava/nbio/aaproperties/IPeptideProperties.java  | 2 +-
 .../nbio/aaproperties/profeat/IProfeatProperties.java      | 2 +-
 .../nbio/aaproperties/profeat/convertor/Convertor.java     | 2 +-
 .../nbio/aaproperties/profeat/convertor/package-info.java  | 2 +-
 .../java/org/biojava/nbio/core/util/FlatFileCache.java     | 2 +-
 .../main/java/org/biojava/nbio/core/util/SoftHashMap.java  | 7 ++++---
 .../main/java/org/biojava/nbio/core/util/XMLWriter.java    | 2 +-
 .../ws/alignment/qblast/BlastAlignmentParameterEnum.java   | 2 +-
 .../alignment/qblast/BlastOutputAlignmentFormatEnum.java   | 2 +-
 .../nbio/ws/alignment/qblast/BlastOutputFormatEnum.java    | 2 +-
 .../nbio/ws/alignment/qblast/BlastOutputParameterEnum.java | 2 +-
 .../biojava/nbio/ws/alignment/qblast/BlastProgramEnum.java | 2 +-
 .../ws/alignment/qblast/NCBIQBlastAlignmentProperties.java | 2 +-
 .../ws/alignment/qblast/NCBIQBlastOutputProperties.java    | 2 +-
 .../nbio/ws/alignment/qblast/NCBIQBlastService.java        | 4 ++--
 16 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Constraints.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Constraints.java
index d525c6bfe8..cecd981223 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Constraints.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/Constraints.java
@@ -30,7 +30,7 @@
 /**
  * This class is used to support the implementation of properties stated in IPeptideProperties.
  * It initializes several values that would be needed for the computation of properties such as
- * <p/>
+ * <p>
  * Molecular weight<br/>
  * Instability index<br/>
  * Hydropathy value<br/>
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
index e90e7bd568..5e7ea3b6f1 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
@@ -35,7 +35,7 @@
 /**
  * An interface to generate some basic physico-chemical properties of protein sequences.<br/>
  * The following properties could be generated:
- * <p/>
+ * <p>
  * Molecular weight<br/>
  * Absorbance<br/>
  * Extinction coefficient<br/>
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/IProfeatProperties.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/IProfeatProperties.java
index 0fab96f94a..864cb0ce78 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/IProfeatProperties.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/IProfeatProperties.java
@@ -28,7 +28,7 @@ public interface IProfeatProperties {
 	/**
 	 * Based on Table 2 of http://nar.oxfordjournals.org/content/34/suppl_2/W32.full.pdf<br/>
 	 * An interface class to generate the properties of a protein sequence based on its converted attributes.<br/>
-	 * The seven different attributes are<p/>
+	 * The seven different attributes are<p>
 	 * Hydrophobicity (Polar, Neutral, Hydrophobicity)<br/>
 	 * Normalized van der Waals volume (Range 0 - 2.78, 2.95 - 4.0, 4.03 - 8.08)<br/>
 	 * Polarity (Value 4.9 - 6.2, 8.0 - 9.2, 10.4 - 13.0)<br/>
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/convertor/Convertor.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/convertor/Convertor.java
index a88d93add3..e298ab2520 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/convertor/Convertor.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/convertor/Convertor.java
@@ -28,7 +28,7 @@ public abstract class Convertor {
 	/**
 	 * Based on Table 2 of http://nar.oxfordjournals.org/content/34/suppl_2/W32.full.pdf<br/>
 	 * An abstract class to convert a protein sequence into representation of different attribute with each attribute having 3 groups.<br/>
-	 * The seven different attributes are<p/>
+	 * The seven different attributes are<p>
 	 * Hydrophobicity (Polar, Neutral, Hydrophobicity)<br/>
 	 * Normalized van der Waals volume (Range 0 - 2.78, 2.95 - 4.0, 4.03 - 8.08)<br/>
 	 * Polarity (Value 4.9 - 6.2, 8.0 - 9.2, 10.4 - 13.0)<br/>
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/convertor/package-info.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/convertor/package-info.java
index 22143b53cb..a28076aa41 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/convertor/package-info.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/convertor/package-info.java
@@ -20,7 +20,7 @@
  */
 /**
  * Set of classes that enable the conversion protein sequences into various attributes.
- * The seven different attributes are<p/>
+ * The seven different attributes are<p>
  * Hydrophobicity (Polar, Neutral, Hydrophobicity)<br/>
  * Normalized van der Waals volume (Range 0 - 2.78, 2.95 - 4.0, 4.03 - 8.08)<br/>
  * Polarity (Value 4.9 - 6.2, 8.0 - 9.2, 10.4 - 13.0)<br/>
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
index 09f8a6760d..110c355b4a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
@@ -58,7 +58,7 @@ private FlatFileCache(){
 
 	/**
 	 * The file is read and the bytes stored immediately.
-	 * <p/> 
+	 * <p> 
 	 * Once added, {@code fileToCache} can be modified or deleted and the cached values will not change.
 	 * @param key
 	 * @param fileToCache A readable file, of Integer.MAX bytes length or less.
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
index f3bcef0468..b93c38277e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
@@ -31,12 +31,13 @@
 import org.slf4j.LoggerFactory;
 
 
-/** A in memory cache using soft references. (can be garbage collected)
+/**
+ * An in memory cache using soft references. (can be garbage collected)
  * This code is based on: http://java-interview-faqs.blogspot.com/2008/09/building-faster-and-efficient-cache.html
- * <p/>
+ * <p>
  * Note that entrySet() is not implemented and therefore many methods such as keySet(),
  * containsKey(), values() etc do not work.
- * <p/>
+ * <p>
  * This class is therefore best used as a cache simply to put and get items by a known key
  */
 public class SoftHashMap<K, V> extends AbstractMap<K, V> {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLWriter.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLWriter.java
index 141ddba640..7b799818df 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLWriter.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLWriter.java
@@ -113,7 +113,7 @@ public interface XMLWriter {
 	 * avoid namespaces that are used only in leaf-nodes of a tree being re-defined
 	 * every time they are used. The XMLWriter will generally try to use the
 	 * suggested prefix for this namespace, but there is no guarantee of this.
-	 * <p/>
+	 * <p>
 	 * 
 	 * In particular, if the namespace is already in use, the current prefix will still
 	 * be used. Similarly if the suggested prefix has already been used for another
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastAlignmentParameterEnum.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastAlignmentParameterEnum.java
index 061475071a..d6389dba98 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastAlignmentParameterEnum.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastAlignmentParameterEnum.java
@@ -26,7 +26,7 @@
 /**
  * Alignment request parameters accepted by QBlast service.<br/>
  * Not all are mandatory. Certain parameters only work with a subset of other parameters in the list.
- * <p/>
+ * <p>
  * Taken from <a href=https://www.ncbi.nlm.nih.gov/staff/tao/URLAPI/new/node9.html>Blast URL API</a>
  *
  * @author Gediminas Rimsa
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastOutputAlignmentFormatEnum.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastOutputAlignmentFormatEnum.java
index f414fb475d..13be691e5c 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastOutputAlignmentFormatEnum.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastOutputAlignmentFormatEnum.java
@@ -25,7 +25,7 @@
 
 /**
  * Enum representing available output alignment types.
- * <p/>
+ * <p>
  * Values as used in QBlast URL API.
  *
  * @author Gediminas Rimsa
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastOutputFormatEnum.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastOutputFormatEnum.java
index 032d7e800a..3ccb1096e6 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastOutputFormatEnum.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastOutputFormatEnum.java
@@ -25,7 +25,7 @@
 
 /**
  * Enum representing available output formats.
- * <p/>
+ * <p>
  * Values are as used by QBlast URL API.
  *
  * @author Gediminas Rimsa
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastOutputParameterEnum.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastOutputParameterEnum.java
index dfa144864d..b0ed9354fa 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastOutputParameterEnum.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastOutputParameterEnum.java
@@ -26,7 +26,7 @@
 /**
  * Output parameters accepted by QBlast service. <br/>
  * Not all are mandatory. Certain parameters only work with a subset of other parameters in the list.
- * <p/>
+ * <p>
  * Taken from <a href=https://www.ncbi.nlm.nih.gov/staff/tao/URLAPI/new/node9.html>Blast URL API</a>
  *
  * @author Gediminas Rimsa
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastProgramEnum.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastProgramEnum.java
index 90c0557c78..ee020bc38d 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastProgramEnum.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/BlastProgramEnum.java
@@ -25,7 +25,7 @@
 
 /**
  * Enum representing available blast programs.
- * <p/>
+ * <p>
  * Values are as used by QBlast URL API.
  *
  * @author Gediminas Rimsa
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java
index 196dc30c90..5976f9e915 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java
@@ -36,7 +36,7 @@
  * This class wraps a QBlast search request parameter {@code Map} by adding several convenient parameter addition
  * methods. Other QBlast URL API parameters should be added using
  * {@link #setAlignmentOption(BlastAlignmentParameterEnum, String)}
- * <p/>
+ * <p>
  * Required parameters are {@code PROGRAM} and {@code DATABASE}, other parameters are optional
  *
  * @author Sylvain Foisy, Diploide BioIT
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastOutputProperties.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastOutputProperties.java
index 3c38328ae6..6c4b92eb87 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastOutputProperties.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastOutputProperties.java
@@ -119,7 +119,7 @@ public String getOutputFormat() {
 
 	/**
 	 * Sets the stream output format to get from the QBlast service
-	 * <p/>
+	 * <p>
 	 * If {@code HTML} format is selected, also adds the following parameters (which are removed if another output
 	 * format is chosen):
 	 *
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastService.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastService.java
index 42fafb0155..5826949426 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastService.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastService.java
@@ -248,7 +248,7 @@ public boolean isReady(String id) throws Exception {
 
 	/**
 	 * Checks for completion of request.
-	 * <p/>
+	 * <p>
 	 * If expected execution time (RTOE) is available for request, this method will always return false until that time
 	 * passes. This is done to prevent sending unnecessary requests to the server.
 	 *
@@ -307,7 +307,7 @@ public boolean isReady(String id, long present) throws Exception {
 	/**
 	 * Extracts the actual Blast report for given request id according to options provided in {@code outputProperties}
 	 * argument.
-	 * <p/>
+	 * <p>
 	 * If the results are not ready yet, sleeps until they are available. If sleeping is not desired, call this method
 	 * after {@code isReady} returns true
 	 *

From 193287b7bff37997d72da9ab188261667f1b1f21 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 3 Jan 2025 11:00:23 -0800
Subject: [PATCH 515/599] Javadoc fix: param fixes

---
 .../nbio/core/alignment/SimpleAlignedSequence.java     |  1 +
 .../nbio/core/alignment/template/AlignedSequence.java  |  1 +
 .../alignment/template/MutableAlignedSequence.java     |  1 +
 .../main/java/org/biojava/nbio/core/search/io/Hsp.java |  5 +++--
 .../sequence/io/FileProxyProteinSequenceCreator.java   |  2 +-
 .../biojava/nbio/core/sequence/io/GenbankReader.java   |  3 ++-
 .../io/template/FastaHeaderFormatInterface.java        |  5 ++++-
 .../io/template/GenbankHeaderFormatInterface.java      | 10 ++++++----
 .../sequence/io/template/SequenceCreatorInterface.java |  1 +
 .../io/template/SequenceHeaderParserInterface.java     |  2 ++
 .../core/sequence/loader/SequenceFileProxyLoader.java  |  2 +-
 .../sequence/loader/StringProxySequenceReader.java     |  3 +--
 .../core/sequence/storage/ArrayListSequenceReader.java |  2 +-
 .../nbio/core/sequence/template/AbstractSequence.java  |  2 +-
 .../java/org/biojava/nbio/core/util/SoftHashMap.java   |  2 ++
 15 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleAlignedSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleAlignedSequence.java
index 85d0a03c26..331480bbef 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleAlignedSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleAlignedSequence.java
@@ -44,6 +44,7 @@
  *
  * @author Mark Chapman
  * @param <C> each element of the {@link Sequence} is a {@link Compound} of type C
+ * @param <S> the sequence type
  */
 public class SimpleAlignedSequence<S extends Sequence<C>, C extends Compound> implements Serializable, AlignedSequence<S, C> {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/AlignedSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/AlignedSequence.java
index bc64496810..92fd972ec7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/AlignedSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/AlignedSequence.java
@@ -34,6 +34,7 @@
  * @author Mark Chapman
  * @author Paolo Pavan
  * @param <C> each element of the {@link Sequence} is a {@link Compound} of type C
+ * @param <S> the sequence type
  */
 public interface AlignedSequence<S extends Sequence<C>, C extends Compound> extends Sequence<C> {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/MutableAlignedSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/MutableAlignedSequence.java
index cfe85f7d33..edef1d54b7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/MutableAlignedSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/MutableAlignedSequence.java
@@ -34,6 +34,7 @@
  * @author Mark Chapman
  * @author Paolo Pavan
  * @param <C> each element of the {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <S> the sequence type
  */
 public interface MutableAlignedSequence<S extends Sequence<C>, C extends Compound> extends AlignedSequence<S, C> {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/Hsp.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/Hsp.java
index 7a27828feb..832997bb2b 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/Hsp.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/Hsp.java
@@ -40,15 +40,16 @@
 /**
  * This class models a search Hsp.
  * You will retrieve a list of this using iterator of a Hit
- *
+ * <p>
  * Designed by Paolo Pavan.
  * You may want to find my contacts on Github and LinkedIn for code info
  * or discuss major changes.
  * https://github.com/paolopavan
  *
  * @author Paolo Pavan
+ * @param <C> the compound type
+ * @param <S> the sequence type
  */
-
 public abstract class Hsp <S extends Sequence<C>, C extends Compound> {
 	private static final Logger logger = LoggerFactory.getLogger(Hsp.class);
 	private Integer hspNum;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyProteinSequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyProteinSequenceCreator.java
index e45907a2ed..f7e1cc7ab6 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyProteinSequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyProteinSequenceCreator.java
@@ -55,7 +55,7 @@ public class FileProxyProteinSequenceCreator implements SequenceCreatorInterface
 
 	/**
 	 * Need File so that we can store full path name in SequenceFileProxyLoader for Random File access as a quick read
-	 * @param fastaFile
+	 * @param file
 	 * @param compoundSet
 	 */
 	public FileProxyProteinSequenceCreator(File file, CompoundSet<AminoAcidCompound> compoundSet, SequenceParserInterface sequenceParser ) {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
index e2f4e8bf25..31f99eab8a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
@@ -53,7 +53,8 @@
 /**
  * Use {@link GenbankReaderHelper} as an example of how to use this class where {@link GenbankReaderHelper} should be the
  * primary class used to read Genbank files
- *
+ * @param <S> the sequence type
+ * @param <C> the compound type
  */
 public class GenbankReader<S extends AbstractSequence<C>, C extends Compound> {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/FastaHeaderFormatInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/FastaHeaderFormatInterface.java
index a0bb6af6d3..51f5898f9f 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/FastaHeaderFormatInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/FastaHeaderFormatInterface.java
@@ -28,12 +28,15 @@
 /**
  *
  * @author Scooter Willis <willishf at gmail dot com>
+ * @param <C> the compound type
+ * @param <S> the sequence type
  */
 public interface FastaHeaderFormatInterface<S extends Sequence<?>, C extends Compound> {
+
 	/**
 	 *
 	 * @param sequence
 	 * @return
 	 */
-	public String getHeader(S sequence);
+	String getHeader(S sequence);
 }
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/GenbankHeaderFormatInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/GenbankHeaderFormatInterface.java
index 5e08a424bf..0dff2d40eb 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/GenbankHeaderFormatInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/GenbankHeaderFormatInterface.java
@@ -28,16 +28,18 @@
 
 /**
  * @author mckeee1
- *
+ * @param <C> the compound type
+ * @param <S> the sequence type
  */
 public interface GenbankHeaderFormatInterface<S extends Sequence<?>, C extends Compound> {
+
+	public static final String UNKNOWN_DNA = "UNK";
+
 	/**
 	 *
 	 * @param sequence
 	 * @return
 	 */
-	public static final String UNKNOWN_DNA = "UNK";
-
-	public String getHeader(S sequence);
+	String getHeader(S sequence);
 
 }
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceCreatorInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceCreatorInterface.java
index 9ec26dc225..b2277aecea 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceCreatorInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceCreatorInterface.java
@@ -33,6 +33,7 @@
 /**
  *
  * @author Scooter Willis <willishf at gmail dot com>
+ * @param <C> the compound type
  */
 public interface SequenceCreatorInterface<C extends Compound> {
 	/**
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceHeaderParserInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceHeaderParserInterface.java
index dba9d7ca3d..41a63ccf90 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceHeaderParserInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceHeaderParserInterface.java
@@ -28,6 +28,8 @@
 /**
  *
  * @author Scooter Willis <willishf at gmail dot com>
+ * @param <C> the compound type
+ * @param <S> the sequence type
  */
 public interface SequenceHeaderParserInterface<S extends Sequence<?>, C extends Compound> {
 	/**
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java
index 61df84f46d..6dad329743 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java
@@ -51,7 +51,7 @@
  *
  *
  * @author Scooter Willis <willishf at gmail dot com>
- * @param <C>
+ * @param <C> the compound type
  */
 public class SequenceFileProxyLoader<C extends Compound> implements ProxySequenceReader<C> {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java
index b97ad43bb9..b9c0a70a9d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java
@@ -39,9 +39,8 @@
 /**
  * An example of a ProxySequenceReader that is created from a String. Used for testing
  * @author Scooter Willis <willishf at gmail dot com>
- * @param <C>
+ * @param <C> the compound type
  */
-
 public class StringProxySequenceReader<C extends Compound> implements ProxySequenceReader<C> {
 
 	private String sequence;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/ArrayListSequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/ArrayListSequenceReader.java
index 5e499261c1..1cfc068fbb 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/ArrayListSequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/ArrayListSequenceReader.java
@@ -39,7 +39,7 @@
 /**
  * Stores a Sequence as a collection of compounds in an ArrayList
  *
- * @param <C>
+ * @param <C> the compound type
  */
 public class ArrayListSequenceReader<C extends Compound> implements SequenceReader<C> {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java
index b5b2d29740..38cf55d09c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/AbstractSequence.java
@@ -47,7 +47,7 @@
 /**
  *
  * The base class for DNA, RNA and Protein sequences.
- * @param <C>
+ * @param <C> the compound type
  */
 public abstract class AbstractSequence<C extends Compound> implements Sequence<C> {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
index b93c38277e..2c10948b55 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/SoftHashMap.java
@@ -39,6 +39,8 @@
  * containsKey(), values() etc do not work.
  * <p>
  * This class is therefore best used as a cache simply to put and get items by a known key
+ * @param <K> the key type
+ * @param <V> the value type
  */
 public class SoftHashMap<K, V> extends AbstractMap<K, V> {
 

From d10480957234d8591f79381f962a985aec1a2c74 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 3 Jan 2025 11:02:20 -0800
Subject: [PATCH 516/599] Javadoc fix: html-like tag not allowed

---
 .../org/biojava/nbio/core/exceptions/ParserException.java     | 2 +-
 .../org/biojava/nbio/core/search/io/blast/BlastXMLParser.java | 2 +-
 .../java/org/biojava/nbio/core/sequence/CDSComparator.java    | 2 +-
 .../main/java/org/biojava/nbio/core/sequence/DataSource.java  | 2 +-
 .../java/org/biojava/nbio/core/sequence/ExonComparator.java   | 2 +-
 .../main/java/org/biojava/nbio/core/sequence/RNASequence.java | 2 +-
 .../org/biojava/nbio/core/sequence/SequenceComparator.java    | 2 +-
 .../biojava/nbio/core/sequence/features/AbstractFeature.java  | 2 +-
 .../biojava/nbio/core/sequence/features/DBReferenceInfo.java  | 2 +-
 .../core/sequence/features/DatabaseReferenceInterface.java    | 2 +-
 .../biojava/nbio/core/sequence/features/FeatureInterface.java | 2 +-
 .../nbio/core/sequence/features/FeaturesKeyWordInterface.java | 2 +-
 .../biojava/nbio/core/sequence/features/QuantityFeature.java  | 2 +-
 .../org/biojava/nbio/core/sequence/features/TextFeature.java  | 2 +-
 .../org/biojava/nbio/core/sequence/io/DNASequenceCreator.java | 2 +-
 .../org/biojava/nbio/core/sequence/io/FastaGeneWriter.java    | 2 +-
 .../org/biojava/nbio/core/sequence/io/FastaReaderHelper.java  | 2 +-
 .../biojava/nbio/core/sequence/io/FastaSequenceParser.java    | 2 +-
 .../java/org/biojava/nbio/core/sequence/io/FastaWriter.java   | 2 +-
 .../org/biojava/nbio/core/sequence/io/FastaWriterHelper.java  | 2 +-
 .../nbio/core/sequence/io/FileProxyDNASequenceCreator.java    | 2 +-
 .../nbio/core/sequence/io/FileProxyRNASequenceCreator.java    | 2 +-
 .../biojava/nbio/core/sequence/io/GenbankReaderHelper.java    | 2 +-
 .../nbio/core/sequence/io/GenericFastaHeaderFormat.java       | 2 +-
 .../nbio/core/sequence/io/GenericFastaHeaderParser.java       | 2 +-
 .../biojava/nbio/core/sequence/io/ProteinSequenceCreator.java | 2 +-
 .../org/biojava/nbio/core/sequence/io/RNASequenceCreator.java | 2 +-
 .../core/sequence/io/template/FastaHeaderFormatInterface.java | 2 +-
 .../core/sequence/io/template/SequenceCreatorInterface.java   | 2 +-
 .../sequence/io/template/SequenceHeaderParserInterface.java   | 2 +-
 .../core/sequence/io/template/SequenceParserInterface.java    | 2 +-
 .../nbio/core/sequence/loader/SequenceFileProxyLoader.java    | 2 +-
 .../nbio/core/sequence/loader/StringProxySequenceReader.java  | 2 +-
 .../biojava/nbio/core/sequence/location/SequenceLocation.java | 2 +-
 .../nbio/core/sequence/storage/SequenceAsStringHelper.java    | 2 +-
 .../org/biojava/nbio/core/sequence/io/FastaReaderTest.java    | 2 +-
 .../biojava/nbio/core/sequence/io/GenbankCookbookTest.java    | 2 +-
 .../org/biojava/nbio/core/sequence/io/GenbankReaderTest.java  | 2 +-
 .../nbio/core/sequence/io/GenericFastaHeaderParserTest.java   | 4 ++--
 .../main/java/org/biojava/nbio/genome/GeneFeatureHelper.java  | 2 +-
 .../org/biojava/nbio/genome/homology/BlastHomologyHits.java   | 2 +-
 .../nbio/genome/homology/GFF3FromUniprotBlastHits.java        | 2 +-
 .../biojava/nbio/genome/parsers/geneid/GeneIDXMLReader.java   | 2 +-
 .../org/biojava/nbio/genome/parsers/gff/FeatureHelper.java    | 2 +-
 .../java/org/biojava/nbio/genome/parsers/gff/GCStats.java     | 2 +-
 .../java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java  | 2 +-
 .../java/org/biojava/nbio/genome/query/BlastXMLQuery.java     | 2 +-
 .../java/org/biojava/nbio/genome/query/OutputHitsGFF.java     | 2 +-
 .../main/java/org/biojava/nbio/genome/util/SplitFasta.java    | 2 +-
 .../java/org/biojava/nbio/genome/GeneFeatureHelperTest.java   | 2 +-
 .../src/main/java/org/biojava/nbio/survival/cox/CoxCC.java    | 2 +-
 .../java/org/biojava/nbio/survival/cox/CoxCoefficient.java    | 2 +-
 .../main/java/org/biojava/nbio/survival/cox/CoxHelper.java    | 2 +-
 .../src/main/java/org/biojava/nbio/survival/cox/CoxInfo.java  | 2 +-
 .../src/main/java/org/biojava/nbio/survival/cox/CoxMart.java  | 2 +-
 .../main/java/org/biojava/nbio/survival/cox/CoxMethod.java    | 2 +-
 .../src/main/java/org/biojava/nbio/survival/cox/CoxR.java     | 2 +-
 .../src/main/java/org/biojava/nbio/survival/cox/CoxScore.java | 2 +-
 .../main/java/org/biojava/nbio/survival/cox/CoxVariables.java | 2 +-
 .../java/org/biojava/nbio/survival/cox/ResidualsCoxph.java    | 2 +-
 .../src/main/java/org/biojava/nbio/survival/cox/RiskInfo.java | 2 +-
 .../main/java/org/biojava/nbio/survival/cox/StrataInfo.java   | 2 +-
 .../main/java/org/biojava/nbio/survival/cox/SurvFitInfo.java  | 2 +-
 .../main/java/org/biojava/nbio/survival/cox/SurvivalInfo.java | 2 +-
 .../org/biojava/nbio/survival/cox/SurvivalInfoHelper.java     | 2 +-
 .../java/org/biojava/nbio/survival/cox/SurvivalInfoIndex.java | 2 +-
 .../src/main/java/org/biojava/nbio/survival/cox/WaldTest.java | 2 +-
 .../main/java/org/biojava/nbio/survival/cox/WaldTestInfo.java | 2 +-
 .../nbio/survival/cox/comparators/CoxComparatorInterface.java | 2 +-
 .../comparators/CoxVariablesOverallModelFitComparator.java    | 2 +-
 .../cox/comparators/CoxVariablesVariableComparator.java       | 2 +-
 .../nbio/survival/cox/comparators/MeanModelComparator.java    | 2 +-
 .../nbio/survival/cox/comparators/SurvivalInfoComparator.java | 2 +-
 .../survival/cox/comparators/SurvivalInfoValueComparator.java | 2 +-
 .../java/org/biojava/nbio/survival/cox/stats/AgScore.java     | 2 +-
 .../main/java/org/biojava/nbio/survival/cox/stats/ChiSq.java  | 2 +-
 .../java/org/biojava/nbio/survival/cox/stats/Cholesky2.java   | 2 +-
 .../java/org/biojava/nbio/survival/cox/stats/Chsolve2.java    | 2 +-
 .../main/java/org/biojava/nbio/survival/data/ChangeValue.java | 2 +-
 .../org/biojava/nbio/survival/data/CompactCharSequence.java   | 2 +-
 .../main/java/org/biojava/nbio/survival/data/HeaderInfo.java  | 2 +-
 .../main/java/org/biojava/nbio/survival/data/WorkSheet.java   | 2 +-
 .../nbio/survival/kaplanmeier/figure/ExpressionFigure.java    | 2 +-
 .../nbio/survival/kaplanmeier/figure/GroupResults.java        | 2 +-
 .../nbio/survival/kaplanmeier/figure/KMFigureInfo.java        | 2 +-
 .../nbio/survival/kaplanmeier/figure/KaplanMeierFigure.java   | 2 +-
 .../nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java  | 2 +-
 .../biojava/nbio/survival/kaplanmeier/figure/SurvFitKM.java   | 2 +-
 .../kaplanmeier/metadata/ClinicalMetaDataOutcome.java         | 2 +-
 .../kaplanmeier/metadata/DiscreteQuantizerInterface.java      | 2 +-
 .../nbio/survival/kaplanmeier/metadata/MeanQuantizer.java     | 2 +-
 .../nbio/survival/kaplanmeier/metadata/MetaDataInfo.java      | 2 +-
 92 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/exceptions/ParserException.java b/biojava-core/src/main/java/org/biojava/nbio/core/exceptions/ParserException.java
index acd8cc47fb..5afaa7c412 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/exceptions/ParserException.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/exceptions/ParserException.java
@@ -23,7 +23,7 @@
  */
 /**
  * General abstraction of different parsing errors
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class ParserException extends RuntimeException {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java
index 73932d9147..5ccd89f459 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/blast/BlastXMLParser.java
@@ -43,7 +43,7 @@
 
 /**
  * Re-designed by Paolo Pavan on the footprint of:
- * org.biojava.nbio.genome.query.BlastXMLQuery by Scooter Willis <willishf at gmail dot com>
+ * org.biojava.nbio.genome.query.BlastXMLQuery by Scooter Willis 
  *
  * You may want to find my contacts on Github and LinkedIn for code info
  * or discuss major changes.
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/CDSComparator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/CDSComparator.java
index 8acb7a7e83..0342ec7a46 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/CDSComparator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/CDSComparator.java
@@ -18,7 +18,7 @@
  *      http://www.biojava.org/
  *
  * Created on 3/1/2010
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 
 package org.biojava.nbio.core.sequence;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DataSource.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DataSource.java
index 000adce936..367c00a889 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DataSource.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DataSource.java
@@ -36,7 +36,7 @@
  * NCBI Reference Sequence           ref|accession|locus
  * Local Sequence identifier         lcl|identifier
  * </pr>
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 
 public enum DataSource {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonComparator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonComparator.java
index 64495b251f..43389f433c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonComparator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/ExonComparator.java
@@ -30,7 +30,7 @@
 /**
  * Sort Exon where it is a little confusing if exons should always be ordered left to right
  * where a negative stranded gene should go the other direction. Need to think about this?
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class ExonComparator implements Comparator<ExonSequence>, Serializable{
 	private static final long serialVersionUID = 1;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/RNASequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/RNASequence.java
index a3e706716b..318df7cf9f 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/RNASequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/RNASequence.java
@@ -39,7 +39,7 @@
 
 /**
  * RNASequence where RNACompoundSet are the allowed values
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 
 public class RNASequence extends AbstractSequence<NucleotideCompound> {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/SequenceComparator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/SequenceComparator.java
index 066aa930de..742b47bfce 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/SequenceComparator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/SequenceComparator.java
@@ -29,7 +29,7 @@
 
 /**
  * Used to sort sequences in ascending order of  bioBegin property.
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class SequenceComparator implements Comparator<AbstractSequence<?>>, Serializable{
 	private static final long serialVersionUID = 1;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/AbstractFeature.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/AbstractFeature.java
index 16e894697c..5f0ed8043f 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/AbstractFeature.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/AbstractFeature.java
@@ -36,7 +36,7 @@
  * A feature is currently any descriptive item that can be associated with a sequence position(s)
  * A feature has a type and a source which is currently a string to allow flexibility for the user
  * Ideally well defined features should have a class to describe attributes of that feature
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public abstract class AbstractFeature<S extends AbstractSequence<C>, C extends Compound>
 		implements FeatureInterface<S, C> {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java
index 7598f77f33..3cc8b8897a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DBReferenceInfo.java
@@ -34,7 +34,7 @@
  * Currently implement when the {@link UniprotProxySequenceReader} is used
  * to load a protein sequence
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  * @author Paolo Pavan
  */
 public class DBReferenceInfo extends Qualifier {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DatabaseReferenceInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DatabaseReferenceInterface.java
index 20c00034dd..a302d08857 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DatabaseReferenceInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/DatabaseReferenceInterface.java
@@ -30,7 +30,7 @@
 /**
  * If a SequenceProxyReader implements this interface then that external source
  * has a list of cross reference id(s)
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public interface DatabaseReferenceInterface {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureInterface.java
index 47564bcefa..c7b05cf5b9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureInterface.java
@@ -37,7 +37,7 @@
  * A feature can contain features to handle cases where a domain is a feature and the secondary structures covered by that domain
  * and other requirements for grouping.
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  * @author Paolo Pavan
  */
 public interface FeatureInterface<S extends AbstractSequence<C>, C extends Compound> {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeaturesKeyWordInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeaturesKeyWordInterface.java
index 1b1acd994e..e7bef35d6c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeaturesKeyWordInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeaturesKeyWordInterface.java
@@ -28,7 +28,7 @@
  * Models the keywords that are annotated for a protein sequence at Uniprot. If a ProxySequenceReader
  * implements this interface then the sequence will call this method
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public interface FeaturesKeyWordInterface {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/QuantityFeature.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/QuantityFeature.java
index 524bdfdaa3..3e6304c5c6 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/QuantityFeature.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/QuantityFeature.java
@@ -31,7 +31,7 @@
  * It is common to have a numerical value or values associated with a feature. This can then
  * be used in heat maps or other visual indicators when viewing a sequence. Multiple quantities
  * could represent a time corse study and display a color gradient
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class QuantityFeature<S extends AbstractSequence<C>, C extends Compound> extends AbstractFeature<S, C> {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/TextFeature.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/TextFeature.java
index 2b8cf26b59..5634e065a9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/TextFeature.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/TextFeature.java
@@ -26,7 +26,7 @@
 
 /**
  * A implmentation of AbstractFeature
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class TextFeature<S extends AbstractSequence<C>, C extends Compound> extends AbstractFeature<S, C> {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/DNASequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/DNASequenceCreator.java
index 78a5dd4832..64a9467f3e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/DNASequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/DNASequenceCreator.java
@@ -37,7 +37,7 @@
  * A helper class that allows different ways to read a string and create a DNA sequence. Used in FastaReaderHelper
  * and probably a layer that isn't needed
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class DNASequenceCreator implements
 		SequenceCreatorInterface<NucleotideCompound> {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaGeneWriter.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaGeneWriter.java
index 2297e5e070..065bfff79a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaGeneWriter.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaGeneWriter.java
@@ -35,7 +35,7 @@
  * A Gene sequence has a Positive or Negative Strand where we want to write out to a stream the 5 to 3 prime version.
  * It is also an option to write out the gene sequence where the exon regions are upper case
  * 6/22/2010 FastaWriter needs to be sequence aware to handle writing out a GeneSequence which is negative Strand with the proper sequence
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class FastaGeneWriter {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java
index 4493766202..973a2813c6 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaReaderHelper.java
@@ -39,7 +39,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class FastaReaderHelper {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaSequenceParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaSequenceParser.java
index 35043c93bc..7140c094c5 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaSequenceParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaSequenceParser.java
@@ -28,7 +28,7 @@
 
 /**
  * Used to parse a stream of a fasta file to get the sequence
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class FastaSequenceParser implements SequenceParserInterface {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriter.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriter.java
index ff425bde49..f0fc191ff2 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriter.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriter.java
@@ -44,7 +44,7 @@
  * and that is used when writing to the stream. This behavior can be overwritten by implementing
  * a custom FastaHeaderFormatInterface.
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class FastaWriter<S extends Sequence<?>, C extends Compound> {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriterHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriterHelper.java
index dfeae8a642..b4200b89c2 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriterHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriterHelper.java
@@ -39,7 +39,7 @@
 
 /**
  * The class that should be used to write out fasta file of a sequence collection
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class FastaWriterHelper {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyDNASequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyDNASequenceCreator.java
index 21b0699ab6..52d11f9953 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyDNASequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyDNASequenceCreator.java
@@ -45,7 +45,7 @@
  * Same approach can be used for genome sequence data stored in a local fasta file, in a database or via http
  * interface to a remote server
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class FileProxyDNASequenceCreator implements
 		SequenceCreatorInterface<NucleotideCompound> {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyRNASequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyRNASequenceCreator.java
index 58fe3f98d7..d5c9b45f0e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyRNASequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyRNASequenceCreator.java
@@ -45,7 +45,7 @@
  * Same approach can be used for genome sequence data stored in a local fasta file, in a database or via http
  * interface to a remote server
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class FileProxyRNASequenceCreator implements
 		SequenceCreatorInterface<NucleotideCompound> {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java
index 5146310591..7d382ce6b9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReaderHelper.java
@@ -41,7 +41,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class GenbankReaderHelper {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderFormat.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderFormat.java
index a007af0a61..c26b8362da 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderFormat.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderFormat.java
@@ -32,7 +32,7 @@
  * use the accession id. This allows the implementation by the user to write out complex header
  * with id notes etc without rewriting the fasta writer
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class GenericFastaHeaderFormat<S extends AbstractSequence<?>, C extends Compound> implements FastaHeaderFormatInterface<S, C> {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
index 1556bf838e..f4c8ea3416 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParser.java
@@ -59,7 +59,7 @@
  * NCBI Reference Sequence           ref|accession|locus
  * Local Sequence identifier         lcl|identifier
  *</pre>
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class GenericFastaHeaderParser<S extends AbstractSequence<C>, C extends Compound> implements SequenceHeaderParserInterface<S,C> {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ProteinSequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ProteinSequenceCreator.java
index 1efebed609..6f4e839ca7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ProteinSequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ProteinSequenceCreator.java
@@ -37,7 +37,7 @@
  * Used to create a ProteinSequence from a String to allow for details
  * about the location of the sequence etc.
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class ProteinSequenceCreator implements
 		SequenceCreatorInterface<AminoAcidCompound> {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/RNASequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/RNASequenceCreator.java
index 0a691f1afa..16f69cbf74 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/RNASequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/RNASequenceCreator.java
@@ -35,7 +35,7 @@
 /**
  * Used to create a RNA sequence
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class RNASequenceCreator implements
 		SequenceCreatorInterface<NucleotideCompound> {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/FastaHeaderFormatInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/FastaHeaderFormatInterface.java
index 51f5898f9f..bfd3092357 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/FastaHeaderFormatInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/FastaHeaderFormatInterface.java
@@ -27,7 +27,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  * @param <C> the compound type
  * @param <S> the sequence type
  */
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceCreatorInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceCreatorInterface.java
index b2277aecea..c03900055b 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceCreatorInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceCreatorInterface.java
@@ -32,7 +32,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  * @param <C> the compound type
  */
 public interface SequenceCreatorInterface<C extends Compound> {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceHeaderParserInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceHeaderParserInterface.java
index 41a63ccf90..a49e27c754 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceHeaderParserInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceHeaderParserInterface.java
@@ -27,7 +27,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  * @param <C> the compound type
  * @param <S> the sequence type
  */
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceParserInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceParserInterface.java
index fd536e2802..9950c450eb 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceParserInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceParserInterface.java
@@ -27,7 +27,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public interface SequenceParserInterface {
 	/**
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java
index 6dad329743..ef4bf016cb 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/SequenceFileProxyLoader.java
@@ -50,7 +50,7 @@
  * data was loaded and then after X amount of time clear the contents to free up memory.
  *
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  * @param <C> the compound type
  */
 public class SequenceFileProxyLoader<C extends Compound> implements ProxySequenceReader<C> {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java
index b9c0a70a9d..86323d1289 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/StringProxySequenceReader.java
@@ -38,7 +38,7 @@
 
 /**
  * An example of a ProxySequenceReader that is created from a String. Used for testing
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  * @param <C> the compound type
  */
 public class StringProxySequenceReader<C extends Compound> implements ProxySequenceReader<C> {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/SequenceLocation.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/SequenceLocation.java
index 443f7d9f06..beb03e3be7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/SequenceLocation.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/SequenceLocation.java
@@ -31,7 +31,7 @@
 import java.util.List;
 /**
  * A location in a sequence that keeps a reference to its parent sequence
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  * @author Paolo Pavan
  */
 public class SequenceLocation<S extends AbstractSequence<C>, C extends Compound> extends SimpleLocation {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SequenceAsStringHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SequenceAsStringHelper.java
index 995a358ef0..c2b02debee 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SequenceAsStringHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SequenceAsStringHelper.java
@@ -29,7 +29,7 @@
 /**
  * This is a common method that can be used across multiple storage/proxy implementations to
  * handle Negative strand and other interesting elements of sequence data.
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class SequenceAsStringHelper<C extends Compound> {
 
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaReaderTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaReaderTest.java
index 7981d8e6e3..466cabaa94 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaReaderTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/FastaReaderTest.java
@@ -35,7 +35,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class FastaReaderTest {
 
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankCookbookTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankCookbookTest.java
index 132a36d816..06459579a7 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankCookbookTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankCookbookTest.java
@@ -37,7 +37,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class GenbankCookbookTest {
 
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankReaderTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankReaderTest.java
index e813f863a8..0a03c85586 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankReaderTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenbankReaderTest.java
@@ -43,7 +43,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  * @author Jacek Grzebyta
  * @author Philippe Soares
  */
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParserTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParserTest.java
index 4d8ae7e8bd..b5e5598722 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParserTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/io/GenericFastaHeaderParserTest.java
@@ -32,7 +32,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class GenericFastaHeaderParserTest {
 
@@ -52,7 +52,7 @@ public class GenericFastaHeaderParserTest {
 	 * NCBI Reference Sequence           ref|accession|locus
 	 * Local Sequence identifier         lcl|identifier
 	 *
-	 * @author Scooter Willis <willishf at gmail dot com>
+	 * @author Scooter Willis 
 	 */
 	@Test
 	public void testParseHeader() throws CompoundNotFoundException {
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/GeneFeatureHelper.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/GeneFeatureHelper.java
index 0090ce7786..c9786b3ad0 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/GeneFeatureHelper.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/GeneFeatureHelper.java
@@ -36,7 +36,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class GeneFeatureHelper {
 
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/BlastHomologyHits.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/BlastHomologyHits.java
index 0d40fe835c..9fb2ebce48 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/BlastHomologyHits.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/BlastHomologyHits.java
@@ -28,7 +28,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class BlastHomologyHits {
 
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
index bc6893d19d..67e22bd992 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/homology/GFF3FromUniprotBlastHits.java
@@ -46,7 +46,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  * @author Mark Chapman
  */
 public class GFF3FromUniprotBlastHits {
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/geneid/GeneIDXMLReader.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/geneid/GeneIDXMLReader.java
index b68074e080..dc6a97e702 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/geneid/GeneIDXMLReader.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/geneid/GeneIDXMLReader.java
@@ -37,7 +37,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class GeneIDXMLReader {
 
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/FeatureHelper.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/FeatureHelper.java
index bcdc0bc32b..f18c14a098 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/FeatureHelper.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/FeatureHelper.java
@@ -25,7 +25,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class FeatureHelper {
 
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GCStats.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GCStats.java
index 2974a13c9c..8ee0881551 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GCStats.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GCStats.java
@@ -26,7 +26,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class GCStats {
 
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java
index 7432729d97..88af970928 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/GFF3Writer.java
@@ -31,7 +31,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class GFF3Writer {
 
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/query/BlastXMLQuery.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/query/BlastXMLQuery.java
index 06d65933a9..98f36dd22f 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/query/BlastXMLQuery.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/query/BlastXMLQuery.java
@@ -33,7 +33,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class BlastXMLQuery {
 
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/query/OutputHitsGFF.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/query/OutputHitsGFF.java
index f7ac399455..5ab5e8f13a 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/query/OutputHitsGFF.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/query/OutputHitsGFF.java
@@ -33,7 +33,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class OutputHitsGFF {
 
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/util/SplitFasta.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/util/SplitFasta.java
index 374dd378a1..a618443d0f 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/util/SplitFasta.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/util/SplitFasta.java
@@ -35,7 +35,7 @@
 
 /**
  * Utility to write each Fasta entry to a unique file
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class SplitFasta {
 
diff --git a/biojava-genome/src/test/java/org/biojava/nbio/genome/GeneFeatureHelperTest.java b/biojava-genome/src/test/java/org/biojava/nbio/genome/GeneFeatureHelperTest.java
index e5e1a8379d..3c81c50916 100644
--- a/biojava-genome/src/test/java/org/biojava/nbio/genome/GeneFeatureHelperTest.java
+++ b/biojava-genome/src/test/java/org/biojava/nbio/genome/GeneFeatureHelperTest.java
@@ -43,7 +43,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class GeneFeatureHelperTest {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxCC.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxCC.java
index a6e4779a44..ccd9d1f238 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxCC.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxCC.java
@@ -30,7 +30,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class CoxCC {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxCoefficient.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxCoefficient.java
index a8023284b5..d95f85ca76 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxCoefficient.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxCoefficient.java
@@ -25,7 +25,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class CoxCoefficient {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxHelper.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxHelper.java
index dfc149c54e..4430922993 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxHelper.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxHelper.java
@@ -30,7 +30,7 @@
  * Given the number of options for adjusting the calculations using weighting, strata, clustering etc the helper class can be used to hide
  * the complexity for typical use case.
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class CoxHelper {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxInfo.java
index 7bfafba710..c9f4f18056 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxInfo.java
@@ -32,7 +32,7 @@
 
 /**
  * Holds the results of a cox analysis where calling dump(), toString() will give an output similar to R
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class CoxInfo {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxMart.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxMart.java
index d49545efa6..9c54c37618 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxMart.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxMart.java
@@ -44,7 +44,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class CoxMart {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxMethod.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxMethod.java
index 64cfe1fdde..fe26661fd8 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxMethod.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxMethod.java
@@ -22,7 +22,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public enum CoxMethod{
 	/**
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxR.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxR.java
index 943dde980d..d2ac87e87a 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxR.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxR.java
@@ -106,7 +106,7 @@
  * <p>
  * the data must be sorted by ascending time within strata
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class CoxR {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxScore.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxScore.java
index cc51ec4d3f..3de88ec20a 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxScore.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxScore.java
@@ -24,7 +24,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class CoxScore {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxVariables.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxVariables.java
index 7a99f4db02..6b477cb496 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxVariables.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxVariables.java
@@ -25,7 +25,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class CoxVariables {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/ResidualsCoxph.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/ResidualsCoxph.java
index 94baf9dce8..42b34905cc 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/ResidualsCoxph.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/ResidualsCoxph.java
@@ -29,7 +29,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class ResidualsCoxph {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/RiskInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/RiskInfo.java
index 9e050b62da..6a8b9c4316 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/RiskInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/RiskInfo.java
@@ -22,7 +22,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class RiskInfo {
 	double weight;
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/StrataInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/StrataInfo.java
index 5cf88613ab..8a50d559fb 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/StrataInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/StrataInfo.java
@@ -27,7 +27,7 @@
 /**
  * Information needed to represent a survival curve
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class StrataInfo {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvFitInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvFitInfo.java
index c22e6fb9b5..fa3d30f756 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvFitInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvFitInfo.java
@@ -25,7 +25,7 @@
 /**
  * Contains info for graphing km figures
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class SurvFitInfo {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfo.java
index c1ed799293..c60d197682 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfo.java
@@ -29,7 +29,7 @@
  * The code handles figuring out if a variables is continuous or categorical. If categorical will
  * convert to numerical values.
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class SurvivalInfo implements Comparable<SurvivalInfo> {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfoHelper.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfoHelper.java
index 6e292d1633..bf89f51fc8 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfoHelper.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfoHelper.java
@@ -27,7 +27,7 @@
 
 /**
  * Used to work with SurvivalInfo
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class SurvivalInfoHelper {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfoIndex.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfoIndex.java
index 51c443b0b7..1a87f906f4 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfoIndex.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/SurvivalInfoIndex.java
@@ -22,7 +22,7 @@
 
 /**
  * Not used and probably should be deleted
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class SurvivalInfoIndex implements Comparable<SurvivalInfoIndex> {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/WaldTest.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/WaldTest.java
index fb011e3cf4..b0996e80e6 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/WaldTest.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/WaldTest.java
@@ -25,7 +25,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class WaldTest {
 //coxph_wtest, df=as.integer(nvar),as.integer(ntest),as.double(var),tests= as.double(b),solve= double(nvar*ntest),as.double(toler.chol))
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/WaldTestInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/WaldTestInfo.java
index f5f09d8b03..30cdd1e3f3 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/WaldTestInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/WaldTestInfo.java
@@ -24,7 +24,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class WaldTestInfo {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/CoxComparatorInterface.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/CoxComparatorInterface.java
index 703936e751..fa012ead4d 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/CoxComparatorInterface.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/CoxComparatorInterface.java
@@ -27,7 +27,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public interface CoxComparatorInterface extends Comparator<CoxVariables> {
 	public String getDescription();
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/CoxVariablesOverallModelFitComparator.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/CoxVariablesOverallModelFitComparator.java
index 964b1e254f..4ec710d6c1 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/CoxVariablesOverallModelFitComparator.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/CoxVariablesOverallModelFitComparator.java
@@ -28,7 +28,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class CoxVariablesOverallModelFitComparator implements Comparator<CoxVariables>, Serializable {
 	private static final long serialVersionUID = 1;
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/CoxVariablesVariableComparator.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/CoxVariablesVariableComparator.java
index 1c48b2dcf0..3c7e2c16d8 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/CoxVariablesVariableComparator.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/CoxVariablesVariableComparator.java
@@ -25,7 +25,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class CoxVariablesVariableComparator implements CoxComparatorInterface {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/MeanModelComparator.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/MeanModelComparator.java
index 5f61766a25..4ac6a3f402 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/MeanModelComparator.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/MeanModelComparator.java
@@ -28,7 +28,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class MeanModelComparator implements Comparator<CoxVariables>, Serializable {
 	private static final long serialVersionUID = 1;
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/SurvivalInfoComparator.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/SurvivalInfoComparator.java
index f8415af304..899e5e0cb4 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/SurvivalInfoComparator.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/SurvivalInfoComparator.java
@@ -27,7 +27,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class SurvivalInfoComparator implements Comparator<SurvivalInfo>, Serializable {
 	private static final long serialVersionUID = 1;
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/SurvivalInfoValueComparator.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/SurvivalInfoValueComparator.java
index 81098c46cf..f639be0079 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/SurvivalInfoValueComparator.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/comparators/SurvivalInfoValueComparator.java
@@ -27,7 +27,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class SurvivalInfoValueComparator implements Comparator<SurvivalInfo>, Serializable {
 	private static final long serialVersionUID = 1;
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/AgScore.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/AgScore.java
index 7760cbe23d..1a3488b1ec 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/AgScore.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/AgScore.java
@@ -28,7 +28,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class AgScore {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/ChiSq.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/ChiSq.java
index 4ad714f549..d193e6104b 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/ChiSq.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/ChiSq.java
@@ -22,7 +22,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class ChiSq {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/Cholesky2.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/Cholesky2.java
index 8c4f81af3b..8ce9f73ff5 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/Cholesky2.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/Cholesky2.java
@@ -22,7 +22,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class Cholesky2 {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/Chsolve2.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/Chsolve2.java
index dad7d06688..8f62db56c3 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/Chsolve2.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/stats/Chsolve2.java
@@ -22,7 +22,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class Chsolve2 {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/ChangeValue.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/ChangeValue.java
index b5841d9f63..5e734a27ba 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/ChangeValue.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/ChangeValue.java
@@ -23,7 +23,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public interface ChangeValue {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/CompactCharSequence.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/CompactCharSequence.java
index 68cf58c0a8..eb029560cb 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/CompactCharSequence.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/CompactCharSequence.java
@@ -25,7 +25,7 @@
 
 /**
  *http://www.javamex.com/tutorials/memory/ascii_charsequence.shtml
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class CompactCharSequence implements CharSequence, Serializable {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/HeaderInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/HeaderInfo.java
index 7357eca3a3..71408271db 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/HeaderInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/HeaderInfo.java
@@ -22,7 +22,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class HeaderInfo {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java
index 9e4de21fcc..9e1f4b6fd2 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java
@@ -27,7 +27,7 @@
  * Need to handle very large spreadsheets of expression data so keep memory
  * footprint low
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class WorkSheet {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/ExpressionFigure.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/ExpressionFigure.java
index d8d120aee7..51142aeab0 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/ExpressionFigure.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/ExpressionFigure.java
@@ -35,7 +35,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class ExpressionFigure extends JPanel {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/GroupResults.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/GroupResults.java
index abdfe810b6..6c2e0b1b90 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/GroupResults.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/GroupResults.java
@@ -24,7 +24,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class GroupResults {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KMFigureInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KMFigureInfo.java
index d17d6afa51..c3b9bed262 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KMFigureInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KMFigureInfo.java
@@ -27,7 +27,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class KMFigureInfo {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KaplanMeierFigure.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KaplanMeierFigure.java
index f1e8877f97..21e68ccdd0 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KaplanMeierFigure.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/KaplanMeierFigure.java
@@ -36,7 +36,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class KaplanMeierFigure extends JPanel {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java
index dc3e57994e..c4578f1c8b 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java
@@ -31,7 +31,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class NumbersAtRiskPanel extends JPanel {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/SurvFitKM.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/SurvFitKM.java
index 764c8af76f..0167aa591a 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/SurvFitKM.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/SurvFitKM.java
@@ -34,7 +34,7 @@
  * Ported from survfitKM.S When combining multiple entries with same time not
  * sure how the weighting adds up
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class SurvFitKM {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/ClinicalMetaDataOutcome.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/ClinicalMetaDataOutcome.java
index 3b1ca8fe15..b507f41f97 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/ClinicalMetaDataOutcome.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/ClinicalMetaDataOutcome.java
@@ -27,7 +27,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class ClinicalMetaDataOutcome {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/DiscreteQuantizerInterface.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/DiscreteQuantizerInterface.java
index 5c80054a72..4d48bd71c3 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/DiscreteQuantizerInterface.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/DiscreteQuantizerInterface.java
@@ -25,7 +25,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public interface DiscreteQuantizerInterface {
 	/**
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/MeanQuantizer.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/MeanQuantizer.java
index 964a365cdc..ba64cf1727 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/MeanQuantizer.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/MeanQuantizer.java
@@ -25,7 +25,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class MeanQuantizer implements DiscreteQuantizerInterface {
 
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/MetaDataInfo.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/MetaDataInfo.java
index bad051b590..75af37ca57 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/MetaDataInfo.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/metadata/MetaDataInfo.java
@@ -26,7 +26,7 @@
 
 /**
  *
- * @author Scooter Willis <willishf at gmail dot com>
+ * @author Scooter Willis 
  */
 public class MetaDataInfo {
 

From 2fab7b03503a48faff1dde8a86254e1b287dd063 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 3 Jan 2025 11:21:46 -0800
Subject: [PATCH 517/599] Javadoc fix: html escaping

---
 .../matrices/SubstitutionMatrixHelper.java    | 32 +++++++++----------
 .../nbio/core/alignment/template/Profile.java | 22 ++++++-------
 .../core/alignment/template/SequencePair.java | 12 +++----
 .../template/SubstitutionMatrix.java          |  2 +-
 .../sequence/location/LocationHelper.java     |  2 +-
 .../storage/JoiningSequenceReader.java        |  6 ++--
 .../sequence/template/LightweightProfile.java |  4 +--
 .../core/sequence/template/SequenceMixin.java |  6 ++--
 .../nbio/core/util/FileDownloadUtils.java     |  4 +--
 .../core/util/StringManipulationHelper.java   |  8 ++---
 10 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java
index 3f55a3897a..ab737b536e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/matrices/SubstitutionMatrixHelper.java
@@ -78,7 +78,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getIdentity() {
 	}
 
 	/**
-	 * Returns Blosum 100 matrix by Henikoff & Henikoff
+	 * Returns Blosum 100 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 100 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum100() {
@@ -86,7 +86,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum100() {
 	}
 
 	/**
-	 * Returns Blosum 30 matrix by Henikoff & Henikoff
+	 * Returns Blosum 30 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 30 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum30() {
@@ -94,7 +94,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum30() {
 	}
 
 	/**
-	 * Returns Blosum 35 matrix by Henikoff & Henikoff
+	 * Returns Blosum 35 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 35 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum35() {
@@ -102,7 +102,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum35() {
 	}
 
 	/**
-	 * Returns Blosum 40 matrix by Henikoff & Henikoff
+	 * Returns Blosum 40 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 40 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum40() {
@@ -110,7 +110,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum40() {
 	}
 
 	/**
-	 * Returns Blosum 45 matrix by Henikoff & Henikoff
+	 * Returns Blosum 45 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 45 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum45() {
@@ -118,7 +118,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum45() {
 	}
 
 	/**
-	 * Returns Blosum 50 matrix by Henikoff & Henikoff
+	 * Returns Blosum 50 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 50 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum50() {
@@ -126,7 +126,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum50() {
 	}
 
 	/**
-	 * Returns Blosum 55 matrix by Henikoff & Henikoff
+	 * Returns Blosum 55 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 55 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum55() {
@@ -134,7 +134,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum55() {
 	}
 
 	/**
-	 * Returns Blosum 60 matrix by Henikoff & Henikoff
+	 * Returns Blosum 60 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 60 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum60() {
@@ -142,7 +142,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum60() {
 	}
 
 	/**
-	 * Returns Blosum 62 matrix by Henikoff & Henikoff
+	 * Returns Blosum 62 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 62 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum62() {
@@ -150,7 +150,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum62() {
 	}
 
 	/**
-	 * Returns Blosum 65 matrix by Henikoff & Henikoff
+	 * Returns Blosum 65 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 65 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum65() {
@@ -158,7 +158,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum65() {
 	}
 
 	/**
-	 * Returns Blosum 70 matrix by Henikoff & Henikoff
+	 * Returns Blosum 70 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 70 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum70() {
@@ -166,7 +166,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum70() {
 	}
 
 	/**
-	 * Returns Blosum 75 matrix by Henikoff & Henikoff
+	 * Returns Blosum 75 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 75 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum75() {
@@ -174,7 +174,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum75() {
 	}
 
 	/**
-	 * Returns Blosum 80 matrix by Henikoff & Henikoff
+	 * Returns Blosum 80 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 80 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum80() {
@@ -182,7 +182,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum80() {
 	}
 
 	/**
-	 * Returns Blosum 85 matrix by Henikoff & Henikoff
+	 * Returns Blosum 85 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 85 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum85() {
@@ -190,7 +190,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum85() {
 	}
 
 	/**
-	 * Returns Blosum 90 matrix by Henikoff & Henikoff
+	 * Returns Blosum 90 matrix by Henikoff &amp; Henikoff
 	 * @return Blosum 90 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getBlosum90() {
@@ -198,7 +198,7 @@ public static SubstitutionMatrix<AminoAcidCompound> getBlosum90() {
 	}
 
 	/**
-	 * Returns PAM 250 matrix by Gonnet, Cohen & Benner
+	 * Returns PAM 250 matrix by Gonnet, Cohen &amp; Benner
 	 * @return Gonnet 250 matrix
 	 */
 	public static SubstitutionMatrix<AminoAcidCompound> getGonnet250() {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/Profile.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/Profile.java
index 811de73b31..62575a1bf2 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/Profile.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/Profile.java
@@ -58,7 +58,7 @@ enum StringFormat {
 	 *
 	 * @param listIndex index of sequence in profile
 	 * @return desired sequence
-	 * @throws IndexOutOfBoundsException if listIndex < 1 or listIndex > number of sequences
+	 * @throws IndexOutOfBoundsException if listIndex &lt; 1 or listIndex &gt; number of sequences
 	 */
 	AlignedSequence<S, C> getAlignedSequence(int listIndex);
 
@@ -101,8 +101,8 @@ enum StringFormat {
 	 * @param listIndex index of sequence in profile
 	 * @param alignmentIndex column index within an alignment
 	 * @return the sequence element
-	 * @throws IndexOutOfBoundsException if listIndex < 1, listIndex > number of sequences, alignmentIndex < 1, or
-	 *     alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if listIndex &lt; 1, listIndex &gt; number of sequences, alignmentIndex &lt; 1, or
+	 *     alignmentIndex &gt; {@link #getLength()}
 	 */
 	C getCompoundAt(int listIndex, int alignmentIndex);
 
@@ -113,7 +113,7 @@ enum StringFormat {
 	 * @param sequence either an {@link AlignedSequence} or an original {@link Sequence}
 	 * @param alignmentIndex column index within an alignment
 	 * @return the sequence element
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	C getCompoundAt(S sequence, int alignmentIndex);
 
@@ -122,7 +122,7 @@ enum StringFormat {
 	 *
 	 * @param alignmentIndex column index within an alignment
 	 * @return list of counts
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	int[] getCompoundCountsAt(int alignmentIndex);
 
@@ -132,7 +132,7 @@ enum StringFormat {
 	 * @param alignmentIndex column index within an alignment
 	 * @param compounds list of compounds to count
 	 * @return corresponding list of counts
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	int[] getCompoundCountsAt(int alignmentIndex, List<C> compounds);
 
@@ -141,7 +141,7 @@ enum StringFormat {
 	 *
 	 * @param alignmentIndex column index within an alignment
 	 * @return the sequence elements
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	List<C> getCompoundsAt(int alignmentIndex);
 
@@ -157,7 +157,7 @@ enum StringFormat {
 	 *
 	 * @param alignmentIndex column index within an alignment
 	 * @return list of fractional weights
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	float[] getCompoundWeightsAt(int alignmentIndex);
 
@@ -167,7 +167,7 @@ enum StringFormat {
 	 * @param alignmentIndex column index within an alignment
 	 * @param compounds list of compounds to count
 	 * @return corresponding list of fractional weights
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	float[] getCompoundWeightsAt(int alignmentIndex, List<C> compounds);
 
@@ -177,7 +177,7 @@ enum StringFormat {
 	 *
 	 * @param alignmentIndex column index within an alignment
 	 * @return the sequence indices
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	int[] getIndicesAt(int alignmentIndex);
 
@@ -236,7 +236,7 @@ enum StringFormat {
 	 *
 	 * @param alignmentIndex column index within an alignment
 	 * @return true if any {@link AlignedSequence} has a gap at the given index
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	boolean hasGap(int alignmentIndex);
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/SequencePair.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/SequencePair.java
index 24f2315e00..1367fb6be9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/SequencePair.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/SequencePair.java
@@ -41,7 +41,7 @@ public interface SequencePair<S extends Sequence<C>, C extends Compound> extends
 	 *
 	 * @param alignmentIndex column index in alignment
 	 * @return the query sequence element
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	C getCompoundInQueryAt(int alignmentIndex);
 
@@ -50,7 +50,7 @@ public interface SequencePair<S extends Sequence<C>, C extends Compound> extends
 	 *
 	 * @param alignmentIndex column index in alignment
 	 * @return the target sequence element
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	C getCompoundInTargetAt(int alignmentIndex);
 
@@ -59,7 +59,7 @@ public interface SequencePair<S extends Sequence<C>, C extends Compound> extends
 	 *
 	 * @param alignmentIndex column index in alignment
 	 * @return index in query {@link Sequence}
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	int getIndexInQueryAt(int alignmentIndex);
 
@@ -68,7 +68,7 @@ public interface SequencePair<S extends Sequence<C>, C extends Compound> extends
 	 *
 	 * @param targetIndex index in target {@link Sequence}
 	 * @return index in query {@link Sequence}
-	 * @throws IndexOutOfBoundsException if targetIndex < 1 or targetIndex > {@link #getTarget()}.getLength()
+	 * @throws IndexOutOfBoundsException if targetIndex &lt; 1 or targetIndex &gt; {@link #getTarget()}.getLength()
 	 */
 	int getIndexInQueryForTargetAt(int targetIndex);
 
@@ -77,7 +77,7 @@ public interface SequencePair<S extends Sequence<C>, C extends Compound> extends
 	 *
 	 * @param alignmentIndex column index in alignment
 	 * @return index in target {@link Sequence}
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	int getIndexInTargetAt(int alignmentIndex);
 
@@ -86,7 +86,7 @@ public interface SequencePair<S extends Sequence<C>, C extends Compound> extends
 	 *
 	 * @param queryIndex index in query {@link Sequence}
 	 * @return index in target {@link Sequence}
-	 * @throws IndexOutOfBoundsException if queryIndex < 1 or queryIndex > {@link #getQuery()}.getLength()
+	 * @throws IndexOutOfBoundsException if queryIndex &lt; 1 or queryIndex &gt; {@link #getQuery()}.getLength()
 	 */
 	int getIndexInTargetForQueryAt(int queryIndex);
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/SubstitutionMatrix.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/SubstitutionMatrix.java
index 22a8de5f5c..436fc7a44b 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/SubstitutionMatrix.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/SubstitutionMatrix.java
@@ -103,7 +103,7 @@ public interface SubstitutionMatrix<C extends Compound> {
 	 * Rescales the matrix so that to {@link #getMaxValue()} - {@link #getMinValue()} = scale.
 	 *
 	 * @param scale new normalization scale of this matrix
-	 * @throws IllegalArgumentException if scale < 1
+	 * @throws IllegalArgumentException if scale &lt; 1
 	 */
 	SubstitutionMatrix<C> normalizeMatrix(short scale);
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/LocationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/LocationHelper.java
index d36d882c98..f164e5b7b8 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/LocationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/LocationHelper.java
@@ -307,7 +307,7 @@ public static Strand detectStrand(List<Location> subLocations) {
 	}
 
 	/**
-	 * Assumes that the first element is the start & clones it
+	 * Assumes that the first element is the start &amp; clones it
 	 */
 	public static Point detectStart(List<Location> subLocations) {
 		return subLocations.get(0).getStart().clonePoint();
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/JoiningSequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/JoiningSequenceReader.java
index 46a0501b8a..ae1471b52c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/JoiningSequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/JoiningSequenceReader.java
@@ -56,7 +56,7 @@ public class JoiningSequenceReader<C extends Compound> implements ProxySequenceR
 	private int[] minSequenceIndex;
 
 	/**
-	 * Allows creation of the store from Vargs Sequence<C> objects. CompoundSet
+	 * Allows creation of the store from Vargs {@link Sequence<C>} objects. CompoundSet
 	 * defaults to the first element of the array (assuming there are elements
 	 * available during construction otherwise we will throw an illegal
 	 * state exception).
@@ -66,7 +66,7 @@ public JoiningSequenceReader(Sequence<C>... sequences) {
 	}
 
 	/**
-	 * Allows creation of the store from List<Sequence<C>>. CompoundSet
+	 * Allows creation of the store from {@link List<Sequence<C>>}. CompoundSet
 	 * defaults to the first element of the List (assuming there are elements
 	 * available during construction otherwise we will throw an illegal
 	 * state exception).
@@ -217,7 +217,7 @@ else if (midMinPosition > position && midMaxPosition > position) {
 
 	/**
 	 * Iterator implementation which attempts to move through the 2D structure
-	 * attempting to skip onto the next sequence as & when it is asked to
+	 * attempting to skip onto the next sequence as &amp; when it is asked to
 	 */
 
 	@Override
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/LightweightProfile.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/LightweightProfile.java
index e6f632224b..033fa84e85 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/LightweightProfile.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/LightweightProfile.java
@@ -52,7 +52,7 @@ enum StringFormat {
 	 *
 	 * @param listIndex index of sequence in profile
 	 * @return desired sequence
-	 * @throws IndexOutOfBoundsException if listIndex < 1 or listIndex > number of sequences
+	 * @throws IndexOutOfBoundsException if listIndex &lt; 1 or listIndex &gt; number of sequences
 	 */
 	S getAlignedSequence(int listIndex);
 
@@ -68,7 +68,7 @@ enum StringFormat {
 	 *
 	 * @param alignmentIndex column index within an alignment
 	 * @return the sequence elements
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	List<C> getCompoundsAt(int alignmentIndex);
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceMixin.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceMixin.java
index c3dec3d0bd..3d75261d87 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceMixin.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceMixin.java
@@ -285,7 +285,7 @@ public static <C extends Compound> List<SequenceView<C>> nonOverlappingKmers(Seq
 
 	/**
 	 * Used to generate overlapping k-mers such i.e. ATGTA will give rise to
-	 * ATG, TGT & GTA
+	 * ATG, TGT &amp; GTA
 	 *
 	 * @param <C> Compound to use
 	 * @param sequence Sequence to build from
@@ -343,7 +343,7 @@ public static <C extends Compound> SequenceView<C> inverse(Sequence<C> sequence)
 	/**
 	 * A case-insensitive manner of comparing two sequence objects together.
 	 * We will throw out any compounds which fail to match on their sequence
-	 * length & compound sets used. The code will also bail out the moment
+	 * length &amp; compound sets used. The code will also bail out the moment
 	 * we find something is wrong with a Sequence. Cost to run is linear to
 	 * the length of the Sequence.
 	 *
@@ -359,7 +359,7 @@ public static <C extends Compound> boolean sequenceEqualityIgnoreCase(Sequence<C
 	/**
 	 * A case-sensitive manner of comparing two sequence objects together.
 	 * We will throw out any compounds which fail to match on their sequence
-	 * length & compound sets used. The code will also bail out the moment
+	 * length &amp; compound sets used. The code will also bail out the moment
 	 * we find something is wrong with a Sequence. Cost to run is linear to
 	 * the length of the Sequence.
 	 *
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index 3259676ef0..00cb2c923f 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -350,7 +350,7 @@ public static URLConnection prepareURLConnection(String url, int timeout) throws
 	}
 
 	/**
-	 * Recursively delete a folder & contents
+	 * Recursively delete a folder &amp; contents
 	 *
 	 * @param dir directory to delete
 	 */
@@ -375,7 +375,7 @@ public FileVisitResult postVisitDirectory(Path dir, IOException e) throws IOExce
 	    });
 	}
 	/**
-	 * Recursively delete a folder & contents
+	 * Recursively delete a folder &amp; contents
 	 *
 	 * @param dir directory to delete
 	 */
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
index 1fe985d0ba..c7b27cc752 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
@@ -202,9 +202,9 @@ public static boolean equalsToXml(String expected, String actual) {
 	/**
 	 * Adds padding to left of supplied string
 	 * @param s The String to pad
-	 * @param n an integer >= 1
+	 * @param n an integer &gt;= 1
 	 * @return The left-padded string. 
-	 * @throws IllegalArgumentException if n <= 0
+	 * @throws IllegalArgumentException if n &lt;= 0
 	 */
 	public static String padLeft(String s, int n) {
 		validatePadding(n);
@@ -214,9 +214,9 @@ public static String padLeft(String s, int n) {
 	/**
 	 * Adds padding to right of supplied string
 	 * @param s The String to pad
-	 * @param n an integer >= 1
+	 * @param n an integer &gt;= 1
 	 * @return The right-padded string. 
-	 * @throws IllegalArgumentException if n <= 0
+	 * @throws IllegalArgumentException if n &lt;= 0
 	 */
 	public static String padRight(String s, int n) {
 		validatePadding(n);

From 1c8d58788845e1418b83683734eef997951734c5 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 3 Jan 2025 11:22:22 -0800
Subject: [PATCH 518/599] Javadoc fix: bad tags

---
 .../biojava/nbio/core/sequence/reference/AbstractReference.java | 2 +-
 .../biojava/nbio/core/sequence/reference/GenbankReference.java  | 2 +-
 .../nbio/core/sequence/reference/ReferenceInterface.java        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/reference/AbstractReference.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/reference/AbstractReference.java
index 64c9792a0b..3c9958cb5c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/reference/AbstractReference.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/reference/AbstractReference.java
@@ -22,7 +22,7 @@
 
 /**
  * @since 5.0.0
- * @Author Jim Tang
+ * @author Jim Tang
  */
 public abstract class AbstractReference implements ReferenceInterface {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/reference/GenbankReference.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/reference/GenbankReference.java
index 9e67dcb0fa..ff8db13727 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/reference/GenbankReference.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/reference/GenbankReference.java
@@ -24,7 +24,7 @@
  * For Genbank format file only.
  *
  * @since 5.0.0
- * @Author Jim Tang
+ * @author Jim Tang
  */
 public class GenbankReference extends AbstractReference {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/reference/ReferenceInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/reference/ReferenceInterface.java
index 2c3b8fa457..6c86cca96d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/reference/ReferenceInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/reference/ReferenceInterface.java
@@ -22,7 +22,7 @@
 
 /**
  * @since 5.0.0
- * @Author Jim Tang
+ * @author Jim Tang
  */
 public interface ReferenceInterface {
 

From 13e3afef7566de8d5662eac8438c3dfa9edefa42 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 3 Jan 2025 14:52:33 -0800
Subject: [PATCH 519/599] Javadoc fix: all other errors in core module

---
 .../src/main/java/demo/UncompressFile.java    |  2 +-
 .../nbio/core/alignment/SimpleProfile.java    |  2 +-
 .../alignment/template/AlignedSequence.java   |  8 +--
 .../nbio/core/search/io/ResultFactory.java    |  7 +-
 .../biojava/nbio/core/search/io/SearchIO.java |  1 -
 .../nbio/core/sequence/CDSSequence.java       |  6 +-
 .../nbio/core/sequence/DataSource.java        |  2 +-
 .../nbio/core/sequence/edits/Edit.java        |  2 +-
 .../features/FeatureDbReferenceInfo.java      |  2 +-
 .../sequence/features/FeatureInterface.java   | 64 ++++++++-----------
 .../nbio/core/sequence/io/ABITrace.java       |  4 +-
 .../sequence/io/BufferedReaderBytesRead.java  |  4 +-
 .../CasePreservingProteinSequenceCreator.java | 15 +++--
 .../core/sequence/io/FastaWriterHelper.java   |  2 +-
 .../io/FileProxyDNASequenceCreator.java       |  3 +-
 .../io/FileProxyRNASequenceCreator.java       |  2 +-
 .../nbio/core/sequence/io/GenbankReader.java  |  2 +-
 .../sequence/io/GenbankSequenceParser.java    |  2 +-
 .../nbio/core/sequence/io/GenbankWriter.java  |  3 -
 .../io/GenericGenbankHeaderParser.java        |  2 +-
 .../nbio/core/sequence/io/IUPACParser.java    |  8 +--
 .../core/sequence/io/embl/EmblRecord.java     | 30 ++++-----
 .../io/template/SequenceParserInterface.java  |  6 +-
 .../nbio/core/sequence/io/util/IOUtils.java   |  4 +-
 .../loader/GenbankProxySequenceReader.java    |  6 +-
 .../loader/UniprotProxySequenceReader.java    |  1 -
 .../sequence/location/LocationHelper.java     |  2 +-
 .../sequence/location/template/Location.java  |  8 +--
 .../sequence/storage/BitSequenceReader.java   |  4 +-
 .../storage/SingleCompoundSequenceReader.java |  2 +-
 .../nbio/core/sequence/template/Compound.java | 20 +++---
 .../core/sequence/template/SequenceMixin.java |  4 +-
 .../core/sequence/transcription/Table.java    |  4 +-
 .../transcription/TranscriptionEngine.java    |  6 +-
 .../nbio/core/util/FileDownloadUtils.java     |  4 +-
 .../biojava/nbio/core/util/FlatFileCache.java |  2 +-
 .../core/util/StringManipulationHelper.java   |  2 +-
 .../org/biojava/nbio/core/util/XMLHelper.java |  2 +-
 .../SimpleGenbankProxySequenceReaderTest.java |  1 -
 39 files changed, 119 insertions(+), 132 deletions(-)

diff --git a/biojava-core/src/main/java/demo/UncompressFile.java b/biojava-core/src/main/java/demo/UncompressFile.java
index bd36ee5983..7258d6d18b 100644
--- a/biojava-core/src/main/java/demo/UncompressFile.java
+++ b/biojava-core/src/main/java/demo/UncompressFile.java
@@ -38,7 +38,7 @@ public class UncompressFile {
 	 * Reads a file, uncompresses it, and sends the result to stdout.
 	 * Also writes trivial statistics to stderr.
 	 * @param args An array with one String element, the name of the file to read.
-	 * @throws IOException for any failure
+	 * @throws Exception for any failure
 	 */
 	public static void main(String[] args) throws Exception {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleProfile.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleProfile.java
index 4b853fcb37..7cfdb7dedc 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleProfile.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleProfile.java
@@ -159,7 +159,7 @@ protected SimpleProfile(Profile<S, C> query, Profile<S, C> target, List<Step> sx
 	 /**
 	 * Creates a profile for the already aligned sequences.
 	 * @param alignedSequences the already aligned sequences
-	 * @throws IllegalArgument if aligned sequences differ in length or
+	 * @throws IllegalArgumentException if aligned sequences differ in length or
 	 * collection is empty.
 	 */
 	public SimpleProfile(Collection<AlignedSequence<S,C>> alignedSequences) {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/AlignedSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/AlignedSequence.java
index 92fd972ec7..cbb959fd25 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/AlignedSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/template/AlignedSequence.java
@@ -39,7 +39,7 @@
 public interface AlignedSequence<S extends Sequence<C>, C extends Compound> extends Sequence<C> {
 
 	/**
-	 * Defines an alignment step in order to pass alignment information from an {@link Aligner} to a constructor.
+	 * Defines an alignment step in order to pass alignment information from an Aligner to a constructor.
 	 */
 	enum Step { COMPOUND, GAP }
 
@@ -66,7 +66,7 @@ enum Step { COMPOUND, GAP }
 	 *
 	 * @param sequenceIndex index in the original {@link Sequence}
 	 * @return column index within an alignment
-	 * @throws IndexOutOfBoundsException if sequenceIndex < 1 or sequenceIndex >
+	 * @throws IndexOutOfBoundsException if sequenceIndex &lt; 1 or sequenceIndex >
 	 *         {@link #getOriginalSequence()}.{@link #getLength()}
 	 */
 	int getAlignmentIndexAt(int sequenceIndex);
@@ -131,7 +131,7 @@ enum Step { COMPOUND, GAP }
 	 *
 	 * @param alignmentIndex column index within an alignment
 	 * @return index in the original {@link Sequence}
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	int getSequenceIndexAt(int alignmentIndex);
 
@@ -155,7 +155,7 @@ enum Step { COMPOUND, GAP }
 	 *
 	 * @param alignmentIndex column index within an alignment
 	 * @return true if this column has a gap
-	 * @throws IndexOutOfBoundsException if alignmentIndex < 1 or alignmentIndex > {@link #getLength()}
+	 * @throws IndexOutOfBoundsException if alignmentIndex &lt; 1 or alignmentIndex &gt; {@link #getLength()}
 	 */
 	boolean isGap(int alignmentIndex);
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/ResultFactory.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/ResultFactory.java
index 479df1ac4d..d9279b8cce 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/ResultFactory.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/ResultFactory.java
@@ -34,7 +34,6 @@
  *
  * @author Paolo Pavan
  */
-
 public interface ResultFactory {
 	/**
 	 * returns a list of file extensions associated to this ResultFactory
@@ -49,7 +48,8 @@ public interface ResultFactory {
 	 *
 	 * @param maxEScore
 	 * @return
-	 * @throws Exception
+	 * @throws IOException
+	 * @throws ParseException
 	 */
 	List<Result> createObjects(double maxEScore) throws IOException, ParseException;
 	/**
@@ -57,7 +57,8 @@ public interface ResultFactory {
 	 * to a file in the same format that it is able to read.
 	 *
 	 * @param results
-	 * @throws Exception
+	 * @throws IOException
+	 * @throws ParseException
 	 */
 	void storeObjects(List<Result> results) throws IOException, ParseException;
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/SearchIO.java b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/SearchIO.java
index 95ffb9fcfc..e864068afd 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/search/io/SearchIO.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/search/io/SearchIO.java
@@ -64,7 +64,6 @@ public class SearchIO implements Iterable<Result>{
 	 * file extension.
 	 *
 	 * @param f
-	 * @throws Exception
 	 */
 	public SearchIO (File f)  throws IOException, ParseException{
 		factory = guessFactory(f);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/CDSSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/CDSSequence.java
index f897622f3c..2fbd638b82 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/CDSSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/CDSSequence.java
@@ -32,7 +32,7 @@
  * Represents a exon or coding sequence in a gene. It has a parent {@link TranscriptSequence}
  * where a TranscriptSequence is the child of a GeneSequence
  * Not important for protein construction but the phase is used if outputting the gene
- * to a gff3 file. {@link http://www.sequenceontology.org/gff3.shtml}
+ * to a gff3 file. <a href="http://www.sequenceontology.org/gff3.shtml">http://www.sequenceontology.org/gff3.shtml</a>
  * @author Scooter Willis
  */
 public class CDSSequence extends DNASequence {
@@ -90,8 +90,8 @@ public Strand getStrand() {
 	 * A CDS sequence if negative stranded needs to be reverse complement
 	 * to represent the actual coding sequence. When getting a ProteinSequence
 	 * from a TranscriptSequence this method is callled for each CDSSequence
-	 * {@link http://www.sequenceontology.org/gff3.shtml}
-	 * {@link http://biowiki.org/~yam/bioe131/GFF.ppt}
+	 * <a href="http://www.sequenceontology.org/gff3.shtml">http://www.sequenceontology.org/gff3.shtml</a>
+	 * <a href="http://biowiki.org/~yam/bioe131/GFF.ppt">http://biowiki.org/~yam/bioe131/GFF.ppt</a>
 	 * @return coding sequence
 	 */
 	public String getCodingSequence() {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DataSource.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DataSource.java
index 367c00a889..9086382155 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DataSource.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/DataSource.java
@@ -35,7 +35,7 @@
  * General database identifier       gnl|database|identifier
  * NCBI Reference Sequence           ref|accession|locus
  * Local Sequence identifier         lcl|identifier
- * </pr>
+ * </pre>
  * @author Scooter Willis 
  */
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/edits/Edit.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/edits/Edit.java
index edf891c4f7..e0d06eb0c7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/edits/Edit.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/edits/Edit.java
@@ -114,7 +114,7 @@ protected void setSequence(Sequence<C> sequence) {
 		 * @param editingSequence Asked for in-case we need to do String to
 		 * Sequence conversion so we need a CompoundSet which is given
 		 * by the Sequence we are editing
-		 * @return The Sequence<C> object we wish to insert
+		 * @return The {@link Sequence<C>} object we wish to insert
 		 */
 		public Sequence<C> getTargetSequence(Sequence<C> editingSequence) {
 			if (sequence == null && stringSequence != null) {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureDbReferenceInfo.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureDbReferenceInfo.java
index 3b49341d22..68b518b051 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureDbReferenceInfo.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureDbReferenceInfo.java
@@ -11,7 +11,7 @@
  * Copyright for this code is held jointly by the individual
  * authors.  These should be listed in @author doc comments.
  *
- * @author Jacek Grzebyta <github:jgrzebyta>
+ * @author Jacek Grzebyta &lt;github:jgrzebyta&gt;
  *
  * For more information on the BioJava project and its aims,
  * or to join the biojava-l mailing list, visit the home page
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureInterface.java
index c7b05cf5b9..8976953fd0 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/features/FeatureInterface.java
@@ -33,7 +33,7 @@
  * the surface of a protein where different sequence positions make up that feature. Ligand binding pocket is another example.
  * The location in its current form knows the start and stop position in a sequence and thus should contain knowledge about the
  * actual sequence.
- *
+ * <p>
  * A feature can contain features to handle cases where a domain is a feature and the secondary structures covered by that domain
  * and other requirements for grouping.
  *
@@ -46,32 +46,26 @@ public interface FeatureInterface<S extends AbstractSequence<C>, C extends Compo
 	 * Get the short description that can be used to describe the feature
 	 * @return
 	 */
-
-	public String getShortDescription();
+	String getShortDescription();
 
 	/**
 	 * Set the short description that can be used to describe the feature
 	 * @param shortDescription
 	 */
+	void setShortDescription(String shortDescription);
 
-	public void setShortDescription(String shortDescription);
-
-	  /**
+	 /**
 	 * Get the description that can be used to describe the feature
 	 * @return
 	 */
+	String getDescription();
 
-	public String getDescription();
-
-
-	  /**
+	 /**
 	 * Set the description that can be used to describe the feature
-	 * @return
 	 */
+	void setDescription(String description);
 
-	public void setDescription(String description);
-
-		/**
+	/**
 	 * The location(s) of this feature where the location should contain a reference to parent and sequence etc.
 	 * <p>
 	 * The location may be complicated, or simply a range.
@@ -80,7 +74,7 @@ public interface FeatureInterface<S extends AbstractSequence<C>, C extends Compo
 	 *
 	 * @return a Location anchoring this feature
 	 */
-	public AbstractLocation getLocations();
+	AbstractLocation getLocations();
 
 		/**
 	 * The new location for this feature.
@@ -93,14 +87,14 @@ public interface FeatureInterface<S extends AbstractSequence<C>, C extends Compo
 	 * @param loc the new Location for this feature
 	 *
 	 */
-	public void setLocation(AbstractLocation loc);
+	void setLocation(AbstractLocation loc);
 
-		/**
+	/**
 	 * The type of the feature.
 	 *
 	 * @return the type of this sequence
 	 */
-	public String getType();
+	String getType();
 
 	/**
 	 * Change the type of this feature.
@@ -108,15 +102,15 @@ public interface FeatureInterface<S extends AbstractSequence<C>, C extends Compo
 	 * @param type  new type String
 	 *
 	 */
-	public void setType(String type);
+	void setType(String type);
 
 
-		/**
+	/**
 	 * The source of the feature. This may be a program or process.
 	 *
 	 * @return the source, or generator
 	 */
-	public String getSource();
+	String getSource();
 
 	/**
 	 * Change the source of the FeatureInterface.
@@ -124,66 +118,60 @@ public interface FeatureInterface<S extends AbstractSequence<C>, C extends Compo
 	 * @param source the new source String
 	 *
 	 */
-	public void setSource(String source);
+	void setSource(String source);
 
 	/**
 	 * Set the parent feature
 	 * @param feature
 	 */
-
-	public void setParentFeature(FeatureInterface<S, C> feature);
+	void setParentFeature(FeatureInterface<S, C> feature);
 
 	/**
 	 * Get the parent feature
 	 * @return
 	 */
-
-	public FeatureInterface<S, C> getParentFeature();
+	FeatureInterface<S, C> getParentFeature();
 
 	/**
 	 * Get the features contained by this feature
 	 * @return
 	 */
-
-	public List<FeatureInterface<S, C>> getChildrenFeatures();
+	List<FeatureInterface<S, C>> getChildrenFeatures();
 
 	/**
 	 * Set the children features
 	 * @param features
 	 */
+	void setChildrenFeatures(List<FeatureInterface<S, C>> features);
 
-	public void setChildrenFeatures(List<FeatureInterface<S, C>> features);
 
-
-		/**
+	/**
 	 * @return the userObject
 	 */
-	public Object getUserObject();
+	Object getUserObject();
 
 	/**
 	 * @param userObject the userObject to set
 	 */
-	public void setUserObject(Object userObject);
-
+	void setUserObject(Object userObject);
 
 	/**
 	 * Get the qualifiers for this feature
 	 * @return
 	 */
 
-	public Map<String, List<Qualifier>> getQualifiers();
+	Map<String, List<Qualifier>> getQualifiers();
 
 	/**
 	 * Set the qualifiers
 	 * @param qualifiers
 	 */
+	void setQualifiers(Map<String, List<Qualifier>> qualifiers);
 
-	public void setQualifiers(Map<String, List<Qualifier>> qualifiers);
 	/**
 	 * Add a qualifier
 	 * @param qualifier
 	 */
-
-	public void addQualifier(String key, Qualifier qualifier);
+	void addQualifier(String key, Qualifier qualifier);
 
 }
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ABITrace.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ABITrace.java
index ea6f9abe1c..9561e21660 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ABITrace.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/ABITrace.java
@@ -171,9 +171,9 @@ public int[] getQcalls() {
 	}
 
 	/**
-	 * Returns the original programmatically determined (unedited) sequence as a <code>AbstractSequence<NucleotideCompound></code>.
+	 * Returns the original programmatically determined (unedited) sequence as a {@link AbstractSequence<NucleotideCompound>}.
 	 *
-	 * @return AbstractSequence<NucleotideCompound> sequence
+	 * @return sequence
 	 */
 	public AbstractSequence<NucleotideCompound> getSequence() throws CompoundNotFoundException {
 		DNASequenceCreator creator = new DNASequenceCreator(ABITracerCompoundSet.getABITracerCompoundSet());
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/BufferedReaderBytesRead.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/BufferedReaderBytesRead.java
index 998bbada13..30aa52c5d7 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/BufferedReaderBytesRead.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/BufferedReaderBytesRead.java
@@ -174,7 +174,7 @@ private void fill() throws IOException {
 	 * Reads a single character.
 	 *
 	 * @return The character read, as an integer in the range
-	 *         0 to 65535 (<tt>0x00-0xffff</tt>), or -1 if the
+	 *         0 to 65535 (<code>0x00-0xffff</code>), or -1 if the
 	 *         end of the stream has been reached
 	 * @exception  IOException  If an I/O error occurs
 	 */
@@ -521,7 +521,7 @@ public boolean markSupported() {
 	 *                         whose size is no smaller than limit.
 	 *                         Therefore large values should be used with care.
 	 *
-	 * @exception  IllegalArgumentException  If readAheadLimit is < 0
+	 * @exception  IllegalArgumentException  If readAheadLimit is &lt; 0
 	 * @exception  IOException  If an I/O error occurs
 	 */
 	@Override
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreator.java
index 94b2a6d918..0fb731ab10 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/CasePreservingProteinSequenceCreator.java
@@ -41,14 +41,15 @@
  * <p>The user collection will be the same length as the resulting ProteinSequence.
  * Each object can be cast to a Boolean. If true, the corresponding position in
  * the input file was uppercase.
- *
- * <h3>Example</h3>
- * <code><pre>CasePreservingProteinSequenceCreator creator =
+ * <p>
+ * Example
+ * <code>
+ *    CasePreservingProteinSequenceCreator creator =
  *    new CasePreservingProteinSequenceCreator(AminoAcidCompoundSet.getAminoAcidCompoundSet());
- *AbstractSequence<AminoAcidCompound> seq = creator.getSequence("aaAA",0);
- *System.out.println(seq.getSequenceAsString()); //"AAAA"
- *System.out.println(seq.getUserCollection()); //"[false, false, true, true]"
- *</code></pre>
+ *    AbstractSequence&lt;AminoAcidCompound&gt; seq = creator.getSequence("aaAA",0);
+ *    System.out.println(seq.getSequenceAsString()); //"AAAA"
+ *    System.out.println(seq.getUserCollection()); //"[false, false, true, true]"
+ * </code>
  */
 public class CasePreservingProteinSequenceCreator extends ProteinSequenceCreator {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriterHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriterHelper.java
index b4200b89c2..364260d9a2 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriterHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FastaWriterHelper.java
@@ -96,7 +96,7 @@ public static void writeGeneSequence(File file, Collection<GeneSequence> geneSeq
 	/**
 	 * Write a collection of GeneSequences to a file where if the gene is negative strand it will flip and complement the sequence
 	 * @param outputStream
-	 * @param dnaSequences
+	 * @param geneSequences
 	 * @throws Exception
 	 */
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyDNASequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyDNASequenceCreator.java
index 52d11f9953..96317cecdd 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyDNASequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyDNASequenceCreator.java
@@ -56,8 +56,9 @@ public class FileProxyDNASequenceCreator implements
 
 	/**
 	 * Need File so that we can store full path name in SequenceFileProxyLoader for Random File access as a quick read
-	 * @param fastaFile
+	 * @param file
 	 * @param compoundSet
+	 * @param sequenceParser
 	 */
 	public FileProxyDNASequenceCreator(File file,
 			CompoundSet<NucleotideCompound> compoundSet,
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyRNASequenceCreator.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyRNASequenceCreator.java
index d5c9b45f0e..53de88bb06 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyRNASequenceCreator.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/FileProxyRNASequenceCreator.java
@@ -56,7 +56,7 @@ public class FileProxyRNASequenceCreator implements
 
 	/**
 	 * Need File so that we can store full path name in SequenceFileProxyLoader for Random File access as a quick read
-	 * @param fastaFile
+	 * @param file
 	 * @param compoundSet
 	 */
 	public FileProxyRNASequenceCreator(File file,
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
index 31f99eab8a..7f67918377 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankReader.java
@@ -12,7 +12,7 @@
  * authors.  These should be listed in @author doc comments.
  *
  * @author Scooter Willis ;lt;willishf at gmail dot com&gt;
- * @author Karl Nicholas <github:karlnicholas>
+ * @author Karl Nicholas &lt;github:karlnicholas&gt;
  * @author Paolo Pavan
  *
  * For more information on the BioJava project and its aims,
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
index 90653612e7..7b7f0e1450 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankSequenceParser.java
@@ -17,7 +17,7 @@
  * @author Bubba Puryear
  * @author George Waldon
  * @author Deepak Sheoran
- * @author Karl Nicholas <github:karlnicholas>
+ * @author Karl Nicholas &lt;github:karlnicholas&gt;
  * @author Jacek Grzebyta
  * @author Paolo Pavan
  *
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java
index c99a9c23fd..9d47db3bbd 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenbankWriter.java
@@ -69,7 +69,6 @@ public GenbankWriter(OutputStream os, Collection<S> sequences,
 	 * @param headerFormat
 	 * @param lineLength
 	 */
-
 	public GenbankWriter(OutputStream os, Collection<S> sequences,
 			GenbankHeaderFormatInterface<S, C> headerFormat, int lineLength) {
 		this.os = os;
@@ -82,9 +81,7 @@ public GenbankWriter(OutputStream os, Collection<S> sequences,
 	 * Allow an override of operating system line separator for programs that
 	 * needs a specific CRLF or CR or LF option
 	 *
-	 * @param lineSeparator
 	 */
-
 	public void process() throws Exception {
 		// Loosely based on code from Howard Salis
 		// TODO - Force lower case?
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
index 7b1dc0524d..4fd6354110 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/GenericGenbankHeaderParser.java
@@ -11,7 +11,7 @@
  * Copyright for this code is held jointly by the individual
  * authors.  These should be listed in @author doc comments.
  *
- * @author Karl Nicholas <github:karlnicholas>
+ * @author Karl Nicholas &lt;github:karlnicholas&gt;
  *
  * For more information on the BioJava project and its aims,
  * or to join the biojava-l mailing list, visit the home page
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java
index 0f9b3ca950..65e9d96830 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/IUPACParser.java
@@ -266,7 +266,7 @@ public boolean isStart(AminoAcidCompound compound) {
 		 * @param aminoAcids The target amino acid compounds objects
 		 */
 				@Override
-		public List<Codon> getCodons(CompoundSet<NucleotideCompound> nucelotides,
+		public List<Codon> getCodons(CompoundSet<NucleotideCompound> nucleotides,
 				CompoundSet<AminoAcidCompound> aminoAcids) {
 
 			if (this.codons.isEmpty()) {
@@ -277,9 +277,9 @@ public List<Codon> getCodons(CompoundSet<NucleotideCompound> nucelotides,
 				for (int i = 0; i < aminoAcidStrings.size(); i++) {
 
 					List<String> codonString    = codonStrings.get(i);
-					NucleotideCompound one      = getCompound(codonString, 0, nucelotides);
-					NucleotideCompound two      = getCompound(codonString, 1, nucelotides);
-					NucleotideCompound three    = getCompound(codonString, 2, nucelotides);
+					NucleotideCompound one      = getCompound(codonString, 0, nucleotides);
+					NucleotideCompound two      = getCompound(codonString, 1, nucleotides);
+					NucleotideCompound three    = getCompound(codonString, 2, nucleotides);
 					boolean start               = ("M".equals(startCodonStrings.get(i)));
 					boolean stop                = ("*".equals(aminoAcidStrings.get(i)));
 					AminoAcidCompound aminoAcid = aminoAcids
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/embl/EmblRecord.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/embl/EmblRecord.java
index 1e84382b54..46497b5a0d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/embl/EmblRecord.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/embl/EmblRecord.java
@@ -64,7 +64,7 @@ public class EmblRecord {
 	 * 6. Taxonomic division
 	 * 7. Sequence length
 	 *
-	 * @return EmblId
+	 * @return
 	 */
 	public EmblId getEmblId() {
 		return emblId;
@@ -80,7 +80,7 @@ public void setEmblId(EmblId emblId) {
 	 * The citations provide access to the papers from which the data has been
 	 * abstracted.
 	 *
-	 * @return EmblReference
+	 * @return
 	 */
 	public List<EmblReference> getEmblReference() {
 		return emblReference;
@@ -94,7 +94,7 @@ public void setEmblReference(List<EmblReference> emblReference) {
 	 * The AC (Accession number) line lists the accession numbers associated with
 	 * the entry.
 	 *
-	 * @return List<String>
+	 * @return
 	 */
 	public List<String> getAccessionNumber() {
 		return accessionNumber;
@@ -119,7 +119,7 @@ public void setProjectIdentifier(String projectIdentifier) {
 	 * The OG (OrGanelle) linetype indicates the sub-cellular location of non-nuclear
 	 * sequences.
 	 *
-	 * @return String
+	 * @return
 	 */
 	public String getOrGanelle() {
 		return orGanelle;
@@ -132,7 +132,7 @@ public void setOrGanelle(String orGanelle) {
 	/**
 	 * The DT  line shows when an entry first appeared in the database
 	 *
-	 * @return String
+	 * @return
 	 */
 	public String getCreatedDate() {
 		return createdDate;
@@ -146,7 +146,7 @@ public void setCreatedDate(String createdDate) {
 	 * The FH (Feature Header) lines are present only to improve readability of
 	 * an entry when it is printed or displayed on a terminal screen.
 	 *
-	 * @return String
+	 * @return
 	 */
 	public String getFeatureHeader() {
 		return featureHeader;
@@ -161,7 +161,7 @@ public void setFeatureHeader(String featureHeader) {
 	 * sequence data. Regions or sites in the sequence which are of interest are
 	 * listed in the table.
 	 *
-	 * @return String
+	 * @return
 	 */
 	public String getFeatureTable() {
 		return featureTable;
@@ -190,7 +190,7 @@ public void setLastUpdatedDate(String lastUpdatedDate) {
 	 * sequence codes, the region of the genome from which it is derived, or other
 	 * information which helps to identify the sequence.
 	 *
-	 * @return String
+	 * @return
 	 */
 	public String getSequenceDescription() {
 		return sequenceDescription;
@@ -205,7 +205,7 @@ public void setSequenceDescription(String sequenceDescription) {
 	 * cross-reference indexes of the sequence entries based on functional,
 	 * structural, or other categories deemed important.
 	 *
-	 * @return List<String>
+	 * @return
 	 */
 	public List<String> getKeyword() {
 		return keyword;
@@ -235,7 +235,7 @@ public void setOrganismSpecies(String organismSpecies) {
 	 * The OC (Organism Classification) lines contain the taxonomic classification
 	 * Of the source organism
 	 *
-	 * @return String
+	 * @return
 	 */
 	public String getOrganismClassification() {
 		return organismClassification;
@@ -249,7 +249,7 @@ public void setOrganismClassification(String organismClassification) {
 	 * The DR (Database Cross-reference) line cross-references other databases which
 	 * contain information related to the entry in which the DR line appears.
 	 *
-	 * @return String
+	 * @return
 	 */
 	public String getDatabaseCrossReference() {
 		return databaseCrossReference;
@@ -262,7 +262,7 @@ public void setDatabaseCrossReference(String databaseCrossReference) {
 	/**
 	 * The AH (Assembly Header) line provides column headings for the assembly information.
 	 *
-	 * @return String
+	 * @return
 	 */
 	public String getAssemblyHeader() {
 		return assemblyHeader;
@@ -290,7 +290,7 @@ public void setAssemblyInformation(String assemblyInformation) {
 	 * Con(structed) sequences in the CON data classes represent complete
 	 * chromosomes, genomes and other long sequences constructed from segment entries.
 	 *
-	 * @return String
+	 * @return
 	 */
 	public String getConstructedSequence() {
 		return constructedSequence;
@@ -304,7 +304,7 @@ public void setConstructedSequence(String constructedSequence) {
 	 * The SQ (SeQuence header) line marks the beginning of the sequence data and
 	 * Gives a summary of its content.
 	 *
-	 * @return String
+	 * @return
 	 */
 	public String getSequenceHeader() {
 		return sequenceHeader;
@@ -317,7 +317,7 @@ public void setSequenceHeader(String sequenceHeader) {
 	/**
 	 * The Sequence Data Line
 	 *
-	 * @return String
+	 * @return
 	 */
 	public String getSequence() {
 		return sequence;
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceParserInterface.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceParserInterface.java
index 9950c450eb..82b2cab38b 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceParserInterface.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/template/SequenceParserInterface.java
@@ -32,10 +32,10 @@
 public interface SequenceParserInterface {
 	/**
 	 *
-	 * @param dataInput
+	 * @param bufferedReader
 	 * @param sequenceLength
 	 * @return
-	 * @throws Exception
+	 * @throws IOException
 	 */
-	public String getSequence(BufferedReader bufferedReader,int sequenceLength) throws IOException;
+	String getSequence(BufferedReader bufferedReader,int sequenceLength) throws IOException;
 }
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/util/IOUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/util/IOUtils.java
index b60bc9eb00..fe3dfcd42a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/util/IOUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/io/util/IOUtils.java
@@ -157,7 +157,7 @@ public static List<String> getList(File file) throws IOException {
 	 *
 	 * @param file File which may or may not be GZipped
 	 * @return The final stream
-	 * @throws IOExceptio n
+	 * @throws IOException
 	 */
 	public static InputStream openFile(File file) throws IOException {
 		final InputStream is;
@@ -178,7 +178,7 @@ public static InputStream openFile(File file) throws IOException {
 
 	/**
 	 * Closure interface used when working with
-	 * {@link IOUtils#processReader(String)}. Each time a line is encountered
+	 * {@link IOUtils#processReader(BufferedReader, ReaderProcessor)}. Each time a line is encountered
 	 * the object that implements this interface will be invoked.
 	 *
 	 * @author ayates
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java
index d3e6c52661..f443472aad 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/GenbankProxySequenceReader.java
@@ -11,7 +11,7 @@
  * Copyright for this code is held jointly by the individual
  * authors.  These should be listed in @author doc comments.
  *
- * @author Karl Nicholas <github:karlnicholas>
+ * @author Karl Nicholas &lt;github:karlnicholas&gt;
  *
  * For more information on the BioJava project and its aims,
  * or to join the biojava-l mailing list, visit the home page
@@ -42,8 +42,8 @@
 import java.util.Map;
 
 /**
- * @author Karl Nicholas <github:karlnicholas>
- * @author Jacek Grzebyta <github:jgrzebyta>
+ * @author Karl Nicholas &lt;github:karlnicholas&gt;
+ * @author Jacek Grzebyta &lt;github:jgrzebyta&gt;
  */
 public class GenbankProxySequenceReader<C extends Compound> extends StringProxySequenceReader<C> implements FeaturesKeyWordInterface, DatabaseReferenceInterface, FeatureRetriever {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
index f1cd7a7471..38feabdbf5 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/loader/UniprotProxySequenceReader.java
@@ -120,7 +120,6 @@ public UniprotProxySequenceReader(Document document, CompoundSet<C> compoundSet)
 	 * @param xml
 	 * @param compoundSet
 	 * @return UniprotProxySequenceReader
-	 * @throws Exception
 	 */
 	public static <C extends Compound> UniprotProxySequenceReader<C> parseUniprotXMLString(String xml, CompoundSet<C> compoundSet) {
 		try {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/LocationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/LocationHelper.java
index f164e5b7b8..38f96d7d08 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/LocationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/LocationHelper.java
@@ -113,7 +113,7 @@ public static Location location(int start, int end, Strand strand, int length) {
 	 * other location builder this allows you to express your input
 	 * location on the reverse strand
 	 *
-	 * @param location The location which currently expresses the outer
+	 * @param start The location which currently expresses the outer
 	 * bounds of a circular location.
 	 * @param length The length of the circular genomic unit
 	 * @return The circular location; can optionally return a normal non
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/template/Location.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/template/Location.java
index b0887bf706..266f9a6f1b 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/template/Location.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/template/Location.java
@@ -71,7 +71,7 @@ public interface Location extends Iterable<Location>, Accessioned {
 	/**
 	 * Gives access to the sub locations for this location. However this does
 	 * not return sub-locations of sub-locations. For that functionality use
-	 * {@link #getAllSubLocations()}.
+	 * {@link #getRelevantSubLocations()}.
 	 *
 	 * @return A list of a single level of sub-locations
 	 */
@@ -107,7 +107,7 @@ public interface Location extends Iterable<Location>, Accessioned {
 	 * Will return a SequenceReader object which represents the outer bounds
 	 * of this Location
 	 *
-	 * @param &lt;C&gt; The type of compound to use
+	 * @param <C> The type of compound to use
 	 * @param sequence The sequence object to work with
 	 * @return The sequence
 	 */
@@ -118,7 +118,7 @@ public interface Location extends Iterable<Location>, Accessioned {
 	 * locations i.e. those locations which are not complex and define the
 	 * true Sequence represented
 	 *
-	 * @param &lt;C&gt; The type of compound to use
+	 * @param <C> The type of compound to use
 	 * @param sequence The sequence object to work with
 	 * @return The full assembled sequence
 	 */
@@ -166,7 +166,7 @@ public static Location location(int start, int end, Strand strand, int length) {
 		 * other location builder this allows you to express your input
 		 * location on the reverse strand
 		 *
-		 * @param location The location which currently expresses the outer
+		 * @param start The location which currently expresses the outer
 		 * bounds of a circular location.
 		 * @param length The length of the circular genomic unit
 		 * @return The circular location; can optionally return a normal non
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/BitSequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/BitSequenceReader.java
index 4c1f064ea6..8ca85aeec3 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/BitSequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/BitSequenceReader.java
@@ -64,7 +64,7 @@ public BitSequenceReader(BitArrayWorker<C> worker, AccessionID accession) {
 	}
 
 	/**
-	 * Class is immutable & so this is unsupported
+	 * Class is immutable, so this is unsupported
 	 */
 	@Override
 	public void setCompoundSet(CompoundSet<C> compoundSet) {
@@ -72,7 +72,7 @@ public void setCompoundSet(CompoundSet<C> compoundSet) {
 	}
 
 	/**
-	 * Class is immutable & so this is unsupported
+	 * Class is immutable, so this is unsupported
 	 */
 	@Override
 	public void setContents(String sequence) throws CompoundNotFoundException {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SingleCompoundSequenceReader.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SingleCompoundSequenceReader.java
index b02c1e0c77..fd492f1bf9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SingleCompoundSequenceReader.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SingleCompoundSequenceReader.java
@@ -168,7 +168,7 @@ public AccessionID getAccession() {
 	}
 
 	/**
-	 * Delegates to {@link SequenceMixin#countCompounds(org.biojava.nbio.core.sequence.template.Sequence, C[]) }
+	 * Delegates to {@link SequenceMixin#countCompounds}
 	 */
 
 	@Override
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/Compound.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/Compound.java
index 6dbeda2208..aa04cb8c8a 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/Compound.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/Compound.java
@@ -28,21 +28,23 @@
 
 public interface Compound {
 
-	public boolean equalsIgnoreCase(Compound compound);
+	boolean equalsIgnoreCase(Compound compound);
 
-	public String getDescription();
+	String getDescription();
 
-	public void setDescription(String description);
+	void setDescription(String description);
 
-	public String getShortName();
+	String getShortName();
 
-	public void setShortName(String shortName);
+	void setShortName(String shortName);
 
-	public String getLongName();
+	String getLongName();
 
-	public void setLongName(String longName);
+	void setLongName(String longName);
 
-	public Float getMolecularWeight();
+	Float getMolecularWeight();
 
-	public void setMolecularWeight(Float molecularWeight);
+	void setMolecularWeight(Float molecularWeight);
+
+	String toString();
 }
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceMixin.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceMixin.java
index 3d75261d87..a71c9ba6f8 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceMixin.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/template/SequenceMixin.java
@@ -150,7 +150,7 @@ public static <C extends Compound> Map<C, Integer> getComposition(Sequence<C> se
 	 * converting to a full length String and then writing the data out
 	 *
 	 * @param <C> Type of compound
-	 * @param writer The writer to send data to
+	 * @param appendable The writer to send data to
 	 * @param sequence The sequence to write out
 	 * @throws IOException Thrown if we encounter a problem
 	 */
@@ -244,7 +244,7 @@ public static <C extends Compound> SequenceView<C> createSubSequence(
 	 * Implements sequence shuffling by first materializing the given
 	 * {@link Sequence} into a {@link List}, applying
 	 * {@link Collections#shuffle(List)} and then returning the shuffled
-	 * elements in a new instance of {@link SequenceBackingStore} which behaves
+	 * elements in a new instance of {@link Sequence} which behaves
 	 * as a {@link Sequence}.
 	 */
 	public static <C extends Compound> Sequence<C> shuffle(Sequence<C> sequence) {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/Table.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/Table.java
index 7d75a10d6a..bb86de83c9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/Table.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/Table.java
@@ -57,8 +57,8 @@ CompoundSet<Codon> getCodonCompoundSet(
 	/**
 	 * Instance of a Codon which is 3 {@link NucleotideCompound}s, its
 	 * corresponding {@link AminoAcidCompound} and if it is a start or stop codon.
-	 * The object implements hashCode & equals but according to the nucleotide
-	 * compounds & not to the designation of it being a start, stop & amino
+	 * The object implements hashCode &amp; equals but according to the nucleotide
+	 * compounds &amp; not to the designation of it being a start, stop &amp; amino
 	 * acid compound
 	 *
 	 * @author ayates
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/TranscriptionEngine.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/TranscriptionEngine.java
index 162d760f05..f79bd0465e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/TranscriptionEngine.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/transcription/TranscriptionEngine.java
@@ -39,7 +39,7 @@
  * Protein sequence.
  *
  * In order to build one look at @ TranscriptionEngine.Builder} which provides
- * intelligent defaults & allows you to build an engine which is nearly the same
+ * intelligent defaults and allows you to build an engine which is nearly the same
  * as the default one but with a few changes. All of the engine is customisable.
  *
  * By default the code will attempt to:
@@ -48,7 +48,7 @@
  * <li>Trim Stops</li>
  * <li>Convert initiating codons to M</li>
  * <li>Allow for the fuzzy translation of Codons i.e. if it contains an N that
- * produces a {@link Sequence}&lt;{@link{AminoAcidCompound}&gt; with an X at
+ * produces a {@link Sequence<AminoAcidCompound>} with an X at
  * that position
  * </ul>
  *
@@ -170,7 +170,7 @@ public CompoundSet<AminoAcidCompound> getAminoAcidCompounds() {
 	}
 
 	/**
-	 * This class is the way to create a {@link TranslationEngine}.
+	 * This class is the way to create a {@link TranscriptionEngine}.
 	 */
 	public static class Builder {
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
index 00cb2c923f..0b132b180e 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FileDownloadUtils.java
@@ -336,8 +336,8 @@ public static boolean ping(String url, int timeout) {
 	 * </code>
 	 * <p>
 	 *
-	 * <bold>NB. User should execute connect() method before getting input
-	 * stream.</bold>
+	 * <strong>NB. User should execute connect() method before getting input
+	 * stream.</strong>
 	 * @return
 	 * @throws IOException
 	 * @author Jacek Grzebyta
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
index 110c355b4a..5df00ea661 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/FlatFileCache.java
@@ -123,7 +123,7 @@ public  static InputStream getInputStream(String key){
 
 	/**
 	 * Returns the number of items in the cache.
-	 * If the cache is {@}, returns -1
+	 * If the cache is empty, returns -1
 	 * @return
 	 */
 	public static int size() {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
index c7b27cc752..1ddadf695c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/StringManipulationHelper.java
@@ -77,7 +77,7 @@ private StringManipulationHelper() {
 	 * <li> Any IOException reading the stream is 'squashed' and not made
 	 *   available to caller
 	 * <li> An additional newline is appended at the end of the string.
-	 * <ul>
+	 * </ul>
 	 * @author andreas
 	 * @param stream
 	 * @return a possibly empty but non-null String
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
index 64aee3849a..9b895ef492 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/XMLHelper.java
@@ -164,7 +164,7 @@ public static Element selectParentElement(Element element, String parentName) {
 	/**
 	 * If {@code}xpathExpression{@code} is a plain string with no '/' characterr, this is 
 	 * interpreted as a child element name to search for. 
-	 * <b/>
+	 * <p>
 	 * If {@code}xpathExpression{@code} is an XPath expression, this is evaluated and is assumed
 	 * to identify a single element.
 	 * @param element
diff --git a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/loader/SimpleGenbankProxySequenceReaderTest.java b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/loader/SimpleGenbankProxySequenceReaderTest.java
index 4150e90ffc..072e25a1e4 100644
--- a/biojava-core/src/test/java/org/biojava/nbio/core/sequence/loader/SimpleGenbankProxySequenceReaderTest.java
+++ b/biojava-core/src/test/java/org/biojava/nbio/core/sequence/loader/SimpleGenbankProxySequenceReaderTest.java
@@ -34,7 +34,6 @@
  *
  * @author Jacek Grzebyta
  * @author Paolo Pavan
- * @see InfoTask
  */
 public class SimpleGenbankProxySequenceReaderTest {
 

From 71fe179011fbd17a04876da57a4e4f49f0845338 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 3 Jan 2025 15:30:12 -0800
Subject: [PATCH 520/599] Javadoc fix: all error in alignment module

---
 .../biojava/nbio/alignment/Alignments.java    | 26 +++++++-------
 .../alignment/FractionalIdentityScorer.java   |  2 +-
 .../alignment/FractionalSimilarityScorer.java |  2 +-
 .../SimpleProfileProfileAligner.java          |  2 +-
 .../alignment/io/StockholmFileAnnotation.java |  2 +-
 .../nbio/alignment/io/StockholmStructure.java | 11 ++++--
 .../AnchoredPairwiseSequenceAligner.java      |  4 +--
 .../alignment/routines/GuanUberbacher.java    |  2 +-
 .../template/AbstractMatrixAligner.java       |  2 +-
 .../AbstractPairwiseSequenceAligner.java      |  2 +-
 .../AbstractProfileProfileAligner.java        |  2 +-
 .../nbio/alignment/template/Aligner.java      |  2 +-
 .../CallablePairwiseSequenceAligner.java      |  2 +-
 .../CallableProfileProfileAligner.java        |  4 +--
 .../alignment/template/MatrixAligner.java     |  4 +--
 .../template/PairInProfileScorer.java         |  2 +-
 .../template/PairwiseSequenceAligner.java     |  2 +-
 .../alignment/template/PartitionRefiner.java  |  6 ++--
 .../template/ProfileProfileAligner.java       |  6 ++--
 .../template/ProfileProfileScorer.java        |  2 +-
 .../alignment/template/RescoreRefiner.java    |  6 ++--
 .../org/biojava/nbio/phylo/Comparison.java    |  4 +--
 .../nbio/phylo/DistanceMatrixCalculator.java  | 36 +++++++++----------
 23 files changed, 69 insertions(+), 64 deletions(-)

diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/Alignments.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/Alignments.java
index 6cc2eb3f35..b389504826 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/Alignments.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/Alignments.java
@@ -122,7 +122,7 @@ private Alignments() { }
 	 * {@link ConcurrencyTools} utility.
 	 *
 	 * @param <S> each {@link Sequence} of an alignment pair is of type S
-	 * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+	 * @param <C> each element of a sequence is a {@link Compound} of type C
 	 * @param sequences the {@link List} of {@link Sequence}s to align
 	 * @param type chosen type from list of pairwise sequence alignment routines
 	 * @param gapPenalty the gap penalties used during alignment
@@ -203,7 +203,7 @@ public static <S extends Sequence<C>, C extends Compound> Profile<S, C> getMulti
 	 * Factory method which computes a sequence alignment for the given {@link Sequence} pair.
 	 *
 	 * @param <S> each {@link Sequence} of the pair is of type S
-	 * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+	 * @param <C> each element of a sequence is a {@link Compound} of type C
 	 * @param query the first {@link Sequence}s to align
 	 * @param target the second {@link Sequence}s to align
 	 * @param type chosen type from list of pairwise sequence alignment routines
@@ -223,7 +223,7 @@ public static <S extends Sequence<C>, C extends Compound> SequencePair<S, C> get
 	 * Factory method which sets up a sequence alignment for all {@link Sequence} pairs in the given {@link List}.
 	 *
 	 * @param <S> each {@link Sequence} of an alignment pair is of type S
-	 * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+	 * @param <C> each element of a sequence is a {@link Compound} of type C
 	 * @param sequences the {@link List} of {@link Sequence}s to align
 	 * @param type chosen type from list of pairwise sequence alignment routines
 	 * @param gapPenalty the gap penalties used during alignment
@@ -309,7 +309,7 @@ static <E> List<E> getListFromFutures(List<Future<E>> futures) {
 	 * Factory method which constructs a pairwise sequence aligner.
 	 *
 	 * @param <S> each {@link Sequence} of an alignment pair is of type S
-	 * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+	 * @param <C> each element of a sequence is a {@link Compound} of type C
 	 * @param query the first {@link Sequence} to align
 	 * @param target the second {@link Sequence} to align
 	 * @param type chosen type from list of pairwise sequence alignment routines
@@ -399,7 +399,7 @@ static <S extends Sequence<C>, C extends Compound> PairwiseSequenceScorer<S, C>
 	 * Factory method which constructs a profile-profile aligner.
 	 *
 	 * @param <S> each {@link Sequence} of an alignment profile is of type S
-	 * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+	 * @param <C> each element of a sequence is a {@link Compound} of type C
 	 * @param profile1 the first {@link Profile} to align
 	 * @param profile2 the second {@link Profile} to align
 	 * @param type chosen type from list of profile-profile alignment routines
@@ -429,7 +429,7 @@ static <S extends Sequence<C>, C extends Compound> ProfileProfileAligner<S, C> g
 	 * Factory method which constructs a profile-profile aligner.
 	 *
 	 * @param <S> each {@link Sequence} of an alignment profile is of type S
-	 * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+	 * @param <C> each element of a sequence is a {@link Compound} of type C
 	 * @param profile1 the first {@link Profile} to align
 	 * @param profile2 the second {@link Profile} to align
 	 * @param type chosen type from list of profile-profile alignment routines
@@ -459,7 +459,7 @@ static <S extends Sequence<C>, C extends Compound> ProfileProfileAligner<S, C> g
 	 * Factory method which constructs a profile-profile aligner.
 	 *
 	 * @param <S> each {@link Sequence} of an alignment profile is of type S
-	 * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+	 * @param <C> each element of a sequence is a {@link Compound} of type C
 	 * @param profile1 the first {@link Profile} to align
 	 * @param profile2 the second {@link Profile} to align
 	 * @param type chosen type from list of profile-profile alignment routines
@@ -489,7 +489,7 @@ static <S extends Sequence<C>, C extends Compound> ProfileProfileAligner<S, C> g
 	 * Factory method which constructs a profile-profile aligner.
 	 *
 	 * @param <S> each {@link Sequence} of an alignment profile is of type S
-	 * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+	 * @param <C> each element of a sequence is a {@link Compound} of type C
 	 * @param profile1 the first {@link Profile} to align
 	 * @param profile2 the second {@link Profile} to align
 	 * @param type chosen type from list of profile-profile alignment routines
@@ -519,7 +519,7 @@ static <S extends Sequence<C>, C extends Compound> ProfileProfileAligner<S, C> g
 	 * Factory method which computes a profile alignment for the given {@link Profile} pair.
 	 *
 	 * @param <S> each {@link Sequence} of the {@link Profile} pair is of type S
-	 * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+	 * @param <C> each element of a sequence is a {@link Compound} of type C
 	 * @param profile1 the first {@link Profile} to align
 	 * @param profile2 the second {@link Profile} to align
 	 * @param type chosen type from list of profile-profile alignment routines
@@ -539,7 +539,7 @@ static <S extends Sequence<C>, C extends Compound> ProfilePair<S, C> getProfileP
 	 * of the {@link ConcurrencyTools} utility.
 	 *
 	 * @param <S> each {@link Sequence} of the {@link Profile} pair is of type S
-	 * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+	 * @param <C> each element of a sequence is a {@link Compound} of type C
 	 * @param tree guide tree to follow aligning profiles from leaves to root
 	 * @param type chosen type from list of profile-profile alignment routines
 	 * @param gapPenalty the gap penalties used during alignment
@@ -592,7 +592,7 @@ public static <S extends Sequence<C>, C extends Compound> Profile<S, C> getProgr
 	 * submitting all of the alignment tasks to the shared thread pool of the {@link ConcurrencyTools} utility.
 	 *
 	 * @param <S> each {@link Sequence} of an alignment pair is of type S
-	 * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+	 * @param <C> each element of a sequence is a {@link Compound} of type C
 	 * @param aligners list of alignments to run
 	 * @return list of {@link SequencePair} results from running alignments
 	 */
@@ -612,7 +612,7 @@ public static <S extends Sequence<C>, C extends Compound> Profile<S, C> getProgr
 	 * all of the scoring tasks to the shared thread pool of the {@link ConcurrencyTools} utility.
 	 *
 	 * @param <S> each {@link Sequence} of an alignment pair is of type S
-	 * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+	 * @param <C> each element of a sequence is a {@link Compound} of type C
 	 * @param scorers list of scorers to run
 	 * @return list of score results from running scorers
 	 */
@@ -637,7 +637,7 @@ public static <S extends Sequence<C>, C extends Compound> double[] runPairwiseSc
 	 * submitting all of the alignment tasks to the shared thread pool of the {@link ConcurrencyTools} utility.
 	 *
 	 * @param <S> each {@link Sequence} of the {@link Profile} pair is of type S
-	 * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+	 * @param <C> each element of a sequence is a {@link Compound} of type C
 	 * @param aligners list of alignments to run
 	 * @return list of {@link ProfilePair} results from running alignments
 	 */
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/FractionalIdentityScorer.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/FractionalIdentityScorer.java
index 4b494db779..d66105681d 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/FractionalIdentityScorer.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/FractionalIdentityScorer.java
@@ -34,7 +34,7 @@
  *
  * @author Mark Chapman
  * @param <S> each {@link Sequence} of the alignment pair is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public class FractionalIdentityScorer<S extends Sequence<C>, C extends Compound> extends AbstractScorer
 		implements PairwiseSequenceScorer<S, C> {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/FractionalSimilarityScorer.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/FractionalSimilarityScorer.java
index 05911367f8..e9581f1f96 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/FractionalSimilarityScorer.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/FractionalSimilarityScorer.java
@@ -34,7 +34,7 @@
  *
  * @author Mark Chapman
  * @param <S> each {@link Sequence} of the alignment pair is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public class FractionalSimilarityScorer<S extends Sequence<C>, C extends Compound> extends AbstractScorer
 		implements PairwiseSequenceScorer<S, C> {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/SimpleProfileProfileAligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/SimpleProfileProfileAligner.java
index 47fb7976e0..ff94041bb8 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/SimpleProfileProfileAligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/SimpleProfileProfileAligner.java
@@ -41,7 +41,7 @@
  *
  * @author Mark Chapman
  * @param <S> each {@link Sequence} in the pair of alignment {@link Profile}s is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public class SimpleProfileProfileAligner<S extends Sequence<C>, C extends Compound>
 		extends AbstractProfileProfileAligner<S, C> {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileAnnotation.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileAnnotation.java
index f0ca2bfa23..5b7ff9899b 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileAnnotation.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmFileAnnotation.java
@@ -160,7 +160,7 @@ public void setDbReferences(Set<DatabaseReference> dbReferences) {
 		this.dbReferences = dbReferences;
 	}
 	/**
-	 * @param dbReference the string without the initial annotation identifier ( #=GS DR )
+	 * @param dbReferenceRepresentingString the string without the initial annotation identifier ( #=GS DR )
 	 */
 	public void addDBReference(String dbReferenceRepresentingString) {
 		if (this.dbReferences == null) {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
index d95a2bfa97..a70e751df5 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/io/StockholmStructure.java
@@ -38,7 +38,8 @@
  * In general, Stockholm File contains the alignment mark-up lines.<br>
  * <br>
  *
- * <Table border="1" align="center">
+ * <table>
+ * <caption></caption>
  * <tr>
  * <td><b>Header Section</b></td>
  * </tr>
@@ -56,18 +57,24 @@
  * Sequence letters may include any characters except whitespace. Gaps may be indicated by "." or "-".<br>
  * Mark-up lines may include any characters except whitespace. Use underscore ("_") instead of space.<br>
  *
- * <Table border="1">
+ * <table>
+ * <caption></caption>
+ * <tr>
  * <th>section field</th>
  * <th>preferred location</th>
+ * </tr>
  * <tr>
  * <td>#=GF &lt;feature&gt; &lt;Generic per-File annotation, free text&gt;</td>
  * <td>Above the alignment</td>
+ * </tr>
  * <tr>
  * <td>#=GC &lt;feature&gt; &lt;Generic per-Column annotation, exactly 1 char per column&gt;</td>
  * <td>Below the alignment</td>
+ * </tr>
  * <tr>
  * <td>#=GS &lt;seqname&gt; &lt;feature&gt; &lt;Generic per-Sequence annotation, free text&gt;</td>
  * <td>Above the alignment or just below the corresponding sequence</td>
+ * </tr>
  * <tr>
  * <td>#=GR &lt;seqname&gt; &lt;feature&gt; &lt;Generic per-Residue annotation, exactly 1 char per residue&gt;</td>
  * <td>Just below the corresponding sequence</td>
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AnchoredPairwiseSequenceAligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AnchoredPairwiseSequenceAligner.java
index 95d5264f1e..8533ecc91e 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AnchoredPairwiseSequenceAligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/AnchoredPairwiseSequenceAligner.java
@@ -42,7 +42,7 @@
  * will connect the query sequence to the target sequence at the <em>anchors</em>.  This class performs such global
  * sequence comparisons efficiently by dynamic programming with a space requirement reduced from quadratic (a multiple
  * of query sequence length times target sequence length) to only linear (a multiple of query sequence length).  The
- * counterpoint to this reduction in space complexity is a modest (a multiple < 2) increase in time.
+ * counterpoint to this reduction in space complexity is a modest (a multiple &lt; 2) increase in time.
  *
  * @author Mark Chapman
  * @author Daniel Cameron
@@ -67,7 +67,6 @@ public AnchoredPairwiseSequenceAligner() {
 	 * @param target the second {@link Sequence} of the pair to align
 	 * @param gapPenalty the gap penalties used during alignment
 	 * @param subMatrix the set of substitution scores used during alignment
-	 * @param cutsPerSection the number of cuts added to each section during each pass
 	 */
 	public AnchoredPairwiseSequenceAligner(S query, S target, GapPenalty gapPenalty, SubstitutionMatrix<C> subMatrix) {
 		this(query, target, gapPenalty, subMatrix, null);
@@ -80,7 +79,6 @@ public AnchoredPairwiseSequenceAligner(S query, S target, GapPenalty gapPenalty,
 	 * @param target the second {@link Sequence} of the pair to align
 	 * @param gapPenalty the gap penalties used during alignment
 	 * @param subMatrix the set of substitution scores used during alignment
-	 * @param cutsPerSection the number of cuts added to each section during each pass
 	 * @param anchors the initial list of anchors
 	 */
 	public AnchoredPairwiseSequenceAligner(S query, S target, GapPenalty gapPenalty, SubstitutionMatrix<C> subMatrix, int[] anchors) {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/GuanUberbacher.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/GuanUberbacher.java
index 3ff44d8a8c..7e2d739db9 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/GuanUberbacher.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/routines/GuanUberbacher.java
@@ -34,7 +34,7 @@
  * {@link Compound} of each {@link Sequence}).  This class performs such global sequence comparisons efficiently by
  * dynamic programming with a space requirement reduced from quadratic (a multiple of query sequence length times
  * target sequence length) to only linear (a multiple of query sequence length).  The counterpoint to this reduction in
- * space complexity is a modest (a multiple < 2) increase in time.
+ * space complexity is a modest (a multiple &lt; 2) increase in time.
  *
  * @author Mark Chapman
  * @param <S> each {@link Sequence} of the alignment pair is of type S
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractMatrixAligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractMatrixAligner.java
index 19fcc9c98f..1ea2e0de81 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractMatrixAligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractMatrixAligner.java
@@ -46,7 +46,7 @@
  * @author Mark Chapman
  * @author Daniel Cameron
  * @param <S> each element of the alignment {@link Profile} is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public abstract class AbstractMatrixAligner<S extends Sequence<C>, C extends Compound> extends AbstractScorer
 		implements MatrixAligner<S, C> {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractPairwiseSequenceAligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractPairwiseSequenceAligner.java
index 8c86470608..699ff77d36 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractPairwiseSequenceAligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractPairwiseSequenceAligner.java
@@ -37,7 +37,7 @@
  *
  * @author Mark Chapman
  * @param <S> each {@link Sequence} of the alignment pair is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public abstract class AbstractPairwiseSequenceAligner<S extends Sequence<C>, C extends Compound>
 		extends AbstractMatrixAligner<S, C> implements PairwiseSequenceAligner<S, C> {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractProfileProfileAligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractProfileProfileAligner.java
index 01cba48463..140627de9c 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractProfileProfileAligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/AbstractProfileProfileAligner.java
@@ -43,7 +43,7 @@
  *
  * @author Mark Chapman
  * @param <S> each {@link Sequence} in the pair of alignment {@link Profile}s is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public abstract class AbstractProfileProfileAligner<S extends Sequence<C>, C extends Compound>
 		extends AbstractMatrixAligner<S, C> implements ProfileProfileAligner<S, C> {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/Aligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/Aligner.java
index 75ec8b4df8..76e735c031 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/Aligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/Aligner.java
@@ -32,7 +32,7 @@
  *
  * @author Mark Chapman
  * @param <S> each element of the alignment {@link Profile} is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public interface Aligner<S extends Sequence<C>, C extends Compound> extends Scorer {
 
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/CallablePairwiseSequenceAligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/CallablePairwiseSequenceAligner.java
index e1c4616620..7201513800 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/CallablePairwiseSequenceAligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/CallablePairwiseSequenceAligner.java
@@ -34,7 +34,7 @@
  *
  * @author Mark Chapman
  * @param <S> each {@link Sequence} of the alignment pair is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public class CallablePairwiseSequenceAligner<S extends Sequence<C>, C extends Compound>
 		implements Callable<SequencePair<S, C>> {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/CallableProfileProfileAligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/CallableProfileProfileAligner.java
index 063426a91a..042138f144 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/CallableProfileProfileAligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/CallableProfileProfileAligner.java
@@ -33,8 +33,8 @@
  * Implements a concurrency wrapper for a {@link ProfileProfileAligner}.
  *
  * @author Mark Chapman
- * @param <S> each {@link Sequence} of the {@link Profile} pair is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <S> each {@link Sequence} of the profile pair is of type S
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public class CallableProfileProfileAligner<S extends Sequence<C>, C extends Compound>
 		implements Callable<ProfilePair<S, C>> {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/MatrixAligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/MatrixAligner.java
index 87f9f504ce..dd8e38ceeb 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/MatrixAligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/MatrixAligner.java
@@ -30,8 +30,8 @@
  * Defines an {@link Aligner} which builds a score matrix during computation.
  *
  * @author Mark Chapman
- * @param <S> each element of the alignment {@link Profile} is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <S> each element of the alignment profile is of type S
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public interface MatrixAligner<S extends Sequence<C>, C extends Compound> extends Aligner<S, C> {
 
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/PairInProfileScorer.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/PairInProfileScorer.java
index 094a18bead..4166bcfef4 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/PairInProfileScorer.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/PairInProfileScorer.java
@@ -32,7 +32,7 @@
  *
  * @author Mark Chapman
  * @param <S> each {@link Sequence} of the alignment pair is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public interface PairInProfileScorer<S extends Sequence<C>, C extends Compound> extends PairwiseSequenceScorer<S, C> {
 
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/PairwiseSequenceAligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/PairwiseSequenceAligner.java
index 696ff6ecd8..960c3a527b 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/PairwiseSequenceAligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/PairwiseSequenceAligner.java
@@ -32,7 +32,7 @@
  *
  * @author Mark Chapman
  * @param <S> each {@link Sequence} of the alignment pair is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public interface PairwiseSequenceAligner<S extends Sequence<C>, C extends Compound> extends Aligner<S, C>,
 		PairwiseSequenceScorer<S, C> {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/PartitionRefiner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/PartitionRefiner.java
index 573944b413..124f2ff132 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/PartitionRefiner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/PartitionRefiner.java
@@ -28,11 +28,11 @@
 import org.biojava.nbio.core.sequence.template.Sequence;
 
 /**
- * Defines an algorithm which computes a new alignment {@link Profile} by splitting a current alignment and realigning.
+ * Defines an algorithm which computes a new alignment profile by splitting a current alignment and realigning.
  *
  * @author Mark Chapman
- * @param <S> each element of the alignment {@link Profile} is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <S> each element of the alignment profile is of type S
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public interface PartitionRefiner<S extends Sequence<C>, C extends Compound> extends Aligner<S, C>,
 		ProfileProfileScorer<S, C> {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/ProfileProfileAligner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/ProfileProfileAligner.java
index 6df23e0909..1e6fe7cccf 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/ProfileProfileAligner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/ProfileProfileAligner.java
@@ -28,11 +28,11 @@
 import org.biojava.nbio.core.sequence.template.Sequence;
 
 /**
- * Defines an {@link Aligner} for a pair of {@link Profile}s.
+ * Defines an {@link Aligner} for a pair of profiles.
  *
  * @author Mark Chapman
- * @param <S> each {@link Sequence} in the pair of alignment {@link Profile}s is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <S> each {@link Sequence} in the pair of alignment profiles is of type S
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public interface ProfileProfileAligner<S extends Sequence<C>, C extends Compound> extends Aligner<S, C>,
 		ProfileProfileScorer<S, C> {
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/ProfileProfileScorer.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/ProfileProfileScorer.java
index 1d114841ee..c525b9c75a 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/ProfileProfileScorer.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/ProfileProfileScorer.java
@@ -32,7 +32,7 @@
  *
  * @author Mark Chapman
  * @param <S> each {@link Sequence} in the pair of alignment {@link Profile}s is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public interface ProfileProfileScorer<S extends Sequence<C>, C extends Compound> extends Scorer {
 
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/RescoreRefiner.java b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/RescoreRefiner.java
index dba02a028c..f93c000380 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/RescoreRefiner.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/alignment/template/RescoreRefiner.java
@@ -29,12 +29,12 @@
 import org.biojava.nbio.core.sequence.template.Sequence;
 
 /**
- * Defines an algorithm which computes a new alignment {@link Profile} by rescoring all pairs in an alignment and
+ * Defines an algorithm which computes a new alignment profile by rescoring all pairs in an alignment and
  * realigning.
  *
  * @author Mark Chapman
- * @param <S> each element of the alignment {@link Profile} is of type S
- * @param <C> each element of an {@link AlignedSequence} is a {@link Compound} of type C
+ * @param <S> each element of the alignment profile is of type S
+ * @param <C> each element of a sequence is a {@link Compound} of type C
  */
 public interface RescoreRefiner<S extends Sequence<C>, C extends Compound> extends Aligner<S, C> {
 
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/phylo/Comparison.java b/biojava-alignment/src/main/java/org/biojava/nbio/phylo/Comparison.java
index dc8ead79a7..9cae7734cb 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/phylo/Comparison.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/phylo/Comparison.java
@@ -38,9 +38,9 @@ public class Comparison {
 	/**
 	 * this is a gapped PID calculation
 	 *
-	 * @param s1
+	 * @param seq1
 	 *            SequenceI
-	 * @param s2
+	 * @param seq2
 	 *            SequenceI
 	 * @return float
 	 */
diff --git a/biojava-alignment/src/main/java/org/biojava/nbio/phylo/DistanceMatrixCalculator.java b/biojava-alignment/src/main/java/org/biojava/nbio/phylo/DistanceMatrixCalculator.java
index d0464bae8b..922f301a8c 100644
--- a/biojava-alignment/src/main/java/org/biojava/nbio/phylo/DistanceMatrixCalculator.java
+++ b/biojava-alignment/src/main/java/org/biojava/nbio/phylo/DistanceMatrixCalculator.java
@@ -54,9 +54,9 @@ private DistanceMatrixCalculator() {}
 	 * that differ between two aligned sequences. The percentage of identity
 	 * (PID) is the fraction of identical sites between two aligned sequences.
 	 *
-	 * <pre>
+	 * <code>
 	 * D = 1 - PID
-	 * </pre>
+	 * </code>
 	 *
 	 * The gapped positons in the alignment are ignored in the calculation. This
 	 * method is a wrapper to the forester implementation of the calculation:
@@ -65,7 +65,7 @@ private DistanceMatrixCalculator() {}
 	 * @param msa
 	 *            MultipleSequenceAlignment
 	 * @return DistanceMatrix
-	 * @throws Exception
+	 * @throws IOException
 	 */
 	public static <C extends Sequence<D>, D extends Compound> DistanceMatrix fractionalDissimilarity(
 			MultipleSequenceAlignment<C, D> msa) throws IOException {
@@ -81,9 +81,9 @@ public static <C extends Sequence<D>, D extends Compound> DistanceMatrix fractio
 	 * The Poisson (correction) evolutionary distance (d) is a function of the
 	 * fractional dissimilarity (D), given by:
 	 *
-	 * <pre>
+	 * <code>
 	 * d = -log(1 - D)
-	 * </pre>
+	 * </code>
 	 *
 	 * The gapped positons in the alignment are ignored in the calculation. This
 	 * method is a wrapper to the forester implementation of the calculation:
@@ -109,14 +109,14 @@ public static <C extends Sequence<D>, D extends Compound> DistanceMatrix poisson
 	 * dissimilarity (D) specially needed for large evolutionary distances. It
 	 * is given by:
 	 *
-	 * <pre>
+	 * <code>
 	 * d = -log(1 - D - 0.2 * D<sup>2</sup>)
-	 * </pre>
+	 * </code>
 	 *
 	 * The equation is derived by fitting the relationship between the
 	 * evolutionary distance (d) and the fractional dissimilarity (D) according
 	 * to the PAM model of evolution (it is an empirical approximation for the
-	 * method {@link #pamDistance(MultipleSequenceAlignment}). The gapped
+	 * method {@link #pamMLdistance(MultipleSequenceAlignment)}). The gapped
 	 * positons in the alignment are ignored in the calculation. This method is
 	 * a wrapper to the forester implementation of the calculation:
 	 * {@link PairwiseDistanceCalculator#calcKimuraDistances(Msa)}.
@@ -190,9 +190,9 @@ public static <C extends Sequence<D>, D extends Compound> DistanceMatrix percent
 	 * The fractional dissimilarity score (Ds) is a relative measure of the
 	 * dissimilarity between two aligned sequences. It is calculated as:
 	 *
-	 * <pre>
+	 * <code>
 	 * Ds = sum( max(M) - M<sub>ai,bi</sub> ) / (max(M)-min(M)) ) / L
-	 * </pre>
+	 * </code>
 	 *
 	 * Where the sum through i runs for all the alignment positions, ai and bi
 	 * are the AA at position i in the first and second aligned sequences,
@@ -270,9 +270,9 @@ public static <C extends Sequence<D>, D extends Compound> DistanceMatrix fractio
 	 * maximum similarity score between self-alignments (each sequence against
 	 * itself). Calculation of the score is as follows:
 	 *
-	 * <pre>
+	 * <code>
 	 * Ds = maxScore - sum<sub>i</sub>(M<sub>ai,bi</sub>)
-	 * </pre>
+	 * </code>
 	 *
 	 * It is recommended to use the method
 	 * {@link #fractionalDissimilarityScore(MultipleSequenceAlignment, SubstitutionMatrix)}
@@ -362,9 +362,9 @@ public static <C extends Sequence<D>, D extends Compound> DistanceMatrix dissimi
 	 * substitution rate of 1% per site. The fractional dissimilarity (D) of two
 	 * aligned sequences is related with the PAM distance (d) by the equation:
 	 *
-	 * <pre>
+	 * <code>
 	 * D = sum(fi * (1 - M<sub>ii</sub><sup>d</sup>))
-	 * </pre>
+	 * </code>
 	 *
 	 * Where the sum is for all 20 AA, fi denotes the natural fraction of the
 	 * given AA and M is the substitution matrix (in this case the PAM1 matrix).
@@ -373,9 +373,9 @@ public static <C extends Sequence<D>, D extends Compound> DistanceMatrix dissimi
 	 * likelihood (ML) approach is used, which consists in finding d that
 	 * maximazies the function:
 	 *
-	 * <pre>
+	 * <code>
 	 * L(d) = product(f<sub>ai</sub> * (1 - M<sub>ai,bi</sub><sup>d</sup>))
-	 * </pre>
+	 * </code>
 	 *
 	 * Where the product is for every position i in the alignment, and ai and bi
 	 * are the AA at position i in the first and second aligned sequences,
@@ -400,11 +400,11 @@ public static <C extends Sequence<D>, D extends Compound> DistanceMatrix pamMLdi
 	 * strutures. It is based on the diffusive model for protein fold evolution
 	 * (Grishin 1995). The structural deviations are captured as RMS deviations.
 	 *
-	 * <pre>
+	 * <code>
 	 * d<sub>Sij</sub> = (rmsd<sub>max</sub><sup>2</sup> / alpha<sup>2</sup>) *
 	 *        ln( (rmsd<sub>max</sub><sup>2</sup> - rmsd<sub>0</sub><sup>2</sup>) /
 	 *        (rmsd<sub>max</sub><sup>2</sup> - (rmsd<sub>ij</sub><sup>2</sup>) )
-	 * </pre>
+	 * </code>
 	 *
 	 * @param rmsdMat
 	 *            RMSD matrix for all structure pairs (symmetric matrix)

From ed7ab8e32d958730568898f733fccd0f0d42273d Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 3 Jan 2025 15:42:32 -0800
Subject: [PATCH 521/599] Javadoc fix: a few errors from structure module

---
 .../main/java/org/biojava/nbio/structure/BondImpl.java    | 4 ++--
 .../src/main/java/org/biojava/nbio/structure/Calc.java    | 4 ++--
 .../src/main/java/org/biojava/nbio/structure/Chain.java   | 8 +++++---
 .../org/biojava/nbio/structure/align/multiple/Block.java  | 3 +--
 .../biojava/nbio/structure/align/multiple/BlockImpl.java  | 2 --
 .../nbio/structure/align/multiple/BlockSetImpl.java       | 2 --
 .../java/org/biojava/nbio/structure/io/BondMaker.java     | 2 ++
 .../nbio/structure/io/StructureSequenceMatcher.java       | 5 ++---
 .../nbio/structure/quaternary/BioAssemblyTools.java       | 5 ++---
 .../structure/quaternary/BiologicalAssemblyBuilder.java   | 2 ++
 .../biojava/nbio/structure/symmetry/internal/CeSymm.java  | 3 +--
 11 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java
index 3c5fd7af68..78d38559f7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java
@@ -44,7 +44,7 @@ public class BondImpl implements Bond {
 	 * Note that by forming a bond between atoms 'A' and 'B' with this
 	 * constructor, atoms 'A' and 'B' will be updated to have this bond in their
 	 * list of bonds. If you do not want this automatic updating, instead use
-	 * {@link #Bond(Atom, Atom, int, boolean)} with the
+	 * {@link Bond(Atom, Atom, int, boolean)} with the
 	 * <code>addSelfToAtoms</code> flag set to <code>false</code>.
 	 *
 	 * @param atomA one of the atoms in this bond
@@ -83,7 +83,7 @@ public BondImpl(Atom atomA, Atom atomB, int bondOrder, boolean addSelfToAtoms) {
 	 * include this bond.
 	 * <p>
 	 * If you created your Bond with the constructor
-	 * {@link #Bond(Atom, Atom, int)}, this method has already been called for
+	 * {@link Bond(Atom, Atom, int)}, this method has already been called for
 	 * you and should not be called again.
 	 */
 	// TODO first check if those bonds haven't been made already
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Calc.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Calc.java
index b6fde44843..8c92f876f0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Calc.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Calc.java
@@ -327,9 +327,9 @@ public static final double getPsi(AminoAcid a, AminoAcid b)
 	}
 
 	/**
-	 * Test if two amino acids are connected, i.e. if the distance from C to N <
+	 * Test if two amino acids are connected, i.e. if the distance from C to N &lt;
 	 * 2.5 Angstrom.
-	 *
+	 * <p>
 	 * If one of the AminoAcids has an atom missing, returns false.
 	 *
 	 * @param a
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java
index 6ceba9fd61..0d067373ca 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Chain.java
@@ -199,7 +199,7 @@ public interface Chain extends Serializable {
 	 * @return the length
 	 * @see #getAtomGroup(int)
 	 * @see #getAtomGroups()
-	 * @see #getSeqResLength())
+	 * @see #getSeqResLength()
 	 */
 	int getAtomLength();
 
@@ -346,18 +346,20 @@ public interface Chain extends Serializable {
 
 	/**
 	 * Get the predominant {@link GroupType} for a given Chain, following these
-	 * rules: <li>if the ratio of number of residues of a certain
+	 * rules:
+	 * <ul>
+	 * <li>if the ratio of number of residues of a certain
 	 * {@link GroupType} to total non-water residues is above the threshold
 	 * {@value org.biojava.nbio.structure.StructureTools#RATIO_RESIDUES_TO_TOTAL}, then that {@link GroupType} is
 	 * returned</li> <li>if there is no {@link GroupType} that is above the
 	 * threshold then the {@link GroupType} with most members is chosen, logging
 	 * it</li>
+	 * </ul>
 	 * <p>
 	 * See also {@link ChemComp#getPolymerType()} and
 	 * {@link ChemComp#getResidueType()} which follow the PDB chemical component
 	 * dictionary and provide a much more accurate description of groups and
 	 * their linking.
-	 * </p>
 	 *
 	 * @return the predominant group type
 	 */
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/Block.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/Block.java
index c41e31e1c5..2bf5df80c6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/Block.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/Block.java
@@ -72,7 +72,7 @@ public interface Block extends ScoresCache {
 	 * alignRes.get(structure).get(residue) = alignRes.get(size).get(length).
 	 *
 	 * @return List a double List of aligned residues for each structure.
-	 * @see #setAlignRes()
+	 * @see #setAlignRes(List)
 	 */
 	public List<List<Integer>> getAlignRes();
 
@@ -108,7 +108,6 @@ public interface Block extends ScoresCache {
 	 * Block.
 	 *
 	 * @return int number of aligned residues.
-	 * @see #updateCoreLength()
 	 * @see #length()
 	 * @see #size()
 	 */
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockImpl.java
index becc817e85..e0423b6f8f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockImpl.java
@@ -52,7 +52,6 @@ public class BlockImpl extends AbstractScoresCache implements Serializable,
 	 *
 	 * @param blockSet
 	 *            the parent BlockSet of the BlockImpl instance.
-	 * @return BlockImpl a BlockImpl instance linked to its parent BlockSet.
 	 */
 	public BlockImpl(BlockSet blockSet) {
 
@@ -69,7 +68,6 @@ public BlockImpl(BlockSet blockSet) {
 	 *
 	 * @param b
 	 *            BlockImpl object to be copied.
-	 * @return BlockImpl an identical copy of the input BlockImpl object.
 	 */
 	public BlockImpl(BlockImpl b) {
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSetImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSetImpl.java
index 5282f83b31..cbbb3ae895 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSetImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSetImpl.java
@@ -55,7 +55,6 @@ public class BlockSetImpl extends AbstractScoresCache implements Serializable,
 	 *
 	 * @param alignment
 	 *            MultipleAlignment parent of the BlockSet.
-	 * @return BlockSet an instance linked to the parent alignment.
 	 */
 	public BlockSetImpl(MultipleAlignment alignment) {
 
@@ -76,7 +75,6 @@ public BlockSetImpl(MultipleAlignment alignment) {
 	 *
 	 * @param bs
 	 *            BlockSet object to be copied.
-	 * @return BlockSet an identical copy of the input object.
 	 */
 	public BlockSetImpl(BlockSetImpl bs) {
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
index a582f922d2..e6b8548025 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/BondMaker.java
@@ -89,6 +89,7 @@ public BondMaker(Structure structure, FileParsingParameters params) {
 
 	/**
 	 * Creates bond objects and corresponding references in Atom objects:
+	 * <ul>
 	 * <li>
 	 * peptide bonds: inferred from sequence and distances
 	 * </li>
@@ -98,6 +99,7 @@ public BondMaker(Structure structure, FileParsingParameters params) {
 	 * <li>
 	 * intra-group (residue) bonds: read from the chemical component dictionary, via {@link org.biojava.nbio.structure.chem.ChemCompProvider}
 	 * </li>
+	 * </ul>
 	 */
 	public void makeBonds() {
 		logger.debug("Going to start making bonds");
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
index fd06080118..fbc12ec9d3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
@@ -59,8 +59,7 @@ public class StructureSequenceMatcher {
 	 * @param sequence The input protein sequence
 	 * @param wholeStructure The structure from which to take a substructure
 	 * @return The resulting structure
-	 * @throws StructureException
-	 * @see {@link #matchSequenceToStructure(ProteinSequence, Structure)}
+	 * @see #matchSequenceToStructure(ProteinSequence, Structure)
 	 */
 	public static Structure getSubstructureMatchingProteinSequence(ProteinSequence sequence, Structure wholeStructure) {
 		ResidueNumber[] rns = matchSequenceToStructure(sequence, wholeStructure);
@@ -104,7 +103,7 @@ public static Structure getSubstructureMatchingProteinSequence(ProteinSequence s
 	 * @return A ProteinSequence with the full sequence of struct. Chains are
 	 *  concatenated in the same order as the input structures
 	 *
-	 * @see {@link SeqRes2AtomAligner#getFullAtomSequence(List, Map)}, which
+	 * @see SeqRes2AtomAligner#getFullAtomSequence(List, Map, boolean), which
 	 * 	does the heavy lifting.
 	 *
 	 */
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
index 95bcf1b402..7c359121de 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
@@ -262,12 +262,11 @@ public static double getBiologicalMoleculeMaximumExtend( final Structure structu
 
 	/**
 	 * Returns the centroid of the biological molecule.
-	 * @param structure
+	 * @param asymUnit
 	 * @return centroid
 	 * @throws IllegalArgumentException if structure is null
 	 */
-
-	public static double[] getBiologicalMoleculeCentroid( final Structure asymUnit,List<BiologicalAssemblyTransformation> transformations ) {
+	public static double[] getBiologicalMoleculeCentroid( final Structure asymUnit, List<BiologicalAssemblyTransformation> transformations ) {
 		if ( asymUnit == null ) {
 			throw new IllegalArgumentException( "null structure" );
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java
index f9597bbb7d..c6ec6bc8ff 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java
@@ -75,6 +75,7 @@ public BiologicalAssemblyBuilder(){
 	 * Builds a Structure object containing the quaternary structure built from given asymUnit and transformations,
 	 * by adding symmetry partners as new models.
 	 * The output Structure will be different depending on the multiModel parameter:
+	 * <ul>
 	 * <li>
 	 * the symmetry-expanded chains are added as new models, one per transformId. All original models but
 	 * the first one are discarded.
@@ -83,6 +84,7 @@ public BiologicalAssemblyBuilder(){
 	 * as original with symmetry-expanded chains added with renamed chain ids and names (in the form
 	 * originalAsymId_transformId and originalAuthId_transformId)
 	 * </li>
+	 * </ul>
 	 * @param asymUnit
 	 * @param transformations
 	 * @param useAsymIds if true use {@link Chain#getId()} to match the ids in the BiologicalAssemblyTransformation (needed if data read from mmCIF),
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java
index 43ee89c234..b8ea01d6a1 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymm.java
@@ -82,7 +82,6 @@ public class CeSymm {
 	 * <li>2.2 - run multiple symmetry levels recursively to find PG and
 	 * hierarchical symmetries.
 	 * </ul>
-	 * </li>
 	 */
 	public static final String version = "2.2";
 	public static final String algorithmName = "jCE-symm";
@@ -364,7 +363,7 @@ public static CeSymmResult analyze(Atom[] atoms) throws StructureException {
 	 *
 	 * @param atoms
 	 *            representative Atom array of the Structure
-	 * @param param
+	 * @param params
 	 *            CeSymmParameters bean
 	 * @return CeSymmResult
 	 * @throws StructureException

From 280f2398e7e287c8e3c41d3e09750fb9e0d285d8 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 3 Jan 2025 15:46:52 -0800
Subject: [PATCH 522/599] Javadoc fix: some more errors from structure module

---
 .../nbio/structure/align/ce/CeParameters.java | 19 ++++++++++++-------
 .../nbio/structure/align/multiple/Block.java  |  2 +-
 .../structure/align/multiple/BlockSet.java    |  2 +-
 .../nbio/structure/ecod/EcodInstallation.java |  4 ++--
 .../nbio/structure/geometry/CalcPoint.java    |  2 +-
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeParameters.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeParameters.java
index 106aa08090..b2e7177244 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeParameters.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeParameters.java
@@ -342,7 +342,8 @@ public void setDistanceIncrement(Double distanceIncrement)
 
 
 
-	/** Get the Original RMSD threshold from which the alignment optimization is started
+	/**
+	 * Get the Original RMSD threshold from which the alignment optimization is started
 	 *
 	 * @return oRMSDThreshold
 	 */
@@ -353,7 +354,8 @@ public Double getORmsdThr()
 
 
 
-	/** Set the Original RMSD threshold from which the alignment optimization is started
+	/**
+	 * Set the Original RMSD threshold from which the alignment optimization is started
 	 *
 	 * @param oRmsdThr the threshold
 	 */
@@ -363,16 +365,17 @@ public void setORmsdThr(Double oRmsdThr)
 	}
 
 
-	/** Get the maximum nr of times the (slow) optimiziation of alignment should iterate. Default: unlimited
+	/**
+	 * Get the maximum nr of times the (slow) optimiziation of alignment should iterate. Default: unlimited
 	 *
-	 * @param maxNrIterationsForOptimization
 	 */
 	public int getMaxNrIterationsForOptimization() {
 		return maxNrIterationsForOptimization;
 	}
 
 
-	/** Set the maximum nr of times the (slow) optimiziation of alignment should iterate. Default: unlimited
+	/**
+	 * Set the maximum nr of times the (slow) optimiziation of alignment should iterate. Default: unlimited
 	 *
 	 * @param maxNrIterationsForOptimization
 	 */
@@ -381,7 +384,8 @@ public void setMaxNrIterationsForOptimization(int maxNrIterationsForOptimization
 	}
 
 
-	/** Should sequence conservation be considered as part of the alignment? If yes, this weight factor allows to determine how much.
+	/**
+	 * Should sequence conservation be considered as part of the alignment? If yes, this weight factor allows to determine how much.
 	 *  By default this is set to 0, meaning no contribution of the sequence alignment score.
 	 *
 	 * @return seqWeight the weight factor (default 0)
@@ -392,7 +396,8 @@ public double getSeqWeight() {
 	}
 
 
-	/** Should sequence conservation be considered as part of the alignment? If yes, this weight factor allows to determine how much.
+	/**
+	 * Should sequence conservation be considered as part of the alignment? If yes, this weight factor allows to determine how much.
 	 *  By default this is set to 0, meaning no contribution of the sequence alignment score.
 	 *
 	 * @param seqWeight the weight factor (default 0)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/Block.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/Block.java
index 2bf5df80c6..802d016c68 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/Block.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/Block.java
@@ -89,7 +89,7 @@ public interface Block extends ScoresCache {
 	 * Returns the total number of aligned positions (columns) in the Block.
 	 *
 	 * @return int number of aligned residues.
-	 * @see #getCoreLength();
+	 * @see #getCoreLength()
 	 * @see #size()
 	 */
 	public int length();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSet.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSet.java
index 4fdf318c61..ed46d6bbe7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSet.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSet.java
@@ -111,7 +111,7 @@ public interface BlockSet extends ScoresCache {
 	 * This may trigger other properties to update which depend on the
 	 * superposition.
 	 *
-	 * @param matrices
+	 * @param transformations
 	 */
 	public void setTransformations(List<Matrix4d> transformations);
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
index 2f9d27997a..f4be5cd4f5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/ecod/EcodInstallation.java
@@ -97,7 +97,7 @@ public class EcodInstallation implements EcodDatabase {
 	 * installations at the same path can lead to race conditions when downloading
 	 * files.
 	 * @param cacheLocation Location to save files, typically from the PDB_CACHE_DIR parameter
-	 * @param requestedVersion ECOD requestedVersion to fetch
+	 * @param version ECOD requestedVersion to fetch
 	 */
 	public EcodInstallation(String cacheLocation, String version) {
 		domainsFileLock = new ReentrantReadWriteLock();
@@ -295,7 +295,7 @@ public String getUrl() {
 
 	/**
 	 * Specify a different mirror for the ECOD server.
-	 * @param urlFormat the urlFormat to set
+	 * @param url the urlFormat to set
 	 */
 	public void setUrl(String url) {
 		this.url = url;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/CalcPoint.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/CalcPoint.java
index c1cfeb73e1..b0e440af31 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/CalcPoint.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/CalcPoint.java
@@ -40,7 +40,7 @@ private CalcPoint() {
 	}
 
 	/**
-	 * Center a cloud of points. This means subtracting the {@lin
+	 * Center a cloud of points. This means subtracting the {@link
 	 * #centroid(Point3d[])} of the cloud to each point.
 	 *
 	 * @param x

From 52d10538768889d97e23e5fe245434c956723091 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 3 Jan 2025 16:11:21 -0800
Subject: [PATCH 523/599] Javadoc fix: some more errors from structure module

---
 .../org/biojava/nbio/structure/Structure.java |  6 ------
 .../align/fatcat/calc/AFPChainer.java         |  6 +++---
 .../structure/align/util/AlignmentTools.java  | 19 ++++++++++---------
 .../structure/geometry/SuperPositionQCP.java  |  6 +++---
 .../biojava/nbio/structure/jama/Matrix.java   |  2 +-
 5 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
index 5a31f407e2..8521044de7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
@@ -65,7 +65,6 @@
  *
  *
  * <hr/>
- * </hr>
  * <p>
  * Q: How can I get a Structure object from a PDB file?
  * </p>
@@ -88,7 +87,6 @@
  *  </pre>
  *
  * <hr>
- * </hr>
  * <p>
  * Q: How can I calculate Phi and Psi angles of AminoAcids?
  * </p>
@@ -157,10 +155,6 @@
  * 		}
  * </pre>
  * <hr>
- * </hr>
- *
- *
- *
  *
  * @author Andreas Prlic
  * @since 1.4
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPChainer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPChainer.java
index 1d1628b51e..1e9e1cf7d7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPChainer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/fatcat/calc/AFPChainer.java
@@ -39,17 +39,17 @@
 
 import javax.vecmath.Matrix4d;
 
-/** a class to chain AFPs to an alignment
+/**
+ * A class to chain AFPs to an alignment
  *
  * @author Andreas Prlic
- *
  */
 public class AFPChainer
 {
 	public static final boolean debug = FatCatAligner.debug;
 	// private static final boolean showAlig = false;
 
-	/**
+	/*
 	// Key function: chain (assembly) the AFPs
 	// a AFP (k) is defined as (i, j, k), with i and j are staring points
 	// AFP extension (eg. AFP(k-1) -> AFP(k) ) requiring
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java
index 82d38d010c..f43a97392f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java
@@ -72,7 +72,7 @@ public class AlignmentTools {
 	 * Since algorithms which create non-sequential alignments split the
 	 * alignment into multiple blocks, some computational time can be saved
 	 * by only checking block boundaries for sequentiality. Setting
-	 * <tt>checkWithinBlocks</tt> to <tt>true</tt> makes this function slower,
+	 * <code>checkWithinBlocks</code> to <code>true</code> makes this function slower,
 	 * but detects AFPChains with non-sequential blocks.
 	 *
 	 * Note that this method should give the same results as
@@ -209,7 +209,7 @@ public static <T> Map<T,T> applyAlignment(Map<T, T> alignmentMap, int k) {
 	 * @param <T>
 	 * @param alignmentMap The input function, as a map (see {@link AlignmentTools#alignmentAsMap(AFPChain)})
 	 * @param identity An identity-like function providing the isomorphism between
-	 *  the codomain of alignmentMap (of type <T>) and the domain (type <S>).
+	 *  the codomain of alignmentMap (of type T) and the domain (type S).
 	 * @param k The number of times to apply the alignment
 	 * @return A new alignment. If the input function is not automorphic
 	 *  (one-to-one), then some inputs may map to null, indicating that the
@@ -303,7 +303,7 @@ public static int getSymmetryOrder(Map<Integer, Integer> alignment,
 	 * identity. If <i>n</i> corresponds to the intrinsic order of the alignment,
 	 * this will be small. This algorithm tries increasing values of <i>n</i>
 	 * and looks for abrupt decreases in the root mean squared offset.
-	 * If none are found at <i>n</i><=maxSymmetry, the alignment is reported as
+	 * If none are found at <i>n</i>&lt;=maxSymmetry, the alignment is reported as
 	 * non-symmetric.
 	 *
 	 * @param alignment The alignment to test for symmetry
@@ -314,7 +314,7 @@ public static int getSymmetryOrder(Map<Integer, Integer> alignment,
 	 *  the calculation time and can lead to overfitting.
 	 * @param minimumMetricChange Percent decrease in root mean squared offsets
 	 *  in order to declare symmetry. 0.4f seems to work well for CeSymm.
-	 * @return The order of symmetry of alignment, or 1 if no order <=
+	 * @return The order of symmetry of alignment, or 1 if no order &lt;=
 	 *  maxSymmetry is found.
 	 *
 	 * @see IdentityMap For a simple identity function
@@ -472,7 +472,8 @@ public static Map<Integer, Integer> guessSequentialAlignment(
 	 * {@link AFPChain#getOptAln()}, but has the correct size().
 	 * <pre>
 	 * List<List<List<Integer>>> aln = getOptAlnAsList(AFPChain afpChain);
-	 * aln.get(blockNum).get(structureNum={0,1}).get(pos)</pre>
+	 * aln.get(blockNum).get(structureNum={0,1}).get(pos)
+	 * </pre>
 	 *
 	 * @param afpChain
 	 * @return
@@ -850,7 +851,7 @@ public static AFPChain replaceOptAln(AFPChain afpChain, Atom[] ca1, Atom[] ca2,
 	 * @param ca1
 	 * @param ca2 Second set of ca atoms. Will be modified based on the superposition
 	 * @throws StructureException
-	 * @see {@link CECalculator#calc_rmsd(Atom[], Atom[], int, boolean)}
+	 * @see CECalculator#calc_rmsd(Atom[], Atom[], int, boolean)
 	 *  contains much of the same code, but stores results in a CECalculator
 	 *  instance rather than an AFPChain
 	 */
@@ -979,12 +980,13 @@ public static Object resizeArray (Object oldArray, int newSize) {
 	 * <p>Note that more concise representations may be possible.</p>
 	 *
 	 * Examples:
+	 * <ul>
 	 * <li>1>2>3>1</li>
 	 * <li>1>2>3>2 4>3</li>
-	 *
+	 * </ul>
 	 * @param alignment The input function, as a map (see {@link AlignmentTools#alignmentAsMap(AFPChain)})
 	 * @param identity An identity-like function providing the isomorphism between
-	 *  the codomain of alignment (of type <T>) and the domain (type <S>).
+	 *  the codomain of alignment (of type T) and the domain (type S).
 	 * @return
 	 */
 	public static <S,T> String toConciseAlignmentString(Map<S,T> alignment, Map<T,S> identity) {
@@ -1197,7 +1199,6 @@ public static void alignmentToSIF(Writer out,AFPChain afpChain,
 	 * Does NOT rotate anything.
 	 * @param ca
 	 * @return a list of Chains that is built up from the Atoms in the ca array
-	 * @throws StructureException
 	 */
 	public static final List<Chain> getAlignedModel(Atom[] ca){
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
index bfb029bbe1..a36854a711 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
@@ -74,12 +74,12 @@
  * <p>
  * Citations:
  * <p>
- * Liu P, Agrafiotis DK, & Theobald DL (2011) Reply to comment on: "Fast
+ * Liu P, Agrafiotis DK, &amp; Theobald DL (2011) Reply to comment on: "Fast
  * determination of the optimal rotation matrix for macromolecular
  * superpositions." Journal of Computational Chemistry 32(1):185-186.
  * [http://dx.doi.org/10.1002/jcc.21606]
  * <p>
- * Liu P, Agrafiotis DK, & Theobald DL (2010) "Fast determination of the optimal
+ * Liu P, Agrafiotis DK, &amp; Theobald DL (2010) "Fast determination of the optimal
  * rotation matrix for macromolecular superpositions." Journal of Computational
  * Chemistry 31(7):1561-1563. [http://dx.doi.org/10.1002/jcc.21439]
  * <p>
@@ -96,7 +96,7 @@
  * <p>
  * dtheobald@brandeis.edu
  * <p>
- * Pu Liu Johnson & Johnson Pharmaceutical Research and Development, L.L.C. 665
+ * Pu Liu Johnson &amp; Johnson Pharmaceutical Research and Development, L.L.C. 665
  * Stockton Drive Exton, PA 19341 USA
  * <p>
  * pliu24@its.jnj.com
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/jama/Matrix.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/jama/Matrix.java
index 15bd130b99..2abdd1c972 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/jama/Matrix.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/jama/Matrix.java
@@ -53,7 +53,7 @@
  * 	decomposition classes.  These decompositions are accessed by the Matrix
  * 	class to compute solutions of simultaneous linear equations, determinants,
  * 	inverses and other matrix functions.  The five decompositions are:
- * <P><UL>
+ * <UL>
  * 	<LI>Cholesky Decomposition of symmetric, positive definite matrices.
  * 	<LI>LU Decomposition of rectangular matrices.
  * 	<LI>QR Decomposition of rectangular matrices.

From 5a5052428c88669d7bb31a92dcd2718c3cbb9788 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 6 Jan 2025 15:13:04 -0800
Subject: [PATCH 524/599] More lenient parsing if some fields are missing (e.g.
 in files output by Gemmi)

---
 .../nbio/structure/io/cif/CifStructureConsumerImpl.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index ca3906e4b2..b204687762 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -972,9 +972,9 @@ public void consumeStructRefSeq(StructRefSeq structRefSeq) {
 
             DBRef dbRef = new DBRef();
 
-            dbRef.setIdCode(structRefSeq.getPdbxPDBIdCode().get(rowIndex));
-            dbRef.setDbAccession(structRefSeq.getPdbxDbAccession().get(rowIndex));
-            dbRef.setDbIdCode(structRefSeq.getPdbxDbAccession().get(rowIndex));
+            dbRef.setIdCode(structRefSeq.getPdbxPDBIdCode().isDefined()? structRefSeq.getPdbxPDBIdCode().get(rowIndex):null);
+            dbRef.setDbAccession(structRefSeq.getPdbxDbAccession().isDefined()? structRefSeq.getPdbxDbAccession().get(rowIndex):null);
+            dbRef.setDbIdCode(structRefSeq.getPdbxDbAccession().isDefined()? structRefSeq.getPdbxDbAccession().get(rowIndex):null);
             dbRef.setChainName(structRefSeq.getPdbxStrandId().get(rowIndex));
 
             OptionalInt structRefRowIndex = IntStream.range(0, structRef.getRowCount())
@@ -1330,7 +1330,7 @@ private String getEntityType(String entityId) {
     private String getEntityDescription(String entityId) {
         return IntStream.range(0, entity.getRowCount())
                 .filter(i -> entity.getId().get(i).equals(entityId))
-                .mapToObj(i -> entity.getPdbxDescription().get(i))
+                .mapToObj(i -> entity.getPdbxDescription().isDefined()? entity.getPdbxDescription().get(i):"")
                 .findFirst()
                 .orElseThrow(() -> new NoSuchElementException("could not find entity with id " + entityId));
     }

From 2b33a56bd2fa555c62197ad8f81fff1f46722731 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 6 Jan 2025 15:27:11 -0800
Subject: [PATCH 525/599] Javadoc fix: many errors in struct align package

---
 .../align/multiple/MultipleAlignmentEnsemble.java      |  3 ---
 .../align/multiple/MultipleAlignmentEnsembleImpl.java  |  4 ----
 .../align/multiple/MultipleAlignmentImpl.java          |  3 ---
 .../structure/align/multiple/mc/MultipleMcMain.java    |  6 +++---
 .../align/multiple/mc/MultipleMcOptimizer.java         |  3 +--
 .../align/multiple/util/MultipleAlignmentScorer.java   |  4 ++--
 .../align/multiple/util/MultipleAlignmentTools.java    | 10 +++++-----
 .../align/multiple/util/MultipleAlignmentWriter.java   |  4 ++--
 8 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentEnsemble.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentEnsemble.java
index d6358a825d..be1c46631c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentEnsemble.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentEnsemble.java
@@ -147,7 +147,6 @@ public interface MultipleAlignmentEnsemble extends ScoresCache {
 	 * structure.
 	 *
 	 * @return List of Matrix interatomic distance matrices.
-	 * @see #updateDistanceMatrix()
 	 */
 	public List<Matrix> getDistanceMatrix();
 
@@ -155,7 +154,6 @@ public interface MultipleAlignmentEnsemble extends ScoresCache {
 	 * Returns the List of MultipleAlignments in the ensemble.
 	 *
 	 * @return List of MultipleAlignment in the ensemble.
-	 * @see #setMultipleAlignments()
 	 */
 	public List<MultipleAlignment> getMultipleAlignments();
 
@@ -165,7 +163,6 @@ public interface MultipleAlignmentEnsemble extends ScoresCache {
 	 * accessing an index of a List
 	 *
 	 * @return MultipleAlignment at the index in the ensemble.
-	 * @see #setMultipleAlignments()
 	 */
 	public MultipleAlignment getMultipleAlignment(int index);
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentEnsembleImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentEnsembleImpl.java
index a6df171705..0f0b442a63 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentEnsembleImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentEnsembleImpl.java
@@ -67,7 +67,6 @@ public class MultipleAlignmentEnsembleImpl extends AbstractScoresCache
 	/**
 	 * Default Constructor. Empty ensemble, no structures assigned.
 	 *
-	 * @return MultipleAlignmentEnsemble an empty ensemble instance.
 	 */
 	public MultipleAlignmentEnsembleImpl() {
 
@@ -88,7 +87,6 @@ public MultipleAlignmentEnsembleImpl() {
 	 * @param structureIdentifiers
 	 *            List of Structure names, that can be parsed by
 	 *            {@link AtomCache}.
-	 * @return MultipleAlignmentEnsemble an ensemble with the structures.
 	 */
 	public MultipleAlignmentEnsembleImpl(
 			List<StructureIdentifier> structureIdentifiers) {
@@ -102,7 +100,6 @@ public MultipleAlignmentEnsembleImpl(
 	 *
 	 * @param e
 	 *            MultipleAlignmentEnsemble to copy.
-	 * @return MultipleAlignmentEnsemble identical copy of the input ensemble.
 	 */
 	public MultipleAlignmentEnsembleImpl(MultipleAlignmentEnsembleImpl e) {
 
@@ -153,7 +150,6 @@ public MultipleAlignmentEnsembleImpl(MultipleAlignmentEnsembleImpl e) {
 	 *            Atoms of the second structure
 	 * @param flexible
 	 *            true if the alignment is flexible (use BlockSets)
-	 * @return MultipleAlignmentEnsemble an ensemble
 	 */
 	public MultipleAlignmentEnsembleImpl(AFPChain afp, Atom[] ca1, Atom[] ca2,
 			boolean flexible) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
index 7f55f1c2f0..f858f3082e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
@@ -53,7 +53,6 @@ public class MultipleAlignmentImpl extends AbstractScoresCache implements
 	/**
 	 * Default Constructor. Empty alignment. No structures assigned.
 	 *
-	 * @return MultipleAlignment an empty MultipleAlignment instance.
 	 */
 	public MultipleAlignmentImpl() {
 		this(new MultipleAlignmentEnsembleImpl()); // assign an empty ensemble.
@@ -65,7 +64,6 @@ public MultipleAlignmentImpl() {
 	 *
 	 * @param ensemble
 	 *            parent MultipleAlignmentEnsemble.
-	 * @return MultipleAlignment an alignment instance part of an ensemble.
 	 */
 	public MultipleAlignmentImpl(MultipleAlignmentEnsemble ensemble) {
 
@@ -87,7 +85,6 @@ public MultipleAlignmentImpl(MultipleAlignmentEnsemble ensemble) {
 	 *
 	 * @param ma
 	 *            MultipleAlignmentImpl to copy.
-	 * @return MultipleAlignmentImpl identical copy of the alignment.
 	 */
 	public MultipleAlignmentImpl(MultipleAlignmentImpl ma) {
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcMain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcMain.java
index 702ed1d6a5..e68cbe384e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcMain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcMain.java
@@ -91,7 +91,7 @@ public class MultipleMcMain implements MultipleStructureAligner {
 	/**
 	 * Default constructor.
 	 * Default parameters are used.
-	 * @param pairwise the pairwise structure alignment used to generate the
+	 * @param pairwiseAlgo the pairwise structure alignment used to generate the
 	 * 			multiple alignment seed.
 	 */
 	public MultipleMcMain(StructureAlignment pairwiseAlgo){
@@ -177,7 +177,7 @@ private MultipleAlignment generateSeed(List<Atom[]> atomArrays)
 	 * lowest average RMSD against all others.
 	 * The index of this structure is returned.
 	 *
-	 * @param alignments List double containing all-to-all pairwise alignments
+	 * @param afpAlignments List double containing all-to-all pairwise alignments
 	 * @return int reference index
 	 */
 	private static int chooseReferenceRMSD(List<List<AFPChain>> afpAlignments){
@@ -209,7 +209,7 @@ private static int chooseReferenceRMSD(List<List<AFPChain>> afpAlignments){
 	 * It uses the blocks in AFPChain as {@link Block}s in the
 	 * MultipleAlignment, so considers non-topological
 	 * alignments, if the alignment is rigid. If the alignment is flexible,
-	 * it considers the blocks as {@link BlockSets}.
+	 * it considers the blocks as {@link BlockSet}s.
 	 *
 	 * @param afpList the list of pairwise alignments to the reference
 	 * @param atomArrays List of Atoms of the structures
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java
index 664f251899..052f147fc6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java
@@ -108,7 +108,6 @@ public class MultipleMcOptimizer implements Callable<MultipleAlignment> {
 	 *            the parameter beam
 	 * @param reference
 	 *            the index of the most similar structure to all others
-	 * @throws StructureException
 	 */
 	public MultipleMcOptimizer(MultipleAlignment seedAln,
 			MultipleMcParameters params, int reference) {
@@ -235,7 +234,7 @@ private void initialize() throws StructureException {
 	 * <li>Shrink Block: move a block column to the freePool.
 	 * <li>Insert gap: insert a gap in a random position of the alignment.
 	 * </ul>
-	 * </li>
+	 *
 	 */
 	public MultipleAlignment optimize() throws StructureException {
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentScorer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentScorer.java
index 1a9642e251..b17c5ae8f3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentScorer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentScorer.java
@@ -304,7 +304,7 @@ public static double getAvgTMScore(List<Atom[]> transformed,
 	 * length.
 	 *
 	 * @param alignment
-	 * @param reference
+	 * @param ref
 	 *            Index of the reference structure
 	 * @return
 	 * @throws StructureException
@@ -427,7 +427,7 @@ public static double getMCScore(MultipleAlignment alignment,
 	 * Complexity: T(n,l) = O(l*n^2), if n=number of structures and l=alignment
 	 * length.
 	 *
-	 * @param transformed
+	 * @param trans
 	 *            List of transformed Atom arrays
 	 * @param d0
 	 *            parameter for the half-score distance
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
index 52f926a5c6..7e46d3f115 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
@@ -309,7 +309,7 @@ public static List<String> getSequenceAlignment(
 	 * Blocks is indicated by a gap in all positions, meaning that there is a
 	 * possible discontinuity.
 	 *
-	 * @param alignment
+	 * @param msa
 	 *            input MultipleAlignment
 	 * @return String for each row in the alignment, giving the 1-letter code
 	 *         for each aligned residue.
@@ -466,7 +466,7 @@ else if (previousPos[str] + 1 == residue) {
 	 * gap in all positions, meaning that there is something unaligned
 	 * inbetween.
 	 *
-	 * @param alignment
+	 * @param ma
 	 *            input MultipleAlignment
 	 * @return String for each row in the alignment, giving the 1-letter code
 	 *         for each aligned residue.
@@ -479,7 +479,7 @@ public static List<String> getBlockSequenceAlignment(MultipleAlignment ma) {
 	 * Returns the Atom of the specified structure that is aligned in the
 	 * sequence alignment position specified.
 	 *
-	 * @param multAln
+	 * @param msa
 	 *            the MultipleAlignment object from where the sequence alignment
 	 *            has been generated
 	 * @param mapSeqToStruct
@@ -568,7 +568,7 @@ public static int getBlockForSequencePosition(MultipleAlignment multAln,
 	 * Complexity: T(n,l) = O(l*n^2), if n=number of structures and l=alignment
 	 * length.
 	 *
-	 * @param alignment
+	 * @param msa
 	 *            MultipleAlignment
 	 * @return Matrix containing all average residue distances
 	 */
@@ -644,7 +644,7 @@ public static Matrix getAverageResidueDistances(List<Atom[]> transformed) {
 	 * <p>
 	 * For each structure in the alignment, returns an atom for each
 	 * representative atom in the aligned columns, omitting unaligned residues
-	 * (i.e. an array of length <tt>alignment.length()</tt> ).
+	 * (i.e. an array of length <code>alignment.length()</code> ).
 	 * <p>
 	 * All blocks are concatenated together, so Atoms may not appear in the same
 	 * order as in their parent structure. If the alignment blocks contain null
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java
index 7db5d2e714..771b8b5f68 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentWriter.java
@@ -194,7 +194,7 @@ public static String toAlignedResidues(MultipleAlignment multAln) {
 	 * Converts the transformation Matrices of the alignment into a String
 	 * output.
 	 *
-	 * @param afpChain
+	 * @param alignment
 	 * @return String transformation Matrices
 	 */
 	public static String toTransformMatrices(MultipleAlignment alignment) {
@@ -289,7 +289,7 @@ public static String toXML(MultipleAlignmentEnsemble ensemble)
 	 * ATOM   2004  CA  ARG     4      32.662 -25.111   7.172  132 ARG
 	 * ATOM   2005  CA  GLY     5      29.121 -25.194   8.602  133 ARG
 	 *
-	 * Column 1 -30: Atom & Residue records of query sequence.
+	 * Column 1 -30: Atom and Residue records of query sequence.
 	 * Column 31-54: Coordinates of atoms in query copied from corresponding atoms in template.
 	 * Column 55-59: Corresponding residue number in template based on alignment
 	 * Column 60-64: Corresponding residue name in template

From d2053f30741f1361ab5cf377f8e0da240a7ba59f Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 6 Jan 2025 16:03:37 -0800
Subject: [PATCH 526/599] Javadoc fix: many errors in struct align package

---
 .../nbio/structure/BioAssemblyIdentifier.java    |  2 +-
 .../org/biojava/nbio/structure/StructureIO.java  |  6 ++++--
 .../nbio/structure/StructureIdentifier.java      |  5 ++---
 .../biojava/nbio/structure/StructureImpl.java    |  2 +-
 .../biojava/nbio/structure/URLIdentifier.java    |  2 +-
 .../nbio/structure/align/ce/CeCPMain.java        |  2 +-
 .../align/multiple/MultipleAlignmentImpl.java    |  1 -
 .../multiple/util/MultipleAlignmentTools.java    |  1 -
 .../nbio/structure/align/util/AtomCache.java     |  4 ++--
 .../nbio/structure/align/util/RotationAxis.java  |  6 ++----
 .../nbio/structure/asa/AsaCalculator.java        |  2 +-
 .../structure/chem/DownloadChemCompProvider.java |  2 ++
 .../biojava/nbio/structure/chem/PolymerType.java | 10 +++++-----
 .../biojava/nbio/structure/contact/GridCell.java |  3 ---
 .../contact/StructureInterfaceList.java          |  2 +-
 .../structure/geometry/SuperPositionQCP.java     |  6 ++----
 .../structure/io/FastaAFPChainConverter.java     |  6 +++---
 .../structure/io/StructureSequenceMatcher.java   |  3 +--
 .../biojava/nbio/structure/math/SymbolTable.java | 16 ++++++++--------
 .../nbio/structure/secstruc/SecStrucState.java   |  2 +-
 .../nbio/structure/symmetry/core/Helix.java      |  2 --
 .../symmetry/core/QuatSuperpositionScorer.java   |  2 +-
 .../nbio/structure/symmetry/core/Rotation.java   |  2 +-
 .../structure/symmetry/core/Stoichiometry.java   |  2 +-
 .../structure/symmetry/geometry/Icosahedron.java |  4 ++--
 .../structure/symmetry/geometry/Octahedron.java  |  7 ++-----
 .../nbio/structure/symmetry/geometry/Prism.java  |  2 +-
 .../symmetry/geometry/RectangularPrism.java      |  3 ---
 .../structure/symmetry/geometry/Tetrahedron.java |  7 ++-----
 .../internal/AngleOrderDetectorPlus.java         |  6 +++---
 .../symmetry/internal/ResidueGroup.java          |  2 +-
 .../symmetry/internal/SymmOptimizer.java         |  5 ++---
 .../nbio/structure/xtal/SymoplibParser.java      |  4 ++--
 33 files changed, 56 insertions(+), 75 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/BioAssemblyIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/BioAssemblyIdentifier.java
index 194368d763..eef6de2457 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/BioAssemblyIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/BioAssemblyIdentifier.java
@@ -58,7 +58,7 @@ public BioAssemblyIdentifier(String pdbCode, int biolNr) {
 	}
 
 	/**
-	 * @param pdbCode
+	 * @param pdbId
 	 * @param biolNr
 	 */
 	public BioAssemblyIdentifier(PdbId pdbId, int biolNr) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
index 9b96705c91..b08f52aba1 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
@@ -81,7 +81,7 @@ public class StructureIO {
 	 *  <ul>
 	 *  <li>If only a PDB code is provided, the whole structure will be return including ligands, but the first model only (for NMR).
 	 *	<li>Chain IDs are case sensitive, PDB ids are not. To specify a particular chain write as: 4hhb.A or 4HHB.A </li>
-	 *  <li>To specify a SCOP domain write a scopId e.g. d2bq6a1. Some flexibility can be allowed in SCOP domain names, see {@link #setStrictSCOP(boolean)}</li>
+	 *  <li>To specify a SCOP domain write a scopId e.g. d2bq6a1</li>
 	 *  <li>URLs are accepted as well</li>
 	 *  </ul>
 	 *
@@ -116,6 +116,7 @@ public static AtomCache getAtomCache() {
 	 * Returns the first biological assembly that is available for the given PDB id.
 	 * <p>
 	 * The output Structure will be different depending on the multiModel parameter:
+	 * <ul>
 	 * <li>
 	 * the symmetry-expanded chains are added as new models, one per transformId. All original models but
 	 * the first one are discarded.
@@ -124,9 +125,10 @@ public static AtomCache getAtomCache() {
 	 * as original with symmetry-expanded chains added with renamed chain ids and names (in the form
 	 * originalAsymId_transformId and originalAuthId_transformId)
 	 * </li>
+	 * </ul>
 	 * <p>
 	 * For more documentation on quaternary structures see:
-	 * {@link http://pdb101.rcsb.org/learn/guide-to-understanding-pdb-data/biological-assemblies}
+	 * <a href="http://pdb101.rcsb.org/learn/guide-to-understanding-pdb-data/biological-assemblies">http://pdb101.rcsb.org/learn/guide-to-understanding-pdb-data/biological-assemblies</a>
 	 *
 	 *
 	 * @param pdbId
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIdentifier.java
index cc7d8109b2..2b8cb669cf 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIdentifier.java
@@ -48,7 +48,7 @@ public interface StructureIdentifier extends Serializable {
 	/**
 	 * Get the String form of this identifier.
 	 *
-	 * It is recommended that the {@link #toString()} method also return the
+	 * It is recommended that the toString() method also return the
 	 * identifier, for consistency during serialization.
 	 * @return The String form of this identifier
 	 */
@@ -63,7 +63,7 @@ public interface StructureIdentifier extends Serializable {
 	 * It is recommended that the most complete structure available be returned
 	 * (e.g. the full PDB) to allow processing of unselected portions where
 	 * appropriate.
-	 * @param AtomCache A potential sources of structures
+	 * @param cache A potential sources of structures
 	 * @return A Structure containing at least the atoms identified by this,
 	 *  or null if Structures are not applicable.
 	 * @throws StructureException For errors loading and parsing the structure
@@ -92,7 +92,6 @@ public interface StructureIdentifier extends Serializable {
 	 * ID should match that returned by getPdbId(), if applicable.
 	 * @return
 	 * @throws StructureException
-	 * @see StructureTools#getReducedStructure(Structure, String)
 	 */
 	Structure reduce(Structure input) throws StructureException;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
index 4fce5b853e..ae00c8f7f3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
@@ -1015,7 +1015,7 @@ public String  getPDBCode () {
 	}
 	
 	/** {@inheritDoc} 
-	 * @deprecated use {@link #setPDBCode(PdbId)}
+	 * @deprecated use {@link #setPdbId(PdbId)}
 	 * */
 	@Deprecated
 	@Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
index 796362809f..016d1f592c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
@@ -75,7 +75,7 @@ public class URLIdentifier implements StructureIdentifier {
 	//TODO: should this get renamed to chainname or asymid?
 	public static final String CHAINID_PARAM = "chainid";
 	/**
-	 * URL parameter specifying residue ranges to include, e.g. <tt>residues=A:1-70</tt>
+	 * URL parameter specifying residue ranges to include, e.g. <code>residues=A:1-70</code>
 	 * @see SubstructureIdentifier
 	 */
 	public static final String RESIDUES_PARAM = "residues";
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCPMain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCPMain.java
index 881fc224b4..e40bdce47c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCPMain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCPMain.java
@@ -61,7 +61,7 @@ public class CeCPMain extends CeMain {
 	/**
 	 *  version history:
 	 *  1.5 - Added more parameters to the command line, including -maxOptRMSD
-	 *  1.4 - Added DuplicationHint parameter & default to duplicating the shorter chain
+	 *  1.4 - Added DuplicationHint parameter and default to duplicating the shorter chain
 	 *  1.3 - Short CPs are now discarded
 	 *  1.2 - now supports check AlignmentTools.isSequentialAlignment. XML protocol
 	 *  1.1 - skipped, (trying to avoid confusion with jfatcat in all vs. all comparisons)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
index f858f3082e..738eee30c5 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
@@ -237,7 +237,6 @@ protected void updateCoreLength() {
 	/**
 	 * Updates all cached properties
 	 *
-	 * @throws StructureException
 	 */
 	protected void updateCache() {
 		updateCoreLength();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
index 7e46d3f115..543aaa8405 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/util/MultipleAlignmentTools.java
@@ -940,7 +940,6 @@ public static Phylogeny getHSDMTree(MultipleAlignment msta)
 	 * @param msta
 	 *            MultipleAlignment of protein structures
 	 * @return Phylogeny phylogenetic tree
-	 * @throws CompoundNotFoundException
 	 */
 	public static Phylogeny getStructuralTree(MultipleAlignment msta) {
 		double[][] rmsdMat = MultipleAlignmentTools.getRMSDMatrix(msta)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
index 63fc089a97..fe5bfb0f2e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
@@ -670,14 +670,14 @@ public void setFileParsingParams(FileParsingParameters params) {
 	 *   Load the requested ID from the PDB's obsolete repository
 	 * <li>{@link ObsoleteBehavior#FETCH_CURRENT FETCH_CURRENT}
 	 *   Load the most recent version of the requested structure
+	 * </ul>
 	 *
 	 * <p>This setting may be silently ignored by implementations which do not have
 	 * access to the server to determine whether an entry is obsolete, such as
 	 * if {@link #isAutoFetch()} is false. Note that an obsolete entry may still be
 	 * returned even this is FETCH_CURRENT if the entry is found locally.
 	 *
-	 * @param fetchFileEvenIfObsolete Whether to fetch obsolete records
-	 * @see #setFetchCurrent(boolean)
+	 * @param behavior Whether to fetch obsolete records
 	 * @since 4.0.0
 	 */
 	public void setObsoleteBehavior(ObsoleteBehavior behavior) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/RotationAxis.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/RotationAxis.java
index 6e00e1d434..859f944645 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/RotationAxis.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/RotationAxis.java
@@ -374,8 +374,7 @@ private void calculateTranslationalAxis(Matrix rotation, Atom translation) {
 	 * @param atoms Some atoms from the protein, used for determining the bounds
 	 *  	  of the axis.
 	 *
-	 * @return The Jmol script, suitable for calls to
-	 * {@link org.biojava.nbio.structure.align.gui.jmol.StructureAlignmentJmol#evalString() jmol.evalString()}
+	 * @return The Jmol script
 	 */
 	public String getJmolScript(Atom[] atoms){
 		return getJmolScript(atoms, 0);
@@ -442,8 +441,7 @@ public Pair<Atom> getAxisEnds(Atom[] atoms) {
 	 * @param axisID in case of representing more than one axis in the same jmol
 	 * 		  panel, indicate the ID number.
 	 *
-	 * @return The Jmol script, suitable for calls to
-	 * {@link org.biojava.nbio.structure.align.gui.jmol.StructureAlignmentJmol#evalString() jmol.evalString()}
+	 * @return The Jmol script
 	 */
 	public String getJmolScript(Atom[] atoms, int axisID){
 		final double width=.5;// width of JMol object
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
index 956bbe90a4..84effc3e44 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
@@ -618,7 +618,7 @@ private static double getRadiusForNucl(NucleotideImpl nuc, Atom atom) {
 	 *
 	 * If atom is neither part of a nucleotide nor of a standard aminoacid,
 	 * the default vdw radius for the element is returned. If atom is of
-	 * unknown type (element) the vdw radius of {@link Element().N} is returned
+	 * unknown type (element) the vdw radius of {@link Element#N} is returned
 	 *
 	 * @param atom
 	 * @return
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
index 5e0a055a39..9eb9c7c6cf 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/DownloadChemCompProvider.java
@@ -109,11 +109,13 @@ public static void setServerBaseUrl(String serverBaseUrl) {
     /**
      * Set the path to append to the serverBaseUrl (settable in {@link #setServerBaseUrl(String)}).
      * The string can contain placeholders that will be expanded at runtime:
+     * <ul>
      * <li>"{ccd_id}" to be replaced by the chemical component identifier, in capitals</li>
      * <li>"{ccd_id:beginIndex-endIndex}" to be replaced by a substring of the chemical component identifier in capitals,
      * with indices following the same convention as {@link String#substring(int, int)} </li>
      * <li>"{ccd_id:index}" to be replaced by a substring of the chemical component identifier in capitals,
      * with index either a positive or negative integer to substring from left or right of the string respectively.</li>
+     * </ul>
      * If any of the indices are off-bounds, then the full chemical component identifier is replaced
      */
     public static void setChemCompPathUrlTemplate(String chemCompPathUrlTemplate) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/PolymerType.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/PolymerType.java
index 78bae77f86..8066044a43 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/PolymerType.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/PolymerType.java
@@ -106,22 +106,22 @@ public static PolymerType polymerTypeFromString(String polymerTypeString) {
     }
 
     /**
-     * Convenience <tt>Set</tt> of polymer types classified as protein.  This only contains {@link #peptide}
+     * Convenience <code>Set</code> of polymer types classified as protein.  This only contains {@link #peptide}
      */
     public static final Set<PolymerType> PROTEIN_ONLY;
 
     /**
-     * Convenience <tt>Set</tt> of polymer types classified as DNA.  This only contains {@link #dna}
+     * Convenience <code>Set</code> of polymer types classified as DNA.  This only contains {@link #dna}
      */
     public static final Set<PolymerType> DNA_ONLY;
 
     /**
-     * Convenience <tt>Set</tt> of polymer types classified as RNA.  This only contains {@link #rna}
+     * Convenience <code>Set</code> of polymer types classified as RNA.  This only contains {@link #rna}
      */
     public static final Set<PolymerType> RNA_ONLY;
 
     /**
-     * Convenience <tt>Set</tt> of polymer types classified as DNA.  This contains:
+     * Convenience <code>Set</code> of polymer types classified as DNA.  This contains:
      * <ul>
      * <li>{@link #dna}</li>
      * <li>{@link #rna}</li>
@@ -131,7 +131,7 @@ public static PolymerType polymerTypeFromString(String polymerTypeString) {
     public static final Set<PolymerType> POLYNUCLEOTIDE_ONLY;
 
     /**
-     * Convenience <tt>Set</tt> of all polymer types.
+     * Convenience <code>Set</code> of all polymer types.
      */
     public static final Set<PolymerType> ALL_POLYMER_TYPES;
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GridCell.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GridCell.java
index 11e2a59283..6028110eb6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GridCell.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/GridCell.java
@@ -103,9 +103,6 @@ public List<Contact> getContactsWithinCell(){
 	 * within the given cutoff as a list of Contacts containing the indices of the pair and the calculated distance.
 	 *
 	 * @param otherCell
-	 * @param iAtoms the first set of atom coordinates to which the iIndices correspond
-	 * @param jAtoms the second set of atom coordinates to which the jIndices correspond, if null distances are within the iAtoms only
-	 * @param cutoff
 	 * @return
 	 */
 	public List<Contact> getContactsToOtherCell(GridCell otherCell){
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceList.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceList.java
index 5af5a61bc3..60f7c3a91b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceList.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/contact/StructureInterfaceList.java
@@ -52,7 +52,7 @@ public class StructureInterfaceList implements Serializable, Iterable<StructureI
 	/**
 	 * Default minimum area for a contact between two chains to be considered a
 	 * valid interface.
-	 * @see #removeInterfacesBelowArea(double);
+	 * @see #removeInterfacesBelowArea(double)
 	 */
 	public static final double DEFAULT_MINIMUM_INTERFACE_AREA = 35.0;
 	/**
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
index a36854a711..c96f2f7125 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/SuperPositionQCP.java
@@ -587,7 +587,7 @@ public Matrix4d superpose(Point3d[] fixed, Point3d[] moved) {
 	 * @param fixed
 	 * @param moved
 	 * @param weight
-	 *            array of weigths for each equivalent point position
+	 *            array of weights for each equivalent point position
 	 * @return weighted RMSD.
 	 */
 	public double getWeightedRmsd(Point3d[] fixed, Point3d[] moved, double[] weight) {
@@ -598,13 +598,11 @@ public double getWeightedRmsd(Point3d[] fixed, Point3d[] moved, double[] weight)
 	/**
 	 * The QCP method can be used as a two-step calculation: first compute the
 	 * RMSD (fast) and then compute the superposition.
-	 *
+	 * <p>
 	 * This method assumes that the RMSD of two arrays of points has been
 	 * already calculated using {@link #getRmsd(Point3d[], Point3d[])} method
 	 * and calculates the transformation of the same two point arrays.
 	 *
-	 * @param fixed
-	 * @param moved
 	 * @return transformation matrix as a Matrix4d to superpose moved onto fixed
 	 *         point arrays
 	 */
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaAFPChainConverter.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaAFPChainConverter.java
index 81bf601ab6..1b8278125e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaAFPChainConverter.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/FastaAFPChainConverter.java
@@ -51,7 +51,7 @@
 import java.util.*;
 
 /**
- * A collection of static utilities to convert between {@link AFPChain AFPChains} and {@link FastaSequence FastaSequences}.
+ * A collection of static utilities to convert between {@link AFPChain AFPChains} and FastaSequences.
  *
  * @author dmyersturnbull
  * @see StructureSequenceMatcher
@@ -73,7 +73,7 @@ public static AFPChain cpFastaToAfpChain(String first, String second, Structure
 
 	/**
 	 * Takes a structure and sequence corresponding to an alignment between a structure or sequence and itself (or even a structure with a sequence), where the result has a circular permutation site
-	 * {@link cpSite} residues to the right.
+	 * <code>cpSite</code> residues to the right.
 	 *
 	 * @param fastaFile A FASTA file containing exactly 2 sequences, the first unpermuted and the second permuted
 	 * @param cpSite
@@ -97,7 +97,7 @@ public static AFPChain cpFastaToAfpChain(File fastaFile, Structure structure, in
 
 	/**
 	 * Takes a structure and sequence corresponding to an alignment between a structure or sequence and itself (or even a structure with a sequence), where the result has a circular permutation site
-	 * {@link cpSite} residues to the right.
+	 * <code>cpSite</code> residues to the right.
 	 *
 	 * @param first The unpermuted sequence
 	 * @param second The sequence permuted by cpSite
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
index fbc12ec9d3..529526e2e0 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/StructureSequenceMatcher.java
@@ -103,8 +103,7 @@ public static Structure getSubstructureMatchingProteinSequence(ProteinSequence s
 	 * @return A ProteinSequence with the full sequence of struct. Chains are
 	 *  concatenated in the same order as the input structures
 	 *
-	 * @see SeqRes2AtomAligner#getFullAtomSequence(List, Map, boolean), which
-	 * 	does the heavy lifting.
+	 * @see SeqRes2AtomAligner#getFullAtomSequence(List, Map, boolean)
 	 *
 	 */
 	public static ProteinSequence getProteinSequenceForStructure(Structure struct, Map<Integer,Group> groupIndexPosition ) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/math/SymbolTable.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/math/SymbolTable.java
index 0f9066b323..960e18b019 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/math/SymbolTable.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/math/SymbolTable.java
@@ -35,7 +35,7 @@
  *  Does not allow duplicate keys.
  *
  *  This class represents an ordered symbol table. It assumes that
- *  the elements are <tt>Comparable</tt>.
+ *  the elements are <code>Comparable</code>.
  *  It supports the usual <em>put</em>, <em>get</em>, <em>contains</em>,
  *  and <em>delete</em> methods.
  *  It also provides ordered methods for finding the <em>minimum</em>,
@@ -111,9 +111,9 @@ public int size() {
 	}
 
 	/**
-	 * Return an <tt>Iterator</tt> for the keys in the table.
-	 * To iterate over all of the keys in the symbol table <tt>st</tt>, use the
-	 * foreach notation: <tt>for (Key key : st)</tt>.
+	 * Return an <code>Iterator</code> for the keys in the table.
+	 * To iterate over all of the keys in the symbol table <code>st</code>, use the
+	 * foreach notation: <code>for (Key key : st)</code>.
 	 */
 	@Override
 	public Iterator<Key> iterator() {
@@ -121,9 +121,9 @@ public Iterator<Key> iterator() {
 	}
 
 	/**
-	 * Return an <tt>Iterable</tt> for the keys in the table.
-	 * To iterate over all of the keys in the symbol table <tt>st</tt>, use the
-	 * foreach notation: <tt>for (Key key : st.keys())</tt>.
+	 * Return an <code>Iterable</code> for the keys in the table.
+	 * To iterate over all of the keys in the symbol table <code>st</code>, use the
+	 * foreach notation: <code>for (Key key : st.keys())</code>.
 	 */
 	public Iterable<Key> keys() {
 		return st.keySet();
@@ -153,7 +153,7 @@ public Key ceil(Key k) {
 	}
 
 	/**
-	 * Return the largest key in the table <= k.
+	 * Return the largest key in the table &lt;= k.
 	 */
 	public Key floor(Key k) {
 		if (st.containsKey(k)) return k;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucState.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucState.java
index 33bdc7c931..6faebae39c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucState.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucState.java
@@ -107,7 +107,7 @@ public char[] getTurn() {
 
 	/**
 	 * Set the turn column corresponding to 3,4 or 5 helix patterns. If starting
-	 * > or ending < was set and the opposite is being set, the value will be
+	 * &gt; or ending &lt; was set and the opposite is being set, the value will be
 	 * converted to X. If a number was set, it will be overwritten by the new
 	 * character.
 	 *
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Helix.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Helix.java
index 4dabe0c0ac..2c399185f1 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Helix.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Helix.java
@@ -101,7 +101,6 @@ public void setRise(double rise) {
 
 	/**
 	 * Returns the pitch angle of the helix
-	 * @param transformation helix transformation
 	 * @return
 	 */
 	public double getAngle() {
@@ -110,7 +109,6 @@ public double getAngle() {
 
 	/**
 	 * Returns the AxisAngle of the helix transformation
-	 * @param transformation helix transformation
 	 * @return
 	 */
 	public AxisAngle4d getAxisAngle() {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSuperpositionScorer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSuperpositionScorer.java
index 5df1278563..1964132a0d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSuperpositionScorer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/QuatSuperpositionScorer.java
@@ -40,7 +40,7 @@ public class QuatSuperpositionScorer {
 	 * TM score: Yang Zhang and Jeffrey Skolnick, PROTEINS: Structure, Function, and Bioinformatics 57:702–710 (2004)
 	 * @param subunits subunits to be scored
 	 * @param transformation transformation matrix
-	 * @param permutations permutation that determines which subunits are superposed
+	 * @param permutation permutation that determines which subunits are superposed
 	 * @return
 	 */
 	public static QuatSymmetryScores calcScores(QuatSymmetrySubunits subunits, Matrix4d transformation, List<Integer> permutation) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Rotation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Rotation.java
index 9f1410abc6..6a9b95c3a6 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Rotation.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Rotation.java
@@ -147,7 +147,7 @@ public int getDirection() {
 	}
 
 	/**
-	 * @param direction the direction to set
+	 * @param axis the direction to set
 	 */
 	public void setDirection(int axis) {
 		this.direction = axis;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Stoichiometry.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Stoichiometry.java
index dc6a09053f..697ee41f82 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Stoichiometry.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/Stoichiometry.java
@@ -238,7 +238,7 @@ public int numberOfComponents() {
 	}
 
 	/**
-	 * Make a combined Stoichiometry object of <i>this</> and the <i>other</>.
+	 * Make a combined Stoichiometry object of <i>this</i> and the <i>other</i>.
 	 * The combined list of clusters will be ordered by the number of subunits.
 	 * @return new {@link Stoichiometry} object.
 	 */
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Icosahedron.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Icosahedron.java
index 7de37ee842..5cb5a99458 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Icosahedron.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Icosahedron.java
@@ -67,7 +67,7 @@ public double getInscribedRadius() {
 	/**
 	 * Sets the radius of an inscribed sphere, that is tangent to each
 	 * of the icosahedron's faces
-	 * @param inscribedRadius the inscribedRadius to set
+	 * @param radius the inscribedRadius to set
 	 */
 	public void setInscribedRadius(double radius) {
 		double side = getSideLengthFromInscribedRadius(radius);
@@ -88,7 +88,7 @@ public double getMidRadius() {
 	/**
 	 * Sets the radius of radius of a sphere, that is tangent to each
 	 * of the icosahedron's edges
-	 * @param midRadius the midRadius to set
+	 * @param radius the midRadius to set
 	 */
 	public void setMidRadius(double radius) {
 		double side = getSideLengthFromMiddleRadius(radius);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Octahedron.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Octahedron.java
index 6cc5842dda..3165093908 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Octahedron.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Octahedron.java
@@ -62,7 +62,7 @@ public double getInscribedRadius() {
 	/**
 	 * Sets the radius of an inscribed sphere, that is tangent to each
 	 * of the octahedron's faces
-	 * @param inscribedRadius the inscribedRadius to set
+	 * @param radius the inscribedRadius to set
 	 */
 	public void setInscribedRadius(double radius) {
 		double side = getSideLengthFromInscribedRadius(radius);
@@ -83,7 +83,7 @@ public double getMidRadius() {
 	/**
 	 * Sets the radius of radius of a sphere, that is tangent to each
 	 * of the octahedron's edges
-	 * @param midRadius the midRadius to set
+	 * @param radius the midRadius to set
 	 */
 	public void setMidRadius(double radius) {
 		double side = getSideLengthFromMiddleRadius(radius);
@@ -92,9 +92,6 @@ public void setMidRadius(double radius) {
 
 	/**
 	 * Returns the vertices of an n-fold polygon of given radius and center
-	 * @param n
-	 * @param radius
-	 * @param center
 	 * @return
 	 */
 	@Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Prism.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Prism.java
index 770126b601..24166059fc 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Prism.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Prism.java
@@ -87,7 +87,7 @@ public double getInscribedRadius() {
 	/**
 	 * Sets the radius of an inscribed sphere, that is tangent to each
 	 * of the icosahedron's faces
-	 * @param inscribedRadius the inscribedRadius to set
+	 * @param radius the inscribedRadius to set
 	 */
 	public void setInscribedRadius(double radius) {
 		double side = getSideLengthFromInscribedRadius(radius, n);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/RectangularPrism.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/RectangularPrism.java
index 45d32828c3..295c6275e9 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/RectangularPrism.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/RectangularPrism.java
@@ -82,9 +82,6 @@ public double getCirumscribedRadius() {
 
 	/**
 	 * Returns the vertices of an n-fold polygon of given radius and center
-	 * @param n
-	 * @param radius
-	 * @param center
 	 * @return
 	 */
 	@Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Tetrahedron.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Tetrahedron.java
index 7effd81cbe..a402cbef7e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Tetrahedron.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/Tetrahedron.java
@@ -66,7 +66,7 @@ public double getInscribedRadius() {
 	/**
 	 * Sets the radius of an inscribed sphere, that is tangent to each
 	 * of the tetrahedron's faces
-	 * @param inscribedRadius the inscribedRadius to set
+	 * @param radius the inscribedRadius to set
 	 */
 	public void setInscribedRadius(double radius) {
 		double side = getSideLengthFromInscribedRadius(radius);
@@ -87,7 +87,7 @@ public double getMidRadius() {
 	/**
 	 * Sets the radius of radius of a sphere, that is tangent to each
 	 * of the tetrahedron's edges
-	 * @param midRadius the midRadius to set
+	 * @param radius the midRadius to set
 	 */
 	public void setMidRadius(double radius) {
 		double side = getSideLengthFromMiddleRadius(radius);
@@ -96,9 +96,6 @@ public void setMidRadius(double radius) {
 
 	/**
 	 * Returns the vertices of an n-fold polygon of given radius and center
-	 * @param n
-	 * @param radius
-	 * @param center
 	 * @return
 	 */
 	@Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/AngleOrderDetectorPlus.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/AngleOrderDetectorPlus.java
index 96b41f48e9..345493ce91 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/AngleOrderDetectorPlus.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/AngleOrderDetectorPlus.java
@@ -45,7 +45,7 @@ public class AngleOrderDetectorPlus implements OrderDetector {
 	private boolean normalizeError;
 
 	/**
-	 * @param error
+	 * @param angleError
 	 *            maximum angular error, in radians
 	 */
 	public AngleOrderDetectorPlus(double angleError) {
@@ -61,7 +61,7 @@ public AngleOrderDetectorPlus(int maxOrder) {
 	 *
 	 * @param maxOrder
 	 *            maximum order to consider
-	 * @param error
+	 * @param angleError
 	 *            maximum angular error, in radians
 	 */
 	public AngleOrderDetectorPlus(int maxOrder, double angleError) {
@@ -82,7 +82,7 @@ public AngleOrderDetectorPlus(int maxOrder, double angleError) {
 	 *
 	 * @param maxOrder
 	 *            maximum order to consider
-	 * @param error
+	 * @param angleError
 	 *            maximum angular error
 	 * @param normalize
 	 *            indicates whether error should be normalized by the order
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/ResidueGroup.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/ResidueGroup.java
index a9e1bcdeb5..79053f55f9 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/ResidueGroup.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/ResidueGroup.java
@@ -76,7 +76,7 @@ public int order() {
 	 * ResidueGroups {A,B,C}, if A is compatible with B and B is compatible with
 	 * C, then A is not necessarily compatible with C.
 	 *
-	 * @param c2
+	 * @param other
 	 *            second maximally connected component
 	 * @return true if compatible, false otherwise
 	 */
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java
index 8ea264ba67..58a8c89394 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java
@@ -107,8 +107,6 @@ public class SymmOptimizer {
 	 *
 	 * @param symmResult
 	 *            CeSymmResult with all the information
-	 * @throws RefinerFailedException
-	 * @throws StructureException
 	 */
 	public SymmOptimizer(CeSymmResult symmResult) {
 
@@ -181,11 +179,12 @@ private void initialize() throws StructureException, RefinerFailedException {
 	 * Optimization method based in a Monte-Carlo approach. Starting from the
 	 * refined alignment uses 4 types of moves:
 	 * <p>
+	 * <ul>
 	 * <li>1- Shift Row: if there are enough freePool residues available.
 	 * <li>2- Expand Block: add another alignment column.
 	 * <li>3- Shrink Block: move a block column to the freePool.
 	 * <li>4- Insert gap: insert a gap in a position of the alignment.
-	 *
+	 * </ul>
 	 * @throws StructureException
 	 * @throws RefinerFailedException
 	 *             if the alignment is not symmetric or too short.
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
index 5d58e019eb..f2a9ffb9c2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
@@ -185,8 +185,8 @@ public static TreeMap<Integer,SpaceGroup> getAllSpaceGroups() {
 	 * A parser for the symop.lib file provided by CCP4. Note: this file is not getting re-distributed by BioJava.
 	 * It can be downloaded from:
 	 *
-	 *  http://www.ccp4.ac.uk/cvs/viewvc.cgi/libccp4/data/symop.lib?revision=1.10&view=markup
-	 *
+	 * <a href="http://www.ccp4.ac.uk/cvs/viewvc.cgi/libccp4/data/symop.lib?revision=1.10&view=markup">http://www.ccp4.ac.uk/cvs/viewvc.cgi/libccp4/data/symop.lib?revision=1.10&view=markup</a>
+	 * <p>
 	 * Note: this file is not needed by BioJava. BioJava loads equivalent information from the file spacegroups.xml
 	 *
 	 * @param symoplibIS

From 435ebe98b58bf9cc044dc37414e4ae75a08835b1 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 6 Jan 2025 16:16:59 -0800
Subject: [PATCH 527/599] Javadoc fix: many errors in struct align package

---
 .../java/org/biojava/nbio/structure/Atom.java | 62 +++++++++----------
 .../org/biojava/nbio/structure/Group.java     |  4 +-
 .../biojava/nbio/structure/StructureIO.java   |  4 +-
 .../structure/align/ce/OptimalCECPMain.java   |  9 ++-
 .../nbio/structure/align/model/AFPChain.java  |  6 +-
 .../align/util/UserConfiguration.java         |  1 -
 .../symmetry/utils/SymmetryTools.java         |  2 +-
 .../nbio/structure/xtal/SymoplibParser.java   |  2 +-
 8 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Atom.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Atom.java
index 2e19acb29a..df38b06205 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Atom.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Atom.java
@@ -48,7 +48,7 @@ public interface Atom extends Cloneable, PDBRecord {
 	 * @param s  a trimmed String specifying the name value
 	 * @see #getName
 	 */
-	public void   setName(String s);
+	void   setName(String s);
 
 	/**
 	 * Get atom name, e.g. "CA".
@@ -57,42 +57,42 @@ public interface Atom extends Cloneable, PDBRecord {
 	 * @return a trimmed String representing the name value
 	 * @see #setName
 	 */
-	public String getName();
+	String getName();
 
 	/**
 	 * Set element of the atom name, e.g. {@link Element#Fe}
 	 * @param e  an Element enumeration
 	 * @see #getElement
 	 */
-	public void   setElement(Element e);
+	void   setElement(Element e);
 
 	/**
 	 * Get element of the atom, e.g. {@link Element#Ca}
 	 * @return an Element enumeration
 	 * @see #setElement
 	 */
-	public Element getElement();
+	Element getElement();
 
 	/**
 	 * Set PDB atom number.
 	 * @param i  an int specifying the PDBserial value
 	 * @see #getPDBserial
 	 */
-	public void setPDBserial(int i) ;
+	void setPDBserial(int i) ;
 
 	/**
 	 * Get PDB atom number.
 	 * @return an int representing the PDBserial value
 	 * @see #setPDBserial
 	 */
-	public int  getPDBserial() ;
+	int  getPDBserial() ;
 
 	/**
 	 * Set the coordinates.
 	 * @param c  an array of doubles specifying the coords value
 	 * @see #getCoords
 	 */
-	public void    setCoords(double[] c);
+	void    setCoords(double[] c);
 
 	/**
 	 * Get the coordinates.
@@ -100,7 +100,7 @@ public interface Atom extends Cloneable, PDBRecord {
 	 * @see #setCoords
 	 * @see #getCoordsAsPoint3d()
 	 */
-	public double[] getCoords() ;
+	double[] getCoords() ;
 
 	/**
 	 * Get the coordinates.
@@ -110,56 +110,56 @@ public interface Atom extends Cloneable, PDBRecord {
 	 * @return a reference to the Point3d coordinates
 	 * @see #getCoords()
 	 */
-	public Point3d getCoordsAsPoint3d();
+	Point3d getCoordsAsPoint3d();
 
 	/**
 	 * Set the X coordinate.
 	 * @param x  a double
 	 * @see #getX()
 	 */
-	public void setX(double x);
+	void setX(double x);
 
 	/**
 	 * Set the Y coordinate.
 	 * @param y  a double
 	 * @see #getY()
 	 */
-	public void setY(double y);
+	void setY(double y);
 
 	/**
 	 * Set the Z coordinate.
 	 * @param z  a double
 	 * @see #getZ()
 	 */
-	public void setZ(double z);
+	void setZ(double z);
 
 	/**
 	 * Get coordinate X.
 	 * @return a double
 	 * @see #setX(double)
 	 */
-	public double getX() ;
+	double getX() ;
 
 	/**
 	 * Get coordinate Y.
 	 * @return a double
 	 * @see #setY(double)
 	 */
-	public double getY() ;
+	double getY() ;
 
 	/**
 	 * Get coordinate Z.
 	 * @return a double
 	 * @see #setZ(double)
 	 */
-	public double getZ() ;
+	double getZ() ;
 
 	/**
 	 * Set alternate Location.
 	 * @param c  a Character object specifying the alt loc value
 	 * @see #getAltLoc
 	 */
-	public void setAltLoc(Character c);
+	void setAltLoc(Character c);
 
 	/**
 	 * Get alternate Location.
@@ -167,41 +167,41 @@ public interface Atom extends Cloneable, PDBRecord {
 	 * is represented by ' ' (space character, ascii 32).
 	 * @see #setAltLoc
 	 */
-	public Character getAltLoc();
+	Character getAltLoc();
 
 	/**
 	 * Set occupancy.
 	 * @param occupancy  a float specifying the occupancy value
 	 * @see #getOccupancy
 	 */
-	public void setOccupancy(float occupancy) ;
+	void setOccupancy(float occupancy) ;
 
 	/**
 	 * Get occupancy.
 	 * @return a float representing the occupancy value
 	 * @see #setOccupancy
 	 */
-	public float getOccupancy();
+	float getOccupancy();
 
 	/**
 	 * Set temp factor .
 	 * @param temp  a float specifying the temp factor value
 	 * @see #getTempFactor
 	 */
-	public void   setTempFactor(float temp) ;
+	void   setTempFactor(float temp) ;
 
 	/**
 	 * Get temp factor.
 	 * @return a float representing the temp factor value
 	 * @see #setTempFactor
 	 */
-	public float getTempFactor() ;
+	float getTempFactor() ;
 
 	/**
 	 * Return an identical copy of this  object .
 	 * @return  an identical copy of this  object
 	 */
-	public Object clone();
+	Object clone();
 
 	/**
 	 * Set the back-reference to its parent Group.
@@ -209,7 +209,7 @@ public interface Atom extends Cloneable, PDBRecord {
 	 * @see #getGroup()
 	 */
 
-	public void setGroup(Group parent);
+	void setGroup(Group parent);
 
 	/**
 	 * Return the parent Group of the Atom.
@@ -217,28 +217,27 @@ public interface Atom extends Cloneable, PDBRecord {
 	 * @return Group the parent Group of the Atom, or null
 	 * @see #setGroup(Group)
 	 */
-	public Group getGroup();
+	Group getGroup();
 
 	/**
 	 * Add a bond
 	 * @param bond to be added
 	 * @see #getBonds()
 	 */
-	public void addBond(Bond bond);
+	void addBond(Bond bond);
 
 	/**
 	 * Get all {@link Bond}s this atom is part of.
 	 *
 	 * @return a list of {@link Bond}s or null if no bonds exist for this Atom
 	 */
-	public List<Bond> getBonds();
+	List<Bond> getBonds();
 
 	/**
 	 * Sets the bonds
 	 * @param bonds
 	 */
-	public void setBonds(List<Bond> bonds);
-
+	void setBonds(List<Bond> bonds);
 
 	/**
 	 * Test if another atom has a bond to this atom
@@ -246,19 +245,18 @@ public interface Atom extends Cloneable, PDBRecord {
 	 * @param other
 	 * @return
 	 */
-	public boolean hasBond(Atom other);
+	boolean hasBond(Atom other);
 
 	/**
 	 * Get the charge of this atom
 	 *
 	 * @return a the integer charge.
 	 */
-	public short getCharge();
+	short getCharge();
 
 	/**
 	 * Set the charge of this atom
 	 *
-	 * @return void.
 	 */
-	public void setCharge(short charge);
+	void setCharge(short charge);
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java
index 8b7b5cb809..1ea0d1633e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Group.java
@@ -346,7 +346,7 @@ public interface Group extends Serializable {
 	 * The main group (this group) will contain the first altloc (be it the default '.' or 'A' or a mix of '.' and 'A').
 	 * <p>
 	 * This method will return the altloc groups that are not the main group, e.g.:
-	 *
+	 * <ul>
 	 * <li> if '.' (default), 'A' and 'B' altlocs are present in file, the main group will contain
 	 * the default '.' and this method will return 2 altloc groups
 	 * </li>
@@ -354,7 +354,7 @@ public interface Group extends Serializable {
 	 * <li> if 'A' and 'B' are present in file without a default '.' group, then the main group will contain the 'A'
 	 * location whilst this method will return only 1 altloc group with the 'B' location
 	 * </li>
-	 *
+	 * </ul>
 	 * <p>
 	 * Note that atoms with the default altloc (.) are included in all groups. Atoms with other altlocs (typically A, B, etc)
 	 * will be sorted into groups by altloc.
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
index b08f52aba1..75e4b95194 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
@@ -149,7 +149,7 @@ public static Structure getBiologicalAssembly(String pdbId, boolean multiModel)
 	 * using multiModel={@value AtomCache#DEFAULT_BIOASSEMBLY_STYLE}
 	 * <p>
 	 * For more documentation on quaternary structures see:
-	 * {@link http://pdb101.rcsb.org/learn/guide-to-understanding-pdb-data/biological-assemblies}
+	 * <a href="http://pdb101.rcsb.org/learn/guide-to-understanding-pdb-data/biological-assemblies">http://pdb101.rcsb.org/learn/guide-to-understanding-pdb-data/biological-assemblies</a>
 	 *
 	 *
 	 * @param pdbId
@@ -165,6 +165,7 @@ public static Structure getBiologicalAssembly(String pdbId) throws IOException,
 	 * Returns the biological assembly for the given PDB id and bioassembly identifier.
 	 * <p>
 	 * The output Structure will be different depending on the multiModel parameter:
+	 * <ul>
 	 * <li>
 	 * the symmetry-expanded chains are added as new models, one per transformId. All original models but
 	 * the first one are discarded.
@@ -173,6 +174,7 @@ public static Structure getBiologicalAssembly(String pdbId) throws IOException,
 	 * as original with symmetry-expanded chains added with renamed chain ids and names (in the form
 	 * originalAsymId_transformId and originalAuthId_transformId)
 	 * </li>
+	 * </ul>
 	 * @param pdbId
 	 * @param biolAssemblyNr - the ith biological assembly that is available for a PDB ID (we start counting at 1, 0 represents the asym unit).
 	 * @param multiModel if true the output Structure will be a multi-model one with one transformId per model,
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/OptimalCECPMain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/OptimalCECPMain.java
index 7fa9c4cf28..0f3e4d1283 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/OptimalCECPMain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/OptimalCECPMain.java
@@ -300,7 +300,7 @@ private static Matrix permuteMatrix(Matrix mat, int cpRows, int cpCols) {
 	/**
 	 * Modifies the {@link AFPChain#setOptAln(int[][][]) optAln} of an AFPChain
 	 * by permuting the second protein.
-	 *
+	 * <p>
 	 * Sets residue numbers in the second protein to <i>(i-cp)%len</i>
 	 *
 	 * @param afpChain
@@ -425,7 +425,7 @@ private static void assignOptAln(AFPChain afpChain, List<List<List<Integer>>> bl
 	/**
 	 * Finds the optimal alignment between two proteins allowing for a circular
 	 * permutation (CP).
-	 *
+	 * <p>
 	 * The precise algorithm is controlled by the
 	 * {@link OptimalCECPParameters parameters}. If the parameter
 	 * {@link OptimalCECPParameters#isTryAllCPs() tryAllCPs} is true, all possible
@@ -456,10 +456,9 @@ public AFPChain align(Atom[] ca1, Atom[] ca2, Object param)
 	/**
 	 * Finds the optimal alignment between two proteins allowing for a circular
 	 * permutation (CP).
-	 *
+	 * <p>
 	 * This algorithm performs a CE alignment for each possible CP site. This is
-	 * quite slow. Use {@link #alignHeuristic(Atom[], Atom[], Object)} for a
-	 * faster algorithm.
+	 * quite slow.
 	 *
 	 * @param ca1 CA atoms of the first protein
 	 * @param ca2 CA atoms of the second protein
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
index 41cef89031..001d32d806 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
@@ -973,6 +973,10 @@ public void setOptRmsd(double[] optRmsd)
 		this.optRmsd = optRmsd;
 	}
 
+	/**
+	 * The number of aligned residues in the final alignment.
+	 * @return
+	 */
 	public int getOptLength()
 	{
 		return optLength;
@@ -1023,7 +1027,7 @@ public void setAlnseq2(char[] alnseq2)
 
 	/**
 	 * @return The total length of the alignment, including gaps
-	 * @see #getOptLength(), the number of aligned residues in the final alignment.
+	 * @see #getOptLength()
 	 */
 	public int getAlnLength()
 	{
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/UserConfiguration.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/UserConfiguration.java
index 70e85acec3..67eba4c966 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/UserConfiguration.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/UserConfiguration.java
@@ -306,7 +306,6 @@ public XMLWriter toXML(PrintWriter pw)
 	 * @param xw the XML writer to use
 	 * @return the writer again
 	 * @throws IOException
-	 * @see org.biojava.nbio.structure.align.webstart.ConfigXMLHandler
 	 */
 
 	public XMLWriter toXML(XMLWriter xw)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/SymmetryTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/SymmetryTools.java
index 4913ac5cc5..76822af35f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/SymmetryTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/utils/SymmetryTools.java
@@ -501,7 +501,7 @@ public static Graph<Integer, DefaultEdge> buildSymmetryGraph(
 	 * @param symmetry
 	 *            CeSymmResult
 	 * @throws StructureException
-	 * @result List of structures, by repeat index sequentially
+	 * @return List of structures, by repeat index sequentially
 	 *
 	 */
 	public static List<Structure> divideStructure(CeSymmResult symmetry)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
index f2a9ffb9c2..0de5e33bc4 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SymoplibParser.java
@@ -185,7 +185,7 @@ public static TreeMap<Integer,SpaceGroup> getAllSpaceGroups() {
 	 * A parser for the symop.lib file provided by CCP4. Note: this file is not getting re-distributed by BioJava.
 	 * It can be downloaded from:
 	 *
-	 * <a href="http://www.ccp4.ac.uk/cvs/viewvc.cgi/libccp4/data/symop.lib?revision=1.10&view=markup">http://www.ccp4.ac.uk/cvs/viewvc.cgi/libccp4/data/symop.lib?revision=1.10&view=markup</a>
+	 * <a href="http://www.ccp4.ac.uk/cvs/viewvc.cgi/libccp4/data/symop.lib?revision=1.10&view=markup">http://www.ccp4.ac.uk/cvs/viewvc.cgi/libccp4/data/symop.lib?revision=1.10&amp;view=markup</a>
 	 * <p>
 	 * Note: this file is not needed by BioJava. BioJava loads equivalent information from the file spacegroups.xml
 	 *

From 0c7e9f5fc52f79e942cf1780baafde473b459368 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 13:31:40 -0800
Subject: [PATCH 528/599] Javadoc fix: most other errors in structure module

---
 .../structure/align/gui/AlignmentCalc.java    |  4 +-
 .../java/demo/DemoChangeChemCompProvider.java |  5 +-
 .../java/org/biojava/nbio/structure/Bond.java | 12 +--
 .../org/biojava/nbio/structure/BondImpl.java  |  6 +-
 .../org/biojava/nbio/structure/BondType.java  |  2 +-
 .../org/biojava/nbio/structure/Structure.java | 94 ++++++-------------
 .../biojava/nbio/structure/StructureIO.java   |  2 +
 .../nbio/structure/StructureIdentifier.java   |  8 +-
 .../biojava/nbio/structure/URLIdentifier.java | 10 +-
 .../nbio/structure/align/ce/CeMain.java       |  2 +-
 .../align/util/AFPAlignmentDisplay.java       |  5 +-
 .../structure/align/util/AlignmentTools.java  | 12 +--
 .../nbio/structure/align/util/AtomCache.java  | 11 +--
 .../nbio/structure/io/LocalPDBDirectory.java  |  2 +-
 .../nbio/structure/io/PDBFileReader.java      | 15 +--
 .../nbio/structure/jama/LUDecomposition.java  |  4 +-
 .../biojava/nbio/structure/jama/Matrix.java   |  2 +-
 .../biojava/nbio/structure/package-info.java  |  7 +-
 .../nbio/structure/secstruc/BridgeType.java   |  2 +-
 .../symmetry/core/RotationGroup.java          |  2 +-
 .../symmetry/internal/CeSymmIterative.java    |  1 -
 .../symmetry/internal/SymmOptimizer.java      |  2 +-
 22 files changed, 81 insertions(+), 129 deletions(-)

diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/AlignmentCalc.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/AlignmentCalc.java
index 98ed76f7a4..af2f8f9d91 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/AlignmentCalc.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/AlignmentCalc.java
@@ -35,13 +35,13 @@
 import org.slf4j.LoggerFactory;
 
 
-/** A class that obtains two structures via DAS and aligns them
+/**
+ * A class that obtains two structures via DAS and aligns them
  *  This is done in a separate thread.
  *  It is possible to register Event listeners to get notification of when the download has finished.
  *
  * @author Andreas Prlic
  * @since 1.7
- * @version %I% %G%
  */
 public class AlignmentCalc implements AlignmentCalculationRunnable {
 
diff --git a/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java b/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
index b198aeb46a..bb78c98d77 100644
--- a/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
+++ b/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
@@ -37,17 +37,18 @@
  *  componentsby using the {@link DownloadChemCompProvider}. It fetches and locally caches chemical component
  *  definitions as they are encountered during file parsing. It can be enabled by using the
  *  {@link FileParsingParameters#setLoadChemCompInfo(boolean)} method.
- *
+ * <p>
  * The {@link AllChemCompProvider} downloads and unpacks all chemcomps. It is slower and requires more memory than the
  * default {@link DownloadChemCompProvider}, but it avoids network access to the FTP site, if a new chemcomp is
  * detected, that has not been downloaded yet.
- *
+ * <p>
  * Since all chemcomps will be kept in memory, the standard memory that is available to a JVM will not be sufficient
  * in order to run this demo. Please start with -Xmx200M
  *
  * @author Andreas Prlic
  */
 public class DemoChangeChemCompProvider {
+
 	public static void main(String[] args){
 		String pdbId = "1O1G";
 		boolean loadChemComp = true;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Bond.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Bond.java
index 7af10c23e0..ae4c97f74e 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Bond.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Bond.java
@@ -26,7 +26,7 @@
  * A simple bond -- it stores information about two atoms as well as information
  * about its bond order.
  *
- * @author Jules Jacobsen <jacobsen@ebi.ac.uk>
+ * @author Jules Jacobsen jacobsen@ebi.ac.uk
  * @author Ulysse Carion
  */
 public interface Bond extends Serializable {
@@ -39,7 +39,7 @@ public interface Bond extends Serializable {
 	 * @see #getAtomB()
 	 * @return one of the two atoms in this bond
 	 */
-	public Atom getAtomA();
+	Atom getAtomA();
 
 	/**
 	 * Gets atom 'B' of this bond. There is no meaning to which atom is 'A' and
@@ -49,7 +49,7 @@ public interface Bond extends Serializable {
 	 * @see #getAtomA()
 	 * @return one of the two atoms in this bond
 	 */
-	public Atom getAtomB();
+	Atom getAtomB();
 
 	/**
 	 * A utility method to get the other atom in a bond, given one of its atoms.
@@ -66,7 +66,7 @@ public interface Bond extends Serializable {
 	 *             if the passed atom is not in this bond
 	 * @return the atom in this bond that was not passed as an argument
 	 */
-	public Atom getOther(Atom exclude);
+	Atom getOther(Atom exclude);
 
 	/**
 	 * Gets the bond order of this bond. A return value of '1' corresponds to a
@@ -74,7 +74,7 @@ public interface Bond extends Serializable {
 	 *
 	 * @return this bond's bond order
 	 */
-	public int getBondOrder();
+	int getBondOrder();
 
 	/**
 	 * Gets the distance between the two atoms of this bond.
@@ -85,5 +85,5 @@ public interface Bond extends Serializable {
 	 *
 	 * @return the distance between the two atoms of this bond.
 	 */
-	public double getLength();
+	double getLength();
 }
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java
index 78d38559f7..4deac44faa 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/BondImpl.java
@@ -27,7 +27,7 @@
  * A simple bond -- it stores information about two atoms as well as information
  * about its bond order.
  *
- * @author Jules Jacobsen <jacobsen@ebi.ac.uk>
+ * @author Jules Jacobsen jacobsen@ebi.ac.uk
  * @author Ulysse Carion
  */
 public class BondImpl implements Bond {
@@ -44,7 +44,7 @@ public class BondImpl implements Bond {
 	 * Note that by forming a bond between atoms 'A' and 'B' with this
 	 * constructor, atoms 'A' and 'B' will be updated to have this bond in their
 	 * list of bonds. If you do not want this automatic updating, instead use
-	 * {@link Bond(Atom, Atom, int, boolean)} with the
+	 * {@link #BondImpl(Atom, Atom, int, boolean)} with the
 	 * <code>addSelfToAtoms</code> flag set to <code>false</code>.
 	 *
 	 * @param atomA one of the atoms in this bond
@@ -83,7 +83,7 @@ public BondImpl(Atom atomA, Atom atomB, int bondOrder, boolean addSelfToAtoms) {
 	 * include this bond.
 	 * <p>
 	 * If you created your Bond with the constructor
-	 * {@link Bond(Atom, Atom, int)}, this method has already been called for
+	 * {@link #BondImpl(Atom, Atom, int)}, this method has already been called for
 	 * you and should not be called again.
 	 */
 	// TODO first check if those bonds haven't been made already
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/BondType.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/BondType.java
index 9b3f752092..5a8569f396 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/BondType.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/BondType.java
@@ -23,7 +23,7 @@
 
 /**
  * Work in progress - NOT final!
- * @author Jules Jacobsen <jacobsen@ebi.ac.uk>
+ * @author Jules Jacobsen jacobsen@ebi.ac.uk
  */
 public enum BondType {
 	UNDEFINED, COVALENT, IONIC, HBOND, VANDERWAALS, HYDROPHOBIC, METAL, PLANAR, ATOM_PLANE;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
index 8521044de7..51d69234c7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
@@ -31,9 +31,8 @@
 
 
 /**
- *
  * Interface for a structure object. Provides access to the data of a PDB file.
- *
+ * <p>
  * A structure object allows to access the PDB header information as well
  * as to the data from the ATOM records. The header information is
  * currently available through the following objects:
@@ -61,27 +60,16 @@
  *
  * <p>
  *  The tutorial for the BioJava structure modules can be found at <a href="https://github.com/biojava/biojava3-tutorial/tree/master/structure">github</a>.
- * </p>
- *
- *
  * <hr/>
  * <p>
  * Q: How can I get a Structure object from a PDB file?
- * </p>
  * <p>
  * A:
- * </p>
  * <pre>
- *  {@link Structure} loadStructure(String pathToPDBFile){
- * 		{@link PDBFileReader} pdbreader = new {@link PDBFileReader}();
- *
- * 		{@link Structure} structure = null;
- * 		try{
- * 			structure = pdbreader.getStructure(pathToPDBFile);
- * 			System.out.println(structure);
- * 		} catch (IOException e) {
- * 			e.printStackTrace();
- * 		}
+ *  Structure loadStructure(String pathToPDBFile) {
+ * 		PDBFileReader pdbreader = new PDBFileReader();
+ * 		Structure structure = pdbreader.getStructure(pathToPDBFile);
+ * 		System.out.println(structure);
  * 		return structure;
  * 	}
  *  </pre>
@@ -89,20 +77,16 @@
  * <hr>
  * <p>
  * Q: How can I calculate Phi and Psi angles of AminoAcids?
- * </p>
  * <p>
  * A:
- * </p>
- * <pre>
- *  void calcPhiPsi({@link Structure} structure){
- *
+ * <pre>{@code
+ *  void calcPhiPsi(Structure structure) {
  *
  * 		// get the first chain from the structure
- *
- * 		{@link Chain} chain  = structure.getChain(0);
+ * 		Chain chain  = structure.getChain(0);
  *
  * 		// A protein chain consists of a number of groups. These can be either
- * 		// {@link AminoAcid}, {@link HetatomImpl Hetatom} or {@link NucleotideImpl Nucleotide} groups.
+ * 		// AminoAcid, HetatomImpl or NucleotideImpl groups.
  * 		//
  * 		// Note: BioJava provides access to both the ATOM and SEQRES data in a PDB file.
  * 		// since we are interested in doing calculations here, we only request the groups
@@ -111,54 +95,35 @@
  * 		//  get the Groups of the chain that are AminoAcids.
  * 		List<Group> groups = chain.getAtomGroups(GroupType.AMINOACID);
  *
- * 		{@link AminoAcid} a;
- * 		{@link AminoAcid} b;
- * 		{@link AminoAcid} c ;
- *
- * 		for ( int i=0; i < groups.size(); i++){
- *
+ * 		AminoAcid a;
+ * 		AminoAcid b;
+ * 		AminoAcid c;
+ * 		for (int i=0; i < groups.size(); i++) {
  * 			// since we requested only groups of type AMINOACID they will always be amino acids
  * 			// Nucleotide and Hetatom groups will not be present in the groups list.
- *
- * 			b = ({@link AminoAcid})groups.get(i);
- *
- * 			double phi =360.0;
- * 			double psi =360.0;
- *
- * 			if ( i > 0) {
- * 				a = ({@link AminoAcid})groups.get(i-1) ;
- * 				try {
- *
- * 					// the Calc class provides utility methods for various calculations on
- * 					// structures, groups and atoms
- *
- * 					phi = {@link Calc}.getPhi(a,b);
- * 				} catch ({@link StructureException} e){
- * 					e.printStackTrace();
- * 					phi = 360.0 ;
- * 				}
+ * 			b = (AminoAcid)groups.get(i);
+ * 			double phi = 360.0;
+ * 			double psi = 360.0;
+ *
+ * 			if (i > 0) {
+ * 				a = (AminoAcid)groups.get(i-1) ;
+ * 				// the Calc class provides utility methods for various calculations on
+ * 				// structures, groups and atoms
+ * 				phi = Calc.getPhi(a,b);
  * 			}
- * 			if ( i < groups.size()-1) {
- * 				c = ({@link AminoAcid})groups.get(i+1) ;
- * 				try {
- * 					psi = {@link Calc}.getPsi(b,c);
- * 				}catch ({@link StructureException} e){
- * 					e.printStackTrace();
- * 					psi = 360.0 ;
- * 				}
+ * 			if (i < groups.size()-1) {
+ * 				c = (AminoAcid)groups.get(i+1) ;
+ * 				psi = Calc.getPsi(b, c);
  * 			}
- *
  * 			System.out.print(b.getPDBCode() + " " + b.getPDBName() + ":"  );
- *
  * 			System.out.println(String.format("\tphi: %+7.2f psi: %+7.2f", phi, psi));
- *
  * 		}
- * </pre>
+ * 	}
+ * }</pre>
  * <hr>
  *
  * @author Andreas Prlic
  * @since 1.4
- * @version %I% %G%
  */
 public interface Structure extends Cloneable, Serializable {
 
@@ -776,13 +741,11 @@ public interface Structure extends Cloneable, Serializable {
 	 *
 	 * @param pdb_id  a String specifying the PDBCode
 	 * @see #getPDBCode
-	 * @deprecated use {@link #setPDBCode(PdbId)}
+	 * @deprecated use {@link #setPdbId(PdbId)}
 	 */
 	@Deprecated
 	void setPDBCode (String pdb_id);
 
-
-
 	/**
 	 * Returns the PDB identifier associated with this StructureIdentifier.
 	 * @return the {@link PdbId} object
@@ -790,7 +753,6 @@ public interface Structure extends Cloneable, Serializable {
 	 */
 	PdbId getPdbId();
 	
-	
 	/**Sets the {@link PdbId} identifier associated with this structure.
 	 * @param pdbId the {@link PdbId} identifier object to set
 	 * @since 6.0.0
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
index 75e4b95194..0b802787dd 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIO.java
@@ -206,6 +206,7 @@ public static Structure getBiologicalAssembly(String pdbId, int biolAssemblyNr)
 	 * Returns all biological assemblies for the given PDB id.
 	 * <p>
 	 * The output Structure will be different depending on the multiModel parameter:
+	 * <ul>
 	 * <li>
 	 * the symmetry-expanded chains are added as new models, one per transformId. All original models but
 	 * the first one are discarded.
@@ -214,6 +215,7 @@ public static Structure getBiologicalAssembly(String pdbId, int biolAssemblyNr)
 	 * as original with symmetry-expanded chains added with renamed chain ids and names (in the form
 	 * originalAsymId_transformId and originalAuthId_transformId)
 	 * </li>
+	 * </ul>
 	 * If only one biological assembly is required use {@link #getBiologicalAssembly(String)} or {@link #getBiologicalAssembly(String, int)} instead.
 	 * @param pdbId
 	 * @param multiModel if true the output Structure will be a multi-model one with one transformId per model,
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIdentifier.java
index 2b8cb669cf..ba8de5d870 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureIdentifier.java
@@ -33,12 +33,12 @@
  * An identifier that <em>uniquely</em> identifies a whole {@link Structure} or
  * arbitrary substructure. Common examples would be reducing a structure to a
  * single chain, domain, or residue range.
- *
+ * <p>
  * StructureIdentifiers are represented by unique strings. The getId() and fromId()
  * methods convert to and from the string representation.
- *
+ * <p>
  * Implementations should provide a constructor which takes a String. A static
- * <tt>fromId(String)</tt> method is also recommended.
+ * <code>fromId(String)</code> method is also recommended.
  *
  * @author dmyersturnbull
  * @author Spencer Bliven
@@ -59,7 +59,7 @@ public interface StructureIdentifier extends Serializable {
 	 * Loads a structure encompassing the structure identified.
 	 * The Structure returned should be suitable for passing as
 	 * the input to {@link #reduce(Structure)}.
-	 *
+	 * <p>
 	 * It is recommended that the most complete structure available be returned
 	 * (e.g. the full PDB) to allow processing of unselected portions where
 	 * appropriate.
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
index 016d1f592c..3505deaf02 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/URLIdentifier.java
@@ -42,15 +42,15 @@
 
 /**
  * Represents a structure loaded from a URL (including a file URL)
- *
+ * <p>
  * A few custom query parameters are supported:
  *
  * <ul>
- * <li><tt>format=[pdb|cif]</tt> Specify the file format (will otherwise be
+ * <li><code>format=[pdb|cif]</code> Specify the file format (will otherwise be
  *     guessed from the extension)
- * <li><tt>pdbId=[String]</tt> Specify the PDB ID (also guessed from the filename)
- * <li><tt>chainID=[String]</tt> A single chain from the structure
- * <li><tt>residues=[String]</tt> Residue ranges, in a form understood by
+ * <li><code>pdbId=[String]</code> Specify the PDB ID (also guessed from the filename)
+ * <li><code>chainID=[String]</code> A single chain from the structure
+ * <li><code>residues=[String]</code> Residue ranges, in a form understood by
  *     {@link SubstructureIdentifier}
  * </ul>
  * @author Spencer Bliven
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeMain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeMain.java
index 70f4acb64f..e35e88fce8 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeMain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeMain.java
@@ -39,7 +39,7 @@
  * The original CE paper is available from here: <a href="http://peds.oxfordjournals.org/cgi/content/short/11/9/739">http://peds.oxfordjournals.org/cgi/content/short/11/9/739</a>
  *
  * For a demo of how to use this algorithm, visit the BioJava web site:
- * <a href="">CE usage example</a>.
+ * <a href="https://github.com/biojava/biojava-tutorial/blob/master/structure/alignment.md">CE usage example</a>.
  *
  * The BioJava CE version is based on CE version 2.3 (2003 or 2004).
  *
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AFPAlignmentDisplay.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AFPAlignmentDisplay.java
index 11f36456ab..8d053a2520 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AFPAlignmentDisplay.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AFPAlignmentDisplay.java
@@ -168,8 +168,9 @@ public static void getAlign(AFPChain afpChain,Atom[] ca1,Atom[] ca2) {
 	 * <ul>
 	 * <li>{@link AFPChain#getOptAln()} and lengths
 	 * </ul>
-	 *
-	 * <section>Known Bugs</section>
+	 * <p>
+	 * Known Bugs:
+	 * <p>
 	 * Expects the alignment to have linear topology. May give odd results
 	 * for circular permutations and other complicated topologies.
 	 *
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java
index f43a97392f..15d1e0712f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java
@@ -470,10 +470,10 @@ public static Map<Integer, Integer> guessSequentialAlignment(
 	 * Retrieves the optimum alignment from an AFPChain and returns it as a
 	 * java collection. The result is indexed in the same way as
 	 * {@link AFPChain#getOptAln()}, but has the correct size().
-	 * <pre>
+	 * <pre>{@code
 	 * List<List<List<Integer>>> aln = getOptAlnAsList(AFPChain afpChain);
 	 * aln.get(blockNum).get(structureNum={0,1}).get(pos)
-	 * </pre>
+	 * }</pre>
 	 *
 	 * @param afpChain
 	 * @return
@@ -504,7 +504,7 @@ public static List<List<List<Integer>>> getOptAlnAsList(AFPChain afpChain) {
 
 
 	/**
-	 * A Map<K,V> can be viewed as a function from K to V. This class represents
+	 * A {@code Map<K,V>} can be viewed as a function from K to V. This class represents
 	 * the identity function. Getting a value results in the value itself.
 	 *
 	 * <p>The class is a bit inconsistent when representing its contents. On
@@ -1078,9 +1078,9 @@ public static Map<Integer, Integer> fromConciseAlignmentString(String string) {
 
 	/**
 	 * Method that calculates the number of gaps in each subunit block of an optimal AFP alignment.
-	 *
-	 * INPUT: an optimal alignment in the format int[][][].
-	 * OUTPUT: an int[] array of <order> length containing the gaps in each block as int[block].
+	 * @param optAln
+	 * 				an optimal alignment in the format int[][][]
+	 * @return an int[] array of order length containing the gaps in each block as int[block]
 	 */
 	public static int[] calculateBlockGap(int[][][] optAln){
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
index fe5bfb0f2e..e547a0cafc 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
@@ -162,7 +162,6 @@ public AtomCache(UserConfiguration config) {
 	 * @return an array of Atoms.
 	 * @throws IOException
 	 * @throws StructureException
-	 * @see
 	 */
 	public Atom[] getAtoms(String name) throws IOException, StructureException {
 		return getAtoms(new StructureName(name));
@@ -189,7 +188,6 @@ public Atom[] getAtoms(StructureIdentifier name) throws IOException, StructureEx
 	 * @return an array of Atoms.
 	 * @throws IOException
 	 * @throws StructureException
-	 * @see
 	 */
 	public Atom[] getRepresentativeAtoms(String name) throws IOException, StructureException {
 		return getRepresentativeAtoms(new StructureName(name));
@@ -223,7 +221,7 @@ public Atom[] getRepresentativeAtoms(StructureIdentifier name) throws IOExceptio
 	 * if false the outputStructure will be as the original with added chains with renamed asymIds (in the form originalAsymId_transformId and originalAuthId_transformId).
 	 * @return a structure object
 	 * @throws IOException
-	 * @throws StructureException if biassemblyId < 0 or other problems while loading structure
+	 * @throws StructureException if biassemblyId &lt; 0 or other problems while loading structure
 	 * @since 3.2
 	 */
 	public Structure getBiologicalAssembly(String pdbId, int bioAssemblyId, boolean multiModel)
@@ -247,7 +245,7 @@ public Structure getBiologicalAssembly(String pdbId, int bioAssemblyId, boolean
 	 * if false the outputStructure will be as the original with added chains with renamed asymIds (in the form originalAsymId_transformId and originalAuthId_transformId).
 	 * @return a structure object
 	 * @throws IOException
-	 * @throws StructureException if biassemblyId < 0 or other problems while loading structure
+	 * @throws StructureException if biassemblyId &lt; 0 or other problems while loading structure
 	 * @since 6.0.0
 	 */
 	public Structure getBiologicalAssembly(PdbId pdbId, int bioAssemblyId, boolean multiModel)
@@ -305,7 +303,7 @@ public Structure getBiologicalAssembly(PdbId pdbId, int bioAssemblyId, boolean m
 	 * the asymmetric unit will be returned, e.g. for NMR structures.
 	 *
 	 * <p>Biological assemblies can also be accessed using
-	 * <tt>getStructure("BIO:<i>[pdbId]</i>")</tt>
+	 * <code>getStructure("BIO:<i>[pdbId]</i>")</code>
 	 * @param pdbId the PDB id
 	 * @param multiModel if true the output Structure will be a multi-model one with one transformId per model,
 	 * if false the outputStructure will be as the original with added chains with renamed asymIds (in the form originalAsymId_transformId and originalAuthId_transformId).
@@ -791,7 +789,7 @@ protected void flagLoadingFinished(PdbId pdbId) {
 
 	/**
 	 * Loads a structure directly by PDB ID
-	 * @param pdbId
+	 * @param id
 	 * @return
 	 * @throws IOException
 	 * @throws StructureException
@@ -806,7 +804,6 @@ public Structure getStructureForPdbId(String id) throws IOException, StructureEx
 	 * @param pdbId
 	 * @return
 	 * @throws IOException
-	 * @throws StructureException
 	 */
 	public Structure getStructureForPdbId(PdbId pdbId) throws IOException {
 		if (pdbId == null)
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index 5297443a34..51b8e91497 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -259,7 +259,7 @@ public FileParsingParameters getFileParsingParameters(){
 	 *   Load the requested ID from the PDB's obsolete repository
 	 * <li>{@link ObsoleteBehavior#FETCH_CURRENT FETCH_CURRENT}
 	 *   Load the most recent version of the requested structure
-	 *
+	 * </ul>
 	 * <p>This setting may be silently ignored by implementations which do not have
 	 * access to the server to determine whether an entry is obsolete, such as
 	 * if {@link #isAutoFetch()} is false. Note that an obsolete entry may still be
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileReader.java
index 5591fbdd84..7e12874dbc 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileReader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileReader.java
@@ -30,27 +30,20 @@
 import java.io.InputStream;
 
 /**
- * <p>
  *  The wrapper class for parsing a PDB file.
- *  </p>
- *
  *
- *  <p>
+ * <p>
  *  Several flags can be set for this class
- *  <ul>
+ * <ul>
  *
  * <li> {@link #setAutoFetch(boolean)} - if the PDB file can not be found locally, should it be fetched
  *  from the PDB ftp servers? (default:false)</li>
- *  <li> Other parameters can be set using the {@link #setFileParsingParameters(FileParsingParameters)}</li>
- *  </ul>
- *  </p>
- *
- *
+ * <li> Other parameters can be set using the {@link #setFileParsingParameters(FileParsingParameters)}</li>
+ * </ul>
  *
  *<h2>Example</h2>
  * <p>
  * Q: How can I get a Structure object from a PDB file?
- * </p>
  * <p>
  * A:
  * <pre>
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/jama/LUDecomposition.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/jama/LUDecomposition.java
index 00f5d302ec..64c77c3665 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/jama/LUDecomposition.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/jama/LUDecomposition.java
@@ -22,10 +22,10 @@
 
 	/** LU Decomposition.
 	<P>
-	For an m-by-n matrix A with m >= n, the LU decomposition is an m-by-n
+	For an m-by-n matrix A with m &gt;= n, the LU decomposition is an m-by-n
 	unit lower triangular matrix L, an n-by-n upper triangular matrix U,
 	and a permutation vector piv of length m so that A(piv,:) = L*U.
-	If m < n, then L is m-by-m and U is m-by-n.
+	If m &lt; n, then L is m-by-m and U is m-by-n.
 	<P>
 	The LU decompostion with pivoting always exists, even if the matrix is
 	singular, so the constructor will never fail.  The primary use of the
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/jama/Matrix.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/jama/Matrix.java
index 2abdd1c972..fab188ce98 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/jama/Matrix.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/jama/Matrix.java
@@ -62,7 +62,7 @@
  * </UL>
  * <DL>
  * <DT><B>Example of use:</B></DT>
- * <P>
+ *
  * <DD>Solve a linear system A x = b and compute the residual norm, ||b - A x||.
  * <P><PRE>
  * 		double[][] vals = {{1.,2.,3},{4.,5.,6.},{7.,8.,10.}};
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/package-info.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/package-info.java
index fecc3afee6..8d5fb81573 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/package-info.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/package-info.java
@@ -19,10 +19,8 @@
  *
  */
 /**
- * <BODY>
- * <P>
  * Interfaces and classes for protein structure (PDB).
- * </P>
+ *
  * <p>
  * See also the <a href="https://github.com/biojava/biojava3-tutorial/blob/master/structure/README.md">BioJava 3 tutorial</a> for more information on the protein structure modules.
  * </p>
@@ -62,8 +60,7 @@
  * For more documentation on how to work with the Structure API please
  * see <a href="http://biojava.org/wiki/BioJava:CookBook#Protein_Structure" target="_top">
  * http://biojava.org/wiki/BioJava:CookBook#Protein_Structure</a>
- * </p>
- * </BODY>
+ *
  * @since 1.5
  */
 package org.biojava.nbio.structure;
\ No newline at end of file
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/BridgeType.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/BridgeType.java
index 04e35fe14d..26b4656767 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/BridgeType.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/BridgeType.java
@@ -22,7 +22,7 @@
 
 /**
  * A bridge is formed by two non-overlapping stretches of three residues each
- * (i-1,i,i+1) and (j-1,j,j+1), where i<j.
+ * (i-1,i,i+1) and (j-1,j,j+1), where i&lt;j.
  * <p>
  * Depending on two basic patterns, a Bridge can be either of type parallel (H
  * bonds in {(i-1,j) and (j,i+1)} OR {(j-1,i) and (i,j-1)}) or antiparallel (H
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationGroup.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationGroup.java
index 9d25a7acbc..70b69afe14 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationGroup.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationGroup.java
@@ -31,7 +31,7 @@
 import java.util.List;
 
 /**
- * @see http://en.wikipedia.org/wiki/Rotation_group_SO(3)
+ * See <a href="http://en.wikipedia.org/wiki/Rotation_group_SO(3)">http://en.wikipedia.org/wiki/Rotation_group_SO(3)</a>
  * @author Peter
  */
 public class RotationGroup implements Iterable<Rotation> {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java
index 4527a7fa49..0700e34571 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/CeSymmIterative.java
@@ -63,7 +63,6 @@
  * <li>Repeat the last two steps until no more significant results are found.
  * <li>Map back all residues in a multiple alignment of the repeats.
  * </ul>
- * </li>
  *
  * @author Aleix Lafita
  * @since 4.1.1
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java
index 58a8c89394..d03e90080f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SymmOptimizer.java
@@ -43,7 +43,7 @@
  * Optimizes a symmetry alignment by a Monte Carlo score optimization of the
  * repeat multiple alignment. The superposition of the repeats is not free
  * (felxible), because it is constrained on the symmetry axes found in the
- * structure. This is the main difference to the {@link MultipleMC} algorithm in
+ * structure. This is the main difference to the {@link org.biojava.nbio.structure.align.multiple.mc.MultipleMcMain} algorithm in
  * biojava. Another major difference is that the free Pool is shared for all
  * repeats, so that no residue can appear to more than one repeat at a time.
  * <p>

From 2bbc82438cc8aba6dbbfbc362aef4959a0714918 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 13:52:17 -0800
Subject: [PATCH 529/599] Javadoc fix: remaining errors in structure module.
 Mostly obsolete references

---
 .../nbio/structure/test/scop/ScopDescriptionTest.java     | 2 +-
 .../src/main/java/demo/DemoChangeChemCompProvider.java    | 5 ++---
 .../org/biojava/nbio/structure/align/model/AFPChain.java  | 2 +-
 .../biojava/nbio/structure/align/util/AlignmentTools.java | 4 +---
 .../org/biojava/nbio/structure/align/util/AtomCache.java  | 7 +++----
 .../org/biojava/nbio/structure/io/LocalPDBDirectory.java  | 7 +++----
 .../java/org/biojava/nbio/structure/io/PDBFileReader.java | 5 +----
 .../symmetry/internal/SequenceFunctionRefiner.java        | 8 ++++----
 .../java/org/biojava/nbio/structure/HetatomImplTest.java  | 2 +-
 .../java/org/biojava/nbio/structure/PDBStatusTest.java    | 2 +-
 .../org/biojava/nbio/structure/ResidueNumberTest.java     | 2 +-
 .../test/java/org/biojava/nbio/structure/SiteTest.java    | 2 +-
 .../biojava/nbio/structure/align/util/AtomCacheTest.java  | 2 +-
 13 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/ScopDescriptionTest.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/ScopDescriptionTest.java
index 39f1fdacf2..5976d635c9 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/ScopDescriptionTest.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/ScopDescriptionTest.java
@@ -30,7 +30,7 @@
 
 
 /**
- * @author Spencer Bliven <sbliven@ucsd.edu>
+ * @author Spencer Bliven sbliven@ucsd.edu
  *
  */
 public class ScopDescriptionTest {
diff --git a/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java b/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
index bb78c98d77..b3c292c92d 100644
--- a/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
+++ b/biojava-structure/src/main/java/demo/DemoChangeChemCompProvider.java
@@ -34,9 +34,8 @@
 
 /**
  *  This demo shows how to use an alternative ChemCompProvider. The default mechanism in BioJava is to access chemical
- *  componentsby using the {@link DownloadChemCompProvider}. It fetches and locally caches chemical component
- *  definitions as they are encountered during file parsing. It can be enabled by using the
- *  {@link FileParsingParameters#setLoadChemCompInfo(boolean)} method.
+ *  components by using the {@link DownloadChemCompProvider}. It fetches and locally caches chemical component
+ *  definitions as they are encountered during file parsing.
  * <p>
  * The {@link AllChemCompProvider} downloads and unpacks all chemcomps. It is slower and requires more memory than the
  * default {@link DownloadChemCompProvider}, but it avoids network access to the FTP site, if a new chemcomp is
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
index 001d32d806..0c4ee5ec95 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/model/AFPChain.java
@@ -1312,7 +1312,7 @@ public void setSequentialAlignment(boolean sequentialAlignment) {
 	 * up to the alignment algorithm.
 	 *
 	 * <p>Note:
-	 * A {@link org.biojava.nbio.structure.gui.JMatrixPanel}, which is used in
+	 * The org.biojava.nbio.structure.gui.JMatrixPanel, used in
 	 * the structure-gui package to display distance matrices, will display the
 	 * transpose of this matrix. Be sure to take that into account when debugging
 	 * visually.
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java
index 15d1e0712f..c6791f4ed2 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AlignmentTools.java
@@ -239,8 +239,6 @@ public static <S,T> Map<S,T> applyAlignment(Map<S, T> alignmentMap, Map<T,S> ide
 			}
 		}
 
-
-
 		Map<S, T> imageMap = new HashMap<>(alignmentMap.size());
 
 		//TODO handle nulls consistently.
@@ -282,7 +280,7 @@ public static <S,T> Map<S,T> applyAlignment(Map<S, T> alignmentMap, Map<T,S> ide
 	 */
 	public static int getSymmetryOrder(Map<Integer, Integer> alignment,
 									   final int maxSymmetry, final float minimumMetricChange) {
-		return getSymmetryOrder(alignment, new IdentityMap<Integer>(), maxSymmetry, minimumMetricChange);
+		return getSymmetryOrder(alignment, new IdentityMap<>(), maxSymmetry, minimumMetricChange);
 	}
 	/**
 	 * Tries to detect symmetry in an alignment.
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
index e547a0cafc..1435191c2c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
@@ -464,8 +464,7 @@ public String getPath() {
 	 * <li>If only a PDB code is provided, the whole structure will be return including ligands, but the first model
 	 * only (for NMR).
 	 * <li>Chain IDs are case sensitive, PDB ids are not. To specify a particular chain write as: 4hhb.A or 4HHB.A</li>
-	 * <li>To specify a SCOP domain write a scopId e.g. d2bq6a1. Some flexibility can be allowed in SCOP domain names,
-	 * see {@link #setStrictSCOP(boolean)}</li>
+	 * <li>To specify a SCOP domain write a scopId e.g. d2bq6a1. </li>
 	 * <li>URLs are accepted as well</li>
 	 * </ul>
 	 *
@@ -672,7 +671,7 @@ public void setFileParsingParams(FileParsingParameters params) {
 	 *
 	 * <p>This setting may be silently ignored by implementations which do not have
 	 * access to the server to determine whether an entry is obsolete, such as
-	 * if {@link #isAutoFetch()} is false. Note that an obsolete entry may still be
+	 * certain {@link FetchBehavior}s. Note that an obsolete entry may still be
 	 * returned even this is FETCH_CURRENT if the entry is found locally.
 	 *
 	 * @param behavior Whether to fetch obsolete records
@@ -685,7 +684,7 @@ public void setObsoleteBehavior(ObsoleteBehavior behavior) {
 	/**
 	 * Returns how this instance deals with obsolete entries. Note that this
 	 * setting may be ignored by some implementations or in some situations,
-	 * such as when {@link #isAutoFetch()} is false.
+	 * such as certain {@link FetchBehavior}s.
 	 *
 	 * <p>For most implementations, the default value is
 	 * {@link ObsoleteBehavior#THROW_EXCEPTION THROW_EXCEPTION}.
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
index 51b8e91497..4ec4577f59 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/LocalPDBDirectory.java
@@ -262,7 +262,7 @@ public FileParsingParameters getFileParsingParameters(){
 	 * </ul>
 	 * <p>This setting may be silently ignored by implementations which do not have
 	 * access to the server to determine whether an entry is obsolete, such as
-	 * if {@link #isAutoFetch()} is false. Note that an obsolete entry may still be
+	 * certain {@link FetchBehavior}s. Note that an obsolete entry may still be
 	 * returned even this is FETCH_CURRENT if the entry is found locally.
 	 *
 	 * @param behavior Whether to fetch obsolete records
@@ -276,7 +276,7 @@ public void setObsoleteBehavior(ObsoleteBehavior behavior) {
 	/**
 	 * Returns how this instance deals with obsolete entries. Note that this
 	 * setting may be ignored by some implementations or in some situations,
-	 * such as when {@link #isAutoFetch()} is false.
+	 * such as certain {@link FetchBehavior}s.
 	 *
 	 * <p>For most implementations, the default value is
 	 * {@link ObsoleteBehavior#THROW_EXCEPTION THROW_EXCEPTION}.
@@ -295,10 +295,9 @@ public ObsoleteBehavior getObsoleteBehavior() {
 	public FetchBehavior getFetchBehavior() {
 		return fetchBehavior;
 	}
+
 	/**
 	 * Set the behavior for fetching files from the server.
-	 * This replaces the {@link #setAutoFetch(boolean)} method with a more
-	 * extensive set of options.
 	 * @param fetchBehavior
 	 */
 	public void setFetchBehavior(FetchBehavior fetchBehavior) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileReader.java
index 7e12874dbc..dec97b4f61 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileReader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileReader.java
@@ -35,10 +35,7 @@
  * <p>
  *  Several flags can be set for this class
  * <ul>
- *
- * <li> {@link #setAutoFetch(boolean)} - if the PDB file can not be found locally, should it be fetched
- *  from the PDB ftp servers? (default:false)</li>
- * <li> Other parameters can be set using the {@link #setFileParsingParameters(FileParsingParameters)}</li>
+ * <li> Parameters can be set using the {@link #setFileParsingParameters(FileParsingParameters)}</li>
  * </ul>
  *
  *<h2>Example</h2>
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SequenceFunctionRefiner.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SequenceFunctionRefiner.java
index beeba62df2..a6ad226698 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SequenceFunctionRefiner.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/internal/SequenceFunctionRefiner.java
@@ -61,12 +61,12 @@ public MultipleAlignment refine(AFPChain selfAlignment, Atom[] atoms,
 
 	/**
 	 * Refines a CE-Symm alignment so that it is perfectly symmetric.
-	 *
+	 * <p>
 	 * The resulting alignment will have a one-to-one correspondance between
 	 * aligned residues of each symmetric part.
 	 *
 	 * @param afpChain Input alignment from CE-Symm
-	 * @param k Symmetry order. This can be guessed by {@link CeSymm#getSymmetryOrder(AFPChain)}
+	 * @param k Symmetry order. This can be guessed by {@link AlignmentTools#getSymmetryOrder(Map, Map, int, float)}
 	 * @return The refined alignment
 	 * @throws StructureException
 	 * @throws RefinerFailedException
@@ -97,11 +97,11 @@ public static AFPChain refineSymmetry(AFPChain afpChain, Atom[] ca1, Atom[] ca2,
 
 	/**
 	 * Refines a CE-Symm alignment so that it is perfectly symmetric.
-	 *
+	 * <p>
 	 * The resulting alignment will have a one-to-one correspondance between
 	 * aligned residues of each symmetric part.
 	 * @param alignment The input alignment, as a map. This will be modified.
-	 * @param k Symmetry order. This can be guessed by {@link CeSymm#getSymmetryOrder(AFPChain)}
+	 * @param k Symmetry order. This can be guessed by {@link AlignmentTools#getSymmetryOrder(Map, Map, int, float)}
 	 * @return A modified map with the refined alignment
 	 * @throws StructureException
 	 */
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/HetatomImplTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/HetatomImplTest.java
index 74556c2434..8f9d190a71 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/HetatomImplTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/HetatomImplTest.java
@@ -29,7 +29,7 @@
 
 /**
  *
- * @author Jules Jacobsen <jacobsen@ebi.ac.uk>
+ * @author Jules Jacobsen jacobsen@ebi.ac.uk
  */
 public class HetatomImplTest {
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/PDBStatusTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/PDBStatusTest.java
index 82e26bd802..6d97b0889d 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/PDBStatusTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/PDBStatusTest.java
@@ -27,7 +27,7 @@
 import java.io.IOException;
 
 /**
- * @author Spencer Bliven <sbliven@ucsd.edu>
+ * @author Spencer Bliven sbliven@ucsd.edu
  *
  */
 public class PDBStatusTest {
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/ResidueNumberTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/ResidueNumberTest.java
index c594f0dd18..c5ebb6c028 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/ResidueNumberTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/ResidueNumberTest.java
@@ -29,7 +29,7 @@
 
 /**
  *
- * @author Jules Jacobsen <jacobsen@ebi.ac.uk>
+ * @author Jules Jacobsen jacobsen@ebi.ac.uk
  */
 public class ResidueNumberTest {
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/SiteTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/SiteTest.java
index d7a64d0017..5e39000e90 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/SiteTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/SiteTest.java
@@ -29,7 +29,7 @@
 
 /**
  * Tests functionality of Site class.
- * @author Jules Jacobsen <jacobsen@ebi.ac.uk>
+ * @author Jules Jacobsen jacobsen@ebi.ac.uk
  */
 public class SiteTest {
 
diff --git a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
index ec2763df9a..073a679dbb 100644
--- a/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
+++ b/biojava-structure/src/test/java/org/biojava/nbio/structure/align/util/AtomCacheTest.java
@@ -165,7 +165,7 @@ public void testGetStructureForDomain3() throws IOException, StructureException
 	}
 
 	/**
-	 * Test parsing of chain-less ranges (present in SCOP < 1.73)
+	 * Test parsing of chain-less ranges (present in SCOP &lt; 1.73)
 	 * @throws IOException
 	 * @throws StructureException
 	 */

From aefa34a52f1c208e3b43d005d5db336052cef900 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 14:02:49 -0800
Subject: [PATCH 530/599] Javadoc fix: errors in structure-gui module

---
 .../main/java/org/biojava/nbio/ontology/io/package-info.java | 2 --
 biojava-ontology/src/main/java/package-info.java             | 2 --
 biojava-structure-gui/src/main/java/demo/AFPFromFasta.java   | 5 ++---
 .../org/biojava/nbio/structure/align/gui/DotPlotPanel.java   | 1 -
 .../org/biojava/nbio/structure/align/gui/MemoryMonitor.java  | 2 +-
 .../org/biojava/nbio/structure/align/gui/SelectPDBPanel.java | 3 ++-
 .../structure/align/gui/aligpanel/MultipleAligPanel.java     | 4 ++--
 .../nbio/structure/align/gui/jmol/AbstractAlignmentJmol.java | 2 +-
 .../org/biojava/nbio/structure/gui/events/package-info.java  | 2 --
 .../java/org/biojava/nbio/structure/gui/package-info.java    | 2 --
 .../gui/util/color/ContinuousColorMapperTransform.java       | 2 +-
 .../biojava/nbio/structure/gui/util/color/HSVColorSpace.java | 3 +--
 .../structure/gui/util/color/LinearColorInterpolator.java    | 2 +-
 .../org/biojava/nbio/structure/gui/util/package-info.java    | 2 --
 .../biojava/nbio/structure/symmetry/gui/SymmetryDisplay.java | 2 +-
 .../symmetry/jmolScript/JmolSymmetryScriptGenerator.java     | 2 +-
 16 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/package-info.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/package-info.java
index b6aed42304..43c5d532bc 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/package-info.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/package-info.java
@@ -19,10 +19,8 @@
  *
  */
 /**
- * <BODY>
  * <P>
  * Tools for loading and saving ontologies.
  * </P>
- * </BODY>
  */
 package org.biojava.nbio.ontology.io;
\ No newline at end of file
diff --git a/biojava-ontology/src/main/java/package-info.java b/biojava-ontology/src/main/java/package-info.java
index 56cc7e5eba..7cafa32539 100644
--- a/biojava-ontology/src/main/java/package-info.java
+++ b/biojava-ontology/src/main/java/package-info.java
@@ -19,7 +19,6 @@
  *
  */
 /**
- * <BODY>
  * <P>
  * A general-purpose API for ontologies.
  * These are directed graphs consisting of <code>Term</code> obects.  Each
@@ -30,5 +29,4 @@
  * <P>Some interfaces and implementations from this package are extended in
  * {@link org.biojavax.ontology biojavax} to better facilitate their persistence to
  * biosql.</P>
- * </BODY>
  */
\ No newline at end of file
diff --git a/biojava-structure-gui/src/main/java/demo/AFPFromFasta.java b/biojava-structure-gui/src/main/java/demo/AFPFromFasta.java
index 97f32828be..5d91f22aa8 100644
--- a/biojava-structure-gui/src/main/java/demo/AFPFromFasta.java
+++ b/biojava-structure-gui/src/main/java/demo/AFPFromFasta.java
@@ -41,10 +41,9 @@
 
 /**
  * Demo displaying a structural alignment from a FASTA file using {@link FastaAFPChainConverter}.
- *
- * @author dmyerstu
- * @see {@link DemoAlignmentFromFasta} Also demonstrates the display of {@link StructureAlignment StructureAlignments} from FASTA sequences, but does so using the more general
+ * See {@link DemoAlignmentFromFasta} Also demonstrates the display of {@link StructureAlignment StructureAlignments} from FASTA sequences, but does so using the more general
  *      {@link FastaStructureParser}
+ * @author dmyerstu
  */
 public class AFPFromFasta {
 
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/DotPlotPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/DotPlotPanel.java
index 0532d91498..b96b10a066 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/DotPlotPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/DotPlotPanel.java
@@ -56,7 +56,6 @@ public class DotPlotPanel extends ScaleableMatrixPanel {
 	/**
 	 *
 	 * @param alignment The alignment to plot
-	 * @param background [Optional]A matrix of 'background colors' over which to draw the alignment.
 	 *
 	 *	Originally designed as a matrix of RMSD values between AFPs, so it is colorized
 	 *	accordingly from red (0) to black (>10).
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MemoryMonitor.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MemoryMonitor.java
index 91ca7571b4..3c60ab3275 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MemoryMonitor.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/MemoryMonitor.java
@@ -51,7 +51,7 @@
 
 
 /**
- * Tracks Memory allocated & used, displayed in graph form.
+ * Tracks Memory allocated and used, displayed in graph form.
  */
 public class MemoryMonitor extends JPanel {
 
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/SelectPDBPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/SelectPDBPanel.java
index 240246bb88..41eaf80b1e 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/SelectPDBPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/SelectPDBPanel.java
@@ -43,7 +43,8 @@
 import org.biojava.nbio.structure.gui.util.StructurePairSelector;
 
 
-/** A Panel that allows user to specify PDB & chain ID, as well as sub-ranges
+/**
+ * A Panel that allows user to specify PDB and chain ID, as well as sub-ranges
  *
  * @author Andreas
  *
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/MultipleAligPanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/MultipleAligPanel.java
index 483df6f2df..3614907b5b 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/MultipleAligPanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/aligpanel/MultipleAligPanel.java
@@ -154,8 +154,8 @@ public MultipleAligPanel(AFPChain afpChain, Atom[] ca1, Atom[] ca2,
 	/**
 	 * Constructor using a MultipleAlignment.
 	 *
-	 * @param multAln
-	 * @param colors
+	 * @param msa
+	 * @param jm
 	 */
 	public MultipleAligPanel(MultipleAlignment msa, AbstractAlignmentJmol jm) {
 		this();
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/AbstractAlignmentJmol.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/AbstractAlignmentJmol.java
index 4663505797..535ad182fe 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/AbstractAlignmentJmol.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/align/gui/jmol/AbstractAlignmentJmol.java
@@ -196,7 +196,7 @@ public Structure getStructure(){
 
 	/**
 	 * Set the title of the AlignmentJmol window.
-	 * @param label
+	 * @param title
 	 */
 	public void setTitle(String title){
 		frame.setTitle(title);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/events/package-info.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/events/package-info.java
index 138365c88a..001686e4f6 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/events/package-info.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/events/package-info.java
@@ -19,12 +19,10 @@
  *
  */
 /**
- * <BODY>
  * <P>
  * Some event classes for the protein structure GUIs.
  * Possible start classes are one level higher at
  * org.biojava.nbio.structure.gui.BiojavaJmol, and org.biojava.nbio.structure.gui.AlignmentGui.
  * </P>
- * </BODY>
  */
 package org.biojava.nbio.structure.gui.events;
\ No newline at end of file
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/package-info.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/package-info.java
index 1a4bc6d6af..ed9ae12804 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/package-info.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/package-info.java
@@ -19,13 +19,11 @@
  *
  */
 /**
- * <BODY>
  * <P>
  * A few convenience classes to view protein structures with Jmol (if it is on the classpath),
  * to calculate a protein structure alignment and to investigate the internals of the protein structure alignment algorithm.
  * Possible start classes are BiojavaJmol, AlignmentGui.
  * Also MVC interface for structure-gui
  * </P>
- * </BODY>
  */
 package org.biojava.nbio.structure.gui;
\ No newline at end of file
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/ContinuousColorMapperTransform.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/ContinuousColorMapperTransform.java
index 5cd010b356..d691a5237d 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/ContinuousColorMapperTransform.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/ContinuousColorMapperTransform.java
@@ -60,7 +60,7 @@ public Color getColor(double value) {
 
 	/**
 	 * An arbitrary transform over reals
-	 * @param the input value
+	 * @param value the input value
 	 * @return the transformed value
 	 */
 	public abstract double transform(double value);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/HSVColorSpace.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/HSVColorSpace.java
index 4aafce9f1e..31e3919ae5 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/HSVColorSpace.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/HSVColorSpace.java
@@ -79,9 +79,8 @@ public static void main(String[] args) {
 
 
 	}
+
 	/**
-	 * @param type
-	 * @param numcomponents
 	 */
 	public HSVColorSpace() {
 		super(ColorSpace.TYPE_HSV, 3);
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/LinearColorInterpolator.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/LinearColorInterpolator.java
index 9522ec7a15..2e6d1fc4e4 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/LinearColorInterpolator.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/color/LinearColorInterpolator.java
@@ -142,7 +142,7 @@ public Color interpolate(Color a, Color b, float mixing) {
 	 * InterpolationDirections.
 	 *
 	 * @param colorSpace The color space for interpolation
-	 * @param interpDirection An array of size colorSpace.getNumComponents()
+	 * @param dir An array of size colorSpace.getNumComponents()
 	 * 		giving the interpolation direction for each component.
 	 */
 	public void setColorSpace(ColorSpace colorSpace, InterpolationDirection[] dir) {
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/package-info.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/package-info.java
index 2c59281a2c..c820470c62 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/package-info.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/package-info.java
@@ -19,12 +19,10 @@
  *
  */
 /**
- * <BODY>
  * <P>
  * Some utility classes for the protein structure GUIs.
  * Possible start classes are one level higher at
  * org.biojava.nbio.structure.ngui.BiojavaJmol, and org.biojava.nbio.structure.gui.AlignmentGui.
  * </P>
- * </BODY>
  */
 package org.biojava.nbio.structure.gui.util;
\ No newline at end of file
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/gui/SymmetryDisplay.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/gui/SymmetryDisplay.java
index 52df113942..ea558927a3 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/gui/SymmetryDisplay.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/gui/SymmetryDisplay.java
@@ -104,7 +104,7 @@ public static MultipleAlignmentJmol displayFull(CeSymmResult symm)
 	 * Displays a single structure in a cartoon representation with each
 	 * symmetric repeat colored differently.
 	 *
-	 * @param msa
+	 * @param symmResult
 	 *            the symmetry multiple alignment obtained from CeSymm
 	 * @throws StructureException
 	 */
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java
index 8a5764e1bb..507d4c727e 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java
@@ -38,7 +38,7 @@ public abstract class JmolSymmetryScriptGenerator {
 	/**
 	 * Returns an instance of a JmolSymmetryScriptGenerator, based on the symmetry of a structure (factory method)
 	 * @param axisAligner
-	 * @param rotationGroup
+	 * @param name
 	 * @return instance of JmolSymmetryScriptGenerator
 	 */
 	public static JmolSymmetryScriptGenerator getInstance(AxisAligner axisAligner, String name) {

From 3580f7bac804f3305411a7a9d41bdb47cb836b4e Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 14:10:26 -0800
Subject: [PATCH 531/599] Javadoc fix: errors in genome module

---
 .../org/biojava/nbio/genome/parsers/gff/Location.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Location.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Location.java
index d0b2fc8f97..4163be2b56 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Location.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Location.java
@@ -409,9 +409,9 @@ public LocIterator iterator( int windowSize, int increment )
 	 * The part of this location before the specified position. If position is negative,
 	 * count backwards from the end.
 	 * <br><br>
-	 * For position >= 0, return Location( start, start + position ).
+	 * For position &gt;= 0, return Location( start, start + position ).
 	 * <br>
-	 * For position < 0, return Location( start, end + position ).
+	 * For position &lt; 0, return Location( start, end + position ).
 	 * <br>
 	 * @return New location from start of this location to directly before position.
 	 * @param position Where the prefix ends.
@@ -451,9 +451,9 @@ public Location prefix( int position )
 	 * The part of this location after the specified position. If position is negative, count backwards
 	 * from the end.
 	 * <br><br>
-	 * For position >= 0, return Location( start + position, end ).
+	 * For position &gt;= 0, return Location( start + position, end ).
 	 * <br>
-	 * For position < 0, return Location( end - position, end ).
+	 * For position &lt; 0, return Location( end - position, end ).
 	 * <br>
 	 * @return New location from position to end of this location.
 	 * @param position Where the suffix starts.

From bb073294543ce4c4096d0389ab89aad9d33675f2 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 14:16:37 -0800
Subject: [PATCH 532/599] Javadoc fix: errors in modfinder module

---
 .../main/java/org/biojava/nbio/protmod/Component.java    | 4 ++--
 .../org/biojava/nbio/protmod/ModificationLinkage.java    | 8 ++++----
 .../nbio/protmod/ProteinModificationRegistry.java        | 2 +-
 .../biojava/nbio/protmod/structure/ModifiedCompound.java | 9 ++++-----
 .../nbio/protmod/structure/ModifiedCompoundImpl.java     | 1 -
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/Component.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/Component.java
index 4a35ff5218..08dafb0626 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/Component.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/Component.java
@@ -30,7 +30,7 @@
  * contains information about a certain Component.
  * The Component class uses the extensible enum pattern.
  * You can't instantiate Component directly, instead
- * you have to use one of the {@link register} and {@link of} methods.
+ * you have to use one of the register and {@link #of} methods.
  *
  * @author Jianjiong Gao
  * @since 3.0
@@ -109,7 +109,7 @@ public boolean isCTerminal() {
 	/**
 	 * Get a Component that does not have to occur at terminals. If the
 	 * corresponding component has already been registered, return that one.
-	 * @param pdbccIds possible Protein Data Bank ID.
+	 * @param pdbccId possible Protein Data Bank ID.
 	 * @return a component.
 	 * @throws IllegalArgumentException if pdbccId or type is null,
 	 *  or the pdbccId has been registered as a different type.
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationLinkage.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationLinkage.java
index 75ddb4c807..8bbccacce3 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationLinkage.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ModificationLinkage.java
@@ -54,10 +54,10 @@ public ModificationLinkage(
 	 *
 	 * @param components {@link Component}s involved in a modification.
 	 * @param indexOfComponent1 index of the first component.
-	 * @param labelOfAtomOnComponent1 label of the atom on the first
+	 * @param pdbNameOfAtomsOnComponent1 label of the atom on the first
 	 *  component.
 	 * @param indexOfComponent2 index of the second component.
-	 * @param labelOfAtomOnComponent2 label of the atom on the second
+	 * @param pdbNameOfAtomsOnComponent2 label of the atom on the second
 	 *  component.
 	 */
 	public ModificationLinkage(
@@ -77,10 +77,10 @@ public ModificationLinkage(
 	 *
 	 * @param components {@link Component}s involved in a modification.
 	 * @param indexOfComponent1 index of the first component.
-	 * @param labelOfAtomOnComponent1 label of the atom on the first
+	 * @param pdbNameOfPotentialAtomsOnComponent1 label of the atom on the first
 	 *  component.
 	 * @param indexOfComponent2 index of the second component.
-	 * @param labelOfAtomOnComponent2 label of the atom on the second
+	 * @param pdbNameOfPotentialAtomsOnComponent2 label of the atom on the second
 	 *  component.
 	 */
 	public ModificationLinkage(
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ProteinModificationRegistry.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ProteinModificationRegistry.java
index 043aa3d779..383560ab01 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ProteinModificationRegistry.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/ProteinModificationRegistry.java
@@ -206,7 +206,7 @@ public static void register(final ProteinModification modification) {
 
 	/**
 	 * Remove a modification from registry.
-	 * @param mod
+	 * @param modification
 	 */
 	public static void unregister(ProteinModification modification) {
 		if (modification==null) throw new IllegalArgumentException("modification == null!");
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ModifiedCompound.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ModifiedCompound.java
index 164c3d86d9..1a65fcdfbc 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ModifiedCompound.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ModifiedCompound.java
@@ -47,7 +47,7 @@ public interface ModifiedCompound {
 
 	/**
 	 *
-	 * @return {@link ProteinModificationBean} occurred on the residue.
+	 * @return {@link ProteinModification} occurred on the residue.
 	 */
 	public ProteinModification getModification();
 
@@ -73,19 +73,18 @@ public interface ModifiedCompound {
 	/**
 	 *
 	 * @return a set of atom linkages.
-	 * @see #getLinkedGroupPairs
 	 * @see StructureAtomLinkage
 	 */
 	public Set<StructureAtomLinkage> getAtomLinkages();
 
-	/** Set atom linkages
+	/**
+	 * Set atom linkages
 	 *
-	 * @return
 	 */
 	public void setAtomLinkages(Set<StructureAtomLinkage> linkages);
 
 	/**
-	 * Add a linkage. Add new the involved groups first using {@link addGroup}.
+	 * Add a linkage. Add new the involved groups first using addGroup.
 	 * @param linkage an atom linkage.
 	 * @return true if this linkage was not already contained.
 	 * @see StructureAtomLinkage
diff --git a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ModifiedCompoundImpl.java b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ModifiedCompoundImpl.java
index 889d3948b2..435772defd 100644
--- a/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ModifiedCompoundImpl.java
+++ b/biojava-modfinder/src/main/java/org/biojava/nbio/protmod/structure/ModifiedCompoundImpl.java
@@ -65,7 +65,6 @@ public ModifiedCompoundImpl(){
 	 * Use this constructor for a modified residue.
 	 * @param modification {@link ProteinModification}.
 	 * @param modifiedResidue modified group.
-	 * @return a {@link ModifiedCompound}.
 	 * @throws IllegalArgumentException if either argument is null.
 	 */
 	public ModifiedCompoundImpl (

From d483bba04798f62fec44f6a83262a1c74370202e Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 14:23:02 -0800
Subject: [PATCH 533/599] Javadoc fix: errors in ws module

---
 .../nbio/ws/alignment/qblast/MapToStringTransformer.java    | 6 +++---
 .../ws/alignment/qblast/NCBIQBlastAlignmentProperties.java  | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/MapToStringTransformer.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/MapToStringTransformer.java
index 3fc154d009..7da35cb04b 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/MapToStringTransformer.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/MapToStringTransformer.java
@@ -41,11 +41,11 @@ public class MapToStringTransformer {
 	/**
 	 * Creates {@code MapToStringTransformer} with defaults:
 	 *
-	 * <pre>
+	 * <pre>{@code
 	 * mappingSequence = "=";
 	 * separatorSequence = "&";
 	 * nullValue = "null";
-	 * </pre>
+	 * }</pre>
 	 */
 	public MapToStringTransformer() {
 		this("=", "&", "null");
@@ -76,7 +76,7 @@ public MapToStringTransformer(String mappingSequence, String separatorSequence,
 	 * <p>
 	 * For example, if we have a map with two entries: {@code ("key1", "1")} and
 	 * {@code ("key2", "2")} this method would return {@code "key1=1&key2=2"} if
-	 * {@code mappingSequence} is "=" and separator sequence is "&";
+	 * {@code mappingSequence} is "=" and separator sequence is "&amp;";
 	 *
 	 * @param map map of arguments
 	 * @return String resulting string
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java
index 5976f9e915..ccad91b981 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/alignment/qblast/NCBIQBlastAlignmentProperties.java
@@ -137,11 +137,9 @@ public String getBlastDatabase() {
 	/**
 	 * Sets the database to be used with blastall
 	 * <p>
-	 * A list of available databases can be acquired by calling {@link NCBIQBlastService#printRemoteBlastInfo()}
-	 * <p>
 	 * Blastall equivalent: -d
 	 *
-	 * @param db : a valid name to a NCBI blastable database
+	 * @param database a valid name to a NCBI blastable database
 	 */
 	public void setBlastDatabase(String database) {
 		setAlignmentOption(DATABASE, database);

From 0183dc629b76a2632dfdf271462a3a90fbef085b Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 14:26:35 -0800
Subject: [PATCH 534/599] Javadoc fix: errors in protein-disorder module

---
 .../src/main/java/org/biojava/nbio/ronn/Jronn.java               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java
index ccb85292b8..91862f0e36 100644
--- a/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java
+++ b/biojava-protein-disorder/src/main/java/org/biojava/nbio/ronn/Jronn.java
@@ -270,7 +270,6 @@ public static Map<FastaSequence,Range[]> getDisorder(List<FastaSequence> sequenc
 	 * @throws FileNotFoundException if the input file cannot be found
 	 * @throws IOException of the system cannot access or read from the input file
 	 * @see #getDisorder(FastaSequence)
-	 * @see #Jronn.Range
 	 */
 	public static Map<FastaSequence,Range[]> getDisorder(String fastaFile) throws IOException {
 		final List<FastaSequence> sequences = SequenceUtil.readFasta(new FileInputStream(fastaFile));

From 24310c315b565389cae7c4d38f00908c2bedaee7 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 14:52:26 -0800
Subject: [PATCH 535/599] Javadoc fix: errors in aaprops and survival and
 modules

---
 .../org/biojava/nbio/aaproperties/IPeptideProperties.java     | 2 +-
 .../biojava/nbio/aaproperties/profeat/IProfeatProperties.java | 4 ++--
 .../biojava/nbio/aaproperties/profeat/ProfeatProperties.java  | 4 ++--
 .../src/main/java/org/biojava/nbio/survival/cox/CoxR.java     | 2 +-
 .../main/java/org/biojava/nbio/survival/data/WorkSheet.java   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
index 5e7ea3b6f1..5342013b61 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/IPeptideProperties.java
@@ -258,7 +258,7 @@ public AminoAcidCompositionTable obtainAminoAcidCompositionTable(File elementMas
 	 * Returns the net charge of sequence at pH 7. The sequence argument must be
 	 * a protein sequence consisting of only non-ambiguous characters.
 	 * The net charge will be computed using the approach stated in
-	 * <a href="http://www.innovagen.se/custom-peptide-synthesis/peptide-property-calculator/peptide-property-calculator-notes.asp#NetCharge>here</a>
+	 * <a href="http://www.innovagen.se/custom-peptide-synthesis/peptide-property-calculator/peptide-property-calculator-notes.asp#NetCharge">here</a>
 	 *
 	 * pKa values used will be either
 	 * those used by Expasy which referenced "Electrophoresis 1994, 15, 529-539"
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/IProfeatProperties.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/IProfeatProperties.java
index 864cb0ce78..7f39fff79e 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/IProfeatProperties.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/IProfeatProperties.java
@@ -103,8 +103,8 @@ public enum DISTRIBUTION {FIRST, FIRST25, FIRST50, FIRST75, ALL};
 	 * Computes and return the position with respect to the sequence where the given distribution of the grouping can be found.<br/>
 	 * Example: "1111122222"<br/>
 	 * For the above example,<br/>
-	 * position of the GROUPING.GROUP1 && DISTRIBUTION.FIRST = 0/10 (because the first occurrence of '1' is at position 0)<br/>
-	 * position of the GROUPING.GROUP1 && DISTRIBUTION.ALL = 4/10 (because all occurrences of '1' happens on and before position 4)<br/>
+	 * position of the GROUPING.GROUP1 &amp; DISTRIBUTION.FIRST = 0/10 (because the first occurrence of '1' is at position 0)<br/>
+	 * position of the GROUPING.GROUP1 &amp; DISTRIBUTION.ALL = 4/10 (because all occurrences of '1' happens on and before position 4)<br/>
 	 *
 	 * @param sequence
 	 * 	a protein sequence consisting of non-ambiguous characters only
diff --git a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/ProfeatProperties.java b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/ProfeatProperties.java
index d8844476f4..dd0d310439 100644
--- a/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/ProfeatProperties.java
+++ b/biojava-aa-prop/src/main/java/org/biojava/nbio/aaproperties/profeat/ProfeatProperties.java
@@ -119,8 +119,8 @@ public static Map<ATTRIBUTE, Map<TRANSITION, Double>> getTransition(String seque
 	 * An adaptor method which computes and return the position with respect to the sequence where the given distribution of the grouping can be found.<br/>
 	 * Example: "1111122222"<br/>
 	 * For the above example,<br/>
-	 * position of the GROUPING.GROUP1 && DISTRIBUTION.FIRST = 0/10 (because the first occurrence of '1' is at position 0)<br/>
-	 * position of the GROUPING.GROUP1 && DISTRIBUTION.ALL = 4/10 (because all occurrences of '1' happens on and before position 4)<br/>
+	 * position of the GROUPING.GROUP1 &amp; DISTRIBUTION.FIRST = 0/10 (because the first occurrence of '1' is at position 0)<br/>
+	 * position of the GROUPING.GROUP1 &amp; DISTRIBUTION.ALL = 4/10 (because all occurrences of '1' happens on and before position 4)<br/>
 	 *
 	 * @param sequence
 	 * 	a protein sequence consisting of non-ambiguous characters only
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxR.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxR.java
index d2ac87e87a..d23ded840b 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxR.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/cox/CoxR.java
@@ -75,7 +75,7 @@
  *      weights(n)   :case weights
  *      init         :initial estimate for the coefficients
  *      eps          :tolerance for convergence.  Iteration continues until
- *                      the percent change in loglikelihood is <= eps.
+ *                      the percent change in loglikelihood is &lt;= eps.
  *      chol_tol     : tolerance for the Cholesky decompostion
  *      method       : 0=Breslow, 1=Efron
  *      doscale      : 0=don't scale the X matrix, 1=scale the X matrix
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java
index 9e1f4b6fd2..542085942e 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/data/WorkSheet.java
@@ -1464,7 +1464,7 @@ static public WorkSheet readCSV(File f, char delimiter) throws Exception {
 	/**
 	 * Read a CSV/Tab delimited file where you pass in the delimiter
 	 *
-	 * @param f
+	 * @param is
 	 * @param delimiter
 	 * @return
 	 * @throws Exception

From b55dc80cfba061dcc9e4ca09bdc4f6c5c9137037 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 15:07:47 -0800
Subject: [PATCH 536/599] Javadoc fix: errors in ontology module

---
 .../main/java/org/biojava/nbio/ontology/Ontology.java    | 8 --------
 .../src/main/java/org/biojava/nbio/ontology/Term.java    | 5 +----
 .../src/main/java/org/biojava/nbio/ontology/Triple.java  | 9 ++-------
 .../org/biojava/nbio/ontology/io/TabDelimParser.java     | 4 ++--
 .../org/biojava/nbio/ontology/obo/OboFileParser.java     | 5 +++--
 .../org/biojava/nbio/ontology/utils/Annotatable.java     | 1 -
 .../java/org/biojava/nbio/ontology/utils/Annotation.java | 6 +-----
 .../org/biojava/nbio/ontology/utils/EmptyAnnotation.java | 1 -
 8 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Ontology.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Ontology.java
index b921fdd243..5463d3ccee 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Ontology.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Ontology.java
@@ -40,7 +40,6 @@
  * @author Matthew Pocock
  *
  * @since 1.4
- * @see org.biojavax.ontology.ComparableOntology
  */
 
 public interface Ontology  {
@@ -129,7 +128,6 @@ public interface Ontology  {
 	 *         some other constraint of this implementation.
 	 * @throws AlreadyExistsException if a term of this name already exists
 	 * @return The newly created term.
-	 * @throws ChangeVetoException
 	 */
 
 	public Term createTerm(String name)
@@ -148,7 +146,6 @@ public Term createTerm(String name)
 	 *         some other constraint of this implementation.
 	 * @throws AlreadyExistsException if a term of this name already exists
 	 * @return The newly created term.
-	 * @throws ChangeVetoException
 	 */
 
 	public Term createTerm(String name, String description)
@@ -168,7 +165,6 @@ public Term createTerm(String name, String description)
 	 *         some other constraint of this implementation.
 	 * @throws AlreadyExistsException if a term of this name already exists
 	 * @return The newly created term.
-	 * @throws ChangeVetoException
 	 */
 
 	public Term createTerm(String name, String description, Object[] synonyms)
@@ -187,7 +183,6 @@ public Term createTerm(String name, String description, Object[] synonyms)
 	 *         some other constraint of this implementation.
 	 * @throws AlreadyExistsException if a term of this name already exists
 	 * @return The newly created term.
-	 * @throws ChangeVetoException
 	 */
 
 	public Variable createVariable(String name, String description)
@@ -208,7 +203,6 @@ public Variable createVariable(String name, String description)
 	 * @param t  the Term to import
 	 * @param localName  the local name to import it under, optionally null
 	 * @return a Term
-	 * @throws ChangeVetoException
 	 * @throws IllegalArgumentException
 	 */
 
@@ -228,7 +222,6 @@ public Term importTerm(Term t, String localName)
 	 * @return  a new Triple over these three terms
 	 * @throws AlreadyExistsException if a triple already exists with the same
 	 *      subject, object and predicate, regardless of the name and description
-	 * @throws ChangeVetoException
 	 * @throws NullPointerException if subject, object or predicate are null
 	 * @throws IllegalArgumentException if subject, object or predicate are not all
 	 *      from the same ontology
@@ -251,7 +244,6 @@ public Triple createTriple(Term subject, Term object, Term predicate, String nam
 	/**
 	 * Remove a term from an ontology, together with all triples which refer to it.
 	 * @param t
-	 * @throws ChangeVetoException
 	 */
 
 	public void deleteTerm(Term t) ;
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Term.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Term.java
index 209c76414f..df26dcbcba 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Term.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Term.java
@@ -32,7 +32,7 @@
 
 
 /**
- * A term in an ontology.  This has an {@link org.biojava.nbio.Annotation Annotation}
+ * A term in an ontology.  This has an {@link Annotation Annotation}
  * which can be used for storing additional human-displayable information.  It
  * is strongly recommended that the Annotation is not used for any machine-readable
  * data -- this should be represented by relations in the ontology instead.
@@ -51,9 +51,7 @@
  * @author Thomas Down
  * @author Matthew Pocock
  * @since 1.4
- * @see org.biojavax.ontology.ComparableTerm
  */
-
 public interface Term extends Annotatable {
 	/**
 	 * ChangeType which indicates that this term's ontology has been
@@ -113,7 +111,6 @@ public interface Term extends Annotatable {
 
 	/**
 	 * Simple in-memory implementation of an ontology term.
-	 * @see org.biojavax.ontology.SimpleComparableTerm
 	 * This can be used to implement Ontology.createTerm
 	 */
 
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Triple.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Triple.java
index a265f2ff56..368bfea36e 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Triple.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/Triple.java
@@ -41,7 +41,6 @@
  * @author Thomas Down
  * @author Matthew Pocock
  * @since 1.4
- * @see org.biojavax.ontology.ComparableTriple
  */
 
 public interface Triple
@@ -79,7 +78,6 @@ public interface Triple
 	 * If you do not implement hashcode in this way then you have no guarantee
 	 * that your Triple objects will be found in an ontology and that they will
 	 * not be duplicated.
-	 * </p>
 	 */
 	@Override
 	public int hashCode();
@@ -90,7 +88,7 @@ public interface Triple
 	 * <p>
 	 * Two triples are equivalent if they have the same subject, object and
 	 * predicate fields.
-	 * <pre>
+	 * <pre>{@code
 	 * if (! (o instanceof Triple)) {
 	 *     return false;
 	 * }
@@ -98,11 +96,10 @@ public interface Triple
 	 * return to.getSubject() == getSubject() &&
 	 *        to.getObject() == getObject() &&
 	 *        to.getPredicate() == getPredicate();
-	 * </pre>
+	 * }</pre>
 	 * If you do not implement equals in this way then you have no guarantee
 	 * that your Triple objects will be found in an ontology and that they will
 	 * not be duplicated.
-	 * </p>
 	 */
 	@Override
 	public boolean equals(Object obj);
@@ -111,9 +108,7 @@ public interface Triple
 	 * Basic in-memory implementation of a Triple in an ontology
 	 *
 	 * This can be used to implement Ontology.createTriple
-	 * @see org.biojavax.ontology.SimpleComparableTriple
 	 */
-
 	public static final class Impl
 
 	implements Triple, java.io.Serializable {
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/TabDelimParser.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/TabDelimParser.java
index 2c0ed0a3ae..77259b0e5b 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/TabDelimParser.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/io/TabDelimParser.java
@@ -54,7 +54,7 @@
  * the core ontology.
  * </p>
  *
- * <code><pre>
+ * <pre>
  * ...
  * triple	is-a	any
  * triple	has-a	source
@@ -62,7 +62,7 @@
  * triple	has-a	predicate
  * (triple,has-a,any)	size	3
  * ...
- * </pre></code>
+ * </pre>
  *
  * <p>
  * The first four lines just associate triple with some type with a predicate
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java
index 96474a5385..8e8a16d174 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/obo/OboFileParser.java
@@ -33,12 +33,13 @@
 import java.util.*;
 
 
-/** A class to parse the content of an OBO file. It delegates handling of the
+/**
+ * A class to parse the content of an OBO file. It delegates handling of the
  * content to the OBOFileEventListener implementation.
  *
  * This file contains parts of the OBO-Edit file OBOParseEngine, (particularly the encoding and decoding part)
  *
- * http://geneontology.cvs.sourceforge.net/geneontology/go-dev/java/oboedit/sources/org/geneontology/oboedit/dataadapter/OBOParseEngine.java?revision=1.10&view=markup
+ * See <a href="http://geneontology.cvs.sourceforge.net/geneontology/go-dev/java/oboedit/sources/org/geneontology/oboedit/dataadapter/OBOParseEngine.java?revision=1.10&view=markup">link</a>
  * Thanks to the OboEdit developers for giving permission to release this in BioJava.
  *
  *
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/Annotatable.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/Annotatable.java
index 4018aa0655..c1be7a3c99 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/Annotatable.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/Annotatable.java
@@ -75,7 +75,6 @@
  * @author  Matthew Pocock
  * @author <a href="mailto:kdj@sanger.ac.uk">Keith James</a> (docs).
  * @author  Kalle Näslund (docs)
- * @see org.biojavax.RichAnnotatable
  * @since 1.0
  */
 public interface Annotatable  {
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/Annotation.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/Annotation.java
index a0cf3ce65a..e0ade9cc6b 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/Annotation.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/Annotation.java
@@ -53,7 +53,6 @@
  *
  * @author Matthew Pocock
  * @author Thomas Down
- * @see org.biojavax.RichAnnotation
  *
  *
  * @since 1.0
@@ -96,8 +95,6 @@ public interface Annotation  {
 	 * @param value the new value for this key
 	 * @throws IllegalArgumentException if the property <code>key</code> is not
 	 *         legal
-	 * @throws ChangeVetoException if this annotation object can't be changed, or
-	 *         if the change was vetoed.
 	 */
 	void setProperty(Object key, Object value)
 	;
@@ -108,7 +105,6 @@ void setProperty(Object key, Object value)
 	 *
 	 * @param key the key object
 	 * @throws NoSuchElementException if the property doesn't exist
-	 * @throws ChangeVetoException if the change is vetoed
 	 * @since 1.3
 	 *
 	 */
@@ -147,7 +143,7 @@ public void removeProperty(Object key)
 	 * A really useful empty and immutable annotation object.
 	 * </p>
 	 *
-	 * Be careful when stooring Annotation arguments to
+	 * Be careful when storing Annotation arguments to
 	 *  constructors. It is possible that you have been passed EMPTY_ANNOTATION but
 	 * that code later on will access this object believing it to be
 	 * mutable. For example, the SeqIO factory code clones some
diff --git a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/EmptyAnnotation.java b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/EmptyAnnotation.java
index 99a48861ea..985d55e911 100644
--- a/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/EmptyAnnotation.java
+++ b/biojava-ontology/src/main/java/org/biojava/nbio/ontology/utils/EmptyAnnotation.java
@@ -35,7 +35,6 @@
  *
  * @since 1.0 as part of Annotation
  * @since 1.4 as top-level class
- * @see org.biojavax.EmptyRichAnnotation
  */
 class EmptyAnnotation
 

From c3079eaed9fb58e89a8a286f62e919cfbf6dc7de Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 15:15:01 -0800
Subject: [PATCH 537/599] Javadoc fix: errors in integration-test module

---
 .../nbio/structure/test/util/StringManipulationTestsHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/util/StringManipulationTestsHelper.java b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/util/StringManipulationTestsHelper.java
index 578816efb9..23664c68a3 100644
--- a/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/util/StringManipulationTestsHelper.java
+++ b/biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/util/StringManipulationTestsHelper.java
@@ -42,7 +42,7 @@ public static void assertEqualsIgnoreEndline(String expected, String actual) {
 
 	/**
 	 * Asserts that two XML-representing strings are equal, by recursively
-	 * comparing each node's set of properties & children nodes. This method
+	 * comparing each node's set of properties and children nodes. This method
 	 * should be used when two XMLs are considered identical when all nodes are
 	 * identical regardless to their order
 	 *

From e516a40896b9b2eb57e3cfda4fdf907993ceb101 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 15:21:38 -0800
Subject: [PATCH 538/599] Plugin updates

---
 pom.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4e486ea368..21484e2943 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,11 +171,11 @@
 			<plugins>
 				<plugin>
 					<artifactId>maven-clean-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.4.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.8.1</version>
+					<version>3.13.0</version>
 					<configuration>
 						<source>${jdk.version}</source>
 						<target>${jdk.version}</target>
@@ -183,19 +183,19 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.1.2</version>
+					<version>3.8.1</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.2.0</version>
+					<version>3.4.2</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-scm-plugin</artifactId>
-					<version>1.11.2</version>
+					<version>2.1.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>3.2.1</version>
+					<version>3.3.1</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-failsafe-plugin</artifactId>
@@ -214,7 +214,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>3.0.0-M1</version>
+					<version>3.1.1</version>
 					<configuration>
 						<remoteTagging>true</remoteTagging>
 						<preparationGoals>clean install</preparationGoals>
@@ -247,7 +247,7 @@
 				<plugin>
             		<groupId>org.apache.maven.plugins</groupId>
             		<artifactId>maven-surefire-plugin</artifactId>
-            		<version>3.0.0-M5</version>
+            		<version>3.5.2</version>
              	</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -256,7 +256,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.7.1</version>
 					<configuration>
 						<descriptors>
 							<descriptor>src/main/assembly/assembly.xml</descriptor>
@@ -296,7 +296,7 @@
 
 				<plugin>
 					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>3.0.0-M3</version>
+					<version>3.5.0</version>
 					<executions>
 						<execution>
 							<id>enforce-java</id>
@@ -316,7 +316,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-install-plugin</artifactId>
-					<version>3.0.0-M1</version>
+					<version>3.1.3</version>
 				</plugin>
 
 				<plugin>
@@ -334,7 +334,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-deploy-plugin</artifactId>
-					<version>3.0.0-M1</version>
+					<version>3.1.3</version>
 				</plugin>
 
 			</plugins>

From 93fe015ab9c6151997c6f353e5e1f1a2ba0a9e68 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 16:03:04 -0800
Subject: [PATCH 539/599] Adding pom metadata required for mvn site:stage.
 Adding release instructions to readme

---
 README.md | 10 ++++++++++
 pom.xml   |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/README.md b/README.md
index 92473664be..6ddbaa89d1 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,16 @@ If you are using Maven you can add the BioJava repository by adding the followin
     </dependencies>
 ```
 
+### For developers
+
+Release biojava to maven central:
+- `mvn -Prelease release:prepare`
+- `mvn -Prelease release:perform`
+Publish new javadocs:
+- `mvn site` this will write `target/site`, but that's not enough for a multimodule project. See [docs](https://maven.apache.org/plugins/maven-site-plugin/examples/multimodule.html)
+- `mvn site:stage` this will write the full html directory tree to `target/staging`
+- Push the contents of `target/staging` to the [biojava.github.io repo](https://github.com/biojava/biojava.github.io) under directory `docs/api` for it to be published in biojava.org
+
 ### Mailing Lists
 
 BioJava has one main mailing list. In order to avoid SPAM the list only accepts postings from list members. Anybody can become a list member, so please subscribe before you post. If you send without being subscribed your mail might get stuck in the moderation loop, which can cause several weeks of delay (no fun to read through all that spam).
diff --git a/pom.xml b/pom.xml
index 21484e2943..81c89ea5bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -534,6 +534,13 @@
 			<id>ossrh</id>
 			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
+		<site>
+			<!-- Needed for site plugin, to do mvn site:stage (without which a multimodule project won't have all the correct directory structure)
+			     Note that the values here are not actually used for deployment (for that we'd need some sort of proper git+ssh url I guess) - JD 2024-01-07 -->
+			<id>deploy</id>
+			<name>biojava.org</name>
+			<url>git:github.com:biojava/biojava.github.io.git</url>
+		</site>
 	</distributionManagement>
 
 	<profiles>

From bac14fdc7e35558e23bb73eb3c1ec5addd880a31 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 16:03:49 -0800
Subject: [PATCH 540/599] Format fix

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6ddbaa89d1..19a41e0dbb 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
 Release biojava to maven central:
 - `mvn -Prelease release:prepare`
 - `mvn -Prelease release:perform`
+
 Publish new javadocs:
 - `mvn site` this will write `target/site`, but that's not enough for a multimodule project. See [docs](https://maven.apache.org/plugins/maven-site-plugin/examples/multimodule.html)
 - `mvn site:stage` this will write the full html directory tree to `target/staging`

From de1598c0e2728d29966c86a0d556bdc2d404278c Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 16:29:08 -0800
Subject: [PATCH 541/599] [maven-release-plugin] prepare release biojava-7.1.4

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 474d4e32cf..fbf05525e8 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index d0024aaf6f..c439bed2b2 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 9b8af63ea1..3ceee1bb10 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 5de6f9ec8a..048092115a 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index f0be361c82..61fd787570 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.4-SNAPSHOT</version>
+    <version>7.1.4</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.4-SNAPSHOT</version>
+    	<version>7.1.4</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 2a8b240f62..168865e2e8 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 43e55d9d11..46ff9673b0 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.4-SNAPSHOT</version>
+    <version>7.1.4</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index d5815b33b3..656ebb46b0 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 2c31c5b87f..b0d678ec6f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index d60945af3d..3a77ed2003 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 7572967f73..790bcc3db8 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8827137d94..ab77567b9b 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.4-SNAPSHOT</version>
+        <version>7.1.4</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index e02301197a..abe0573f87 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 81c89ea5bd..696ee974ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.4-SNAPSHOT</version>
+	<version>7.1.4</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.1.4</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From cdf14076d84037ea690cc354ef1dcf674417b6d4 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 16:29:11 -0800
Subject: [PATCH 542/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index fbf05525e8..30b6642ae6 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index c439bed2b2..b1c7eb9a94 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 3ceee1bb10..2b3994284c 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 048092115a..86b0d8c93f 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 61fd787570..a9e79f3d1b 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.4</version>
+    <version>7.1.5-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.4</version>
+    	<version>7.1.5-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 168865e2e8..abb9cab35d 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 46ff9673b0..0813129079 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.4</version>
+    <version>7.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 656ebb46b0..73b06a6159 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index b0d678ec6f..e612fe824f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 3a77ed2003..9d80f82e80 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 790bcc3db8..4c14aee143 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index ab77567b9b..d469386344 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.4</version>
+        <version>7.1.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index abe0573f87..2b0b0f56cd 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 696ee974ba..b2cd37268c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.4</version>
+	<version>7.1.5-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.1.4</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 6387a2ed9029c3b1b254fb4d28424a2182b0a106 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 7 Jan 2025 16:53:32 -0800
Subject: [PATCH 543/599] [maven-release-plugin] rollback the release of
 biojava-7.1.4

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  2 +-
 14 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 30b6642ae6..474d4e32cf 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index b1c7eb9a94..d0024aaf6f 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 2b3994284c..9b8af63ea1 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 86b0d8c93f..5de6f9ec8a 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index a9e79f3d1b..f0be361c82 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.5-SNAPSHOT</version>
+    <version>7.1.4-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.5-SNAPSHOT</version>
+    	<version>7.1.4-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index abb9cab35d..2a8b240f62 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 0813129079..43e55d9d11 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.5-SNAPSHOT</version>
+    <version>7.1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 73b06a6159..d5815b33b3 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index e612fe824f..2c31c5b87f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 9d80f82e80..d60945af3d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 4c14aee143..7572967f73 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index d469386344..8827137d94 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.5-SNAPSHOT</version>
+        <version>7.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 2b0b0f56cd..e02301197a 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index b2cd37268c..81c89ea5bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.5-SNAPSHOT</version>
+	<version>7.1.4-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the

From 5ad2964afb154ea78bf7325262017e8efbd55abe Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 8 Jan 2025 10:52:53 -0800
Subject: [PATCH 544/599] Reports plugin update

---
 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 81c89ea5bd..45fd5022ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,6 +254,11 @@
 					<artifactId>maven-shade-plugin</artifactId>
 					<version>3.2.4</version>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-project-info-reports-plugin</artifactId>
+					<version>3.8.0</version>
+				</plugin>
 				<plugin>
 					<artifactId>maven-assembly-plugin</artifactId>
 					<version>3.7.1</version>
@@ -492,8 +497,8 @@
 				</configuration>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.9</version>
 				<reportSets>
 					<reportSet>
 						<reports>

From 7286c3fe75257f5c41c6fd673bd62ec2ef3c238d Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 8 Jan 2025 11:01:31 -0800
Subject: [PATCH 545/599] [maven-release-plugin] prepare release biojava-7.1.4

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 474d4e32cf..fbf05525e8 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index d0024aaf6f..c439bed2b2 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 9b8af63ea1..3ceee1bb10 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 5de6f9ec8a..048092115a 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index f0be361c82..61fd787570 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.4-SNAPSHOT</version>
+    <version>7.1.4</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.4-SNAPSHOT</version>
+    	<version>7.1.4</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 2a8b240f62..168865e2e8 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 43e55d9d11..46ff9673b0 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.4-SNAPSHOT</version>
+    <version>7.1.4</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index d5815b33b3..656ebb46b0 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 2c31c5b87f..b0d678ec6f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index d60945af3d..3a77ed2003 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 7572967f73..790bcc3db8 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8827137d94..ab77567b9b 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.4-SNAPSHOT</version>
+        <version>7.1.4</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index e02301197a..abe0573f87 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 45fd5022ec..e75cd7317c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.4-SNAPSHOT</version>
+	<version>7.1.4</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.1.4</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 3ec109c93b38ac5da65af9925fd66bb97ee6b638 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 8 Jan 2025 11:01:35 -0800
Subject: [PATCH 546/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index fbf05525e8..30b6642ae6 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index c439bed2b2..b1c7eb9a94 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 3ceee1bb10..2b3994284c 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 048092115a..86b0d8c93f 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 61fd787570..a9e79f3d1b 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.4</version>
+    <version>7.1.5-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.4</version>
+    	<version>7.1.5-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 168865e2e8..abb9cab35d 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 46ff9673b0..0813129079 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.4</version>
+    <version>7.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 656ebb46b0..73b06a6159 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index b0d678ec6f..e612fe824f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 3a77ed2003..9d80f82e80 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 790bcc3db8..4c14aee143 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index ab77567b9b..d469386344 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.4</version>
+        <version>7.1.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index abe0573f87..2b0b0f56cd 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index e75cd7317c..032fafdf2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.4</version>
+	<version>7.1.5-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.1.4</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 9ef2c30072d64c7b07e00cf2137821ee20cdd1bc Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 8 Jan 2025 11:20:35 -0800
Subject: [PATCH 547/599] [maven-release-plugin] rollback the release of
 biojava-7.1.4

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  2 +-
 14 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 30b6642ae6..474d4e32cf 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index b1c7eb9a94..d0024aaf6f 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 2b3994284c..9b8af63ea1 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 86b0d8c93f..5de6f9ec8a 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index a9e79f3d1b..f0be361c82 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.5-SNAPSHOT</version>
+    <version>7.1.4-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.5-SNAPSHOT</version>
+    	<version>7.1.4-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index abb9cab35d..2a8b240f62 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 0813129079..43e55d9d11 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.5-SNAPSHOT</version>
+    <version>7.1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 73b06a6159..d5815b33b3 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index e612fe824f..2c31c5b87f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 9d80f82e80..d60945af3d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 4c14aee143..7572967f73 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index d469386344..8827137d94 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.5-SNAPSHOT</version>
+        <version>7.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 2b0b0f56cd..e02301197a 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 032fafdf2d..45fd5022ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.5-SNAPSHOT</version>
+	<version>7.1.4-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the

From d2ce0893668942b55d751ad1a22494040bf21c84 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 8 Jan 2025 14:04:25 -0800
Subject: [PATCH 548/599] Adding explicit plugin versions to profile "release".
 Somehow the profile doesn't seem to inherit from pluginManagement

---
 pom.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 45fd5022ec..55b4221758 100644
--- a/pom.xml
+++ b/pom.xml
@@ -300,6 +300,7 @@
 				</plugin>
 
 				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-enforcer-plugin</artifactId>
 					<version>3.5.0</version>
 					<executions>
@@ -598,7 +599,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
-						<version>3.2.0</version>
+						<version>3.3.1</version>
 						<executions>
 							<execution>
 								<id>attach-sources</id>
@@ -613,6 +614,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.11.2</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -623,6 +625,12 @@
 						</executions>
 					</plugin>
 
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-enforcer-plugin</artifactId>
+						<version>3.5.0</version>
+					</plugin>
+
 				</plugins>
 			</build>
 		</profile>

From f29a52137eccc09c873bad0be792160c362b6f22 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 8 Jan 2025 14:13:59 -0800
Subject: [PATCH 549/599] [maven-release-plugin] prepare release biojava-7.1.4

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 474d4e32cf..fbf05525e8 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index d0024aaf6f..c439bed2b2 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 9b8af63ea1..3ceee1bb10 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 5de6f9ec8a..048092115a 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index f0be361c82..61fd787570 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.4-SNAPSHOT</version>
+    <version>7.1.4</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.4-SNAPSHOT</version>
+    	<version>7.1.4</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 2a8b240f62..168865e2e8 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 43e55d9d11..46ff9673b0 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.4-SNAPSHOT</version>
+    <version>7.1.4</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index d5815b33b3..656ebb46b0 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 2c31c5b87f..b0d678ec6f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index d60945af3d..3a77ed2003 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 7572967f73..790bcc3db8 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8827137d94..ab77567b9b 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.4-SNAPSHOT</version>
+        <version>7.1.4</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index e02301197a..abe0573f87 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 55b4221758..7cd4e79bb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.4-SNAPSHOT</version>
+	<version>7.1.4</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.1.4</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 76dfee8ca339d66fd05485d1fe12310778949053 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 8 Jan 2025 14:14:03 -0800
Subject: [PATCH 550/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index fbf05525e8..30b6642ae6 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index c439bed2b2..b1c7eb9a94 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 3ceee1bb10..2b3994284c 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 048092115a..86b0d8c93f 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 61fd787570..a9e79f3d1b 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.4</version>
+    <version>7.1.5-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.4</version>
+    	<version>7.1.5-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 168865e2e8..abb9cab35d 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 46ff9673b0..0813129079 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.4</version>
+    <version>7.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 656ebb46b0..73b06a6159 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index b0d678ec6f..e612fe824f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 3a77ed2003..9d80f82e80 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 790bcc3db8..4c14aee143 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index ab77567b9b..d469386344 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.4</version>
+        <version>7.1.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index abe0573f87..2b0b0f56cd 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 7cd4e79bb0..588e582265 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.4</version>
+	<version>7.1.5-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.1.4</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 3a312186188d3f8234407e5c8940b86d26002700 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 8 Jan 2025 14:15:51 -0800
Subject: [PATCH 551/599] [maven-release-plugin] rollback the release of
 biojava-7.1.4

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  2 +-
 14 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 30b6642ae6..474d4e32cf 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index b1c7eb9a94..d0024aaf6f 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 2b3994284c..9b8af63ea1 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 86b0d8c93f..5de6f9ec8a 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index a9e79f3d1b..f0be361c82 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.5-SNAPSHOT</version>
+    <version>7.1.4-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.5-SNAPSHOT</version>
+    	<version>7.1.4-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index abb9cab35d..2a8b240f62 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 0813129079..43e55d9d11 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.5-SNAPSHOT</version>
+    <version>7.1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 73b06a6159..d5815b33b3 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index e612fe824f..2c31c5b87f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 9d80f82e80..d60945af3d 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 4c14aee143..7572967f73 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index d469386344..8827137d94 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.5-SNAPSHOT</version>
+        <version>7.1.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 2b0b0f56cd..e02301197a 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.1.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.1.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 588e582265..55b4221758 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.5-SNAPSHOT</version>
+	<version>7.1.4-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the

From 54fd26ad239866590eaae79f150f1ee3e526f2b0 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 8 Jan 2025 15:02:46 -0800
Subject: [PATCH 552/599] Hopefully fixing issue with site:deploy which was
 failing (as part of release:perform)

---
 pom.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 55b4221758..c22715d396 100644
--- a/pom.xml
+++ b/pom.xml
@@ -543,8 +543,9 @@
 		<site>
 			<!-- Needed for site plugin, to do mvn site:stage (without which a multimodule project won't have all the correct directory structure)
 			     Note that the values here are not actually used for deployment (for that we'd need some sort of proper git+ssh url I guess) - JD 2024-01-07 -->
-			<id>deploy</id>
-			<name>biojava.org</name>
+			<id>biojava.org</id>
+			<name>The biojava.org site</name>
+			<!-- NOTE this is not a proper URL supported by mvn site:deploy . That's why in site configuration for release profile we disable deployment with skipDeploy -->
 			<url>git:github.com:biojava/biojava.github.io.git</url>
 		</site>
 	</distributionManagement>
@@ -631,6 +632,16 @@
 						<version>3.5.0</version>
 					</plugin>
 
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-site-plugin</artifactId>
+						<version>3.21.0</version>
+						<configuration>
+							<!-- In distributionManagement we have a site setting with a fake url (needed for mvn site:stage to work). This is here to skip the deployment that would fail for the fake url -->
+							<skipDeploy>true</skipDeploy>
+						</configuration>
+					</plugin>
+
 				</plugins>
 			</build>
 		</profile>

From c1c8c506edf652ef404c4c501666b36c431b7aea Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 8 Jan 2025 15:12:00 -0800
Subject: [PATCH 553/599] [maven-release-plugin] prepare release biojava-7.1.4

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 474d4e32cf..fbf05525e8 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index d0024aaf6f..c439bed2b2 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 9b8af63ea1..3ceee1bb10 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 5de6f9ec8a..048092115a 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index f0be361c82..61fd787570 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.4-SNAPSHOT</version>
+    <version>7.1.4</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.4-SNAPSHOT</version>
+    	<version>7.1.4</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 2a8b240f62..168865e2e8 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 43e55d9d11..46ff9673b0 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.4-SNAPSHOT</version>
+    <version>7.1.4</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index d5815b33b3..656ebb46b0 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 2c31c5b87f..b0d678ec6f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index d60945af3d..3a77ed2003 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 7572967f73..790bcc3db8 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8827137d94..ab77567b9b 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.4-SNAPSHOT</version>
+        <version>7.1.4</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index e02301197a..abe0573f87 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4-SNAPSHOT</version>
+		<version>7.1.4</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4-SNAPSHOT</version>
+			<version>7.1.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index c22715d396..39c29a4b48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.4-SNAPSHOT</version>
+	<version>7.1.4</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.1.4</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From a1bb15f92d9b01953d239bd3e0ff65822f79858a Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 8 Jan 2025 15:12:04 -0800
Subject: [PATCH 554/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index fbf05525e8..30b6642ae6 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index c439bed2b2..b1c7eb9a94 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 3ceee1bb10..2b3994284c 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 048092115a..86b0d8c93f 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 61fd787570..a9e79f3d1b 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.4</version>
+    <version>7.1.5-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.4</version>
+    	<version>7.1.5-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 168865e2e8..abb9cab35d 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 46ff9673b0..0813129079 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.4</version>
+    <version>7.1.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 656ebb46b0..73b06a6159 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index b0d678ec6f..e612fe824f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 3a77ed2003..9d80f82e80 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 790bcc3db8..4c14aee143 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index ab77567b9b..d469386344 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.4</version>
+        <version>7.1.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index abe0573f87..2b0b0f56cd 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.4</version>
+		<version>7.1.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.4</version>
+			<version>7.1.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 39c29a4b48..7908304f2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.4</version>
+	<version>7.1.5-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.1.4</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 0cd5bd77112336d4814a0e836a36556c8ed48668 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 8 Jan 2025 15:29:03 -0800
Subject: [PATCH 555/599] Updating after release

---
 CHANGELOG.md | 7 +++++++
 README.md    | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14fb2b0610..589a894f06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 BioJava Changelog
 -----------------
 
+BioJava 7.1.4
+==============================
+### Fixed
+* More lenient mmCIF parsing, now can read files produced by [Gemmi](https://gemmi.readthedocs.io/en/latest/) #1103
+* Javadocs: all javadoc lint errors fixed
+* Plugin updates and fixed issues in maven release process
+
 BioJava 7.1.3
 ==============================
 ### Fixed
diff --git a/README.md b/README.md
index 19a41e0dbb..b2f19a7a07 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-7.1.3-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.1.3) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-7.1.4-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.1.4) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>7.1.3</version>
+        <version>7.1.4</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From d4242d269237dcb6f2eb062ed8947c5c8c5acae1 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 8 Jan 2025 16:40:28 -0800
Subject: [PATCH 556/599] Hopefully good final solution for generating apidocs
 site

---
 README.md |  5 ++---
 pom.xml   | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b2f19a7a07..bb36b69de1 100644
--- a/README.md
+++ b/README.md
@@ -42,9 +42,8 @@ Release biojava to maven central:
 - `mvn -Prelease release:perform`
 
 Publish new javadocs:
-- `mvn site` this will write `target/site`, but that's not enough for a multimodule project. See [docs](https://maven.apache.org/plugins/maven-site-plugin/examples/multimodule.html)
-- `mvn site:stage` this will write the full html directory tree to `target/staging`
-- Push the contents of `target/staging` to the [biojava.github.io repo](https://github.com/biojava/biojava.github.io) under directory `docs/api` for it to be published in biojava.org
+- `mvn -Prelease site` this will write `target/site`
+- Push the contents of `target/site/apidocs` to the [biojava.github.io repo](https://github.com/biojava/biojava.github.io) under directory `docs/apiM.m.p` (e.g. docs/api7.1.4) and then link `docs/api` to `docs/apiM.m.p`, for it to be published in biojava.org
 
 ### Mailing Lists
 
diff --git a/pom.xml b/pom.xml
index 7908304f2c..0e137edb3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -487,6 +487,18 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
+				<!-- Make a single javadoc site at target/site/apidocs subdir with all sub-modules, see:
+				 https://stackoverflow.com/questions/5927590/maven-multi-module-project-site-with-javadocs (main solution)
+				 https://stackoverflow.com/questions/39489567/intellij-maven-site-plugin-reportplugins-showing-error-havent-even-done-anyt (to make intellij happy) -->
+				<reportSets>
+					<reportSet>
+						<id>aggregate</id>
+						<reports>
+							<report>aggregate</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+
 				<configuration>
 					<goal>javadoc:aggregate</goal>
 					<breakiterator>true</breakiterator>
@@ -541,12 +553,13 @@
 			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 		<site>
-			<!-- Needed for site plugin, to do mvn site:stage (without which a multimodule project won't have all the correct directory structure)
-			     Note that the values here are not actually used for deployment (for that we'd need some sort of proper git+ssh url I guess) - JD 2024-01-07 -->
+			<!-- Needed for site plugin, to do mvn site:stage (without which a multimodule project won't have all the correct directory structure) -->
+			<!-- Also seems to be needed at mvn release:perform time, where a mvn site:deploy runs and complains if this is not present -->
 			<id>biojava.org</id>
 			<name>The biojava.org site</name>
 			<!-- NOTE this is not a proper URL supported by mvn site:deploy . That's why in site configuration for release profile we disable deployment with skipDeploy -->
-			<url>git:github.com:biojava/biojava.github.io.git</url>
+			<!-- NOTE we don't actually deploy the "site" but just the "apidocs" part of it to /docs/api -->
+			<url>https://biojava.org/docs/site</url>
 		</site>
 	</distributionManagement>
 

From ac2084b9081600cb993a84f335576601945e8646 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 9 Jan 2025 10:11:31 -0800
Subject: [PATCH 557/599] Forcing enforcer plugin upgrade: somehow version
 wasn't being taken from pluginManagement. Hopefully this fixes issue in CI
 building with java 17

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 0e137edb3c..ff16373e0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -392,6 +392,13 @@
 				</configuration>
 			</plugin>
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.5.0</version>
+			</plugin>
+
+
 		</plugins>
 
 		<extensions>

From f271214e76f2772a5364aed9d203087af648f992 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 9 Jan 2025 14:33:23 -0800
Subject: [PATCH 558/599] Docs

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index ff16373e0a..a77a23a43a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -392,6 +392,7 @@
 				</configuration>
 			</plugin>
 
+			<!-- Forcing the enforcer-plugin version: somehow the one declared in pluginManagement doesn't go through without this. No idea why. Other plugins do respect the version in pluginManagement -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>

From e170fc9dc84f9a97482af781fa6c57e23b36c6ba Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 9 Jan 2025 14:37:33 -0800
Subject: [PATCH 559/599] Avoiding a (harmless) error in mvn site by upgrading
 javadoc plugin

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a77a23a43a..691dedc831 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,7 +229,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.3.1</version>
+					<version>3.11.2</version>
 					<configuration>
 					    <additionalJOptions>-Xdoclint:none</additionalJOptions>
 					    <!-- we need to allow script in comments or otherwise we can't use google analytics js in footer below - JD 2017-03-30 -->

From be55381c8b9656d146209083121199e335c936b8 Mon Sep 17 00:00:00 2001
From: Michael L Heuer <heuermh@acm.org>
Date: Thu, 13 Feb 2025 10:27:15 -0600
Subject: [PATCH 560/599] Update guava dependency version to 33.4.0-jre

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 691dedc831..1381eb8041 100644
--- a/pom.xml
+++ b/pom.xml
@@ -486,7 +486,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>33.3.0-jre</version>
+				<version>33.4.0-jre</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

From 93c1c8f9d4c1fa3d12d2c7f7d250532ed6b62098 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 21 Feb 2025 11:01:55 -0800
Subject: [PATCH 561/599] Handle more missing fields in struct_ref_seq

---
 .../io/cif/CifStructureConsumerImpl.java      | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index b204687762..45fd8fc417 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -975,7 +975,7 @@ public void consumeStructRefSeq(StructRefSeq structRefSeq) {
             dbRef.setIdCode(structRefSeq.getPdbxPDBIdCode().isDefined()? structRefSeq.getPdbxPDBIdCode().get(rowIndex):null);
             dbRef.setDbAccession(structRefSeq.getPdbxDbAccession().isDefined()? structRefSeq.getPdbxDbAccession().get(rowIndex):null);
             dbRef.setDbIdCode(structRefSeq.getPdbxDbAccession().isDefined()? structRefSeq.getPdbxDbAccession().get(rowIndex):null);
-            dbRef.setChainName(structRefSeq.getPdbxStrandId().get(rowIndex));
+            dbRef.setChainName(structRefSeq.getPdbxStrandId().isDefined()? structRefSeq.getPdbxStrandId().get(rowIndex):null);
 
             OptionalInt structRefRowIndex = IntStream.range(0, structRef.getRowCount())
                     .filter(i -> structRef.getId().get(i).equals(refId))
@@ -990,34 +990,39 @@ public void consumeStructRefSeq(StructRefSeq structRefSeq) {
 
             int seqBegin;
             int seqEnd;
+            char beginInsCode = ' ';
+            char endInsCode = ' ';
 
-            try {
-                seqBegin = Integer.parseInt(structRefSeq.getPdbxAuthSeqAlignBeg().get(rowIndex));
-                seqEnd = Integer.parseInt(structRefSeq.getPdbxAuthSeqAlignEnd().get(rowIndex));
-            } catch (NumberFormatException e) {
-                // this happens in a few entries, annotation error? e.g. 6eoj
-                logger.warn("Couldn't parse pdbx_auth_seq_align_beg/end in _struct_ref_seq. Will not store dbref " +
-                        "alignment info for accession {}. Error: {}", dbRef.getDbAccession(), e.getMessage());
-                return;
-            }
+            if (structRefSeq.getPdbxAuthSeqAlignBeg().isDefined() && structRefSeq.getPdbxAuthSeqAlignEnd().isDefined()) {
+                try {
+                    seqBegin = Integer.parseInt(structRefSeq.getPdbxAuthSeqAlignBeg().get(rowIndex));
+                    seqEnd = Integer.parseInt(structRefSeq.getPdbxAuthSeqAlignEnd().get(rowIndex));
+                } catch (NumberFormatException e) {
+                    // this happens in a few entries, annotation error? e.g. 6eoj
+                    logger.warn("Couldn't parse pdbx_auth_seq_align_beg/end in _struct_ref_seq. Will not store dbref " +
+                            "alignment info for accession {}. Error: {}", dbRef.getDbAccession(), e.getMessage());
+                    return;
+                }
 
-            char beginInsCode = ' ';
-            String pdbxSeqAlignBegInsCode = structRefSeq.getPdbxSeqAlignBegInsCode().get(rowIndex);
-            if (pdbxSeqAlignBegInsCode.length() > 0) {
-                beginInsCode = pdbxSeqAlignBegInsCode.charAt(0);
-            }
+                String pdbxSeqAlignBegInsCode = structRefSeq.getPdbxSeqAlignBegInsCode().get(rowIndex);
+                if (pdbxSeqAlignBegInsCode.length() > 0) {
+                    beginInsCode = pdbxSeqAlignBegInsCode.charAt(0);
+                }
 
-            char endInsCode = ' ';
-            String pdbxSeqAlignEndInsCode = structRefSeq.getPdbxSeqAlignEndInsCode().get(rowIndex);
-            if (pdbxSeqAlignEndInsCode.length() > 0) {
-                endInsCode = pdbxSeqAlignEndInsCode.charAt(0);
-            }
+                String pdbxSeqAlignEndInsCode = structRefSeq.getPdbxSeqAlignEndInsCode().get(rowIndex);
+                if (pdbxSeqAlignEndInsCode.length() > 0) {
+                    endInsCode = pdbxSeqAlignEndInsCode.charAt(0);
+                }
 
-            if (beginInsCode == '?') {
-                beginInsCode = ' ';
-            }
-            if (endInsCode == '?') {
-                endInsCode = ' ';
+                if (beginInsCode == '?') {
+                    beginInsCode = ' ';
+                }
+                if (endInsCode == '?') {
+                    endInsCode = ' ';
+                }
+            } else {
+                seqBegin = structRefSeq.getSeqAlignBeg().get(rowIndex);
+                seqEnd = structRefSeq.getSeqAlignEnd().get(rowIndex);
             }
 
             dbRef.setSeqBegin(seqBegin);

From 65d3dcde9a49b3b3f36750815c2c2b3e0d501d5a Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 21 Feb 2025 11:24:49 -0800
Subject: [PATCH 562/599] Lenient to missing atom_site.occupancy

---
 .../biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 45fd8fc417..1dccf8ae30 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -333,7 +333,7 @@ public void consumeAtomSite(AtomSite atomSite) {
             atom.setY(cartnY.get(atomIndex));
             atom.setZ(cartnZ.get(atomIndex));
 
-            atom.setOccupancy((float) occupancy.get(atomIndex));
+            atom.setOccupancy((float) (occupancy.isDefined()? occupancy.get(atomIndex) : 1.0));
             atom.setTempFactor((float) bIsoOrEquiv.get(atomIndex));
 
             if (altLocation == null || altLocation.isEmpty() || ".".equals(altLocation)) {

From 12dcb2ce3c1a03d67798311ca7cf6fd26e12563f Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 21 Feb 2025 15:29:44 -0800
Subject: [PATCH 563/599] Another safeguard, that applies to some PDB-IHM
 entries

---
 .../nbio/structure/io/cif/CifStructureConsumerImpl.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 1dccf8ae30..c610c05f2b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -1819,6 +1819,10 @@ private void initMaps() {
 
             String[] chainNames = entityPoly.getPdbxStrandId().get(rowIndex).split(",");
             List<String> asymIds = entityId2asymId.get(entityPoly.getEntityId().get(rowIndex));
+            if (asymIds == null) {
+                logger.warn("No asym ids found for entity {} in _struct_asym. Can't provide a mapping from asym ids to author chain ids for this entity", entityPoly.getEntityId().get(rowIndex));
+                break;
+            }
             if (chainNames.length != asymIds.size()) {
                 logger.warn("The list of asym ids (from _struct_asym) and the list of author ids (from _entity_poly) " +
                         "for entity {} have different lengths! Can't provide a mapping from asym ids to author chain " +

From c45c3dd05beaed3f214b991526f713d9090b5e1f Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 21 Feb 2025 15:39:16 -0800
Subject: [PATCH 564/599] Bugfix: ASA calculation was by default using all
 models. Now it will use model 1 by default. Added new constructor to choose
 model.

---
 .../nbio/structure/asa/AsaCalculator.java     | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
index 84effc3e44..21d6935eb3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
@@ -126,7 +126,37 @@ static class IndexAndDistance {
 	 * Constructs a new AsaCalculator. Subsequently call {@link #calculateAsas()}
 	 * or {@link #getGroupAsas()} to calculate the ASAs
 	 * Only non-Hydrogen atoms are considered in the calculation.
-	 * @param structure the structure, all non-H atoms will be used
+	 * @param structure the structure, all non-H atoms of given model number will be used
+	 * @param probe the probe size
+	 * @param nSpherePoints the number of points to be used in generating the spherical
+	 *                         dot-density, the more points the more accurate (and slower) calculation
+	 * @param nThreads the number of parallel threads to use for the calculation
+	 * @param hetAtoms if true HET residues are considered, if false they aren't, equivalent to
+	 * @param modelNr the model number from which we want atoms extracted
+	 * NACCESS' -h option
+	 */
+	public AsaCalculator(Structure structure, double probe, int nSpherePoints, int nThreads, boolean hetAtoms, int modelNr) {
+		this.atoms = StructureTools.getAllNonHAtomArray(structure, hetAtoms, modelNr);
+		this.atomCoords = Calc.atomsToPoints(atoms);
+		this.probe = probe;
+		this.nThreads = nThreads;
+
+		this.useSpatialHashingForNeighbors = DEFAULT_USE_SPATIAL_HASHING;
+
+		// initialising the radii by looking them up through AtomRadii
+		radii = new double[atomCoords.length];
+		for (int i=0;i<atomCoords.length;i++) {
+			radii[i] = getRadius(atoms[i]);
+		}
+
+		initSpherePoints(nSpherePoints);
+	}
+
+	/**
+	 * Constructs a new AsaCalculator. Subsequently call {@link #calculateAsas()}
+	 * or {@link #getGroupAsas()} to calculate the ASAs
+	 * Only non-Hydrogen atoms are considered in the calculation.
+	 * @param structure the structure, all non-H atoms of model 1 will be used
 	 * @param probe the probe size
 	 * @param nSpherePoints the number of points to be used in generating the spherical
 	 *                         dot-density, the more points the more accurate (and slower) calculation
@@ -135,7 +165,7 @@ static class IndexAndDistance {
 	 * NACCESS' -h option
 	 */
 	public AsaCalculator(Structure structure, double probe, int nSpherePoints, int nThreads, boolean hetAtoms) {
-		this.atoms = StructureTools.getAllNonHAtomArray(structure, hetAtoms);
+		this.atoms = StructureTools.getAllNonHAtomArray(structure, hetAtoms, 1);
 		this.atomCoords = Calc.atomsToPoints(atoms);
 		this.probe = probe;
 		this.nThreads = nThreads;

From 324319e20d5c2ffcbe8b2d10189e369b590a34aa Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 21 Feb 2025 16:33:57 -0800
Subject: [PATCH 565/599] Fix: first model is model index 0

---
 .../main/java/org/biojava/nbio/structure/asa/AsaCalculator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
index 21d6935eb3..a47c67db72 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
@@ -165,7 +165,7 @@ public AsaCalculator(Structure structure, double probe, int nSpherePoints, int n
 	 * NACCESS' -h option
 	 */
 	public AsaCalculator(Structure structure, double probe, int nSpherePoints, int nThreads, boolean hetAtoms) {
-		this.atoms = StructureTools.getAllNonHAtomArray(structure, hetAtoms, 1);
+		this.atoms = StructureTools.getAllNonHAtomArray(structure, hetAtoms, 0);
 		this.atomCoords = Calc.atomsToPoints(atoms);
 		this.probe = probe;
 		this.nThreads = nThreads;

From a5b46ab0bb748317516dbdb95f18bb8ab30fb2ca Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 21 Feb 2025 16:36:08 -0800
Subject: [PATCH 566/599] Review comment

---
 .../biojava/nbio/structure/asa/AsaCalculator.java | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
index a47c67db72..0f46b7f416 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/asa/AsaCalculator.java
@@ -165,20 +165,7 @@ public AsaCalculator(Structure structure, double probe, int nSpherePoints, int n
 	 * NACCESS' -h option
 	 */
 	public AsaCalculator(Structure structure, double probe, int nSpherePoints, int nThreads, boolean hetAtoms) {
-		this.atoms = StructureTools.getAllNonHAtomArray(structure, hetAtoms, 0);
-		this.atomCoords = Calc.atomsToPoints(atoms);
-		this.probe = probe;
-		this.nThreads = nThreads;
-
-		this.useSpatialHashingForNeighbors = DEFAULT_USE_SPATIAL_HASHING;
-
-		// initialising the radii by looking them up through AtomRadii
-		radii = new double[atomCoords.length];
-		for (int i=0;i<atomCoords.length;i++) {
-			radii[i] = getRadius(atoms[i]);
-		}
-
-		initSpherePoints(nSpherePoints);
+		this(structure, probe, nSpherePoints, nThreads, hetAtoms, 0);
 	}
 
 	/**

From 48992a6b126fc6c0ba4ecda15e49c089cea0ebaf Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 27 Feb 2025 10:18:17 -0800
Subject: [PATCH 567/599] [maven-release-plugin] prepare release biojava-7.2.0

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 30b6642ae6..6b06141174 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index b1c7eb9a94..1d860b9ea0 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.2.0</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 2b3994284c..776112a6ed 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 86b0d8c93f..8d8ee15617 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.2.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index a9e79f3d1b..01d398e4e3 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.1.5-SNAPSHOT</version>
+    <version>7.2.0</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.1.5-SNAPSHOT</version>
+    	<version>7.2.0</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index abb9cab35d..e8a940627a 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.2.0</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 0813129079..ee76a29c39 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.1.5-SNAPSHOT</version>
+    <version>7.2.0</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 73b06a6159..2ab628e46f 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.2.0</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index e612fe824f..90719b4aca 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.2.0</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 9d80f82e80..35763e930c 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 4c14aee143..de8df79dd8 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.2.0</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index d469386344..8eee2ee49d 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.1.5-SNAPSHOT</version>
+        <version>7.2.0</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 2b0b0f56cd..a242020712 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.1.5-SNAPSHOT</version>
+		<version>7.2.0</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.1.5-SNAPSHOT</version>
+			<version>7.2.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 1381eb8041..84774f7281 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.1.5-SNAPSHOT</version>
+	<version>7.2.0</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.2.0</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 6da7fd904f77d3c84bbb326671ea43d9c2a305d3 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 27 Feb 2025 10:18:20 -0800
Subject: [PATCH 568/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 6b06141174..b417f96f4d 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.0</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 1d860b9ea0..4d6be17cc5 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.0</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 776112a6ed..60334dd098 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.0</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 8d8ee15617..ef5598c959 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.0</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 01d398e4e3..e492366488 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.2.0</version>
+    <version>7.2.1-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.2.0</version>
+    	<version>7.2.1-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index e8a940627a..1f7def0959 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.0</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index ee76a29c39..013d82a5a6 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.2.0</version>
+    <version>7.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 2ab628e46f..068801a027 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.0</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 90719b4aca..e643485899 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.0</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 35763e930c..589fc60734 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.2.0</version>
+		<version>7.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index de8df79dd8..5492c03468 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.0</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8eee2ee49d..9f103b485a 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.2.0</version>
+        <version>7.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index a242020712..656570d8a4 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.0</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.0</version>
+			<version>7.2.1-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 84774f7281..064503177e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.2.0</version>
+	<version>7.2.1-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.2.0</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From b03fb3f578638c650f503adee4d11155df52a09f Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 27 Feb 2025 11:35:38 -0800
Subject: [PATCH 569/599] Updates after release

---
 CHANGELOG.md | 9 +++++++++
 README.md    | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 589a894f06..3da4829ae4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 BioJava Changelog
 -----------------
 
+BioJava 7.2.0
+==============================
+### Fixed
+* More lenient mmCIF parsing to be able to parse [PDB-IHM](https://pdb-ihm.org/) entries #1106
+* Now AsaCalculator main constructor will use first model only instead of all #1107 
+
+### Added
+* New constructor for AsaCalculator to provide Structure and model #1107
+
 BioJava 7.1.4
 ==============================
 ### Fixed
diff --git a/README.md b/README.md
index bb36b69de1..5492e38913 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-7.1.4-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.1.4) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-7.2.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.2.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>7.1.4</version>
+        <version>7.2.0</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From a6723d42a22166de949bed6a6c4f4f1f29a87ee7 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 28 Feb 2025 11:12:52 -0800
Subject: [PATCH 570/599] Deal with some missing fields in IHM

---
 .../structure/io/cif/CifStructureConsumerImpl.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index c610c05f2b..c9ab103037 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -1297,15 +1297,18 @@ public void finish() {
             SeqMisMatch seqMisMatch = new SeqMisMatchImpl();
             seqMisMatch.setDetails(structRefSeqDif.getDetails().get(rowIndex));
 
-            String insCode = structRefSeqDif.getPdbxPdbInsCode().get(rowIndex);
+            String insCode = null;
+            if (structRefSeqDif.getPdbxPdbInsCode().isDefined()) {
+                insCode = structRefSeqDif.getPdbxPdbInsCode().get(rowIndex);
                 if ("?".equals(insCode)) {
-                insCode = null;
+                    insCode = null;
+                }
             }
             seqMisMatch.setInsCode(insCode);
             seqMisMatch.setOrigGroup(structRefSeqDif.getDbMonId().get(rowIndex));
             seqMisMatch.setPdbGroup(structRefSeqDif.getMonId().get(rowIndex));
-            seqMisMatch.setPdbResNum(structRefSeqDif.getPdbxAuthSeqNum().get(rowIndex));
-            seqMisMatch.setUniProtId(structRefSeqDif.getPdbxSeqDbAccessionCode().get(rowIndex));
+            seqMisMatch.setPdbResNum(structRefSeqDif.getPdbxAuthSeqNum().isDefined()? structRefSeqDif.getPdbxAuthSeqNum().get(rowIndex):null);
+            seqMisMatch.setUniProtId(structRefSeqDif.getPdbxSeqDbAccessionCode().isDefined()? structRefSeqDif.getPdbxSeqDbAccessionCode().get(rowIndex):null);
             seqMisMatch.setSeqNum(structRefSeqDif.getSeqNum().get(rowIndex));
 
             String strandId = structRefSeqDif.getPdbxPdbStrandId().get(rowIndex);

From 8286260589643583c6d631a989b708b4d8c7b956 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 28 Feb 2025 11:15:03 -0800
Subject: [PATCH 571/599] Dealing with struct_ref_seq_dif strand_id by
 referencing through struct_ref_seq and struct_ref

---
 .../io/cif/CifStructureConsumerImpl.java      | 81 ++++++++++++++-----
 1 file changed, 63 insertions(+), 18 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index c9ab103037..23ab32f3bf 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -144,6 +144,7 @@ public class CifStructureConsumerImpl implements CifStructureConsumer {
     private StructNcsOper structNcsOper;
     private PdbxStructOperList structOpers;
     private StructRef structRef;
+    private StructRefSeq structRefSeq;
     private StructRefSeqDif structRefSeqDif;
     private StructSiteGen structSiteGen;
 
@@ -689,7 +690,7 @@ public void consumeEntitySrcSyn(PdbxEntitySrcSyn entitySrcSyn) {
     @Override
     public void consumeEntityPolySeq(EntityPolySeq entityPolySeq) {
         for (int rowIndex = 0; rowIndex < entityPolySeq.getRowCount(); rowIndex++) {
-            Chain entityChain = getEntityChain(entityPolySeq.getEntityId().get(rowIndex));
+            Chain entityChain = getEntityChain(entityPolySeq.getEntityId().get(rowIndex), true);
 
             // first we check through the chemcomp provider, if it fails we do some heuristics to guess the type of group
             // TODO some of this code is analogous to getNewGroup() and we should try to unify them - JD 2016-03-08
@@ -728,19 +729,27 @@ public void consumeEntityPolySeq(EntityPolySeq entityPolySeq) {
         }
     }
 
-    private Chain getEntityChain(String entityId) {
+    /**
+     * Get a chain from the temporary list holding them. If createNewChains is true, a new chain
+     * will be added is none are found with the given entityId
+     * @param entityId the entity id
+     * @param createNewChains whether to add new chains if not found or not. If false, null will be returned if chain not found
+     * @return the chain
+     */
+    private Chain getEntityChain(String entityId, boolean createNewChains) {
         for (Chain chain : entityChains) {
             if (chain.getId().equals(entityId)) {
                 return chain;
             }
         }
-
-        // does not exist yet, so create...
-        Chain chain = new ChainImpl();
-        chain.setId(entityId);
-        entityChains.add(chain);
-
-        return chain;
+        if (createNewChains) {
+            // does not exist yet, so create...
+            Chain chain = new ChainImpl();
+            chain.setId(entityId);
+            entityChains.add(chain);
+            return chain;
+        }
+        return null;
     }
 
     @Override
@@ -967,6 +976,7 @@ public void consumeStructRef(StructRef structRef) {
 
     @Override
     public void consumeStructRefSeq(StructRefSeq structRefSeq) {
+        this.structRefSeq = structRefSeq;
         for (int rowIndex = 0; rowIndex < structRefSeq.getRowCount(); rowIndex++) {
             String refId = structRefSeq.getRefId().get(rowIndex);
 
@@ -1173,7 +1183,7 @@ public void finish() {
             String entityId = structAsym.getEntityId().get(rowIndex);
             logger.debug("Entity {} matches asym_id: {}", entityId, id);
 
-            Chain chain = getEntityChain(entityId);
+            Chain chain = getEntityChain(entityId, true);
             Chain seqRes = (Chain) chain.clone();
             // to solve issue #160 (e.g. 3u7t)
             seqRes = removeSeqResHeterogeneity(seqRes);
@@ -1292,7 +1302,8 @@ public void finish() {
         setStructNcsOps();
         setCrystallographicInfoMetadata();
 
-        Map<String, List<SeqMisMatch>> misMatchMap = new HashMap<>();
+        // entity id to list of SeqMisMatch
+        Map<Integer, List<SeqMisMatch>> misMatchMap = new HashMap<>();
         for (int rowIndex = 0; rowIndex < structRefSeqDif.getRowCount(); rowIndex++) {
             SeqMisMatch seqMisMatch = new SeqMisMatchImpl();
             seqMisMatch.setDetails(structRefSeqDif.getDetails().get(rowIndex));
@@ -1311,20 +1322,54 @@ public void finish() {
             seqMisMatch.setUniProtId(structRefSeqDif.getPdbxSeqDbAccessionCode().isDefined()? structRefSeqDif.getPdbxSeqDbAccessionCode().get(rowIndex):null);
             seqMisMatch.setSeqNum(structRefSeqDif.getSeqNum().get(rowIndex));
 
-            String strandId = structRefSeqDif.getPdbxPdbStrandId().get(rowIndex);
-            List<SeqMisMatch> seqMisMatches = misMatchMap.computeIfAbsent(strandId, k -> new ArrayList<>());
-            seqMisMatches.add(seqMisMatch);
+            // try to trace the reference entity_id to struct_ref_seq -> struct_ref
+            String alignId = findRefIdInStructRefSeq(structRefSeqDif.getAlignId().get(rowIndex));
+            if (alignId!=null) {
+                int entityId = findEntityIdInStructRef(alignId);
+                if (entityId > 0) {
+                    List<SeqMisMatch> seqMisMatches = misMatchMap.computeIfAbsent(entityId, k -> new ArrayList<>());
+                    seqMisMatches.add(seqMisMatch);
+                }
+            }
         }
 
-        for (String chainId : misMatchMap.keySet()){
-            Chain chain = structure.getPolyChainByPDB(chainId);
+        for (int entityId : misMatchMap.keySet()){
+            Chain chain = getEntityChain(String.valueOf(entityId), false);
             if (chain == null) {
-                logger.warn("Could not set mismatches for chain with author id {}", chainId);
+                logger.warn("Could not set mismatches for chain with entity id {}", entityId);
                 continue;
             }
+            chain.setSeqMisMatches(misMatchMap.get(entityId));
+        }
+    }
 
-            chain.setSeqMisMatches(misMatchMap.get(chainId));
+    private String findRefIdInStructRefSeq(String alignId) {
+        for (int rowIndex = 0; rowIndex < structRefSeq.getRowCount(); rowIndex++) {
+            String currentAlignId = structRefSeq.getAlignId().get(rowIndex);
+            if (alignId.equals(currentAlignId)) {
+                return structRefSeq.getRefId().isDefined()? structRefSeq.getRefId().get(rowIndex) : null;
+            }
+        }
+        return null;
+    }
+
+    private int findEntityIdInStructRef(String refId) {
+        String entityIdStr = null;
+        for (int rowIndex = 0; rowIndex < structRef.getRowCount(); rowIndex++) {
+            String currentId = structRef.getId().get(rowIndex);
+            if (refId.equals(currentId)) {
+                entityIdStr = structRef.getEntityId().isDefined()? structRef.getEntityId().get(rowIndex) : null;
+            }
+        }
+        int entityId = -1;
+        if (entityIdStr != null) {
+            try {
+                entityId = Integer.parseInt(entityIdStr);
+            } catch (NumberFormatException e) {
+                logger.warn("Could not parse entity id from '{}'", entityIdStr);
+            }
         }
+        return entityId;
     }
 
     private String getEntityType(String entityId) {

From 58136fe36f4c0c25d3227580e9e3d0b7f869dc7d Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 28 Feb 2025 13:13:47 -0800
Subject: [PATCH 572/599] Logging

---
 .../biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 23ab32f3bf..1de00f7e4c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -1171,7 +1171,7 @@ public void finish() {
                 currentModel.add(currentChain);
             }
         } else if (!params.isHeaderOnly()) {
-            logger.warn("current chain is null at end of document.");
+            logger.warn("No chains were instantiated after parsing the whole CIF document. This could be due to the atom_site category being absent");
         }
 
         allModels.add(currentModel);

From fdf98644c046416531cb53da0f67e8b7fc6a44cf Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 28 Feb 2025 13:22:51 -0800
Subject: [PATCH 573/599] Revert "Dealing with struct_ref_seq_dif strand_id by
 referencing through struct_ref_seq and struct_ref"

This reverts commit 8286260589643583c6d631a989b708b4d8c7b956.
---
 .../io/cif/CifStructureConsumerImpl.java      | 81 +++++--------------
 1 file changed, 18 insertions(+), 63 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 1de00f7e4c..b90b085609 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -144,7 +144,6 @@ public class CifStructureConsumerImpl implements CifStructureConsumer {
     private StructNcsOper structNcsOper;
     private PdbxStructOperList structOpers;
     private StructRef structRef;
-    private StructRefSeq structRefSeq;
     private StructRefSeqDif structRefSeqDif;
     private StructSiteGen structSiteGen;
 
@@ -690,7 +689,7 @@ public void consumeEntitySrcSyn(PdbxEntitySrcSyn entitySrcSyn) {
     @Override
     public void consumeEntityPolySeq(EntityPolySeq entityPolySeq) {
         for (int rowIndex = 0; rowIndex < entityPolySeq.getRowCount(); rowIndex++) {
-            Chain entityChain = getEntityChain(entityPolySeq.getEntityId().get(rowIndex), true);
+            Chain entityChain = getEntityChain(entityPolySeq.getEntityId().get(rowIndex));
 
             // first we check through the chemcomp provider, if it fails we do some heuristics to guess the type of group
             // TODO some of this code is analogous to getNewGroup() and we should try to unify them - JD 2016-03-08
@@ -729,27 +728,19 @@ public void consumeEntityPolySeq(EntityPolySeq entityPolySeq) {
         }
     }
 
-    /**
-     * Get a chain from the temporary list holding them. If createNewChains is true, a new chain
-     * will be added is none are found with the given entityId
-     * @param entityId the entity id
-     * @param createNewChains whether to add new chains if not found or not. If false, null will be returned if chain not found
-     * @return the chain
-     */
-    private Chain getEntityChain(String entityId, boolean createNewChains) {
+    private Chain getEntityChain(String entityId) {
         for (Chain chain : entityChains) {
             if (chain.getId().equals(entityId)) {
                 return chain;
             }
         }
-        if (createNewChains) {
-            // does not exist yet, so create...
-            Chain chain = new ChainImpl();
-            chain.setId(entityId);
-            entityChains.add(chain);
-            return chain;
-        }
-        return null;
+
+        // does not exist yet, so create...
+        Chain chain = new ChainImpl();
+        chain.setId(entityId);
+        entityChains.add(chain);
+
+        return chain;
     }
 
     @Override
@@ -976,7 +967,6 @@ public void consumeStructRef(StructRef structRef) {
 
     @Override
     public void consumeStructRefSeq(StructRefSeq structRefSeq) {
-        this.structRefSeq = structRefSeq;
         for (int rowIndex = 0; rowIndex < structRefSeq.getRowCount(); rowIndex++) {
             String refId = structRefSeq.getRefId().get(rowIndex);
 
@@ -1183,7 +1173,7 @@ public void finish() {
             String entityId = structAsym.getEntityId().get(rowIndex);
             logger.debug("Entity {} matches asym_id: {}", entityId, id);
 
-            Chain chain = getEntityChain(entityId, true);
+            Chain chain = getEntityChain(entityId);
             Chain seqRes = (Chain) chain.clone();
             // to solve issue #160 (e.g. 3u7t)
             seqRes = removeSeqResHeterogeneity(seqRes);
@@ -1302,8 +1292,7 @@ public void finish() {
         setStructNcsOps();
         setCrystallographicInfoMetadata();
 
-        // entity id to list of SeqMisMatch
-        Map<Integer, List<SeqMisMatch>> misMatchMap = new HashMap<>();
+        Map<String, List<SeqMisMatch>> misMatchMap = new HashMap<>();
         for (int rowIndex = 0; rowIndex < structRefSeqDif.getRowCount(); rowIndex++) {
             SeqMisMatch seqMisMatch = new SeqMisMatchImpl();
             seqMisMatch.setDetails(structRefSeqDif.getDetails().get(rowIndex));
@@ -1322,54 +1311,20 @@ public void finish() {
             seqMisMatch.setUniProtId(structRefSeqDif.getPdbxSeqDbAccessionCode().isDefined()? structRefSeqDif.getPdbxSeqDbAccessionCode().get(rowIndex):null);
             seqMisMatch.setSeqNum(structRefSeqDif.getSeqNum().get(rowIndex));
 
-            // try to trace the reference entity_id to struct_ref_seq -> struct_ref
-            String alignId = findRefIdInStructRefSeq(structRefSeqDif.getAlignId().get(rowIndex));
-            if (alignId!=null) {
-                int entityId = findEntityIdInStructRef(alignId);
-                if (entityId > 0) {
-                    List<SeqMisMatch> seqMisMatches = misMatchMap.computeIfAbsent(entityId, k -> new ArrayList<>());
-                    seqMisMatches.add(seqMisMatch);
-                }
-            }
+            String strandId = structRefSeqDif.getPdbxPdbStrandId().get(rowIndex);
+            List<SeqMisMatch> seqMisMatches = misMatchMap.computeIfAbsent(strandId, k -> new ArrayList<>());
+            seqMisMatches.add(seqMisMatch);
         }
 
-        for (int entityId : misMatchMap.keySet()){
-            Chain chain = getEntityChain(String.valueOf(entityId), false);
+        for (String chainId : misMatchMap.keySet()){
+            Chain chain = structure.getPolyChainByPDB(chainId);
             if (chain == null) {
-                logger.warn("Could not set mismatches for chain with entity id {}", entityId);
+                logger.warn("Could not set mismatches for chain with author id {}", chainId);
                 continue;
             }
-            chain.setSeqMisMatches(misMatchMap.get(entityId));
-        }
-    }
 
-    private String findRefIdInStructRefSeq(String alignId) {
-        for (int rowIndex = 0; rowIndex < structRefSeq.getRowCount(); rowIndex++) {
-            String currentAlignId = structRefSeq.getAlignId().get(rowIndex);
-            if (alignId.equals(currentAlignId)) {
-                return structRefSeq.getRefId().isDefined()? structRefSeq.getRefId().get(rowIndex) : null;
-            }
-        }
-        return null;
-    }
-
-    private int findEntityIdInStructRef(String refId) {
-        String entityIdStr = null;
-        for (int rowIndex = 0; rowIndex < structRef.getRowCount(); rowIndex++) {
-            String currentId = structRef.getId().get(rowIndex);
-            if (refId.equals(currentId)) {
-                entityIdStr = structRef.getEntityId().isDefined()? structRef.getEntityId().get(rowIndex) : null;
-            }
-        }
-        int entityId = -1;
-        if (entityIdStr != null) {
-            try {
-                entityId = Integer.parseInt(entityIdStr);
-            } catch (NumberFormatException e) {
-                logger.warn("Could not parse entity id from '{}'", entityIdStr);
-            }
+            chain.setSeqMisMatches(misMatchMap.get(chainId));
         }
-        return entityId;
     }
 
     private String getEntityType(String entityId) {

From 2841770e794679818e8eab458b387d157b97f9ec Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Fri, 28 Feb 2025 13:24:40 -0800
Subject: [PATCH 574/599] Deal with missing strand_id

---
 .../nbio/structure/io/cif/CifStructureConsumerImpl.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index b90b085609..8451d7b8fb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -1311,7 +1311,8 @@ public void finish() {
             seqMisMatch.setUniProtId(structRefSeqDif.getPdbxSeqDbAccessionCode().isDefined()? structRefSeqDif.getPdbxSeqDbAccessionCode().get(rowIndex):null);
             seqMisMatch.setSeqNum(structRefSeqDif.getSeqNum().get(rowIndex));
 
-            String strandId = structRefSeqDif.getPdbxPdbStrandId().get(rowIndex);
+            String strandId = structRefSeqDif.getPdbxPdbStrandId().isDefined()? structRefSeqDif.getPdbxPdbStrandId().get(rowIndex) : null;
+            if (strandId == null) continue;
             List<SeqMisMatch> seqMisMatches = misMatchMap.computeIfAbsent(strandId, k -> new ArrayList<>());
             seqMisMatches.add(seqMisMatch);
         }

From 48cb462e137a17d5161f390bbf265a11bc4f48ee Mon Sep 17 00:00:00 2001
From: Jose Manuel Duarte <jose.m.duarte@gmail.com>
Date: Tue, 4 Mar 2025 13:52:57 -0800
Subject: [PATCH 575/599] Update
 biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java

Co-authored-by: Sebastian Bittrich <sebastian.bittrich@rcsb.org>
---
 .../nbio/structure/io/cif/CifStructureConsumerImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
index 8451d7b8fb..67514edd84 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/CifStructureConsumerImpl.java
@@ -1311,8 +1311,8 @@ public void finish() {
             seqMisMatch.setUniProtId(structRefSeqDif.getPdbxSeqDbAccessionCode().isDefined()? structRefSeqDif.getPdbxSeqDbAccessionCode().get(rowIndex):null);
             seqMisMatch.setSeqNum(structRefSeqDif.getSeqNum().get(rowIndex));
 
-            String strandId = structRefSeqDif.getPdbxPdbStrandId().isDefined()? structRefSeqDif.getPdbxPdbStrandId().get(rowIndex) : null;
-            if (strandId == null) continue;
+            if (!structRefSeqDif.getPdbxPdbStrandId().isDefined()) continue;
+            String strandId = structRefSeqDif.getPdbxPdbStrandId().get(rowIndex);
             List<SeqMisMatch> seqMisMatches = misMatchMap.computeIfAbsent(strandId, k -> new ArrayList<>());
             seqMisMatches.add(seqMisMatch);
         }

From 5589e1eed3c92170c71fa5da80a3f528b37413a3 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 5 Mar 2025 11:58:40 -0800
Subject: [PATCH 576/599] [maven-release-plugin] prepare release biojava-7.2.1

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index b417f96f4d..4642728024 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 4d6be17cc5..ad562e3ef9 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 60334dd098..8a26fa5fef 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index ef5598c959..1875291310 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index e492366488..2b169e7212 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.2.1</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.2.1-SNAPSHOT</version>
+    	<version>7.2.1</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 1f7def0959..e99c843aa9 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 013d82a5a6..befd1e208e 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.2.1-SNAPSHOT</version>
+    <version>7.2.1</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 068801a027..82f5c7507d 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index e643485899..72705a2ec5 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 589fc60734..27061b3c5c 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 5492c03468..72b76cbed9 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 9f103b485a..6f73371344 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.2.1-SNAPSHOT</version>
+        <version>7.2.1</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 656570d8a4..e68c318de9 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1-SNAPSHOT</version>
+		<version>7.2.1</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1-SNAPSHOT</version>
+			<version>7.2.1</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 064503177e..7ae8b07016 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.2.1-SNAPSHOT</version>
+	<version>7.2.1</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.2.1</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 8289418368990fc2510be96a11999511953991ed Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 5 Mar 2025 11:58:43 -0800
Subject: [PATCH 577/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 4642728024..4de0856cdb 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1</version>
+		<version>7.2.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index ad562e3ef9..2c6b2b1ce6 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1</version>
+		<version>7.2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 8a26fa5fef..e3b7b4cc95 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1</version>
+		<version>7.2.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 1875291310..4d8696959a 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1</version>
+		<version>7.2.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 2b169e7212..d20cf89df6 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.2.1</version>
+    <version>7.2.2-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.2.1</version>
+    	<version>7.2.2-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index e99c843aa9..981c499e0a 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1</version>
+		<version>7.2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index befd1e208e..9044de341f 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.2.1</version>
+    <version>7.2.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 82f5c7507d..29be159250 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1</version>
+		<version>7.2.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 72705a2ec5..3c70be5d34 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1</version>
+		<version>7.2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 27061b3c5c..3b8112acfa 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.2.1</version>
+		<version>7.2.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 72b76cbed9..39baa731dd 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1</version>
+		<version>7.2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 6f73371344..d5ac6b03ab 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.2.1</version>
+        <version>7.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index e68c318de9..e28c7823a3 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.1</version>
+		<version>7.2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.1</version>
+			<version>7.2.2-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 7ae8b07016..899abc3d64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.2.1</version>
+	<version>7.2.2-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.2.1</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 602b4d52b0fe10f4a9d880d9c79a2f9f76f48146 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 5 Mar 2025 13:08:51 -0800
Subject: [PATCH 578/599] Updating after release

---
 CHANGELOG.md | 5 +++++
 README.md    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3da4829ae4..d9a873e718 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 BioJava Changelog
 -----------------
 
+BioJava 7.2.1
+==============================
+### Fixed
+* More lenient mmCIF parsing to be able to parse [PDB-IHM](https://pdb-ihm.org/) entries, some more edge cases #1108
+
 BioJava 7.2.0
 ==============================
 ### Fixed
diff --git a/README.md b/README.md
index 5492e38913..2235ae8d35 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-7.2.0-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.2.0) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-7.2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.2.1) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>7.2.0</version>
+        <version>7.2.1</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From 501a09e2590965318d0a85c52d1759291060f450 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 17 Mar 2025 15:08:43 -0700
Subject: [PATCH 579/599] Make entity type case insensitive. Also improved docs

---
 .../biojava/nbio/structure/EntityType.java    | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityType.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityType.java
index de8b5ca4d1..f41930681a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityType.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityType.java
@@ -21,8 +21,7 @@
 package org.biojava.nbio.structure;
 
 /**
- *
- * The type of entity (polymer, non-polymer, water, macrolide)
+ * The type of entity (polymer, non-polymer, water, macrolide, branched)
  * as defined in the mmCIF dictionary: <a href="http://mmcif.wwpdb.org/dictionaries/mmcif_pdbx_v40.dic/Items/_entity.type.html"></a>
  * <p>
  * Entities are of four types:  polymer, non-polymer, macrolide and water.
@@ -76,10 +75,8 @@ public enum EntityType {
 	/**
 	 * @param entType the type of the Entity
 	 */
-	private EntityType(String entType) {
-
+	EntityType(String entType) {
 		this.setEntityType(entType);
-
 	}
 
 	/**
@@ -101,19 +98,15 @@ private void setEntityType(String entityType) {
 	 * Returns null if entityType is null or not one of the supported
 	 * standard types.
 	 *
-	 * @param entityType String value , should be one of "polymer","non-polymer","water","macrolide"
-	 * @return an EntityType object
+	 * @param entityType should be one of "polymer", "non-polymer", "water", "macrolide", "branched" (case insensitive)
+	 * @return an EntityType object or null if the input string doesn't correspond to a known entity
 	 */
-	public static EntityType entityTypeFromString(String entityType)
-	{
-
-		if ( entityType == null)
+	public static EntityType entityTypeFromString(String entityType) {
+		if (entityType == null)
 			return null;
 
-		for(EntityType et : EntityType.values())
-		{
-			if(entityType.equals(et.entityType))
-			{
+		for(EntityType et : EntityType.values()) {
+			if (entityType.toLowerCase().equals(et.entityType)) {
 				return et;
 			}
 		}

From aa0d5767badb81bc672127343ae8a1ce3ea84ad9 Mon Sep 17 00:00:00 2001
From: Jose Manuel Duarte <jose.m.duarte@gmail.com>
Date: Tue, 18 Mar 2025 10:59:54 -0700
Subject: [PATCH 580/599] Update
 biojava-structure/src/main/java/org/biojava/nbio/structure/EntityType.java

Co-authored-by: Sebastian Bittrich <jonstargaryen90@gmail.com>
---
 .../src/main/java/org/biojava/nbio/structure/EntityType.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityType.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityType.java
index f41930681a..b4978fc582 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityType.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/EntityType.java
@@ -106,7 +106,7 @@ public static EntityType entityTypeFromString(String entityType) {
 			return null;
 
 		for(EntityType et : EntityType.values()) {
-			if (entityType.toLowerCase().equals(et.entityType)) {
+			if (entityType.equalsIgnoreCase(et.entityType)) {
 				return et;
 			}
 		}

From a24b6f601b4bae2c58b96bc5cf760724e06a1801 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Tue, 18 Mar 2025 13:24:36 -0700
Subject: [PATCH 581/599] Latest ciftools: should fix performance for some bcif
 edgecases

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 899abc3d64..10b10b029c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 		<log4j.version>2.23.1</log4j.version>
 		<junit-jupiter.version>5.10.1</junit-jupiter.version>
 		<ciftools.artifact>ciftools-java</ciftools.artifact>
-		<ciftools.version>5.0.1</ciftools.version>
+		<ciftools.version>7.0.1</ciftools.version>
 	</properties>
 	<scm>
 		<connection>scm:git:git://github.com/biojava/biojava.git</connection>

From 381fedd40e6b105fa1b806b1d28b02533fb48436 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 19 Mar 2025 10:44:51 -0700
Subject: [PATCH 582/599] Formatting and docs cleanup

---
 .../org/biojava/nbio/structure/Structure.java |  24 ++--
 .../biojava/nbio/structure/StructureImpl.java | 115 +++++-------------
 2 files changed, 42 insertions(+), 97 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
index 51d69234c7..605a717577 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
@@ -232,10 +232,10 @@ public interface Structure extends Cloneable, Serializable {
 	 * Retrieve all Chains belonging to a model .
 	 * @see #getChains(int modelnr)
 	 *
-	 * @param modelnr  an int
+	 * @param modelIdx the model index
 	 * @return a List object containing the Chains of Model nr. modelnr
 	 */
-	List<Chain> getModel(int modelnr);
+	List<Chain> getModel(int modelIdx);
 
 	/**
 	 * Retrieve all chains for the first model.
@@ -261,17 +261,17 @@ public interface Structure extends Cloneable, Serializable {
 	 * Retrieve all chains of a model.
 	 * @see #getModel
 	 *
-	 * @param modelnr  an int
+	 * @param modelIdx the model index
 	 * @return a List object containing the Chains of Model nr. modelnr
 	 */
-	List<Chain> getChains(int modelnr);
+	List<Chain> getChains(int modelIdx);
 
 	/**
 	 * Set the chains for a model
 	 * @param chains the chains for a model
 	 * @param modelnr the number of the model
 	 */
-	void setChains( int modelnr, List<Chain> chains);
+	void setChains(int modelnr, List<Chain> chains);
 
 	/**
 	 * Return all polymeric chains for the first model
@@ -315,7 +315,7 @@ public interface Structure extends Cloneable, Serializable {
 
 	/**
 	 * Return all water chains for the given model index
-	 * @param modelIdx
+	 * @param modelIdx the model index
 	 * @return
 	 * @since 5.0
 	 */
@@ -332,9 +332,9 @@ public interface Structure extends Cloneable, Serializable {
 	 * Add a new chain to the model specified by the given index
 	 *
 	 * @param chain    a Chain object
-	 * @param modelnr  an int specifying to which model the Chain should be added
+	 * @param modelIdx  an int specifying to which model the Chain should be added
 	 */
-	void addChain(Chain chain, int modelnr);
+	void addChain(Chain chain, int modelIdx);
 
 	/**
 	 * Retrieve a chain by its index within the Structure .
@@ -348,10 +348,10 @@ public interface Structure extends Cloneable, Serializable {
 	 * Retrieve a chain by its indices within the Structure and model.
 	 *
 	 * @param chainIndex the index of the desired chain in the structure
-	 * @param modelnr the model the desired chain is in
+	 * @param modelIdx the model index
 	 * @return a Chain object
 	 */
-	Chain getChainByIndex(int modelnr, int chainIndex);
+	Chain getChainByIndex(int modelIdx, int chainIndex);
 
 	/**
 	 * Check if a chain with the chainId aymId is contained in this structure.
@@ -394,11 +394,11 @@ public interface Structure extends Cloneable, Serializable {
 	 * considers only model nr X. count starts with 0.
 	 * @param authId the chain name of the chain to use
 	 * @param pdbResnum the PDB residue number of the requested group
-	 * @param modelnr the number of the model to use
+	 * @param modelIdx the model index
 	 * @return Group the requested Group
 	 * @throws StructureException
 	 */
-	Group findGroup(String authId, String pdbResnum, int modelnr) throws StructureException;
+	Group findGroup(String authId, String pdbResnum, int modelIdx) throws StructureException;
 
 	/**
 	 * Retrieve a Chain (polymeric, non-polymeric or water) based on
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
index ae00c8f7f3..1f5e371e56 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
@@ -123,20 +123,15 @@ public Structure clone() {
 		n.setDBRefs(this.getDBRefs());
 		n.setSites(getSites());
 
-
 		// go through each chain and clone chain
 		for (int i=0;i<nrModels();i++){
 			List<Chain> cloned_model = new ArrayList<>();
 
 			for (int j=0;j<size(i);j++){
-
 				Chain cloned_chain  = (Chain) getChainByIndex(i,j).clone();
-
 				// setting the parent: can only be done from the parent
 				cloned_chain.setStructure(n);
-
 				cloned_model.add(cloned_chain);
-
 			}
 			n.addModel(cloned_model);
 
@@ -170,36 +165,30 @@ public Structure clone() {
 
 	/** {@inheritDoc} */
 	@Override
-	public Group findGroup(String chainName, String pdbResnum, int modelnr)
+	public Group findGroup(String chainName, String pdbResnum, int modelIdx)
 			throws StructureException {
 
-
 		// if structure is xray there will be only one "model".
-		if ( modelnr > models.size())
-			throw new StructureException(" no model nr " + modelnr +
+		if ( modelIdx > models.size())
+			throw new StructureException(" no model nr " + modelIdx +
 					" in this structure. (contains "+models.size()+")");
 
-
 		// first we need to gather all groups with the author id chainName: polymers, non-polymers and waters
-		Chain polyChain = getPolyChainByPDB(chainName, modelnr);
+		Chain polyChain = getPolyChainByPDB(chainName, modelIdx);
 		if(polyChain != null) {
-			List<Group> groups = new ArrayList<>();
-
-			groups.addAll(polyChain.getAtomGroups());
 
+            List<Group> groups = new ArrayList<>(polyChain.getAtomGroups());
 
 			// there can be more than one non-poly chain for a given author id
-			for (Chain chain: getNonPolyChainsByPDB(chainName, modelnr)) {
+			for (Chain chain: getNonPolyChainsByPDB(chainName, modelIdx)) {
 				groups.addAll(chain.getAtomGroups());
 			}
 
-			Chain water = getWaterChainByPDB(chainName, modelnr);
+			Chain water = getWaterChainByPDB(chainName, modelIdx);
 
 			if (water!=null)
 				groups.addAll(water.getAtomGroups());
 
-
-
 			// now iterate over all groups
 			// in order to find the amino acid that has this pdbRenum.
 
@@ -260,7 +249,7 @@ public void addChain(Chain chain) {
 
 	/** {@inheritDoc} */
 	@Override
-	public void addChain(Chain chain, int modelnr) {
+	public void addChain(Chain chain, int modelIdx) {
 		// if model has not been initialized, init it!
 		chain.setStructure(this);
 		if (models.isEmpty()) {
@@ -271,16 +260,11 @@ public void addChain(Chain chain, int modelnr) {
 			models.add(model);
 
 		} else {
-			Model model = models.get(modelnr);
+			Model model = models.get(modelIdx);
 			model.addChain(chain);
 		}
-
-
-
 	}
 
-
-
 	/** {@inheritDoc} */
 	@Override
 	public Chain getChainByIndex(int number) {
@@ -293,9 +277,9 @@ public Chain getChainByIndex(int number) {
 
 	/** {@inheritDoc} */
 	@Override
-	public Chain getChainByIndex(int modelnr,int number) {
+	public Chain getChainByIndex(int modelIdx, int number) {
 
-		Model model = models.get(modelnr);
+		Model model = models.get(modelIdx);
 
 		return model.getChains().get(number);
 	}
@@ -333,8 +317,6 @@ public void setModel(int position, List<Chain> modelChains){
 			c.setStructure(this);
 
 		//System.out.println("model size:" + models.size());
-
-
 		Model model = new Model();
 		model.setChains(modelChains);
 
@@ -350,7 +332,7 @@ public void setModel(int position, List<Chain> modelChains){
 	 */
 	@Override
 	public String toString(){
-		String newline = System.getProperty("line.separator");
+		String newline = System.lineSeparator();
 		StringBuilder str = new StringBuilder();
 		str.append("structure ");
 		str.append(name);
@@ -384,16 +366,12 @@ public String toString(){
 				List<Group> hgr = cha.getAtomGroups(GroupType.HETATM);
 				List<Group> ngr = cha.getAtomGroups(GroupType.NUCLEOTIDE);
 
-
-
-
 				str.append("chain ")
 						.append(j).append(": asymId:")
 						.append(cha.getId())
 						.append(" authId:")
 						.append(cha.getName()).append(" ");
 
-
 				if ( cha.getEntityInfo() != null){
 					EntityInfo comp = cha.getEntityInfo();
 					String molName = comp.getDescription();
@@ -406,7 +384,6 @@ public String toString(){
 							.append(")");
 				}
 
-
 				str.append(newline);
 				str.append(" length SEQRES: ").append(cha.getSeqResLength());
 				str.append(" length ATOM: ").append(cha.getAtomLength());
@@ -425,7 +402,6 @@ public String toString(){
 			str.append(mol).append(newline);
 		}
 
-
 		return str.toString() ;
 	}
 
@@ -566,8 +542,6 @@ public List<Chain> getWaterChains(int modelIdx) {
 		return models.get(modelIdx).getWaterChains();
 	}
 
-
-
 	/** {@inheritDoc} */
 	@Override
 	public void setChains(int modelnr, List<Chain> chains){
@@ -584,37 +558,32 @@ public void setChains(int modelnr, List<Chain> chains){
 
 	}
 
-	/** Retrieve all Chains belonging to a model .
-	 *
-	 * @param modelnr  an int
-	 * @return a List object
+	/**
+	 * {@inheritDoc}
 	 */
 	@Override
-	public List<Chain> getModel(int modelnr) {
+	public List<Chain> getModel(int modelIdx) {
 
-		return models.get(modelnr).getChains();
+		return models.get(modelIdx).getChains();
 	}
 
 	/** {@inheritDoc} */
 	@Override
-	public Chain getChain(String asymId, int modelnr) {
+	public Chain getChain(String asymId, int modelIdx) {
 
-		List<Chain> chains = getChains(modelnr);
+		List<Chain> chains = getChains(modelIdx);
 		for (Chain c : chains) {
 			if (c.getId().equals(asymId)) {
 				return c;
 			}
 		}
 		return null;
-
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public Chain getChain(String asymId) {
-
 		return getChain(asymId,0);
-
 	}
 
 	@Override
@@ -693,7 +662,6 @@ public List<Chain> getNonPolyChainsByPDB(String authId, int modelIdx) {
 			return chains;
 		}
 
-
 		List<Chain> nonpolyChains = model.getNonPolyChains();
 		for (Chain c : nonpolyChains){
 			if (c.getName().equals(authId))
@@ -745,8 +713,6 @@ public Chain getWaterChainByPDB(String authId, int modelIdx) {
 		return null;
 	}
 
-
-
 	/** {@inheritDoc} */
 	@Override
 	public String toPDB() {
@@ -835,7 +801,6 @@ public EntityInfo getEntityById(int entityId) {
 		return null;
 	}
 
-
 	/** {@inheritDoc} */
 	@Override
 	public List<DBRef> getDBRefs() {
@@ -872,7 +837,6 @@ public void setPDBHeader(PDBHeader pdbHeader){
 	@Override
 	public List<Bond> getSSBonds(){
 		return ssbonds;
-
 	}
 
 	/** {@inheritDoc} */
@@ -882,9 +846,7 @@ public void setSSBonds(List<Bond> ssbonds){
 	}
 
 	/**
-	 * Adds a single disulfide Bond to this structure
-	 *
-	 * @param ssbond the SSBond.
+	 * {@inheritDoc}
 	 */
 	@Override
 	public void addSSBond(Bond ssbond){
@@ -892,10 +854,7 @@ public void addSSBond(Bond ssbond){
 	}
 
 	/**
-	 * Return whether or not the entry has an associated journal article
-	 * or publication. The JRNL section is not mandatory and thus may not be
-	 * present.
-	 * @return flag if a JournalArticle could be found.
+	 * R{@inheritDoc}
 	 */
 	@Override
 	public boolean hasJournalArticle() {
@@ -903,9 +862,7 @@ public boolean hasJournalArticle() {
 	}
 
 	/**
-	 * get the associated publication as defined by the JRNL records in a PDB
-	 * file.
-	 * @return a JournalArticle
+	 * {@inheritDoc}
 	 */
 	@Override
 	public JournalArticle getJournalArticle() {
@@ -913,9 +870,7 @@ public JournalArticle getJournalArticle() {
 	}
 
 	/**
-	 * set the associated publication as defined by the JRNL records in a PDB
-	 * file.
-	 * @param journalArticle the article
+	 * {@inheritDoc}
 	 */
 	@Override
 	public void setJournalArticle(JournalArticle journalArticle) {
@@ -923,29 +878,21 @@ public void setJournalArticle(JournalArticle journalArticle) {
 	}
 
 	/**
-	 * @return the sites contained in this structure
+	 * {@inheritDoc}
 	 */
-
 	@Override
 	public List<Site> getSites() {
 		return sites;
 	}
 
 	/**
-	 * @param sites the sites to set in the structure
+	 * {@inheritDoc}
 	 */
-
 	@Override
 	public void setSites(List<Site> sites) {
 		this.sites = sites;
 	}
 
-	/** Caution: we should probably remove this to avoid confusion. Currently this is always an empty list!
-	 *
-	 * @return a list of Groups listed in the HET records - this will not
-	 * include any waters.
-	 */
-
 	/**
 	 * Sets a flag to indicate if this structure is a biological assembly
 	 * @param biologicalAssembly true if biological assembly, otherwise false
@@ -1026,19 +973,17 @@ public void setPDBCode(String pdb_id){
 			pdbId = new PdbId(pdb_id);
 		}
 	}
-	
-
 
-	/** {@inheritDoc} 
-	 * @since 6.0.0
-	 * */
+	/**
+	 * {@inheritDoc}
+	 **/
 	public PdbId getPdbId() {
 		return this.pdbId;
 	}
 	
-	/** {@inheritDoc}
-	 * @since 6.0.0
-	 *  */
+	/**
+	 * {@inheritDoc}
+	 **/
 	public void setPdbId(PdbId pdbId) {
 		this.pdbId = pdbId;
 	}

From 743a9fdc23eaadd4f60a93e57618a33bb2857c49 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 19 Mar 2025 10:53:06 -0700
Subject: [PATCH 583/599] More cleanup

---
 .../org/biojava/nbio/structure/Structure.java |  8 ++--
 .../biojava/nbio/structure/StructureImpl.java | 45 +++++--------------
 2 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
index 605a717577..05bd0ba859 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Structure.java
@@ -178,10 +178,10 @@ public interface Structure extends Cloneable, Serializable {
 	/**
 	 * Return number of chains of model.
 	 *
-	 * @param modelnr  an int specifying the number of the Model that should be used
+	 * @param modelIdx  an int specifying the index of the Model that should be used
 	 * @return an int representing the number of Chains in this Model
 	 */
-	int size(int modelnr);
+	int size(int modelIdx);
 
 	/**
 	 * Return the number of models .
@@ -269,9 +269,9 @@ public interface Structure extends Cloneable, Serializable {
 	/**
 	 * Set the chains for a model
 	 * @param chains the chains for a model
-	 * @param modelnr the number of the model
+	 * @param modelIdx the model index
 	 */
-	void setChains(int modelnr, List<Chain> chains);
+	void setChains(int modelIdx, List<Chain> chains);
 
 	/**
 	 * Return all polymeric chains for the first model
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
index 1f5e371e56..f91f8aff23 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
@@ -268,24 +268,17 @@ public void addChain(Chain chain, int modelIdx) {
 	/** {@inheritDoc} */
 	@Override
 	public Chain getChainByIndex(int number) {
-
-		int modelnr = 0 ;
-
-		return getChainByIndex(modelnr,number);
+		return getChainByIndex(0, number);
 	}
 
 
 	/** {@inheritDoc} */
 	@Override
 	public Chain getChainByIndex(int modelIdx, int number) {
-
 		Model model = models.get(modelIdx);
-
 		return model.getChains().get(number);
 	}
 
-
-
 	/** {@inheritDoc} */
 	@Override
 	public void addModel(List<Chain> modelChains){
@@ -297,7 +290,6 @@ public void addModel(List<Chain> modelChains){
 		models.add(model);
 	}
 
-
 	/** {@inheritDoc} */
 	@Override
 	public void setChains(List<Chain> chains){
@@ -305,8 +297,6 @@ public void setChains(List<Chain> chains){
 		setModel(0,chains);
 	}
 
-
-
 	/** {@inheritDoc} */
 	@Override
 	public void setModel(int position, List<Chain> modelChains){
@@ -327,9 +317,6 @@ public void setModel(int position, List<Chain> modelChains){
 		}
 	}
 
-	/** String representation.
-	 *
-	 */
 	@Override
 	public String toString(){
 		String newline = System.lineSeparator();
@@ -418,15 +405,11 @@ public int size() {
 
 	}
 
-	/** return number of chains  of model.
-	 *
-	 */
 	@Override
-	public int size(int modelnr) { return models.get(modelnr).size(); }
+	public int size(int modelIdx) { return models.get(modelIdx).size(); }
 
 	// some NMR stuff :
 
-	/** return number of models. */
 	@Override
 	public int nrModels() {
 		return models.size() ;
@@ -496,16 +479,15 @@ public List<Chain> getChains(int modelIdx){
 	/** {@inheritDoc} */
 	@Override
 	public List<Chain> getChains(){
-		if (models.size()==0) {
+		if (models.isEmpty()) {
 			return new ArrayList<>(0);
 		}
 		return getChains(0);
-
 	}
 
 	@Override
 	public List<Chain> getPolyChains() {
-		if (models.size()==0) {
+		if (models.isEmpty()) {
 			return new ArrayList<>(0);
 		}
 		return getPolyChains(0);
@@ -518,7 +500,7 @@ public List<Chain> getPolyChains(int modelIdx) {
 
 	@Override
 	public List<Chain> getNonPolyChains() {
-		if (models.size()==0) {
+		if (models.isEmpty()) {
 			return new ArrayList<>(0);
 		}
 		return  getNonPolyChains(0);
@@ -531,7 +513,7 @@ public List<Chain> getNonPolyChains(int modelIdx) {
 
 	@Override
 	public List<Chain> getWaterChains() {
-		if (models.size()==0) {
+		if (models.isEmpty()) {
 			return new ArrayList<>(0);
 		}
 		return getWaterChains(0);
@@ -544,18 +526,17 @@ public List<Chain> getWaterChains(int modelIdx) {
 
 	/** {@inheritDoc} */
 	@Override
-	public void setChains(int modelnr, List<Chain> chains){
+	public void setChains(int modelIdx, List<Chain> chains){
 		for (Chain c: chains){
 			c.setStructure(this);
 		}
-		if (models.size()>modelnr) {
-			models.remove(modelnr);
+		if (models.size()> modelIdx) {
+			models.remove(modelIdx);
 		}
 
 		Model model = new Model();
 		model.setChains(chains);
-		models.add(modelnr, model);
-
+		models.add(modelIdx, model);
 	}
 
 	/**
@@ -563,7 +544,6 @@ public void setChains(int modelnr, List<Chain> chains){
 	 */
 	@Override
 	public List<Chain> getModel(int modelIdx) {
-
 		return models.get(modelIdx).getChains();
 	}
 
@@ -606,7 +586,6 @@ public Chain getPolyChain(String asymId, int modelIdx) {
 		return null;
 	}
 
-
 	@Override
 	public Chain getNonPolyChain(String asymId) {
 		return getNonPolyChain(asymId, 0);
@@ -624,7 +603,6 @@ public Chain getNonPolyChain(String asymId, int modelIdx) {
 			if (c.getId().equals(asymId))
 				return c;
 		}
-
 		return null;
 	}
 
@@ -676,7 +654,6 @@ public Chain getWaterChain(String asymId) {
 		return getWaterChain(asymId, 0);
 	}
 
-
 	@Override
 	public Chain getWaterChain(String asymId, int modelIdx) {
 		Model model = models.get(modelIdx);
@@ -697,7 +674,6 @@ public Chain getWaterChainByPDB(String authId) {
 		return getWaterChainByPDB(authId, 0);
 	}
 
-
 	@Override
 	public Chain getWaterChainByPDB(String authId, int modelIdx) {
 		Model model = models.get(modelIdx);
@@ -820,7 +796,6 @@ public void setDBRefs(List<DBRef> dbrefs) {
 		this.dbrefs = dbrefs;
 	}
 
-
 	/** {@inheritDoc} */
 	@Override
 	public PDBHeader getPDBHeader() {

From c33627f85311f35b5efc947c94cd7439b0db82c5 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 19 Mar 2025 11:03:04 -0700
Subject: [PATCH 584/599] More cleanup

---
 .../biojava/nbio/structure/StructureImpl.java  | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
index f91f8aff23..b0165ec3a7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
@@ -243,8 +243,7 @@ public void setStructureIdentifier(StructureIdentifier structureIdentifier) {
 	/** {@inheritDoc} */
 	@Override
 	public void addChain(Chain chain) {
-		int modelnr = 0 ;
-		addChain(chain,modelnr);
+		addChain(chain, 0);
 	}
 
 	/** {@inheritDoc} */
@@ -293,8 +292,7 @@ public void addModel(List<Chain> modelChains){
 	/** {@inheritDoc} */
 	@Override
 	public void setChains(List<Chain> chains){
-
-		setModel(0,chains);
+		setModel(0, chains);
 	}
 
 	/** {@inheritDoc} */
@@ -359,7 +357,7 @@ public String toString(){
 						.append(" authId:")
 						.append(cha.getName()).append(" ");
 
-				if ( cha.getEntityInfo() != null){
+				if (cha.getEntityInfo() != null){
 					EntityInfo comp = cha.getEntityInfo();
 					String molName = comp.getDescription();
 					if ( molName != null){
@@ -394,22 +392,16 @@ public String toString(){
 
 	@Override
 	public int size() {
-		int modelnr = 0 ;
-
 		if (!models.isEmpty()) {
-			return models.get(modelnr).getPolyChains().size();
-		}
-		else {
+			return models.get(0).getPolyChains().size();
+		} else {
 			return 0 ;
 		}
-
 	}
 
 	@Override
 	public int size(int modelIdx) { return models.get(modelIdx).size(); }
 
-	// some NMR stuff :
-
 	@Override
 	public int nrModels() {
 		return models.size() ;

From 7217ee82acf8098206d67b67feb54c0ed5170b6a Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 19 Mar 2025 12:58:42 -0700
Subject: [PATCH 585/599] Safeguards

---
 .../main/java/org/biojava/nbio/structure/StructureImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
index b0165ec3a7..0a697e2d7b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/StructureImpl.java
@@ -536,13 +536,13 @@ public void setChains(int modelIdx, List<Chain> chains){
 	 */
 	@Override
 	public List<Chain> getModel(int modelIdx) {
+		if (models.isEmpty()) return new ArrayList<>();
 		return models.get(modelIdx).getChains();
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public Chain getChain(String asymId, int modelIdx) {
-
 		List<Chain> chains = getChains(modelIdx);
 		for (Chain c : chains) {
 			if (c.getId().equals(asymId)) {
@@ -566,6 +566,8 @@ public Chain getPolyChain(String asymId) {
 
 	@Override
 	public Chain getPolyChain(String asymId, int modelIdx) {
+		if (models.isEmpty()) return null;
+
 		Model model = models.get(modelIdx);
 		if (model==null) {
 			return null;

From 6e7891b630262ff75f70430ac27629932e6740c5 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 20 Mar 2025 12:19:40 -0700
Subject: [PATCH 586/599] [maven-release-plugin] prepare release biojava-7.2.2

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 4de0856cdb..e53c796e3d 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2-SNAPSHOT</version>
+		<version>7.2.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 2c6b2b1ce6..4d64a820ce 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2-SNAPSHOT</version>
+		<version>7.2.2</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index e3b7b4cc95..7662ec2488 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2-SNAPSHOT</version>
+		<version>7.2.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 4d8696959a..4ce37b1110 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2-SNAPSHOT</version>
+		<version>7.2.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index d20cf89df6..12bb171142 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.2.2-SNAPSHOT</version>
+    <version>7.2.2</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.2.2-SNAPSHOT</version>
+    	<version>7.2.2</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 981c499e0a..baf5f746ce 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2-SNAPSHOT</version>
+		<version>7.2.2</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 9044de341f..4fa75588f4 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.2.2-SNAPSHOT</version>
+    <version>7.2.2</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 29be159250..e8c0c8da22 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2-SNAPSHOT</version>
+		<version>7.2.2</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 3c70be5d34..bb8885d2d8 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2-SNAPSHOT</version>
+		<version>7.2.2</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 3b8112acfa..569a2b4d43 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.2.2-SNAPSHOT</version>
+		<version>7.2.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 39baa731dd..7a9e8da139 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2-SNAPSHOT</version>
+		<version>7.2.2</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index d5ac6b03ab..8deffb1d69 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.2.2-SNAPSHOT</version>
+        <version>7.2.2</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index e28c7823a3..2a649166a1 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2-SNAPSHOT</version>
+		<version>7.2.2</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2-SNAPSHOT</version>
+			<version>7.2.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 10b10b029c..a7ba4e4e52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.2.2-SNAPSHOT</version>
+	<version>7.2.2</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.2.2</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From b9c4cd0afee6ea10e30eb7489178755c25c0662d Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 20 Mar 2025 12:19:43 -0700
Subject: [PATCH 587/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index e53c796e3d..b2b642b661 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2</version>
+		<version>7.2.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 4d64a820ce..fe75c181c7 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2</version>
+		<version>7.2.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 7662ec2488..0836ffe54c 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2</version>
+		<version>7.2.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 4ce37b1110..7729a6e9e3 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2</version>
+		<version>7.2.3-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 12bb171142..2c44988004 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.2.2</version>
+    <version>7.2.3-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.2.2</version>
+    	<version>7.2.3-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index baf5f746ce..0b8cb53791 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2</version>
+		<version>7.2.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 4fa75588f4..001e3e52f1 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.2.2</version>
+    <version>7.2.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index e8c0c8da22..12e4941d55 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2</version>
+		<version>7.2.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index bb8885d2d8..82107e8058 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2</version>
+		<version>7.2.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 569a2b4d43..24644c8ffe 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.2.2</version>
+		<version>7.2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 7a9e8da139..5392798310 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2</version>
+		<version>7.2.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 8deffb1d69..4f3e00f56b 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.2.2</version>
+        <version>7.2.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 2a649166a1..7a4fa63589 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.2</version>
+		<version>7.2.3-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.2</version>
+			<version>7.2.3-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index a7ba4e4e52..f17d3c2d67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.2.2</version>
+	<version>7.2.3-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.2.2</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 5a699eb6465509b853463ae34ec04c4d90bc2a54 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Thu, 20 Mar 2025 13:30:44 -0700
Subject: [PATCH 588/599] Updating after release

---
 CHANGELOG.md | 7 +++++++
 README.md    | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9a873e718..74b52303b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 BioJava Changelog
 -----------------
 
+BioJava 7.2.2
+==============================
+### Fixed
+* mmCIF parsing: entity type should be case insensitive #1109
+* Upgraded to latest version of ciftools-java, fixes mmCIF parsing performance issues in some edge cases https://github.com/rcsb/ciftools-java/issues/13
+* Added safeguards for `Structure.get*Chain*()` methods #1111
+
 BioJava 7.2.1
 ==============================
 ### Fixed
diff --git a/README.md b/README.md
index 2235ae8d35..af128cd92c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-7.2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.2.1) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-7.2.2-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.2.2) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>7.2.1</version>
+        <version>7.2.2</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From 7b82b27b15c76899a9042386ea955882feaa070e Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 18 Jul 2025 08:18:34 -0700
Subject: [PATCH 589/599] Using new mvn central plugin

---
 pom.xml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index f17d3c2d67..c2a70eb02e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -580,17 +580,20 @@
 			<id>release</id>
 			<build>
 				<plugins>
-					<!-- for deployment on OSS Sonatype -->
-					<!-- handles propagating the build to the staging repository -->
+					<!-- handles uploading the build to the maven central repository -->
 					<plugin>
-						<groupId>org.sonatype.plugins</groupId>
-						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.13</version>
+						<groupId>org.sonatype.central</groupId>
+						<artifactId>central-publishing-maven-plugin</artifactId>
+						<version>0.8.0</version>
 						<extensions>true</extensions>
 						<configuration>
-							<serverId>ossrh</serverId>
-							<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-							<autoReleaseAfterClose>true</autoReleaseAfterClose>
+							<!-- Note your maven settings.xml needs a server section with <id> that matches this one and valid credentials for maven central -->
+							<publishingServerId>central</publishingServerId>
+							<!-- If this is set to false, the artifact is only staged and then needs pushing manually via the web interface at https://central.sonatype.com/publishing/deployments -->
+							<!-- With true it publishes automatically -->
+							<autoPublish>true</autoPublish>
+							<!-- NOTE this is to wait for the new release to be validated and publicly available. Not essential but nice that when build is done, we know the artifacts are available publicly -->
+							<waitUntil>published</waitUntil>
 						</configuration>
 					</plugin>
 

From 274a36abf39908eb0eb27c3da6d8e47ae875a83d Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Fri, 7 Nov 2025 21:53:06 -0800
Subject: [PATCH 590/599] Fix for #1116

---
 CHANGELOG.md                                               | 5 +++++
 .../nbio/structure/io/cif/AbstractCifFileSupplier.java     | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74b52303b0..07be3a5172 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 BioJava Changelog
 -----------------
 
+BioJava 7.2.3 - future release
+==============================
+### Fixed
+* Don't use label_seq_id in mmCIF output for non-polymers #1116
+
 BioJava 7.2.2
 ==============================
 ### Fixed
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
index 826d9588ef..7e9d8ad7ac 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/cif/AbstractCifFileSupplier.java
@@ -308,7 +308,12 @@ public void accept(WrappedAtom wrappedAtom) {
                 }
             }
             labelEntityId.add(entityId);
-            labelSeqId.add(seqId);
+            // see https://github.com/biojava/biojava/issues/1116
+            if (chain.getEntityInfo().getType() == EntityType.POLYMER) {
+                labelSeqId.add(seqId);
+            } else {
+                labelSeqId.markNextNotPresent();
+            }
             String insCode = "";
             if (group.getResidueNumber().getInsCode() != null) {
                 insCode = Character.toString(group.getResidueNumber().getInsCode());

From 611fcadeaa9f7dee203de34ae5d8d448df03ea8c Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 12 Nov 2025 16:55:57 -0800
Subject: [PATCH 591/599] [maven-release-plugin] prepare release biojava-7.2.3

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index b2b642b661..0c1016c3b6 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3-SNAPSHOT</version>
+		<version>7.2.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index fe75c181c7..7bb6e3b2ee 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3-SNAPSHOT</version>
+		<version>7.2.3</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 0836ffe54c..890ce360bc 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3-SNAPSHOT</version>
+		<version>7.2.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 7729a6e9e3..79608afaf4 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3-SNAPSHOT</version>
+		<version>7.2.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 2c44988004..41d9be230c 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.2.3-SNAPSHOT</version>
+    <version>7.2.3</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.2.3-SNAPSHOT</version>
+    	<version>7.2.3</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 0b8cb53791..876203f207 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3-SNAPSHOT</version>
+		<version>7.2.3</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 001e3e52f1..02e4a894d2 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.2.3-SNAPSHOT</version>
+    <version>7.2.3</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 12e4941d55..b4de1b1e8a 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3-SNAPSHOT</version>
+		<version>7.2.3</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 82107e8058..d5e216b60d 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3-SNAPSHOT</version>
+		<version>7.2.3</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 24644c8ffe..62db686d60 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.2.3-SNAPSHOT</version>
+		<version>7.2.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 5392798310..aeff7465c0 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3-SNAPSHOT</version>
+		<version>7.2.3</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 4f3e00f56b..a1facab532 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>7.2.3</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 7a4fa63589..23866ccbb1 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3-SNAPSHOT</version>
+		<version>7.2.3</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3-SNAPSHOT</version>
+			<version>7.2.3</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index c2a70eb02e..c4dfdd3b74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.2.3-SNAPSHOT</version>
+	<version>7.2.3</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.2.3</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 515c623529daf9c7fb643a94fa6e55a374ed7ad4 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 12 Nov 2025 16:56:00 -0800
Subject: [PATCH 592/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index 0c1016c3b6..fd7bfcd086 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3</version>
+		<version>7.2.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 7bb6e3b2ee..3886b68bd1 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3</version>
+		<version>7.2.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 890ce360bc..6b3eb9d8ae 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3</version>
+		<version>7.2.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 79608afaf4..29479bcfdf 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3</version>
+		<version>7.2.4-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 41d9be230c..4646e96277 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.2.3</version>
+    <version>7.2.4-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.2.3</version>
+    	<version>7.2.4-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 876203f207..953feeed09 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3</version>
+		<version>7.2.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 02e4a894d2..a6475ce2d7 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.2.3</version>
+    <version>7.2.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index b4de1b1e8a..9b06a29f3b 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3</version>
+		<version>7.2.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index d5e216b60d..eba96d6f87 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3</version>
+		<version>7.2.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 62db686d60..caa5e31782 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.2.3</version>
+		<version>7.2.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index aeff7465c0..3cc048a81a 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3</version>
+		<version>7.2.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index a1facab532..e2ca04fe41 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.2.3</version>
+        <version>7.2.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 23866ccbb1..532034b29f 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.3</version>
+		<version>7.2.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.3</version>
+			<version>7.2.4-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index c4dfdd3b74..faa29d48ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.2.3</version>
+	<version>7.2.4-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.2.3</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 94c6ebcab5c2f78144fab1d7a2c85c6d6af18475 Mon Sep 17 00:00:00 2001
From: Jose Duarte <jose.m.duarte@gmail.com>
Date: Wed, 12 Nov 2025 17:25:22 -0800
Subject: [PATCH 593/599] Updating after release

---
 CHANGELOG.md | 2 +-
 README.md    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07be3a5172..1c4033c826 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 BioJava Changelog
 -----------------
 
-BioJava 7.2.3 - future release
+BioJava 7.2.3
 ==============================
 ### Fixed
 * Don't use label_seq_id in mmCIF output for non-polymers #1116
diff --git a/README.md b/README.md
index af128cd92c..da352ee3f2 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-7.2.2-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.2.2) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-7.2.3-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.2.3) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>7.2.2</version>
+        <version>7.2.3</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>

From 0af196ffd522f98aa093dd569659438f1ab81ebf Mon Sep 17 00:00:00 2001
From: JasonKamsu <silhakaj@3il.fr>
Date: Fri, 21 Nov 2025 08:24:39 +0100
Subject: [PATCH 594/599] Fix RSPEC-1940 boolean checks

---
 .../nbio/core/sequence/location/InsdcParser.java |  4 +++-
 .../java/org/biojava/nbio/core/util/Equals.java  | 16 ++++++++++++++--
 .../nbio/genome/parsers/gff/Location.java        |  4 ++--
 .../java/org/biojava/nbio/structure/Author.java  |  2 +-
 .../java/org/biojava/nbio/structure/Element.java |  2 +-
 .../nbio/structure/align/ce/CECalculator.java    |  2 +-
 .../structure/align/ce/CeCalculatorEnhanced.java |  2 +-
 .../structure/quaternary/BioAssemblyTools.java   |  2 +-
 .../nbio/structure/secstruc/SecStrucTools.java   |  2 +-
 9 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
index e49bd22216..2d43a481bf 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/location/InsdcParser.java
@@ -260,7 +260,9 @@ private List<Location> parseLocationString(String string, int versus) {
 					l.setPartialOn3prime(true);
 				}
 
-				if (!(accession == null || "".equals(accession))) l.setAccession(new AccessionID(accession));
+				if (accession != null && !"".equals(accession)) {
+					l.setAccession(new AccessionID(accession));
+				}
 
 				boundedLocationsCollection.add(l);
 
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/Equals.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/Equals.java
index e8f78243ed..7e2c7128c9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/Equals.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/Equals.java
@@ -49,7 +49,13 @@ public static boolean equal(boolean one, boolean two) {
 	 * @see #classEqual(Object, Object)
 	 */
 	public static boolean equal(Object one, Object two) {
-		return one == null && two == null || !(one == null || two == null) && (one == two || one.equals(two));
+		if (one == two) {
+			return true;
+		}
+		if (one == null || two == null) {
+			return false;
+		}
+		return one.equals(two);
 	}
 
 	/**
@@ -84,6 +90,12 @@ public static boolean equal(Object one, Object two) {
 	 *         equal at the class level
 	 */
 	public static boolean classEqual(Object one, Object two) {
-		return one == two || !(one == null || two == null) && one.getClass() == two.getClass();
+		if (one == two) {
+			return true;
+		}
+		if (one == null || two == null) {
+			return false;
+		}
+		return one.getClass() == two.getClass();
 	}
 }
diff --git a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Location.java b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Location.java
index 4163be2b56..a28f1019fb 100644
--- a/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Location.java
+++ b/biojava-genome/src/main/java/org/biojava/nbio/genome/parsers/gff/Location.java
@@ -135,7 +135,7 @@ public static Location fromBio( int start, int end, char strand )
 		int s= start - 1;
 		int e= end;
 
-		if( !( strand == '-' || strand == '+' || strand == '.' ))
+		if( strand != '-' && strand != '+' && strand != '.' )
 		{
 			throw new IllegalArgumentException( "Strand must be '+', '-', or '.'" );
 		}
@@ -166,7 +166,7 @@ public static Location fromBioExt( int start, int length, char strand, int total
 		int s= start;
 		int e= s + length;
 
-		if( !( strand == '-' || strand == '+' || strand == '.' ))
+		if( strand != '-' && strand != '+' && strand != '.' )
 		{
 			throw new IllegalArgumentException( "Strand must be '+', '-', or '.'" );
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Author.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Author.java
index b0d7253507..bd5a01b885 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Author.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Author.java
@@ -62,7 +62,7 @@ public boolean equals(Object obj) {
 		if ((this.surname == null) ? (other.surname != null) : !this.surname.equals(other.surname)) {
 			return false;
 		}
-		return !((this.initials == null) ? (other.initials != null) : !this.initials.equals(other.initials));
+		return (this.initials == null) ? other.initials == null : this.initials.equals(other.initials);
 	}
 
 	@Override
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/Element.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/Element.java
index 2f534b2828..4e2d3e340a 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/Element.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/Element.java
@@ -424,7 +424,7 @@ public boolean isHeavyAtom() {
 	 * @return <CODE>true</CODE> if Element is not Hydrogen and not Carbon.
 	 */
 	public boolean isHeteroAtom() {
-		return !(this == C || this == H);
+		return this != C && this != H;
 	}
 
 	/**
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java
index 6c045ba48e..83f16b7982 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CECalculator.java
@@ -1450,7 +1450,7 @@ private int optimizeSuperposition(AFPChain afpChain, int nse1, int nse2, int str
 			//afpChain.setTotalRmsdOpt(rmsd);
 			//System.out.println("rmsd: " + rmsd);
 
-			if(!(nAtom<strLen*0.95) && (!isRmsdLenAssigned)) {
+			if(nAtom >= strLen * 0.95 && !isRmsdLenAssigned) {
 				rmsdLen=rmsd;
 				isRmsdLenAssigned=true;
 			}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java
index 4f57161268..cab98b0113 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ce/CeCalculatorEnhanced.java
@@ -1455,7 +1455,7 @@ private int optimizeSuperposition(AFPChain afpChain, int nse1, int nse2, int str
 			//afpChain.setTotalRmsdOpt(rmsd);
 			//System.out.println("rmsd: " + rmsd);
 
-			if(!(nAtom<strLen*0.95) && (!isRmsdLenAssigned)) {
+			if(nAtom >= strLen * 0.95 && !isRmsdLenAssigned) {
 				rmsdLen=rmsd;
 				isRmsdLenAssigned=true;
 			}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
index 7c359121de..f65f4617fe 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
@@ -55,7 +55,7 @@ public static boolean isUnaryExpression(String expression) {
 		if (first < 0 || last < 0) {
 			return true;
 		}
-		return ! (first == 0 && last > first);
+		return first != 0 || last <= first;
 	}
 
 	public static List<String> parseUnaryOperatorExpression(String operatorExpression) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucTools.java
index 7732c04b80..42191d682d 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/secstruc/SecStrucTools.java
@@ -57,7 +57,7 @@ public static List<SecStrucInfo> getSecStrucInfo(Structure s) {
 			Group g = iter.next();
 			if (g.hasAminoAtoms()) {
 				Object p = g.getProperty(Group.SEC_STRUC);
-				if (!(p == null)) {
+				if (p != null) {
 					SecStrucInfo ss = (SecStrucInfo) p;
 					listSSI.add(ss);
 				}

From 3f039fd3f5128e3f97981873f9855f45949848a0 Mon Sep 17 00:00:00 2001
From: Pasjonat90D <20847880+Pasjonat90D@users.noreply.github.com>
Date: Sun, 30 Nov 2025 20:44:39 +0100
Subject: [PATCH 595/599] Fix #1079: Use isEmpty() instead of size() == 0

---
 .../nbio/core/alignment/SimpleAlignedSequence.java   |  2 +-
 .../org/biojava/nbio/core/sequence/GeneSequence.java |  2 +-
 .../sequence/storage/SequenceAsStringHelper.java     |  2 +-
 .../org/biojava/nbio/core/util/PrettyXMLWriter.java  |  2 +-
 .../nbio/structure/gui/util/SequenceScalePanel.java  |  2 +-
 .../nbio/structure/align/ClusterAltAligs.java        |  2 +-
 .../nbio/structure/align/multiple/BlockImpl.java     |  2 +-
 .../nbio/structure/align/multiple/BlockSetImpl.java  |  6 +++---
 .../align/multiple/MultipleAlignmentImpl.java        |  4 ++--
 .../align/multiple/mc/MultipleMcOptimizer.java       |  2 +-
 .../structure/align/quaternary/QsAlignResult.java    |  2 +-
 .../biojava/nbio/structure/align/util/AtomCache.java | 12 ++++++------
 .../nbio/structure/chem/ZipChemCompProvider.java     |  2 +-
 .../nbio/structure/cluster/SubunitCluster.java       |  2 +-
 .../nbio/structure/cluster/SubunitClusterer.java     |  2 +-
 .../nbio/structure/geometry/MomentsOfInertia.java    |  2 +-
 .../org/biojava/nbio/structure/io/PDBFileParser.java |  4 ++--
 .../nbio/structure/io/mmtf/MmtfStructureReader.java  |  2 +-
 .../nbio/structure/quaternary/BioAssemblyTools.java  |  2 +-
 .../quaternary/BiologicalAssemblyBuilder.java        |  2 +-
 .../structure/symmetry/core/HelicalRepeatUnit.java   |  2 +-
 .../nbio/structure/symmetry/core/RotationGroup.java  |  2 +-
 .../nbio/structure/symmetry/core/RotationSolver.java |  2 +-
 .../structure/symmetry/core/SystematicSolver.java    |  2 +-
 .../structure/symmetry/geometry/DistanceBox.java     |  2 +-
 .../org/biojava/nbio/structure/xtal/SpaceGroup.java  |  4 ++--
 .../kaplanmeier/figure/NumbersAtRiskPanel.java       |  2 +-
 .../java/org/biojava/nbio/ws/hmmer/HmmerResult.java  |  2 +-
 28 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleAlignedSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleAlignedSequence.java
index 331480bbef..99b70c036d 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleAlignedSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/alignment/SimpleAlignedSequence.java
@@ -411,7 +411,7 @@ private void setLocation(List<Step> steps) {
 		}
 
 		// combine sublocations into 1 Location
-		if (sublocations.size() == 0) {
+		if (sublocations.isEmpty()) {
 			location = null;
 		} else if (sublocations.size() == 1) {
 			location = sublocations.get(0);
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
index f0f2662fea..638e4e68d9 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/GeneSequence.java
@@ -119,7 +119,7 @@ public void addIntronsUsingExons() throws Exception {
 		if (intronAdded) { //going to assume introns are correct
 			return;
 		}
-		if (exonSequenceList.size() == 0) {
+		if (exonSequenceList.isEmpty()) {
 			return;
 		}
 		ExonComparator exonComparator = new ExonComparator();
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SequenceAsStringHelper.java b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SequenceAsStringHelper.java
index c2b02debee..4acd8969f1 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SequenceAsStringHelper.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/sequence/storage/SequenceAsStringHelper.java
@@ -44,7 +44,7 @@ public class SequenceAsStringHelper<C extends Compound> {
 	 */
 	public String getSequenceAsString(List<C> parsedCompounds, CompoundSet<C> compoundSet, Integer bioBegin, Integer bioEnd, Strand strand) {
 		// TODO Optimise/cache.
-		if(parsedCompounds.size() == 0)
+		if(parsedCompounds.isEmpty())
 			return "";
 		StringBuilder builder = new StringBuilder();
 		if (strand.equals(Strand.NEGATIVE)) {
diff --git a/biojava-core/src/main/java/org/biojava/nbio/core/util/PrettyXMLWriter.java b/biojava-core/src/main/java/org/biojava/nbio/core/util/PrettyXMLWriter.java
index 437085866f..6e4a7db77c 100644
--- a/biojava-core/src/main/java/org/biojava/nbio/core/util/PrettyXMLWriter.java
+++ b/biojava-core/src/main/java/org/biojava/nbio/core/util/PrettyXMLWriter.java
@@ -72,7 +72,7 @@ public void declareNamespace(String nsURI, String prefixHint)
 	private void handleDeclaredNamespaces()
 		throws IOException
 	{
-		if (namespacesDeclared.size() == 0) {
+		if (namespacesDeclared.isEmpty()) {
 			for (Iterator<String> nsi = namespacesDeclared.iterator(); nsi.hasNext(); ) {
 				String nsURI = nsi.next();
 				if (!namespacePrefixes.containsKey(nsURI)) {
diff --git a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SequenceScalePanel.java b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SequenceScalePanel.java
index 06542e5271..75da6c8e28 100644
--- a/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SequenceScalePanel.java
+++ b/biojava-structure-gui/src/main/java/org/biojava/nbio/structure/gui/util/SequenceScalePanel.java
@@ -126,7 +126,7 @@ private void setPrefSize() {
 	public void setAligMap(List<AlignedPosition> apos){
 		this.apos = apos;
 
-		if ( apos.size() == 0)
+		if (apos.isEmpty())
 			return;
 
 		AlignedPosition last = apos.get(apos.size()-1);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ClusterAltAligs.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ClusterAltAligs.java
index 373bcf1611..0933198d7b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ClusterAltAligs.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/ClusterAltAligs.java
@@ -102,7 +102,7 @@ public static void cluster(AlternativeAlignment[] aligs, int cutoff){
 
 			}
 			clusters.add(currentCluster);
-			if ( remainList.size() == 0) {
+			if ( remainList.isEmpty()) {
 				break;
 			}
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockImpl.java
index e0423b6f8f..43da1d7c06 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockImpl.java
@@ -127,7 +127,7 @@ public void setAlignRes(List<List<Integer>> alignRes) {
 	public int length() {
 		if (alignRes == null)
 			return 0;
-		if (alignRes.size() == 0)
+		if (alignRes.isEmpty())
 			return 0;
 		return alignRes.get(0).size();
 	}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSetImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSetImpl.java
index cbbb3ae895..344ee3c239 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSetImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/BlockSetImpl.java
@@ -179,7 +179,7 @@ public int size() {
 		// Get the size from the variables that can contain the information
 		if (parent != null)
 			return parent.size();
-		else if (getBlocks().size() == 0) {
+		else if (getBlocks().isEmpty()) {
 			throw new IndexOutOfBoundsException(
 					"Empty BlockSet: number of Blocks == 0.");
 		} else
@@ -194,7 +194,7 @@ public int getCoreLength() {
 	}
 
 	protected void updateLength() {
-		if (getBlocks().size() == 0) {
+		if (getBlocks().isEmpty()) {
 			throw new IndexOutOfBoundsException(
 					"Empty BlockSet: number of Blocks == 0.");
 		}
@@ -207,7 +207,7 @@ protected void updateLength() {
 	}
 
 	protected void updateCoreLength() {
-		if (getBlocks().size() == 0) {
+		if (getBlocks().isEmpty()) {
 			throw new IndexOutOfBoundsException(
 					"Empty BlockSet: number of Blocks == 0.");
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
index 738eee30c5..06c93a4403 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/MultipleAlignmentImpl.java
@@ -207,7 +207,7 @@ public int getCoreLength() {
 	 * lengths.
 	 */
 	protected void updateLength() {
-		if (getBlockSets().size() == 0) {
+		if (getBlockSets().isEmpty()) {
 			throw new IndexOutOfBoundsException(
 					"Empty MultipleAlignment: blockSets size == 0.");
 		} // Otherwise try to calculate it from the BlockSet information
@@ -223,7 +223,7 @@ protected void updateLength() {
 	 * BlockSet core lengths.
 	 */
 	protected void updateCoreLength() {
-		if (getBlockSets().size() == 0) {
+		if (getBlockSets().isEmpty()) {
 			throw new IndexOutOfBoundsException(
 					"Empty MultipleAlignment: blockSets size == 0.");
 		} // Otherwise try to calculate it from the BlockSet information
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java
index 052f147fc6..29c7012801 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/multiple/mc/MultipleMcOptimizer.java
@@ -153,7 +153,7 @@ public MultipleMcOptimizer(MultipleAlignment seedAln,
 		for (Block b : toDelete) {
 			for (BlockSet bs : msa.getBlockSets()) {
 				bs.getBlocks().remove(b);
-				if (bs.getBlocks().size() == 0)
+				if (bs.getBlocks().isEmpty())
 					emptyBs.add(bs);
 			}
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlignResult.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlignResult.java
index 7ac77a602e..fe1c9c411b 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlignResult.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/quaternary/QsAlignResult.java
@@ -117,7 +117,7 @@ public void setSubunitMap(Map<Integer, Integer> subunitMap) {
 					"Subunit Map index higher than Subunit List size.");
 
 		// Update the relation enum
-		if (subunitMap.size() == 0) {
+		if (subunitMap.isEmpty()) {
 			relation = QsRelation.DIFFERENT;
 		} else if (subunitMap.keySet().size() == subunits1.size()) {
 			if (subunitMap.values().size() == subunits2.size()) {
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
index 1435191c2c..71b8a3da22 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java
@@ -228,7 +228,7 @@ public Structure getBiologicalAssembly(String pdbId, int bioAssemblyId, boolean
 			throws StructureException, IOException {
 		return getBiologicalAssembly(new PdbId(pdbId), bioAssemblyId, multiModel);
 	}
-	
+
 	/**
 	 * Returns the biological assembly for a given PDB ID and bioAssemblyId, by building the
 	 * assembly from the biounit annotations found in {@link Structure#getPDBHeader()}
@@ -284,7 +284,7 @@ public Structure getBiologicalAssembly(PdbId pdbId, int bioAssemblyId, boolean m
 				asymUnit.getPDBHeader().getBioAssemblies().get(bioAssemblyId).getTransforms();
 
 
-		if (transformations == null || transformations.size() == 0) {
+		if (transformations == null || transformations.isEmpty()) {
 			throw new StructureException("Could not load transformations to recreate biological assembly id " + bioAssemblyId + " of " + pdbId);
 		}
 
@@ -339,7 +339,7 @@ public Structure getBiologicalAssembly(String pdbId, boolean multiModel) throws
 				asymUnit.getPDBHeader().getBioAssemblies().get(bioAssemblyId).getTransforms();
 
 
-		if (transformations == null || transformations.size() == 0) {
+		if (transformations == null || transformations.isEmpty()) {
 			throw new StructureException("Could not load transformations to recreate biological assembly id " + bioAssemblyId + " of " + pdbId);
 		}
 
@@ -385,7 +385,7 @@ public List<Structure> getBiologicalAssemblies(String pdbId, boolean multiModel)
 			List<BiologicalAssemblyTransformation> transformations =
 					asymUnit.getPDBHeader().getBioAssemblies().get(bioAssemblyId).getTransforms();
 
-			if (transformations == null || transformations.size() == 0) {
+			if (transformations == null || transformations.isEmpty()) {
 				logger.info("Could not load transformations to recreate biological assembly id {} of {}. Assembly " +
 						"id will be missing in biological assemblies.", bioAssemblyId, pdbId);
 				continue;
@@ -807,7 +807,7 @@ public Structure getStructureForPdbId(String id) throws IOException, StructureEx
 	public Structure getStructureForPdbId(PdbId pdbId) throws IOException {
 		if (pdbId == null)
 			return null;
-		
+
 		while (checkLoading(pdbId)) {
 			// waiting for loading to be finished...
 			try {
@@ -833,7 +833,7 @@ public Structure getStructureForPdbId(PdbId pdbId) throws IOException {
 	protected Structure loadStructureFromCifByPdbId(String pdbId) throws IOException {
 		return loadStructureFromCifByPdbId(new PdbId(pdbId));
 	}
-	
+
 	protected Structure loadStructureFromCifByPdbId(PdbId pdbId) throws IOException {
 		logger.debug("Loading structure {} from mmCIF file {}.", pdbId, path);
 		Structure s;
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java
index 4fe19aca58..a68019efb7 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/chem/ZipChemCompProvider.java
@@ -120,7 +120,7 @@ public ChemComp getChemComp(String recordName) {
         }
 
         // If a null record or an empty chemcomp, return a default ChemComp and blacklist.
-        if (cc == null || (null == cc.getName() && cc.getAtoms().size() == 0)) {
+        if (cc == null || (null == cc.getName() && cc.getAtoms().isEmpty())) {
             s_logger.info("Unable to find or download {} - excluding from future searches.", recordName);
             unavailable.add(recordName);
             return getEmptyChemComp(recordName);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
index 9a87e92f88..b8ef74c8f1 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
@@ -331,7 +331,7 @@ public boolean mergeIdenticalByEntityId(SubunitCluster other) {
 			}
 		}
 
-		if (thisAligned.size() == 0 && otherAligned.size() == 0) {
+		if (thisAligned.isEmpty() && otherAligned.isEmpty()) {
 			logger.warn("No equivalent aligned atoms found between SubunitClusters {}-{} via entity SEQRES alignment. Is FileParsingParameters.setAlignSeqRes() set?", thisName, otherName);
 		}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitClusterer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitClusterer.java
index 6295f8fdf0..964a0aaba3 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitClusterer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitClusterer.java
@@ -58,7 +58,7 @@ public static Stoichiometry cluster(Structure structure,
 
 	public static Stoichiometry cluster(List<Subunit> subunits, SubunitClustererParameters params) {
 		List<SubunitCluster> clusters = new ArrayList<>();
-		if (subunits.size() == 0)
+		if (subunits.isEmpty())
 			return new Stoichiometry(clusters);
 
 		// First generate a new cluster for each Subunit
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/MomentsOfInertia.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/MomentsOfInertia.java
index 8cfd032daa..5a6e69c4cf 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/MomentsOfInertia.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/geometry/MomentsOfInertia.java
@@ -72,7 +72,7 @@ public void addPoint(Point3d point, double mass) {
 
 	public Point3d getCenterOfMass() {
 
-		if (points.size() == 0) {
+		if (points.isEmpty()) {
 			throw new IllegalStateException(
 					"MomentsOfInertia: no points defined");
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
index 176459bbf2..58e4ee6625 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/PDBFileParser.java
@@ -1970,7 +1970,7 @@ private Group getCorrectAltLocGroup( Character altLoc,
 		// build it up.
 
 		if ( groupCode3.equals(currentGroup.getPDBName())) {
-			if ( currentGroup.getAtoms().size() == 0) {
+			if ( currentGroup.getAtoms().isEmpty()) {
 				//System.out.println("current group is empty " + current_group + " " + altLoc);
 				return currentGroup;
 			}
@@ -2762,7 +2762,7 @@ private void makeCompounds(List<String> compoundList,
 		}
 		//		System.out.println("[makeCompounds] adding sources to compounds from sourceLines");
 		// since we're starting again from the first compound, reset it here
-		if ( entities.size() == 0){
+		if ( entities.isEmpty()){
 			current_compound = new EntityInfo();
 		} else {
 			current_compound = entities.get(0);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
index c2830c1685..21ef8bb64c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmtf/MmtfStructureReader.java
@@ -396,7 +396,7 @@ private Group getCorrectAltLocGroup(Character altLoc) {
 		}
 		// no matching altLoc group found.
 		// build it up.
-		if (group.getAtoms().size() == 0) {
+		if (group.getAtoms().isEmpty()) {
 			return group;
 		}
 		Group altLocG = (Group) group.clone();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
index 7c359121de..786ce7646f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BioAssemblyTools.java
@@ -279,7 +279,7 @@ public static double[] getBiologicalMoleculeCentroid( final Structure asymUnit,
 			return centroid;
 		}
 
-		if ( transformations.size() == 0) {
+		if ( transformations.isEmpty()) {
 			return Calc.getCentroid(atoms).getCoords();
 
 		}
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java
index c6ec6bc8ff..9edb8f404c 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/quaternary/BiologicalAssemblyBuilder.java
@@ -205,7 +205,7 @@ private void addChainMultiModel(Structure s, Chain newChain, String transformId)
 
 		// multi-model bioassembly
 
-		if ( modelIndex.size() == 0)
+		if (modelIndex.isEmpty())
 			modelIndex.add("PLACEHOLDER FOR ASYM UNIT");
 
 		int modelCount = modelIndex.indexOf(transformId);
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelicalRepeatUnit.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelicalRepeatUnit.java
index ff9c77cf13..cd16aa5f87 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelicalRepeatUnit.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/HelicalRepeatUnit.java
@@ -64,7 +64,7 @@ public Map<Integer[], Integer> getInteractingRepeatUnits() {
 
 private void run() {
 	this.repeatUnitCenters = calcRepeatUnitCenters();
-	if (this.repeatUnitCenters.size() == 0) {
+	if (this.repeatUnitCenters.isEmpty()) {
 		return;
 	}
 	this.repeatUnits = calcRepeatUnits();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationGroup.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationGroup.java
index 70b69afe14..1490d27036 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationGroup.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationGroup.java
@@ -98,7 +98,7 @@ public void complete() {
 
 	public String getPointGroup() {
 		if (modified) {
-			if (rotations.size() == 0) {
+			if (rotations.isEmpty()) {
 				return "C1";
 			}
 			complete();
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java
index 37a44be7ac..b1566a6d2f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/RotationSolver.java
@@ -305,7 +305,7 @@ private boolean isSpherical() {
 	 * @return null if invalid, or a rotation if valid
 	 */
 	private Rotation isValidPermutation(List<Integer> permutation) {
-		if (permutation.size() == 0) {
+		if (permutation.isEmpty()) {
 			return null;
 		}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java
index d13fa4db16..a449771b58 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/core/SystematicSolver.java
@@ -145,7 +145,7 @@ private void completeRotationGroup() {
 	}
 
 	private boolean isValidPermutation(List<Integer> permutation) {
-		if (permutation.size() == 0) {
+		if (permutation.isEmpty()) {
 			return false;
 		}
 
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/DistanceBox.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/DistanceBox.java
index 2d9b1d6dca..25d37693fb 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/DistanceBox.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/symmetry/geometry/DistanceBox.java
@@ -166,7 +166,7 @@ private List<T> getBoxTwo(long location) {
 		}
 		// ensure that boxTwo has no empty element by copying from tempBox of defined size
 		List<T> boxTwo = null;
-		if (tempBox.size() == 0) {
+		if (tempBox.isEmpty()) {
 			boxTwo = Collections.emptyList();
 		} else if (tempBox.size() == 1) {
 			boxTwo = Collections.singletonList(tempBox.get(0));
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
index cff84c70f8..852d213bb9 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/xtal/SpaceGroup.java
@@ -645,10 +645,10 @@ public List<String> getTransfAlgebraic() {
 
 	public void setTransfAlgebraic(List<String> transfAlgebraic) {
 		//System.out.println("setting transfAlgebraic " + transfAlgebraic);
-		if ( transformations == null || transformations.size() == 0)
+		if ( transformations == null || transformations.isEmpty())
 			transformations = new ArrayList<Matrix4d>(transfAlgebraic.size());
 
-		if ( this.transfAlgebraic == null || this.transfAlgebraic.size() == 0)
+		if ( this.transfAlgebraic == null || this.transfAlgebraic.isEmpty())
 			this.transfAlgebraic = new ArrayList<>(transfAlgebraic.size());
 
 		for ( String transf : transfAlgebraic){
diff --git a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java
index c4578f1c8b..144942a809 100644
--- a/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java
+++ b/biojava-survival/src/main/java/org/biojava/nbio/survival/kaplanmeier/figure/NumbersAtRiskPanel.java
@@ -76,7 +76,7 @@ private void paintTable(Graphics g) {
 			sfiHashMap = sfi.getStrataInfoHashMap();
 		}
 
-		if(sfiHashMap.size() == 0)
+		if(sfiHashMap.isEmpty())
 			return;
 		//int height = this.getHeight();
 
diff --git a/biojava-ws/src/main/java/org/biojava/nbio/ws/hmmer/HmmerResult.java b/biojava-ws/src/main/java/org/biojava/nbio/ws/hmmer/HmmerResult.java
index 3304e78d4f..373b78cd0a 100644
--- a/biojava-ws/src/main/java/org/biojava/nbio/ws/hmmer/HmmerResult.java
+++ b/biojava-ws/src/main/java/org/biojava/nbio/ws/hmmer/HmmerResult.java
@@ -140,7 +140,7 @@ public int compareTo(HmmerResult o) {
 		return(me.getSqFrom().compareTo(other.getSqFrom()));
 	}
 	private boolean emptyDomains(HmmerResult o) {
-		if ( o.getDomains() == null || o.getDomains().size() == 0)
+		if ( o.getDomains() == null || o.getDomains().isEmpty())
 			return true;
 		return false;
 	}

From 423cd86fbc2355f9943a3bbd81597c3d0c231627 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Mon, 8 Dec 2025 15:22:01 -0800
Subject: [PATCH 596/599] Bugfix: edge-case with no equiv residues in alignment
 wasn't dealt with and led to IllegalArgumentException. Also: improved logging

---
 .../structure/cluster/SubunitCluster.java     | 43 ++++++++-----------
 .../structure/cluster/SubunitClusterer.java   | 11 ++---
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
index 9a87e92f88..2bbad10f1f 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitCluster.java
@@ -507,27 +507,24 @@ public boolean mergeStructure(SubunitCluster other, SubunitClustererParameters p
 			}
 		}
 
-		AFPChain afp = aligner.align(this.subunits.get(this.representative)
-				.getRepresentativeAtoms(),
-				other.subunits.get(other.representative)
-						.getRepresentativeAtoms());
+		AFPChain afp = aligner.align(this.subunits.get(this.representative).getRepresentativeAtoms(),
+				other.subunits.get(other.representative).getRepresentativeAtoms());
 
+        String pairName = this.subunits.get(this.representative).getName() + "-" + other.subunits.get(other.representative).getName();
 		if (afp.getOptLength() < 1) {
 			// alignment failed (eg if chains were too short)
 			throw new StructureException(
-					String.format("Subunits failed to align using %s", params.getSuperpositionAlgorithm()));
+					String.format("Subunits %s failed to align using %s", pairName, params.getSuperpositionAlgorithm()));
 		}
 
 		// Convert AFPChain to MultipleAlignment for convenience
 		MultipleAlignment msa = new MultipleAlignmentEnsembleImpl(
 				afp,
 				this.subunits.get(this.representative).getRepresentativeAtoms(),
-				other.subunits.get(other.representative)
-						.getRepresentativeAtoms(), false)
-				.getMultipleAlignment(0);
+				other.subunits.get(other.representative).getRepresentativeAtoms(),
+                false).getMultipleAlignment(0);
 
-		double structureCoverage = Math.min(msa.getCoverages().get(0), msa
-				.getCoverages().get(1));
+		double structureCoverage = Math.min(msa.getCoverages().get(0), msa.getCoverages().get(1));
 
 		if(params.isUseStructureCoverage() && structureCoverage < params.getStructureCoverageThreshold()) {
 			return false;
@@ -543,8 +540,7 @@ public boolean mergeStructure(SubunitCluster other, SubunitClustererParameters p
 			return false;
 		}
 
-		logger.info(String.format("SubunitClusters are structurally similar with "
-				+ "%.2f RMSD %.2f coverage", rmsd, structureCoverage));
+		logger.info("SubunitClusters {} are structurally similar with [ {} ] RMSD and [ {} ] coverage", pairName, String.format("%.2f", rmsd), String.format("%.2f", structureCoverage));
 
 		// Merge clusters
 		List<List<Integer>> alignedRes = msa.getBlock(0).getAlignRes();
@@ -565,13 +561,18 @@ public boolean mergeStructure(SubunitCluster other, SubunitClustererParameters p
 
 			// Only consider residues that are part of the SubunitCluster
 			if (this.subunitEQR.get(this.representative).contains(thisIndex)
-					&& other.subunitEQR.get(other.representative).contains(
-							otherIndex)) {
+					&& other.subunitEQR.get(other.representative).contains(otherIndex)) {
 				thisAligned.add(thisIndex);
 				otherAligned.add(otherIndex);
 			}
 		}
 
+        // this can happen in very rare cases, e.g. 9y9z when merging E_1 into the cluster D_1, OM_1, Y_1
+        if (thisAligned.isEmpty() && otherAligned.isEmpty()) {
+            logger.warn("No equivalent aligned atoms found between SubunitClusters {} via structure alignment. Will not merge the second one into the first.", pairName);
+            return false;
+        }
+
 		updateEquivResidues(other, thisAligned, otherAligned);
 
 		this.method = SubunitClustererMethod.STRUCTURE;
@@ -602,18 +603,12 @@ private void updateEquivResidues(SubunitCluster other, List<Integer> thisAligned
 		Collections.sort(otherRemove);
 		Collections.reverse(otherRemove);
 
-		for (int t = 0; t < thisRemove.size(); t++) {
-			for (List<Integer> eqr : this.subunitEQR) {
-				int column = thisRemove.get(t);
-				eqr.remove(column);
-			}
+		for (int column : thisRemove) {
+            this.subunitEQR.forEach(eqr -> eqr.remove(column));
 		}
 
-		for (int t = 0; t < otherRemove.size(); t++) {
-			for (List<Integer> eqr : other.subunitEQR) {
-				int column = otherRemove.get(t);
-				eqr.remove(column);
-			}
+		for (int column : otherRemove) {
+            other.subunitEQR.forEach(eqr -> eqr.remove(column));
 		}
 
 		// The representative is the longest sequence
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitClusterer.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitClusterer.java
index 6295f8fdf0..70da0b56db 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitClusterer.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/cluster/SubunitClusterer.java
@@ -83,8 +83,7 @@ public static Stoichiometry cluster(List<Subunit> subunits, SubunitClustererPara
 						}
 
 					} catch (CompoundNotFoundException e) {
-						logger.warn("Could not merge by Sequence. {}",
-								e.getMessage());
+						logger.info("Could not merge by Sequence. {}", e.getMessage());
 					}
 				}
 			}
@@ -100,7 +99,7 @@ public static Stoichiometry cluster(List<Subunit> subunits, SubunitClustererPara
 							clusters.remove(c2);
 						}
 					} catch (StructureException e) {
-						logger.warn("Could not merge by Structure. {}", e.getMessage());
+						logger.info("Could not merge by Structure. {}", e.getMessage());
 					}
 				}
 			}
@@ -112,8 +111,7 @@ public static Stoichiometry cluster(List<Subunit> subunits, SubunitClustererPara
 				try {
 					clusters.get(c).divideInternally(params);
 				} catch (StructureException e) {
-					logger.warn("Error analyzing internal symmetry. {}",
-							e.getMessage());
+					logger.info("Error analyzing internal symmetry. {}", e.getMessage());
 				}
 			}
 
@@ -125,8 +123,7 @@ public static Stoichiometry cluster(List<Subunit> subunits, SubunitClustererPara
 						if (clusters.get(c1).mergeStructure(clusters.get(c2), params))
 							clusters.remove(c2);
 					} catch (StructureException e) {
-						logger.warn("Could not merge by Structure. {}",
-								e.getMessage());
+						logger.info("Could not merge by Structure. {}", e.getMessage());
 					}
 				}
 			}

From f55940c0612a61e4f347d8cec502797f34cf8c1f Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 10 Dec 2025 13:55:30 -0800
Subject: [PATCH 597/599] [maven-release-plugin] prepare release biojava-7.2.4

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index fd7bfcd086..b1efc6c661 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4-SNAPSHOT</version>
+		<version>7.2.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index 3886b68bd1..a03519aeca 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4-SNAPSHOT</version>
+		<version>7.2.4</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index 6b3eb9d8ae..e7f36a646d 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4-SNAPSHOT</version>
+		<version>7.2.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index 29479bcfdf..b4e2a0e791 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4-SNAPSHOT</version>
+		<version>7.2.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index 4646e96277..a5b307c637 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.2.4-SNAPSHOT</version>
+    <version>7.2.4</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.2.4-SNAPSHOT</version>
+    	<version>7.2.4</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 953feeed09..4545d15f2f 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4-SNAPSHOT</version>
+		<version>7.2.4</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index a6475ce2d7..82ccc0ed59 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.2.4-SNAPSHOT</version>
+    <version>7.2.4</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 9b06a29f3b..3425644447 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4-SNAPSHOT</version>
+		<version>7.2.4</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index eba96d6f87..30c263b398 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4-SNAPSHOT</version>
+		<version>7.2.4</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index caa5e31782..133f64781c 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.2.4-SNAPSHOT</version>
+		<version>7.2.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index 3cc048a81a..b58fda9a96 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4-SNAPSHOT</version>
+		<version>7.2.4</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index e2ca04fe41..993b9aa1fe 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.2.4-SNAPSHOT</version>
+        <version>7.2.4</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 532034b29f..32a8af0fb4 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4-SNAPSHOT</version>
+		<version>7.2.4</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4-SNAPSHOT</version>
+			<version>7.2.4</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index faa29d48ad..0cd4634a92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.2.4-SNAPSHOT</version>
+	<version>7.2.4</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>HEAD</tag>
+		<tag>biojava-7.2.4</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 006e5eff4e3f779f9ac8b42c6d82bbad873bc171 Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 10 Dec 2025 13:55:34 -0800
Subject: [PATCH 598/599] [maven-release-plugin] prepare for next development
 iteration

---
 biojava-aa-prop/pom.xml                 |  6 +++---
 biojava-alignment/pom.xml               |  4 ++--
 biojava-core/pom.xml                    |  2 +-
 biojava-genome/pom.xml                  |  6 +++---
 biojava-integrationtest/pom.xml         |  4 ++--
 biojava-modfinder/pom.xml               |  4 ++--
 biojava-ontology/pom.xml                |  2 +-
 biojava-protein-comparison-tool/pom.xml | 10 +++++-----
 biojava-protein-disorder/pom.xml        |  4 ++--
 biojava-structure-gui/pom.xml           |  6 +++---
 biojava-structure/pom.xml               |  6 +++---
 biojava-survival/pom.xml                |  2 +-
 biojava-ws/pom.xml                      |  4 ++--
 pom.xml                                 |  4 ++--
 14 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/biojava-aa-prop/pom.xml b/biojava-aa-prop/pom.xml
index b1efc6c661..cbc82fff7b 100644
--- a/biojava-aa-prop/pom.xml
+++ b/biojava-aa-prop/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4</version>
+		<version>7.2.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-aa-prop</artifactId>
@@ -70,12 +70,12 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 		</dependency>
 
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
diff --git a/biojava-alignment/pom.xml b/biojava-alignment/pom.xml
index a03519aeca..b1d0bd9097 100644
--- a/biojava-alignment/pom.xml
+++ b/biojava-alignment/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4</version>
+		<version>7.2.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-alignment</artifactId>
 	<name>biojava-alignment</name>
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-core/pom.xml b/biojava-core/pom.xml
index e7f36a646d..909f46f088 100644
--- a/biojava-core/pom.xml
+++ b/biojava-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4</version>
+		<version>7.2.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-core</artifactId>
diff --git a/biojava-genome/pom.xml b/biojava-genome/pom.xml
index b4e2a0e791..68575bbb9b 100644
--- a/biojava-genome/pom.xml
+++ b/biojava-genome/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4</version>
+		<version>7.2.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>biojava-genome</artifactId>
@@ -70,13 +70,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/biojava-integrationtest/pom.xml b/biojava-integrationtest/pom.xml
index a5b307c637..1c21373bd1 100644
--- a/biojava-integrationtest/pom.xml
+++ b/biojava-integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>biojava</artifactId>
     <groupId>org.biojava</groupId>
-    <version>7.2.4</version>
+    <version>7.2.5-SNAPSHOT</version>
   </parent>
   <artifactId>biojava-integrationtest</artifactId>
   <packaging>jar</packaging>
@@ -40,7 +40,7 @@
     <dependency>
     	<groupId>org.biojava</groupId>
     	<artifactId>biojava-structure</artifactId>
-    	<version>7.2.4</version>
+    	<version>7.2.5-SNAPSHOT</version>
     </dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or scopes here) -->
 		<dependency>
diff --git a/biojava-modfinder/pom.xml b/biojava-modfinder/pom.xml
index 4545d15f2f..e8de9e38d9 100644
--- a/biojava-modfinder/pom.xml
+++ b/biojava-modfinder/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4</version>
+		<version>7.2.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-modfinder</artifactId>
 	<name>biojava-modfinder</name>
@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/biojava-ontology/pom.xml b/biojava-ontology/pom.xml
index 82ccc0ed59..6a3fd5cbc4 100644
--- a/biojava-ontology/pom.xml
+++ b/biojava-ontology/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.biojava</groupId>
     <artifactId>biojava</artifactId>
-    <version>7.2.4</version>
+    <version>7.2.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>biojava-ontology</artifactId>
diff --git a/biojava-protein-comparison-tool/pom.xml b/biojava-protein-comparison-tool/pom.xml
index 3425644447..cf8cd570a7 100644
--- a/biojava-protein-comparison-tool/pom.xml
+++ b/biojava-protein-comparison-tool/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4</version>
+		<version>7.2.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>biojava-protein-comparison-tool</artifactId>
@@ -36,23 +36,23 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-structure-gui</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.jmol</groupId>
diff --git a/biojava-protein-disorder/pom.xml b/biojava-protein-disorder/pom.xml
index 30c263b398..7273bbff8f 100644
--- a/biojava-protein-disorder/pom.xml
+++ b/biojava-protein-disorder/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4</version>
+		<version>7.2.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-protein-disorder</artifactId>
 	<packaging>jar</packaging>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 		</dependency>
 		<!-- logging dependencies (managed by parent pom, don't set versions or
 			scopes here) -->
diff --git a/biojava-structure-gui/pom.xml b/biojava-structure-gui/pom.xml
index 133f64781c..581b8a53cc 100644
--- a/biojava-structure-gui/pom.xml
+++ b/biojava-structure-gui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>biojava</artifactId>
         <groupId>org.biojava</groupId>
-		<version>7.2.4</version>
+		<version>7.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>biojava-structure-gui</artifactId>
@@ -27,13 +27,13 @@
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-structure</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.biojava</groupId>
             <artifactId>biojava-core</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/biojava-structure/pom.xml b/biojava-structure/pom.xml
index b58fda9a96..7fbc64a3c1 100644
--- a/biojava-structure/pom.xml
+++ b/biojava-structure/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4</version>
+		<version>7.2.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-structure</artifactId>
 	<name>biojava-structure</name>
@@ -51,13 +51,13 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-alignment</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/biojava-survival/pom.xml b/biojava-survival/pom.xml
index 993b9aa1fe..88f901cdea 100644
--- a/biojava-survival/pom.xml
+++ b/biojava-survival/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.biojava</groupId>
         <artifactId>biojava</artifactId>
-        <version>7.2.4</version>
+        <version>7.2.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>biojava-survival</artifactId>
diff --git a/biojava-ws/pom.xml b/biojava-ws/pom.xml
index 32a8af0fb4..7e960b4445 100644
--- a/biojava-ws/pom.xml
+++ b/biojava-ws/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>biojava</artifactId>
 		<groupId>org.biojava</groupId>
-		<version>7.2.4</version>
+		<version>7.2.5-SNAPSHOT</version>
 	</parent>
 	<artifactId>biojava-ws</artifactId>
 	<name>biojava-ws</name>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.biojava</groupId>
 			<artifactId>biojava-core</artifactId>
-			<version>7.2.4</version>
+			<version>7.2.5-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 0cd4634a92..e9f246202b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.biojava</groupId>
 	<artifactId>biojava</artifactId>
 	<packaging>pom</packaging>
-	<version>7.2.4</version>
+	<version>7.2.5-SNAPSHOT</version>
 	<name>biojava</name>
 	<description>BioJava is an open-source project dedicated to providing a Java framework for processing biological
         data. It provides analytical and statistical routines, parsers for common file formats and allows the
@@ -51,7 +51,7 @@
 		<developerConnection>scm:git:git@github.com:biojava/biojava.git</developerConnection>
 		<url>https://github.com/biojava/biojava</url>
 
-		<tag>biojava-7.2.4</tag>
+		<tag>HEAD</tag>
 	</scm>
 
 	<!-- This section required for release at Maven Central. For a full list

From 51f48cd517e21fdc6552381777f6747226c6711a Mon Sep 17 00:00:00 2001
From: josemduarte <jose.m.duarte@gmail.com>
Date: Wed, 10 Dec 2025 14:16:36 -0800
Subject: [PATCH 599/599] Updating after release

---
 CHANGELOG.md | 5 +++++
 README.md    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c4033c826..9610b211df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 BioJava Changelog
 -----------------
 
+BioJava 7.2.4
+==============================
+### Fixed
+* Edge case in quaternary symmetry calculation #1120
+
 BioJava 7.2.3
 ==============================
 ### Fixed
diff --git a/README.md b/README.md
index da352ee3f2..eddeb65379 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Welcome to <img src="logo-full.png" height="35"/>
 
 ![Build](https://github.com/biojava/biojava/actions/workflows/master.yml/badge.svg)
-[![Version](http://img.shields.io/badge/version-7.2.3-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.2.3) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Version](http://img.shields.io/badge/version-7.2.4-blue.svg?style=flat)](https://github.com/biojava/biojava/releases/tag/biojava-7.2.4) [![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/biojava/biojava/blob/master/LICENSE) [![Join the chat at https://gitter.im/biojava/biojava](https://badges.gitter.im/biojava/biojava.svg)](https://gitter.im/biojava/biojava?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 BioJava is an open-source project dedicated to providing a Java framework for **processing biological data**. It provides analytical and statistical routines, parsers for common file formats, reference implementations of popular algorithms, and allows the manipulation of sequences and 3D structures. The goal of the biojava project is to facilitate rapid application development for bioinformatics.
@@ -29,7 +29,7 @@ If you are using Maven you can add the BioJava repository by adding the followin
       <dependency>
         <groupId>org.biojava</groupId>
         <artifactId>biojava-core</artifactId>
-        <version>7.2.3</version>
+        <version>7.2.4</version>
       </dependency>
       <!-- other biojava modules as needed -->
     </dependencies>