Revision: 5075
http://sourceforge.net/p/jump-pilot/code/5075
Author: michaudm
Date: 2016-10-13 19:53:51 +0000 (Thu, 13 Oct 2016)
Log Message:
-----------
EditOptions are now persistent except rolling back invalid edits which is
activated by default (in OpenJumpConfiguration)
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/com/vividsolutions/jump/workbench/plugin/AbstractPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/EditOptionsPanel.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerNameRenderer.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/AbstractCursorTool.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/PolygonTool.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/editing/DrawLineStringTool.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/editing/FeatureDrawingUtil.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/AddNewLayerPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/OptionsPlugIn.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/WKTPlugIn.java
core/trunk/src/org/openjump/OpenJumpConfiguration.java
core/trunk/src/org/openjump/core/ui/plugin/AbstractUiPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/ConstrainedPolygonTool.java
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/CutFeaturesTool.java
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/CutPolygonTool.java
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawCircleWithGivenRadiusTool.java
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawConstrainedArcTool.java
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawConstrainedCircleTool.java
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawConstrainedLineStringTool.java
core/trunk/src/org/openjump/util/python/pythonexampleclasses/DrawCustomTool.java
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2016-10-13 07:07:59 UTC (rev 5074)
+++ core/trunk/ChangeLog 2016-10-13 19:53:51 UTC (rev 5075)
@@ -3,6 +3,10 @@
# 2. make sure that lines break at 80 chars for constricted display situations
#<-------------------------------- 80 chars
---------------------------------->#
+2016-10-13 mmichaud <m.michael.mich...@orange.fr>
+ * EditOptions are now persistent except rolling back invalid edits which is
+ activated by default (in OpenJumpConfiguration)
+
2016-10-09 mmichaud <m.michael.mich...@orange.fr>
* Refactoring of EditOptionsPanel + add single editable layer option
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/plugin/AbstractPlugIn.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/plugin/AbstractPlugIn.java
2016-10-13 07:07:59 UTC (rev 5074)
+++ core/trunk/src/com/vividsolutions/jump/workbench/plugin/AbstractPlugIn.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -47,7 +47,6 @@
import com.vividsolutions.jts.util.Assert;
import com.vividsolutions.jump.I18N;
-import com.vividsolutions.jump.util.CollectionUtil;
import com.vividsolutions.jump.util.StringUtil;
import com.vividsolutions.jump.workbench.JUMPWorkbench;
import com.vividsolutions.jump.workbench.Logger;
@@ -63,7 +62,7 @@
import com.vividsolutions.jump.workbench.model.UndoableEditReceiver;
import com.vividsolutions.jump.workbench.ui.EditTransaction;
import com.vividsolutions.jump.workbench.ui.GUIUtil;
-import com.vividsolutions.jump.workbench.ui.WorkbenchFrame;
+import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
import com.vividsolutions.jump.workbench.ui.task.TaskMonitorManager;
/**
@@ -157,7 +156,7 @@
}
protected boolean isRollingBackInvalidEdits(PlugInContext context) {
- return context.getWorkbenchContext().getWorkbench().getBlackboard()
+ return PersistentBlackboardPlugIn.get(context.getWorkbenchContext())
.get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY, false);
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/EditOptionsPanel.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/EditOptionsPanel.java
2016-10-13 07:07:59 UTC (rev 5074)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/EditOptionsPanel.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -32,15 +32,11 @@
package com.vividsolutions.jump.workbench.ui;
-import java.awt.BorderLayout;
import java.awt.Color;
-import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
-import java.awt.Insets;
import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
-import javax.swing.JDesktopPane;
import javax.swing.JPanel;
import javax.swing.border.TitledBorder;
@@ -50,7 +46,6 @@
import com.vividsolutions.jts.util.Assert;
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.util.Blackboard;
-import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
/**
* Implements an {@link OptionsPanel} for Edit.
@@ -120,17 +115,13 @@
}
public void init() {
- System.out.println("persistence " +
PersistentBlackboardPlugIn.get(blackboard).get(
- SINGLE_EDITABLE_LAYER_KEY, true));
- System.out.println("blackboard " + blackboard.get(
- SINGLE_EDITABLE_LAYER_KEY, true));
-
preventEditsCheckBox.setSelected(PersistentBlackboardPlugIn.get(blackboard).get(
+ preventEditsCheckBox.setSelected(blackboard.get(
EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY, false));
-
selectNewGeometryCheckBox.setSelected(PersistentBlackboardPlugIn.get(blackboard).get(
+ selectNewGeometryCheckBox.setSelected(blackboard.get(
SELECT_NEW_GEOMETRY_KEY, false));
-
singleEditableLayerCheckBox.setSelected(PersistentBlackboardPlugIn.get(blackboard).get(
+ singleEditableLayerCheckBox.setSelected(blackboard.get(
SINGLE_EDITABLE_LAYER_KEY, true));
-
tooltipCheckBox.setSelected(PersistentBlackboardPlugIn.get(blackboard).get(
+ tooltipCheckBox.setSelected(blackboard.get(
LAYER_TOOLTIPS_KEY, false));
blackboard.put(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
preventEditsCheckBox.isSelected());
@@ -152,15 +143,6 @@
singleEditableLayerCheckBox.isSelected());
blackboard.put(LAYER_TOOLTIPS_KEY,
tooltipCheckBox.isSelected());
-
- PersistentBlackboardPlugIn.get(blackboard).
- put(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
preventEditsCheckBox.isSelected());
- PersistentBlackboardPlugIn.get(blackboard).
- put(SELECT_NEW_GEOMETRY_KEY,
selectNewGeometryCheckBox.isSelected());
- PersistentBlackboardPlugIn.get(blackboard).
- put(SINGLE_EDITABLE_LAYER_KEY,
singleEditableLayerCheckBox.isSelected());
- PersistentBlackboardPlugIn.get(blackboard).
- put(LAYER_TOOLTIPS_KEY, tooltipCheckBox.isSelected());
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerNameRenderer.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerNameRenderer.java
2016-10-13 07:07:59 UTC (rev 5074)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerNameRenderer.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -310,7 +310,8 @@
* Giuseppe Aruta [2015-01-04] Generated tooltip text [2015-03-29] Made
* tooltip optional (original/enhanced)
*/
- boolean layerTooltipsOn = JUMPWorkbench.getInstance().getBlackboard()
+ boolean layerTooltipsOn = PersistentBlackboardPlugIn
+ .get(JUMPWorkbench.getInstance().getContext())
.get(EditOptionsPanel.LAYER_TOOLTIPS_KEY, false);
if (layerTooltipsOn) {
setToolTipText(generateMinimalToolTipText(layerable));
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/AbstractCursorTool.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/AbstractCursorTool.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/AbstractCursorTool.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -296,7 +296,7 @@
}
protected boolean isRollingBackInvalidEdits() {
- return getWorkbench().getBlackboard().get(
+ return
PersistentBlackboardPlugIn.get(getWorkbench().getContext()).get(
EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false);
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/PolygonTool.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/PolygonTool.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/PolygonTool.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -41,6 +41,7 @@
import com.vividsolutions.jts.operation.valid.IsValidOp;
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.workbench.ui.EditTransaction;
+import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
public abstract class PolygonTool extends MultiClickTool {
public PolygonTool()
@@ -76,8 +77,7 @@
if (!isValidOp.isValid()) {
getPanel().getContext().warnUser(isValidOp.getValidationError().getMessage());
- if (getWorkbench()
- .getBlackboard()
+ if (PersistentBlackboardPlugIn.get(getWorkbench().getContext())
.get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY, false)) {
return false;
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/editing/DrawLineStringTool.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/editing/DrawLineStringTool.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/editing/DrawLineStringTool.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -48,6 +48,7 @@
import com.vividsolutions.jump.workbench.ui.LayerNamePanelProxy;
import com.vividsolutions.jump.workbench.ui.cursortool.*;
import com.vividsolutions.jump.workbench.ui.images.IconLoader;
+import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
import
com.vividsolutions.jump.workbench.ui.snap.SnapToLineStringBeingEditedPolicy;
import com.vividsolutions.jump.workbench.ui.snap.SnapToFeaturesPolicy;
import com.vividsolutions.jump.workbench.ui.snap.SnapToGridPolicy;
@@ -119,7 +120,8 @@
getPanel().getContext().warnUser(isValidOp.getValidationError()
.getMessage());
- if
(getWorkbench().getBlackboard().get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false)) {
+ if (PersistentBlackboardPlugIn.get(getWorkbench().getContext())
+ .get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false)) {
return false;
}
}
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/editing/FeatureDrawingUtil.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/editing/FeatureDrawingUtil.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/editing/FeatureDrawingUtil.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -73,6 +73,7 @@
import com.vividsolutions.jump.workbench.ui.cursortool.DelegatingTool;
import com.vividsolutions.jump.workbench.ui.images.IconLoader;
import com.vividsolutions.jump.workbench.ui.plugin.AddNewLayerPlugIn;
+import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
public class FeatureDrawingUtil {
protected List<Feature> featsToAdd;
@@ -180,8 +181,9 @@
public void execute() {
getLayer().getFeatureCollectionWrapper().add(feature);
- if
(layerViewPanel.getWorkBenchFrame().getContext().getWorkbench()
-
.getBlackboard().get(EditOptionsPanel.SELECT_NEW_GEOMETRY_KEY, false)) {
+ if (PersistentBlackboardPlugIn
+ .get(layerViewPanel.getWorkBenchFrame().getContext())
+ .get(EditOptionsPanel.SELECT_NEW_GEOMETRY_KEY, false)) {
//if (EditOptionsPanel.geometryCheck.isSelected()) {
featsToAdd = new ArrayList<Feature>();
featsToAdd.add(feature);
@@ -382,10 +384,8 @@
public void selectGeometry(LayerViewPanel panel, Geometry geom) {
SelectionManager selectionManager = panel.getSelectionManager();
- if (panel.getWorkBenchFrame()
- .getContext()
- .getWorkbench()
- .getBlackboard()
+ if (PersistentBlackboardPlugIn
+ .get(panel.getWorkBenchFrame().getContext())
.get(EditOptionsPanel.SELECT_NEW_GEOMETRY_KEY, false)) {
//if (EditOptionsPanel.geometryCheck.isSelected()) {
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/AddNewLayerPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/AddNewLayerPlugIn.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/AddNewLayerPlugIn.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -76,7 +76,8 @@
I18N.get("ui.plugin.AddNewLayerPlugIn.new"),
createBlankFeatureCollection());
layer.setFeatureCollectionModified(false);
- if
(context.getWorkbenchContext().getBlackboard().get(EditOptionsPanel.SINGLE_EDITABLE_LAYER_KEY,
false)) {
+ if (PersistentBlackboardPlugIn.get(context.getWorkbenchContext())
+ .get(EditOptionsPanel.SINGLE_EDITABLE_LAYER_KEY, false)) {
setAllLayersToUneditable(context);
}
layer.setEditable(true);
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/OptionsPlugIn.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/OptionsPlugIn.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/OptionsPlugIn.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -43,7 +43,6 @@
import com.vividsolutions.jump.workbench.ui.GUIUtil;
import com.vividsolutions.jump.workbench.ui.LayerViewPanelProxy;
import com.vividsolutions.jump.workbench.ui.OptionsDialog;
-import com.vividsolutions.jump.workbench.ui.OptionsPanel;
import com.vividsolutions.jump.workbench.ui.OptionsPanelV2;
import com.vividsolutions.jump.workbench.ui.SnapVerticesToolsOptionsPanel;
import com.vividsolutions.jump.workbench.ui.network.ProxySettingsOptionsPanel;
@@ -80,8 +79,7 @@
public void initialize(PlugInContext context) throws Exception {
dialog(context).addTab(
I18N.get("ui.plugin.OptionsPlugIn.view-edit"),
- new EditOptionsPanel(context.getWorkbenchContext().getWorkbench()
- .getBlackboard()));
+ new
EditOptionsPanel(PersistentBlackboardPlugIn.get(context.getWorkbenchContext())));
dialog(context).addTab(
I18N.get("ui.plugin.OptionsPlugIn.snap-vertices-tools"),
GUIUtil.resize(IconLoader.icon("QuickSnap.gif"), 16),
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/WKTPlugIn.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/WKTPlugIn.java
2016-10-13 07:07:59 UTC (rev 5074)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/WKTPlugIn.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -66,10 +66,7 @@
Feature f = (Feature) i.next();
IsValidOp op = new IsValidOp(f.getGeometry());
if (!op.isValid()) {
- if (context
- .getWorkbenchContext()
- .getWorkbench()
- .getBlackboard()
+ if
(PersistentBlackboardPlugIn.get(context.getWorkbenchContext())
.get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY, false)
) {
throw new
WorkbenchException(op.getValidationError().getMessage());
Modified: core/trunk/src/org/openjump/OpenJumpConfiguration.java
===================================================================
--- core/trunk/src/org/openjump/OpenJumpConfiguration.java 2016-10-13
07:07:59 UTC (rev 5074)
+++ core/trunk/src/org/openjump/OpenJumpConfiguration.java 2016-10-13
19:53:51 UTC (rev 5075)
@@ -110,7 +110,7 @@
**************************************************************************/
// -- disable drawing of invalid polygons by default (can be changed during
// work in EditOptionsPanel)
- workbenchContext.getBlackboard().put(
+ PersistentBlackboardPlugIn.get(workbenchContext).put(
EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY, true);
Modified: core/trunk/src/org/openjump/core/ui/plugin/AbstractUiPlugIn.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/AbstractUiPlugIn.java
2016-10-13 07:07:59 UTC (rev 5074)
+++ core/trunk/src/org/openjump/core/ui/plugin/AbstractUiPlugIn.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -6,7 +6,6 @@
import javax.swing.Icon;
import com.vividsolutions.jump.I18N;
-import com.vividsolutions.jump.util.StringUtil;
import com.vividsolutions.jump.workbench.JUMPWorkbench;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.model.LayerManager;
@@ -14,12 +13,12 @@
import com.vividsolutions.jump.workbench.plugin.AbstractPlugIn;
import com.vividsolutions.jump.workbench.plugin.EnableCheck;
import com.vividsolutions.jump.workbench.plugin.MultiEnableCheck;
-import com.vividsolutions.jump.workbench.plugin.PlugIn;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
import com.vividsolutions.jump.workbench.plugin.ThreadedPlugIn;
import com.vividsolutions.jump.workbench.ui.EditTransaction;
import com.vividsolutions.jump.workbench.ui.ErrorHandler;
import com.vividsolutions.jump.workbench.ui.WorkbenchFrame;
+import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
import com.vividsolutions.jump.workbench.ui.task.TaskMonitorManager;
/**
@@ -102,7 +101,7 @@
}
protected boolean isRollingBackInvalidEdits(PlugInContext context) {
- return context.getWorkbenchContext().getWorkbench().getBlackboard().get(
+ return PersistentBlackboardPlugIn.get(context.getWorkbenchContext()).get(
EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY, false);
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/ConstrainedPolygonTool.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/ConstrainedPolygonTool.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/ConstrainedPolygonTool.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -41,6 +41,7 @@
import com.vividsolutions.jts.geom.Polygon;
import com.vividsolutions.jts.operation.valid.IsValidOp;
import com.vividsolutions.jump.workbench.ui.EditTransaction;
+import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
public abstract class ConstrainedPolygonTool extends ConstrainedMultiClickTool
{
public ConstrainedPolygonTool()
@@ -75,8 +76,7 @@
if (!isValidOp.isValid()) {
getPanel().getContext().warnUser(isValidOp.getValidationError().getMessage());
- if (getWorkbench()
- .getBlackboard()
+ if (PersistentBlackboardPlugIn.get(getWorkbench().getContext())
.get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY, false)) {
return false;
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/CutFeaturesTool.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/CutFeaturesTool.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/CutFeaturesTool.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -10,13 +10,13 @@
import com.vividsolutions.jump.feature.FeatureUtil;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.model.Layer;
-import com.vividsolutions.jump.workbench.plugin.EnableCheckFactory;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
import com.vividsolutions.jump.workbench.ui.EditTransaction;
import com.vividsolutions.jump.workbench.ui.SelectionManager;
import com.vividsolutions.jump.workbench.ui.cursortool.CoordinateListMetrics;
import com.vividsolutions.jump.workbench.ui.cursortool.MultiClickTool;
import com.vividsolutions.jump.workbench.ui.images.IconLoader;
+import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
import java.awt.BasicStroke;
import java.awt.Color;
@@ -151,7 +151,7 @@
protected boolean isRollingBackInvalidEdits(WorkbenchContext context) {
return
-
context.getWorkbench().getBlackboard().get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false);
+
PersistentBlackboardPlugIn.get(context).get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false);
}
protected boolean checkLineString() throws NoninvertibleTransformException
{
@@ -170,7 +170,8 @@
isValidOp.getValidationError().getMessage());
- if
(getWorkbench().getBlackboard().get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false)) {
+ if (PersistentBlackboardPlugIn.get(getWorkbench().getContext())
+ .get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY, false)) {
return false;
}
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/CutPolygonTool.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/CutPolygonTool.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/CutPolygonTool.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -19,6 +19,7 @@
import com.vividsolutions.jump.workbench.ui.cursortool.CursorTool;
import com.vividsolutions.jump.workbench.ui.cursortool.PolygonTool;
import
com.vividsolutions.jump.workbench.ui.cursortool.editing.FeatureDrawingUtil;
+import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
import javax.swing.*;
import java.util.ArrayList;
@@ -134,7 +135,7 @@
}
protected boolean isRollingBackInvalidEdits(WorkbenchContext context) {
- return context.getWorkbench().getBlackboard()
+ return PersistentBlackboardPlugIn.get(context)
.get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY, false);
}
}
\ No newline at end of file
Modified:
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawCircleWithGivenRadiusTool.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawCircleWithGivenRadiusTool.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawCircleWithGivenRadiusTool.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -67,7 +67,7 @@
import com.vividsolutions.jump.workbench.ui.cursortool.CursorTool;
import com.vividsolutions.jump.workbench.ui.cursortool.NClickTool;
import
com.vividsolutions.jump.workbench.ui.cursortool.editing.FeatureDrawingUtil;
-//import org.openjump.core.ui.MultiInputDialogWithoutCancel;
+import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
public class DrawCircleWithGivenRadiusTool extends NClickTool{
@@ -152,7 +152,8 @@
getPanel().getContext().warnUser(isValidOp.getValidationError()
.getMessage());
- if
(getWorkbench().getBlackboard().get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false)) {
+ if (PersistentBlackboardPlugIn.get(getWorkbench().getContext())
+
.get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY, false)) {
return false;
}
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawConstrainedArcTool.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawConstrainedArcTool.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawConstrainedArcTool.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -39,6 +39,7 @@
import javax.swing.Icon;
import javax.swing.ImageIcon;
+import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
import org.openjump.core.geomutils.Arc;
import org.openjump.core.geomutils.MathVector;
@@ -125,7 +126,8 @@
getPanel().getContext().warnUser(isValidOp.getValidationError()
.getMessage());
- if
(getWorkbench().getBlackboard().get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false)) {
+ if (PersistentBlackboardPlugIn.get(getWorkbench().getContext())
+ .get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false)) {
return false;
}
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawConstrainedCircleTool.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawConstrainedCircleTool.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawConstrainedCircleTool.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -43,6 +43,7 @@
import javax.swing.Icon;
import javax.swing.ImageIcon;
+import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
import org.openjump.core.geomutils.Circle;
import com.vividsolutions.jts.geom.Coordinate;
@@ -174,7 +175,8 @@
getPanel().getContext().warnUser(isValidOp.getValidationError()
.getMessage());
- if
(getWorkbench().getBlackboard().get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false)) {
+ if (PersistentBlackboardPlugIn.get(getWorkbench().getContext())
+ .get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false)) {
return false;
}
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawConstrainedLineStringTool.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawConstrainedLineStringTool.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/DrawConstrainedLineStringTool.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -47,6 +47,7 @@
import com.vividsolutions.jump.workbench.ui.LayerNamePanelProxy;
import com.vividsolutions.jump.workbench.ui.cursortool.CursorTool;
import
com.vividsolutions.jump.workbench.ui.cursortool.editing.FeatureDrawingUtil;
+import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
public class DrawConstrainedLineStringTool extends ConstrainedMultiClickTool {
private FeatureDrawingUtil featureDrawingUtil;
@@ -103,7 +104,8 @@
getPanel().getContext().warnUser(isValidOp.getValidationError()
.getMessage());
- if
(getWorkbench().getBlackboard().get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false)) {
+ if (PersistentBlackboardPlugIn.get(getWorkbench().getContext())
+ .get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false)) {
return false;
}
}
Modified:
core/trunk/src/org/openjump/util/python/pythonexampleclasses/DrawCustomTool.java
===================================================================
---
core/trunk/src/org/openjump/util/python/pythonexampleclasses/DrawCustomTool.java
2016-10-13 07:07:59 UTC (rev 5074)
+++
core/trunk/src/org/openjump/util/python/pythonexampleclasses/DrawCustomTool.java
2016-10-13 19:53:51 UTC (rev 5075)
@@ -45,6 +45,7 @@
import javax.swing.ImageIcon;
import java.util.Iterator;
+import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
import org.python.core.Py;
import org.python.core.PyException;
import org.python.core.PyString;
@@ -280,7 +281,8 @@
if (!isValidOp.isValid())
{
getPanel().getContext().warnUser(isValidOp.getValidationError().getMessage());
- if
(getWorkbench().getBlackboard().get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY,
false))
+ if (PersistentBlackboardPlugIn.get(getWorkbench().getContext())
+
.get(EditTransaction.ROLLING_BACK_INVALID_EDITS_KEY, false))
{
return null;
}
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
