From: <sh...@us...> - 2009-07-06 10:27:37
|
Revision: 14669 http://cdk.svn.sourceforge.net/cdk/?rev=14669&view=rev Author: shk3 Date: 2009-07-06 10:27:30 +0000 (Mon, 06 Jul 2009) Log Message: ----------- avoids npes Modified Paths: -------------- cdk/branches/jchempaint-primary/src/main/org/openscience/cdk/renderer/generators/SelectAtomGenerator.java cdk/branches/jchempaint-primary/src/main/org/openscience/cdk/renderer/generators/SelectBondGenerator.java Modified: cdk/branches/jchempaint-primary/src/main/org/openscience/cdk/renderer/generators/SelectAtomGenerator.java =================================================================== --- cdk/branches/jchempaint-primary/src/main/org/openscience/cdk/renderer/generators/SelectAtomGenerator.java 2009-07-06 10:16:59 UTC (rev 14668) +++ cdk/branches/jchempaint-primary/src/main/org/openscience/cdk/renderer/generators/SelectAtomGenerator.java 2009-07-06 10:27:30 UTC (rev 14669) @@ -48,8 +48,10 @@ Color selectionColor = model.getSelectedPartColor(); AtomShape shape = model.getSelectionShape(); IChemObjectSelection selection = model.getSelection(); + ElementGroup selectionElements = new ElementGroup(); - ElementGroup selectionElements = new ElementGroup(); + if(selection==null) + return selectionElements; if (this.autoUpdateSelection || selection.isFilled()) { double r = model.getSelectionRadius() / model.getScale(); Modified: cdk/branches/jchempaint-primary/src/main/org/openscience/cdk/renderer/generators/SelectBondGenerator.java =================================================================== --- cdk/branches/jchempaint-primary/src/main/org/openscience/cdk/renderer/generators/SelectBondGenerator.java 2009-07-06 10:16:59 UTC (rev 14668) +++ cdk/branches/jchempaint-primary/src/main/org/openscience/cdk/renderer/generators/SelectBondGenerator.java 2009-07-06 10:27:30 UTC (rev 14669) @@ -44,6 +44,8 @@ IChemObjectSelection selection = model.getSelection(); ElementGroup selectionElements = new ElementGroup(); + if(selection==null) + return selectionElements; if (this.autoUpdateSelection || selection.isFilled()) { IAtomContainer selectedAC = selection.getConnectedAtomContainer(); if (selectedAC != null) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |