Use the Standard InChI now

egonw · Jun 4, 2010 · b852859 · b852859
1 parent f34abed
commit b852859
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/features/net.bioclipse.chemoinformatics_feature/feature.xml b/features/net.bioclipse.chemoinformatics_feature/feature.xml
@@ -143,7 +143,7 @@ The Eclipse Public License accompanies this distribution, and is available at ht
          unpack="false"/>
 
    <plugin
-         id="org.openscience.cdk.inchi"
+         id="org.openscience.cdk.sinchi"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -331,12 +331,6 @@ The Eclipse Public License accompanies this distribution, and is available at ht
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="net.sf.jniinchi"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="javax.vecmath"
          download-size="0"
@@ -555,4 +549,10 @@ The Eclipse Public License accompanies this distribution, and is available at ht
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="net.sf.jniinchi.standard"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/plugins/net.bioclipse.inchi/META-INF/MANIFEST.MF b/plugins/net.bioclipse.inchi/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  net.bioclipse.core,
  org.openscience.cdk.core,
- org.openscience.cdk.inchi,
- org.openscience.cdk.interfaces
+ org.openscience.cdk.interfaces,
+ org.openscience.cdk.sinchi;bundle-version="1.3.5"
 Bundle-ActivationPolicy: lazy
 Export-Package: net.bioclipse.inchi.business,
  net.bioclipse.inchi.ui,

diff --git a/plugins/net.bioclipse.inchi/src/net/bioclipse/inchi/business/InChIManager.java b/plugins/net.bioclipse.inchi/src/net/bioclipse/inchi/business/InChIManager.java
@@ -24,8 +24,8 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.openscience.cdk.CDKConstants;
-import org.openscience.cdk.inchi.InChIGenerator;
-import org.openscience.cdk.inchi.InChIGeneratorFactory;
+import org.openscience.cdk.inchi.standard.InChIGenerator;
+import org.openscience.cdk.inchi.standard.InChIGeneratorFactory;
 import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;