[Cdk-commits] SF.net SVN: cdk:[15288] jchempaint/branches/3_0/src/main/org/openscience/ jchempaint

[<sh...@us...>]

Revision: 15288
          http://cdk.svn.sourceforge.net/cdk/?rev=15288&view=rev
Author:   shk3
Date:     2010-01-11 15:07:44 +0000 (Mon, 11 Jan 2010)

Log Message:
-----------
fixes bug #2905692

Modified Paths:
--------------
    jchempaint/branches/3_0/src/main/org/openscience/jchempaint/JChemPaintMenuHelper.java
    jchempaint/branches/3_0/src/main/org/openscience/jchempaint/SwingPopupModule.java

Modified: jchempaint/branches/3_0/src/main/org/openscience/jchempaint/JChemPaintMenuHelper.java
===================================================================
--- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/JChemPaintMenuHelper.java	2010-01-11 14:30:19 UTC (rev 15287)
+++ jchempaint/branches/3_0/src/main/org/openscience/jchempaint/JChemPaintMenuHelper.java	2010-01-11 15:07:44 UTC (rev 15288)
@@ -140,10 +140,9 @@
 
                 public void menuSelected(MenuEvent arg0) {
                     menu.removeAll();
-                    if((jcpPanel.getRenderPanel().getRenderer().getRenderer2DModel().getSelection()!=null && jcpPanel.getRenderPanel().getRenderer().getRenderer2DModel().getSelection().isFilled() && jcpPanel.getRenderPanel().getRenderer().getRenderer2DModel().getSelection().getConnectedAtomContainer().getAtomCount()==1)
-                            || jcpPanel.getRenderPanel().getRenderer().getRenderer2DModel().getHighlightedAtom()!=null){
+                    if(SwingPopupModule.lastAtomPopupedFor.getSymbol()!=null){
                         try {
-                            IIsotope[] isotopes = IsotopeFactory.getInstance(jcpPanel.getChemModel().getBuilder()).getIsotopes(jcpPanel.getRenderPanel().getRenderer().getRenderer2DModel().getHighlightedAtom()!=null ? jcpPanel.getRenderPanel().getRenderer().getRenderer2DModel().getHighlightedAtom().getSymbol() : jcpPanel.getRenderPanel().getRenderer().getRenderer2DModel().getSelection().getConnectedAtomContainer().getAtom(0).getSymbol());
+                            IIsotope[] isotopes = IsotopeFactory.getInstance(jcpPanel.getChemModel().getBuilder()).getIsotopes(SwingPopupModule.lastAtomPopupedFor.getSymbol());
                             for(int i=0;i<isotopes.length;i++){
                                 String cmd=isotopes[i].getSymbol()+isotopes[i].getMassNumber();
                                 JMenuItem mi = new JMenuItem(cmd);

Modified: jchempaint/branches/3_0/src/main/org/openscience/jchempaint/SwingPopupModule.java
===================================================================
--- jchempaint/branches/3_0/src/main/org/openscience/jchempaint/SwingPopupModule.java	2010-01-11 14:30:19 UTC (rev 15287)
+++ jchempaint/branches/3_0/src/main/org/openscience/jchempaint/SwingPopupModule.java	2010-01-11 15:07:44 UTC (rev 15288)
@@ -33,6 +33,7 @@
 
 import javax.vecmath.Point2d;
 
+import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IChemObject;
 import org.openscience.cdk.interfaces.IReactionSet;
 import org.openscience.cdk.tools.ILoggingTool;
@@ -52,6 +53,8 @@
 	private RenderPanel rendererPanel;
 	
 	private String ID;
+	
+	public static IAtom lastAtomPopupedFor = null;
 
 	public SwingPopupModule(RenderPanel renderer,IChemModelRelay chemModelRelay) {
 		super(chemModelRelay);
@@ -125,6 +128,8 @@
 		
 		if (objectInRange == null)
 			objectInRange = chemModelRelay.getIChemModel();
+		if (objectInRange instanceof IAtom)
+		    lastAtomPopupedFor = (IAtom)objectInRange;
 		
 		JChemPaintPopupMenu popupMenu = getPopupMenu(objectInRange.getClass());
 		if (popupMenu != null) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.