ensure2d can reorder components, call this after we have assigned ids.

johnmay · johnmay · commit 7c45420037ce · 2019-06-18T12:14:10.000+01:00
diff --git a/app/depict/src/main/java/org/openscience/cdk/depict/DepictionGenerator.java b/app/depict/src/main/java/org/openscience/cdk/depict/DepictionGenerator.java
@@ -412,8 +412,6 @@ private static void setIfMissing(IChemObject chemObject, String key, String val)
      */
     public Depiction depict(IReaction rxn) throws CDKException {
 
-        ensure2dLayout(rxn); // can reorder components!
-
         final Color fgcol = getParameterValue(StandardGenerator.AtomColor.class).getAtomColor(rxn.getBuilder()
                                                                                                  .newInstance(IAtom.class, "C"));
 
@@ -440,6 +438,8 @@ public Depiction depict(IReaction rxn) throws CDKException {
             layoutBackups.add(new LayoutBackup(mol));
         }
 
+        ensure2dLayout(rxn); // can reorder components!
+
         final Map<IChemObject, Color> myHighlight = new HashMap<>();
         if (highlightAtomMap) {
             myHighlight.putAll(makeHighlightAtomMap(reactants, products));
