[JPP-Devel] SVN: [4717] core/trunk/src

[jump-pilot-svn]

Revision: 4717
          http://sourceforge.net/p/jump-pilot/code/4717
Author:   michaudm
Date:     2015-12-28 22:25:38 +0000 (Mon, 28 Dec 2015)
Log Message:
-----------
Fix 3 plugins depending on macro-recorder

Modified Paths:
--------------
    
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/DisposeSelectedLayersPlugIn.java
    
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/BufferPlugIn.java
    core/trunk/src/org/openjump/core/ui/io/file/DataSourceFileLayerLoader.java

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/DisposeSelectedLayersPlugIn.java
===================================================================
--- 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/DisposeSelectedLayersPlugIn.java
 2015-12-28 22:19:23 UTC (rev 4716)
+++ 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/DisposeSelectedLayersPlugIn.java
 2015-12-28 22:25:38 UTC (rev 4717)
@@ -36,6 +36,7 @@
 import com.vividsolutions.jump.workbench.model.LayerManager;
 import com.vividsolutions.jump.workbench.model.Layerable;
 import com.vividsolutions.jump.workbench.plugin.Macro;
+import com.vividsolutions.jump.workbench.plugin.MacroManager;
 import com.vividsolutions.jump.workbench.plugin.PlugInContext;
 import com.vividsolutions.jump.workbench.plugin.StartMacroPlugIn;
 
@@ -46,7 +47,7 @@
             .selectedNodes(Layerable.class).toArray(new Layerable[] {});
         LayerManager lmgr = context.getLayerManager();
         lmgr.dispose(selectedLayers);
-        if 
(context.getWorkbenchContext().getBlackboard().getBoolean(StartMacroPlugIn.MACRO_STARTED))
 {
+        if 
(context.getWorkbenchContext().getBlackboard().get(MacroManager.MACRO_STARTED, 
false)) {
             
((Macro)context.getWorkbenchContext().getBlackboard().get("Macro")).addProcess(this);
         }
         return true;

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/BufferPlugIn.java
===================================================================
--- 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/BufferPlugIn.java
       2015-12-28 22:19:23 UTC (rev 4716)
+++ 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/analysis/BufferPlugIn.java
       2015-12-28 22:25:38 UTC (rev 4717)
@@ -318,7 +318,7 @@
         } catch(Exception e) {
             throw e;
         }
-        if 
(context.getWorkbenchContext().getBlackboard().getBoolean(StartMacroPlugIn.MACRO_STARTED))
 {
+        if 
(context.getWorkbenchContext().getBlackboard().get(MacroManager.MACRO_STARTED, 
false)) {
             
((Macro)context.getWorkbenchContext().getBlackboard().get("Macro")).addProcess(this);
         }
     }

Modified: 
core/trunk/src/org/openjump/core/ui/io/file/DataSourceFileLayerLoader.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/io/file/DataSourceFileLayerLoader.java  
2015-12-28 22:19:23 UTC (rev 4716)
+++ core/trunk/src/org/openjump/core/ui/io/file/DataSourceFileLayerLoader.java  
2015-12-28 22:25:38 UTC (rev 4717)
@@ -34,6 +34,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.vividsolutions.jump.workbench.plugin.MacroManager;
 import com.vividsolutions.jump.workbench.plugin.PlugInManager;
 import com.vividsolutions.jump.workbench.plugin.Recordable;
 import com.vividsolutions.jump.workbench.plugin.Macro;
@@ -255,7 +256,7 @@
       try {
           //return (Boolean)process(monitor);
           boolean ret = (Boolean)process(monitor);
-          if (workbenchContext.getBlackboard().getBoolean("MacroStarted")) {
+          if (workbenchContext.getBlackboard().get(MacroManager.MACRO_STARTED, 
false)) {
               DataSourceFileLayerLoader clone = new 
DataSourceFileLayerLoader();
               clone.setParameters(this.getParameters());
               
((Macro)workbenchContext.getBlackboard().get("Macro")).addProcess(clone);


------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel