Removed duplicate of code for synchronizing CKDMolecule with ChemMode…

…l from editor. Also fixed the case where the atom container in the controller hub is the same as the one in the cdkmolecule.
bioclipse · Mar 29, 2012 · 4d64c21 · 4d64c21
1 parent 84467af
commit 4d64c21
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/...et.bioclipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/editor/JChemPaintEditor.java b/...et.bioclipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/editor/JChemPaintEditor.java
@@ -559,17 +559,7 @@ public void setInput( Object element ) {
     }
 
     public ICDKMolecule getCDKMolecule() {
-        ICDKMolecule model = widget.getMolecule();
-        if(model == null) return null;
-        IAtomContainer modelContainer = model.getAtomContainer();
-        modelContainer.removeAllElements();
-        IChemModel chemModel = getControllerHub().getIChemModel();
-        for(IAtomContainer aContainer:ChemModelManipulator
-                                        .getAllAtomContainers( chemModel )) {
-            modelContainer.add( aContainer );
-        }
-
-        return model;
+        return widget.getMolecule();
     }
 
     public void setMoleculeProperty(Object key,Object value) {

diff --git a/...lipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/widgets/JChemPaintEditorWidget.java b/...lipse.cdk.jchempaint/src/net/bioclipse/cdk/jchempaint/widgets/JChemPaintEditorWidget.java
@@ -923,12 +923,15 @@ public void addDropSupport(int operations, Transfer[] transferTypes,
     public ICDKMolecule getMolecule() {
         ICDKMolecule model = super.getMolecule();
         if(model == null) return null;
-        IAtomContainer modelContainer = model.getAtomContainer();
-        modelContainer.removeAllElements();
         IChemModel chemModel = getControllerHub().getIChemModel();
-        for(IAtomContainer aContainer:ChemModelManipulator
-                                        .getAllAtomContainers( chemModel )) {
-            modelContainer.add( aContainer );
+        List<IAtomContainer> modelAtomContainers = ChemModelManipulator
+                .getAllAtomContainers( chemModel );
+        IAtomContainer modelContainer = model.getAtomContainer();
+        if( !modelAtomContainers.contains(modelContainer)) {
+        	modelContainer.removeAllElements();
+        	for(IAtomContainer aContainer:modelAtomContainers) {
+        		modelContainer.add( aContainer );
+        	}
         }
         return model;
     }