Allow whole molecules to be highlighted.

johnmay · johnmay · commit f7180e535190 · 2019-06-18T12:02:21.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
@@ -979,8 +979,15 @@ public DepictionGenerator withCarbonSymbols() {
      */
     public DepictionGenerator withHighlight(Iterable<? extends IChemObject> chemObjs, Color color) {
         DepictionGenerator copy = new DepictionGenerator(this);
-        for (IChemObject chemObj : chemObjs)
-            copy.highlight.put(chemObj, color);
+        for (IChemObject chemObj : chemObjs) {
+            if (chemObj instanceof IAtomContainer) {
+                for (IAtom atom : ((IAtomContainer) chemObj).atoms())
+                    copy.highlight.put(atom, color);
+                for (IBond bond : ((IAtomContainer) chemObj).bonds())
+                    copy.highlight.put(bond, color);
+            }
+            else copy.highlight.put(chemObj, color);
+        }
         return copy;
     }
 
