Resolve #523 17 Flip instanceof conditions and use ArrayList instead of Vector.

johnmay · johnmay · commit cb87b11fa67a · 2019-01-02T22:24:07.000Z
diff --git a/storage/libiocml/src/main/java/org/openscience/cdk/io/RssWriter.java b/storage/libiocml/src/main/java/org/openscience/cdk/io/RssWriter.java
@@ -6,6 +6,7 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
@@ -152,7 +153,7 @@ public void write(IChemObject object) throws CDKException {
             channelElement.appendChild(itemsElement);
             channelElement.addAttribute(new Attribute("rdf:about", NS_RDF, about));
             rdfElement.appendChild(channelElement);
-            List list = new Vector();
+            List<IChemObject> list = new ArrayList<>();
             if (object instanceof IAtomContainerSet) {
                 for (int i = 0; i < ((IAtomContainerSet) object).getAtomContainerCount(); i++) {
                     list.add(((IAtomContainerSet) object).getAtomContainer(i));
@@ -199,11 +200,11 @@ public void write(IChemObject object) throws CDKException {
                 }
                 Element root = null;
                 Convertor convertor = new Convertor(true, null);
-                object = (IChemObject) list.get(i);
-                if (object instanceof IAtomContainer) {
-                    root = convertor.cdkAtomContainerToCMLMolecule((IAtomContainer) object);
-                } else if (object instanceof ICrystal) {
+                object = list.get(i);
+                if (object instanceof ICrystal) {
                     root = convertor.cdkCrystalToCMLMolecule((ICrystal) object);
+                } else if (object instanceof IAtomContainer) {
+                    root = convertor.cdkAtomContainerToCMLMolecule((IAtomContainer) object);
                 } else if (object instanceof IAtom) {
                     root = convertor.cdkAtomToCMLAtom(null, (IAtom) object);
                 } else if (object instanceof IBond) {
