From: <sh...@us...> - 2010-04-16 11:18:44
|
Revision: 15520 http://cdk.svn.sourceforge.net/cdk/?rev=15520&view=rev Author: shk3 Date: 2010-04-16 11:18:38 +0000 (Fri, 16 Apr 2010) Log Message: ----------- Some changes which fixes stuff which got broken while adopting to new cdk (mainly usage of IAtomContainer instead of IMolecule) Modified Paths: -------------- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/application/JChemPaint.java jchempaint/branches/3_0/src/main/org/openscience/jchempaint/renderer/Renderer.java Modified: jchempaint/branches/3_0/src/main/org/openscience/jchempaint/application/JChemPaint.java =================================================================== --- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/application/JChemPaint.java 2010-04-16 11:18:06 UTC (rev 15519) +++ jchempaint/branches/3_0/src/main/org/openscience/jchempaint/application/JChemPaint.java 2010-04-16 11:18:38 UTC (rev 15520) @@ -189,7 +189,7 @@ .newInstance(IChemModel.class); chemModel.setMoleculeSet(chemModel.getBuilder().newInstance(IMoleculeSet.class)); chemModel.getMoleculeSet().addAtomContainer( - chemModel.getBuilder().newInstance(IAtomContainer.class)); + chemModel.getBuilder().newInstance(IMolecule.class)); showInstance(chemModel, GT._("Untitled-") + (instancecounter++), debug); } Modified: jchempaint/branches/3_0/src/main/org/openscience/jchempaint/renderer/Renderer.java =================================================================== --- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/renderer/Renderer.java 2010-04-16 11:18:06 UTC (rev 15519) +++ jchempaint/branches/3_0/src/main/org/openscience/jchempaint/renderer/Renderer.java 2010-04-16 11:18:38 UTC (rev 15520) @@ -320,7 +320,7 @@ return paintMoleculeSet(moleculeSet, drawVisitor); } - if (moleculeSet != null && reactionSet != null) { + if (moleculeSet != null && moleculeSet.getAtomContainerCount()>0 && reactionSet != null) { Rectangle2D totalBounds = Renderer.calculateBounds(reactionSet); totalBounds = totalBounds.createUnion( Renderer.calculateBounds(moleculeSet)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |