Resolve #523 16 Need to flip conditions, all ICrystals and IAtomContainers.

johnmay · johnmay · commit bc85e4e0a16f · 2019-01-02T22:24:07.000Z
diff --git a/storage/io/src/main/java/org/openscience/cdk/io/cml/PDBConvention.java b/storage/io/src/main/java/org/openscience/cdk/io/cml/PDBConvention.java
@@ -213,14 +213,14 @@ public void endElement(CMLStack xpath, String uri, String local, String raw) {
             storeData();
             if (xpath.size() == 1) {
                 //	        	cdo.endObject("Molecule");
-                if (currentMolecule instanceof IAtomContainer) {
-                    logger.debug("Adding molecule to set");
-                    currentMoleculeSet.addAtomContainer(currentMolecule);
-                    logger.debug("#mols in set: " + currentMoleculeSet.getAtomContainerCount());
-                } else if (currentMolecule instanceof ICrystal) {
+                if (currentMolecule instanceof ICrystal) {
                     logger.debug("Adding crystal to chemModel");
                     currentChemModel.setCrystal((ICrystal) currentMolecule);
                     currentChemSequence.addChemModel(currentChemModel);
+                } else {
+                    logger.debug("Adding molecule to set");
+                    currentMoleculeSet.addAtomContainer(currentMolecule);
+                    logger.debug("#mols in set: " + currentMoleculeSet.getAtomContainerCount());
                 }
             }
         }
