Revision: 6483
http://sourceforge.net/p/jump-pilot/code/6483
Author: edso
Date: 2020-09-15 13:04:29 +0000 (Tue, 15 Sep 2020)
Log Message:
-----------
clean up plugin installation
Modified Paths:
--------------
core/trunk/src/org/openjump/core/ui/plugin/customize/PythonToolsPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/view/EasyButtonsPlugin.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-09-15 13:03:40 UTC (rev 6482)
+++ core/trunk/src/org/openjump/core/ui/plugin/customize/PythonToolsPlugIn.java
2020-09-15 13:04:29 UTC (rev 6483)
@@ -66,30 +66,16 @@
public class PythonToolsPlugIn extends ToolboxPlugIn {
- private static String sName = "Python Console and Tools";
private static final ImageIcon icon = IconLoader
.icon("famfam/application_python.png");
public String getName() {
- return sName;
+ return I18N
+
.get("org.openjump.core.ui.plugin.customize.PythonToolsPlugIn.Python-Console-and-Tools");
}
public void initialize(PlugInContext context) throws Exception {
- this.sName = I18N
-
.get("org.openjump.core.ui.plugin.customize.PythonToolsPlugIn.Python-Console-and-Tools");
- // [sstein - old, access via button]
- //
context.getWorkbenchContext().getWorkbench().getFrame().getToolBar().addPlugIn(getIcon(),
- // this, createEnableCheck(context.getWorkbenchContext()),
- // context.getWorkbenchContext());
- // [sstein - neu, access via menu]
- FeatureInstaller featureInstaller = new FeatureInstaller(
- context.getWorkbenchContext());
- featureInstaller.addMainMenuItem(this, // exe
- new String[] { MenuNames.CUSTOMIZE }, // menu path
- this.sName + "...", // name methode .getName recieved by AbstractPlugIn
- false, // checkbox
- null, // icon
- createEnableCheck(context.getWorkbenchContext())); // enable check
+ FeatureInstaller.getInstance().addMainMenuPlugin(this, new String[] {
MenuNames.CUSTOMIZE });
}
protected void initializeToolbox(ToolboxDialog toolbox) {
@@ -155,7 +141,7 @@
public MultiEnableCheck createEnableCheck(
final WorkbenchContext workbenchContext) {
EnableCheckFactory checkFactory = new EnableCheckFactory(workbenchContext);
- return new MultiEnableCheck().add(checkFactory
+ return new MultiEnableCheck().add(super.getEnableCheck()).add(checkFactory
.createTaskWindowMustBeActiveCheck());
}
}
Modified: core/trunk/src/org/openjump/core/ui/plugin/view/EasyButtonsPlugin.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/view/EasyButtonsPlugin.java
2020-09-15 13:03:40 UTC (rev 6482)
+++ core/trunk/src/org/openjump/core/ui/plugin/view/EasyButtonsPlugin.java
2020-09-15 13:04:29 UTC (rev 6483)
@@ -44,6 +44,7 @@
import com.vividsolutions.jump.workbench.ui.MenuNames;
import com.vividsolutions.jump.workbench.ui.cursortool.CursorTool;
import com.vividsolutions.jump.workbench.ui.images.IconLoader;
+import com.vividsolutions.jump.workbench.ui.plugin.FeatureInstaller;
import com.vividsolutions.jump.workbench.ui.toolbox.ToolboxDialog;
import com.vividsolutions.jump.workbench.ui.toolbox.ToolboxPlugIn;
@@ -57,8 +58,8 @@
private EasyPanel buttonPanel = null;
public void initialize(final PlugInContext context) throws Exception {
- createMainMenuItem(new String[] { MenuNames.CUSTOMIZE }, getIcon(),
- context.getWorkbenchContext());
+ FeatureInstaller.getInstance().addMainMenuPlugin(this, new String[] {
MenuNames.CUSTOMIZE });
+
// Wait 2 seconds because EasyButtonsPlugIn needs all menu items
// to be initialized first
// Initialization is done here rather than in initializeToolbox because
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
