Revision: 6570 http://sourceforge.net/p/jump-pilot/code/6570 Author: edso Date: 2020-10-04 11:23:18 +0000 (Sun, 04 Oct 2020) Log Message: ----------- fix #506: python tools enablecheck not working by properly implementing EnableChecked interface after switching to generic FeatureInstaller.addMainMenuPlugin()
Modified Paths: -------------- core/trunk/src/org/openjump/core/ui/plugin/customize/PythonToolsPlugIn.java Modified: core/trunk/src/org/openjump/core/ui/plugin/customize/PythonToolsPlugIn.java =================================================================== --- core/trunk/src/org/openjump/core/ui/plugin/customize/PythonToolsPlugIn.java 2020-10-04 11:20:18 UTC (rev 6569) +++ core/trunk/src/org/openjump/core/ui/plugin/customize/PythonToolsPlugIn.java 2020-10-04 11:23:18 UTC (rev 6570) @@ -44,16 +44,13 @@ import javax.swing.JMenu; import javax.swing.JMenuBar; - import org.openjump.util.python.JUMP_GIS_Framework; import org.openjump.util.python.ModifyGeometry; import org.openjump.util.python.PythonInteractiveInterpreter; import org.python.core.PySystemState; -import bsh.util.JConsole; - import com.vividsolutions.jump.I18N; -import com.vividsolutions.jump.workbench.WorkbenchContext; +import com.vividsolutions.jump.workbench.plugin.EnableCheck; import com.vividsolutions.jump.workbench.plugin.EnableCheckFactory; import com.vividsolutions.jump.workbench.plugin.MultiEnableCheck; import com.vividsolutions.jump.workbench.plugin.PlugInContext; @@ -64,6 +61,8 @@ import com.vividsolutions.jump.workbench.ui.toolbox.ToolboxDialog; import com.vividsolutions.jump.workbench.ui.toolbox.ToolboxPlugIn; +import bsh.util.JConsole; + public class PythonToolsPlugIn extends ToolboxPlugIn { private static final ImageIcon icon = IconLoader @@ -138,9 +137,10 @@ return icon; } - public MultiEnableCheck createEnableCheck( - final WorkbenchContext workbenchContext) { - EnableCheckFactory checkFactory = new EnableCheckFactory(workbenchContext); + @Override + public EnableCheck getEnableCheck() { + EnableCheckFactory checkFactory = EnableCheckFactory.getInstance(); + // add parent's enablecheck as well to switch en/disable states properly return new MultiEnableCheck().add(super.getEnableCheck()).add(checkFactory .createTaskWindowMustBeActiveCheck()); } _______________________________________________ Jump-pilot-devel mailing list Jump-pilot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel