@@ -96,8 +96,11 @@ public class ChemModel extends ChemObject implements Serializable, IChemModel, I */ public void setMoleculeSet(IMoleculeSet setOfMolecules) { + if (this.setOfMolecules != null) + this.setOfMolecules.removeListener(this); this.setOfMolecules = setOfMolecules; - this.setOfMolecules.addListener(this); + if (this.setOfMolecules != null) + this.setOfMolecules.addListener(this); notifyChanged(); } @@ -124,7 +127,11 @@ public class ChemModel extends ChemObject implements Serializable, IChemModel, I */ public void setRingSet(IRingSet ringSet) { + if (this.ringSet != null) + this.ringSet.removeListener(this); this.ringSet = ringSet; + if (this.ringSet != null) + this.ringSet.addListener(this); notifyChanged(); } @@ -147,9 +154,12 @@ public class ChemModel extends ChemObject implements Serializable, IChemModel, I * @see #getCrystal */ public void setCrystal(ICrystal crystal) { + if (this.crystal != null) + this.crystal.removeListener(this); this.crystal = crystal; - this.crystal.addListener(this); - notifyChanged(); + if (this.crystal != null) + this.crystal.addListener(this); + notifyChanged(); } /** @@ -171,9 +181,12 @@ public class ChemModel extends ChemObject implements Serializable, IChemModel, I * @see #getReactionSet */ public void setReactionSet(IReactionSet sor) { + if (this.setOfReactions != null) + this.setOfReactions.removeListener(this); this.setOfReactions = sor; - this.setOfReactions.addListener(this); - notifyChanged(); + if (this.setOfReactions != null) + this.setOfReactions.addListener(this); + notifyChanged(); } /** src/main/org/openscience/cdk/ChemModel.java b8331764c29f74a50385e69c0bc8f7be098f7d8f Egon Willighagen egonw@users.sourceforge.net http://github.com/egonw/cdk/commit/0c8a88fec80b2460d6aee526084cbbab1c9424c9 0c8a88fec80b2460d6aee526084cbbab1c9424c9 2009-11-01T08:33:09-08:00 2009-11-01T06:43:37-08:00 Fixed propagation of change events to IChemModel when modifications are made in child IChemObjects Signed-off-by: Rajarshi Guha <rajarshi.guha@gmail.com> db5c643db1e43e621a732cacce0c69cf426ff989 Rajarshi Guha rajarshi.guha@gmail.com