Revision: 6571
http://sourceforge.net/p/jump-pilot/code/6571
Author: michaudm
Date: 2020-10-04 12:53:33 +0000 (Sun, 04 Oct 2020)
Log Message:
-----------
Fix #505 : don't create a new BeanShellEditor if one already exist
Modified Paths:
--------------
plug-ins/BshEditor4Jump/trunk/build.xml
plug-ins/BshEditor4Jump/trunk/src/fr/michaelm/jump/bsheditor/BeanShellEditorPlugIn.java
plug-ins/BshEditor4Jump/trunk/src/fr/michaelm/jump/bsheditor/BshEditorPlugInExtension.java
Modified: plug-ins/BshEditor4Jump/trunk/build.xml
===================================================================
--- plug-ins/BshEditor4Jump/trunk/build.xml 2020-10-04 11:23:18 UTC (rev
6570)
+++ plug-ins/BshEditor4Jump/trunk/build.xml 2020-10-04 12:53:33 UTC (rev
6571)
@@ -17,7 +17,7 @@
<property name="openjump" value="../../openjump_lib" />
<!-- plugins -->
- <property name="version" value="0.3.0" />
+ <property name="version" value="0.3.1" />
<!-- ===================================================================
-->
Modified:
plug-ins/BshEditor4Jump/trunk/src/fr/michaelm/jump/bsheditor/BeanShellEditorPlugIn.java
===================================================================
---
plug-ins/BshEditor4Jump/trunk/src/fr/michaelm/jump/bsheditor/BeanShellEditorPlugIn.java
2020-10-04 11:23:18 UTC (rev 6570)
+++
plug-ins/BshEditor4Jump/trunk/src/fr/michaelm/jump/bsheditor/BeanShellEditorPlugIn.java
2020-10-04 12:53:33 UTC (rev 6571)
@@ -1,5 +1,6 @@
package fr.michaelm.jump.bsheditor;
+import buoy.event.WindowClosingEvent;
import com.vividsolutions.jump.workbench.plugin.AbstractPlugIn;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
import com.vividsolutions.jump.workbench.ui.MenuNames;
@@ -30,13 +31,28 @@
return i18n.getString("name");
}
+ // If an editor is already around, don't create a new one
+ BeanShellEditor e= null;
+
public boolean execute(PlugInContext context) throws Exception {
- Map map = new HashMap();
- map.put("wc", context.getWorkbenchContext());
- BeanShellEditor e = new BeanShellEditor(map, null);
- e.addInitStatement("import com.vividsolutions.jump.feature.*;");
- e.addInitStatement("import com.vividsolutions.jts.geom.*;");
- e.addInitStatement("import
com.vividsolutions.jump.workbench.model.*;");
+ if (e == null) {
+ System.out.println("e == null");
+ Map map = new HashMap();
+ map.put("wc", context.getWorkbenchContext());
+ e = new BeanShellEditor(map, null);
+ e.addEventLink(WindowClosingEvent.class, this, "exit");
+ e.addInitStatement("import com.vividsolutions.jump.feature.*;");
+ e.addInitStatement("import com.vividsolutions.jts.geom.*;");
+ e.addInitStatement("import
com.vividsolutions.jump.workbench.model.*;");
+ } else {
+ System.out.println("e != null");
+ }
+ e.setVisible(true);
return true;
}
+
+ private void exit(){
+ if (e != null) e.dispose();
+ e = null;
+ }
}
Modified:
plug-ins/BshEditor4Jump/trunk/src/fr/michaelm/jump/bsheditor/BshEditorPlugInExtension.java
===================================================================
---
plug-ins/BshEditor4Jump/trunk/src/fr/michaelm/jump/bsheditor/BshEditorPlugInExtension.java
2020-10-04 11:23:18 UTC (rev 6570)
+++
plug-ins/BshEditor4Jump/trunk/src/fr/michaelm/jump/bsheditor/BshEditorPlugInExtension.java
2020-10-04 12:53:33 UTC (rev 6571)
@@ -2,7 +2,9 @@
import com.vividsolutions.jump.workbench.plugin.Extension;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
-
+// v 0.3.1 (2020-10-04) don't create a new editor if one already exists (#505)
+// v 0.3.0 (2020-06-12) 4 improvement sasked by János in support request #7
+// + upload of source code in the main repository
// v 0.2.4 (2012-11-12) fix the plugin name in the menu
// v 0.2.3 (2012-mm-jj)
public class BshEditorPlugInExtension extends Extension {
@@ -10,5 +12,5 @@
new BeanShellEditorPlugIn().initialize(context);
}
public String getName() {return "BeanShell Script Editor";}
- public String getVersion() {return "0.3.0 (2020-06-12)";}
+ public String getVersion() {return "0.3.1 (2020-10-04)";}
}
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
