Adds generator from extension in jcpeditorwidget and jcpview

This is necessary to be able to add all extension generators to the extensionGenerator field in JChemPaintView and allows for toggle the visibility of these.
bioclipse · Mar 10, 2015 · a385ade · a385ade
1 parent a7a2fd3
commit a385ade
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/...t.bioclipse.cdk.jchempaint.view/src/net/bioclipse/cdk/jchempaint/view/JChemPaintView.java b/...t.bioclipse.cdk.jchempaint.view/src/net/bioclipse/cdk/jchempaint/view/JChemPaintView.java
@@ -258,6 +258,7 @@ public void selectionChanged( IWorkbenchPart part, final ISelection selection )
                 if(ac!=null) {
                     canvasView.remove( Message.GENERATED );
                     setAtomContainer( ac );
+                    showExternalGenerators( false );
                     return;
                 }
             }
@@ -281,6 +282,7 @@ public void selectionChanged( IWorkbenchPart part, final ISelection selection )
 
             public void run() {
                 reactOnSelection( selection );
+                showExternalGenerators( false );
             }
         });
     }

diff --git a/...bioclipse.cdk.jchempaint.view/src/net/bioclipse/cdk/jchempaint/view/JChemPaintWidget.java b/...bioclipse.cdk.jchempaint.view/src/net/bioclipse/cdk/jchempaint/view/JChemPaintWidget.java
@@ -178,7 +178,8 @@ protected List<IGenerator<IAtomContainer>> createGenerators() {
         List<IGenerator<IAtomContainer>> generatorList =
         	new ArrayList<IGenerator<IAtomContainer>>();
 
-        generatorList.addAll(ChoiceGenerator.getGeneratorsFromExtension());
+        // generatorList.addAll(ChoiceGenerator.getGeneratorsFromExtension());
+
         if(extensionGenerator!=null) extensionGenerator.setUse( true );
         // This generator can be used for debugging partitioning problems
         //generatorList.add( new AtomContainerBoundsGenerator() );

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
@@ -34,6 +34,7 @@
 import net.bioclipse.cdk.jchempaint.preferences.GenerateLabelPrefChangedLisener;
 import net.bioclipse.cdk.jchempaint.preferences.PreferenceConstants;
 import net.bioclipse.cdk.jchempaint.undoredo.SWTUndoRedoFactory;
+import net.bioclipse.cdk.jchempaint.view.ChoiceGenerator;
 import net.bioclipse.cdk.jchempaint.view.JChemPaintWidget;
 import net.bioclipse.core.business.BioclipseException;
 import net.bioclipse.core.util.LogUtils;
@@ -585,6 +586,7 @@ protected List<IGenerator<IAtomContainer>> createGenerators() {
         	new ArrayList<IGenerator<IAtomContainer>>();
         generatorList.add(new BasicSceneGenerator());
         generatorList.add(new ExternalHighlightGenerator());
+        generatorList.addAll( ChoiceGenerator.getGeneratorsFromExtension() );// Fix for ds generators showing up in jcp view
         generatorList.addAll( super.createGenerators() );
         generatorList.add( phantomGenerator = new PhantomBondGenerator());
         generatorList.add(new SelectAtomGenerator());