From a36fb29a1eecde4813992d89dc582725ecdbd796 Mon Sep 17 00:00:00 2001
From: Ola Spjuth <ola.spjuth@gmail.com>
Date: Sun, 19 Jul 2009 01:19:11 +0800
Subject: [PATCH 1/2] Created public method to indicate if MolTable is showing
 JCPEditor or not.

Signed-off-by: Egon Willighagen <egon.willighagen@gmail.com>
---
 .../editor/MultiPageMoleculesEditorPart.java          | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/net.bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MultiPageMoleculesEditorPart.java b/plugins/net.bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MultiPageMoleculesEditorPart.java
index eb1d8c07c..bf8753cb5 100644
--- a/plugins/net.bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MultiPageMoleculesEditorPart.java
+++ b/plugins/net.bioclipse.cdk.ui.sdfeditor/src/net/bioclipse/cdk/ui/sdfeditor/editor/MultiPageMoleculesEditorPart.java
@@ -61,6 +61,7 @@
 import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.part.Page;
 
 public class MultiPageMoleculesEditorPart extends MultiPageEditorPart implements
                                                     ISelectionListener,
@@ -466,4 +467,14 @@ public Object getAdapter( Class adapter ) {
             return jcpPage;
         return super.getAdapter( adapter );
     }
+
+    /**
+     * @return true if JCP is current editor
+     */
+    public boolean isJCPVisible() {
+        if (getActiveEditor() instanceof JChemPaintEditor)
+            return true;
+        return false;
+    }
+    
 }

From aae8f74bb8750b3133a66a9ca1ecd0978167445c Mon Sep 17 00:00:00 2001
From: Egon Willighagen <egon.willighagen@gmail.com>
Date: Mon, 20 Jul 2009 16:23:46 +0200
Subject: [PATCH 2/2] Fixed messages of progress monitor

---
 .../src/net/bioclipse/cdk/business/CDKManager.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/net.bioclipse.cdk.business/src/net/bioclipse/cdk/business/CDKManager.java b/plugins/net.bioclipse.cdk.business/src/net/bioclipse/cdk/business/CDKManager.java
index 2d91f5c47..e38df1322 100644
--- a/plugins/net.bioclipse.cdk.business/src/net/bioclipse/cdk/business/CDKManager.java
+++ b/plugins/net.bioclipse.cdk.business/src/net/bioclipse/cdk/business/CDKManager.java
@@ -1490,7 +1490,7 @@ public void generate2dCoordinates(IMolecule molecule,
                                         IReturner returner,
                                         IProgressMonitor monitor)
                        throws Exception {
-          monitor.beginTask( "Creating 3d coordinates", IProgressMonitor.UNKNOWN );
+          monitor.beginTask( "Creating 2d coordinates", IProgressMonitor.UNKNOWN );
           List<IMolecule> molecules = new ArrayList<IMolecule>();
           molecules.add( molecule );
           returner.completeReturn( generate2dCoordinates( molecules,