Skip to content

Commit

Permalink
Have the experimental JME reader actually compile
Browse files Browse the repository at this point in the history
git-svn-id: https://cdk.svn.sourceforge.net/svnroot/cdk/trunk/cdk@2860 eb4e18e3-b210-0410-a6ab-dec725e4b171
  • Loading branch information
egonw committed May 19, 2004
1 parent 9d9b04a commit 7f7ea85
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
4 changes: 4 additions & 0 deletions build.xml
Expand Up @@ -61,6 +61,8 @@
<include name="cmlAll.jar" /> <include name="cmlAll.jar" />
<include name="base.jar" /> <include name="base.jar" />
<include name="pmrlib.jar" /> <include name="pmrlib.jar" />
<include name="jmolApis.jar" />
<include name="jmolIO.jar" />
</fileset> </fileset>
<fileset dir="${pathtojava3d}"> <fileset dir="${pathtojava3d}">
<include name="*.jar" /> <include name="*.jar" />
Expand Down Expand Up @@ -691,6 +693,7 @@


<target id="test-experimental" name="test-experimental" depends="noJunit" <target id="test-experimental" name="test-experimental" depends="noJunit"
description="Performs a full JUnit test for the CDK, including experimental classes."> description="Performs a full JUnit test for the CDK, including experimental classes.">
<mkdir dir="${reports.tests}"/>
<junit printsummary="yes" haltonfailure="yes" fork="yes"> <junit printsummary="yes" haltonfailure="yes" fork="yes">
<classpath> <classpath>
<pathelement location="${dist}/jar/cdk-core.jar" /> <pathelement location="${dist}/jar/cdk-core.jar" />
Expand Down Expand Up @@ -724,6 +727,7 @@


<target id="test" name="test" depends="dist-test, noJunit" <target id="test" name="test" depends="dist-test, noJunit"
description="Performs a full JUnit test for the CDK." if="junit.present"> description="Performs a full JUnit test for the CDK." if="junit.present">
<mkdir dir="${reports.tests}"/>
<junit printsummary="yes" haltonfailure="yes" fork="yes"> <junit printsummary="yes" haltonfailure="yes" fork="yes">
<classpath> <classpath>
<pathelement location="${dist}/jar/cdk-core.jar" /> <pathelement location="${dist}/jar/cdk-core.jar" />
Expand Down
13 changes: 7 additions & 6 deletions src/org/openscience/cdk/io/JMEReader.java
Expand Up @@ -42,6 +42,7 @@
import org.jmol.adapter.smarter.SmarterModelAdapter; import org.jmol.adapter.smarter.SmarterModelAdapter;
import org.jmol.api.ModelAdapter; import org.jmol.api.ModelAdapter;
import org.jmol.api.ModelAdapter.AtomIterator; import org.jmol.api.ModelAdapter.AtomIterator;
import org.jmol.api.ModelAdapter.BondIterator;


import org.openscience.cdk.Atom; import org.openscience.cdk.Atom;
import org.openscience.cdk.Bond; import org.openscience.cdk.Bond;
Expand Down Expand Up @@ -132,23 +133,23 @@ private Molecule readMolecule(Molecule molecule) throws CDKException {
AtomIterator atomIterator = adapter.getAtomIterator(model); AtomIterator atomIterator = adapter.getAtomIterator(model);
while (atomIterator.hasNext()) { while (atomIterator.hasNext()) {
Atom atom = new Atom(atomIterator.getElementSymbol()); Atom atom = new Atom(atomIterator.getElementSymbol());
atom.setX3d(atomIterator.x); /* atom.setX3d(atomIterator.x);
atom.setY3d(atomIterator.y); atom.setY3d(atomIterator.y);
atom.setZ3d(atomIterator.z); atom.setZ3d(atomIterator.z); */
molecule.addAtom(atom); molecule.addAtom(atom);
} }
BondIterator bondIterator = adapter.getBondIterator(model); BondIterator bondIterator = adapter.getBondIterator(model);
while (bondIterator.hasNext()) { while (bondIterator.hasNext()) {
Object atom1 = bondIterator.getgetAtomUid1(); Object atom1 = bondIterator.getAtomUid1();
Object atom2 = bondIterator.getgetAtomUid2(); Object atom2 = bondIterator.getAtomUid2();
if (atom1 instanceof org.jmol.adapter.smarter.Atom) { /* if (atom1 instanceof org.jmol.adapter.smarter.Atom) {
org.jmol.adapter.smarter.Atom atomOne = org.jmol.adapter.smarter.Atom atomOne =
(org.jmol.adapter.smarter.Atom)atom1; (org.jmol.adapter.smarter.Atom)atom1;
org.jmol.adapter.smarter.Atom atomTwo = org.jmol.adapter.smarter.Atom atomTwo =
(org.jmol.adapter.smarter.Atom)atom2; (org.jmol.adapter.smarter.Atom)atom2;
// now I'm stuck... no idea which atoms this bond // now I'm stuck... no idea which atoms this bond
// connects... consulting Miguel // connects... consulting Miguel
} } */
} }
return molecule; return molecule;
} }
Expand Down

0 comments on commit 7f7ea85

Please sign in to comment.