Revision: 6353
http://sourceforge.net/p/jump-pilot/code/6353
Author: ma15569
Date: 2020-07-16 10:58:28 +0000 (Thu, 16 Jul 2020)
Log Message:
-----------
Added option to open a feature InfoFrame when a feature is created.
Workaround to Feature request #245 "Create form to edit attribute values"
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/editing/FeatureDrawingUtil.java
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
2020-07-16 10:55:56 UTC (rev 6352)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/cursortool/editing/FeatureDrawingUtil.java
2020-07-16 10:58:28 UTC (rev 6353)
@@ -48,6 +48,8 @@
import java.util.Iterator;
import java.util.List;
+import javax.swing.JInternalFrame;
+
import com.vividsolutions.jts.geom.CoordinateList;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.GeometryCollection;
@@ -58,6 +60,7 @@
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.feature.Feature;
import com.vividsolutions.jump.feature.FeatureUtil;
+import com.vividsolutions.jump.workbench.JUMPWorkbench;
import com.vividsolutions.jump.workbench.model.Layer;
import com.vividsolutions.jump.workbench.model.StandardCategoryNames;
import com.vividsolutions.jump.workbench.model.UndoableCommand;
@@ -65,9 +68,13 @@
import com.vividsolutions.jump.workbench.ui.EditOptionsPanel;
import com.vividsolutions.jump.workbench.ui.EditTransaction;
import com.vividsolutions.jump.workbench.ui.GeometryEditor;
+import com.vividsolutions.jump.workbench.ui.InfoFrame;
import com.vividsolutions.jump.workbench.ui.LayerNamePanelProxy;
import com.vividsolutions.jump.workbench.ui.LayerViewPanel;
+import com.vividsolutions.jump.workbench.ui.OptionsPanel;
import com.vividsolutions.jump.workbench.ui.SelectionManager;
+import com.vividsolutions.jump.workbench.ui.TaskFrameProxy;
+import com.vividsolutions.jump.workbench.ui.WorkbenchFrame;
import com.vividsolutions.jump.workbench.ui.cursortool.AbstractCursorTool;
import com.vividsolutions.jump.workbench.ui.cursortool.CursorTool;
import com.vividsolutions.jump.workbench.ui.cursortool.DelegatingTool;
@@ -75,330 +82,363 @@
import com.vividsolutions.jump.workbench.ui.plugin.AddNewLayerPlugIn;
import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
+
+
public class FeatureDrawingUtil {
- protected List<Feature> featsToAdd;
+ protected List<Feature> featsToAdd;
- private Collection selectedFeaturesContaining(Polygon polygon,
- LayerViewPanel panel) {
- if (layerNamePanelProxy.getLayerNamePanel().chooseEditableLayer() ==
null) {
- return new ArrayList();
- }
- ArrayList selectedFeaturesContainingPolygon = new ArrayList();
- for (Iterator i = panel
- .getSelectionManager()
- .getFeaturesWithSelectedItems(
- layerNamePanelProxy.getLayerNamePanel()
- .chooseEditableLayer()).iterator();
i.hasNext();) {
- Feature feature = (Feature) i.next();
- // Unfortunately, GeometryCollection does not yet support either
- // #contains or (more importantly) #difference. [Jon Aquino]
- // Use == rather than instanceof because MultiPoint,
MultiLineString
- // and
- // MultiPolygon do not have this problem. [Jon Aquino]
- if (feature.getGeometry().getClass() == GeometryCollection.class) {
- continue;
- }
- if (!feature.getGeometry().getEnvelopeInternal()
- .contains(polygon.getEnvelopeInternal())) {
- continue;
- }
- if (feature.getGeometry().contains(polygon)) {
- selectedFeaturesContainingPolygon.add(feature);
- }
- }
- return selectedFeaturesContainingPolygon;
- }
+ private Collection selectedFeaturesContaining(Polygon polygon,
+ LayerViewPanel panel) {
+ if
(layerNamePanelProxy.getLayerNamePanel().chooseEditableLayer() == null) {
+ return new ArrayList();
+ }
+ ArrayList selectedFeaturesContainingPolygon = new ArrayList();
+ for (Iterator i = panel
+ .getSelectionManager()
+ .getFeaturesWithSelectedItems(
+
layerNamePanelProxy.getLayerNamePanel()
+
.chooseEditableLayer()).iterator(); i.hasNext();) {
+ Feature feature = (Feature) i.next();
+ // Unfortunately, GeometryCollection does not yet
support either
+ // #contains or (more importantly) #difference. [Jon
Aquino]
+ // Use == rather than instanceof because MultiPoint,
MultiLineString
+ // and
+ // MultiPolygon do not have this problem. [Jon Aquino]
+ if (feature.getGeometry().getClass() ==
GeometryCollection.class) {
+ continue;
+ }
+ if (!feature.getGeometry().getEnvelopeInternal()
+
.contains(polygon.getEnvelopeInternal())) {
+ continue;
+ }
+ if (feature.getGeometry().contains(polygon)) {
+ selectedFeaturesContainingPolygon.add(feature);
+ }
+ }
+ return selectedFeaturesContainingPolygon;
+ }
- private void createHole(Polygon hole, Collection features, Layer layer,
- LayerViewPanel panel, boolean rollingBackInvalidEdits,
- String transactionName) {
- Assert.isTrue(hole.getNumInteriorRing() == 0);
- EditTransaction transaction = new EditTransaction(features,
- transactionName, layer, rollingBackInvalidEdits, false, panel);
- // for (int i = 0; i < transaction.size(); i++) {
- // transaction.setGeometry(i,
- // transaction.getGeometry(i).difference(hole));
- // }
- for (Iterator<Feature> i = transaction.getFeatures().iterator(); i
- .hasNext();) {
- Feature f = i.next();
- transaction.setGeometry(f,
- transaction.getGeometry(f).difference(hole));
- }
- transaction.commit();
- }
+ private void createHole(Polygon hole, Collection features, Layer layer,
+ LayerViewPanel panel, boolean rollingBackInvalidEdits,
+ String transactionName) {
+ Assert.isTrue(hole.getNumInteriorRing() == 0);
+ EditTransaction transaction = new EditTransaction(features,
+ transactionName, layer,
rollingBackInvalidEdits, false, panel);
+ // for (int i = 0; i < transaction.size(); i++) {
+ // transaction.setGeometry(i,
+ // transaction.getGeometry(i).difference(hole));
+ // }
+ for (Iterator<Feature> i =
transaction.getFeatures().iterator(); i
+ .hasNext();) {
+ Feature f = i.next();
+ transaction.setGeometry(f,
+
transaction.getGeometry(f).difference(hole));
+ }
+ transaction.commit();
+ }
- private LayerNamePanelProxy layerNamePanelProxy;
+ private LayerNamePanelProxy layerNamePanelProxy;
- public FeatureDrawingUtil(LayerNamePanelProxy layerNamePanelProxy) {
- this.layerNamePanelProxy = layerNamePanelProxy;
- }
+ public FeatureDrawingUtil(LayerNamePanelProxy layerNamePanelProxy) {
+ this.layerNamePanelProxy = layerNamePanelProxy;
+ }
- private Layer layer(LayerViewPanel layerViewPanel) {
- if (layerNamePanelProxy.getLayerNamePanel().chooseEditableLayer() ==
null) {
- Layer layer = layerViewPanel.getLayerManager().addLayer(
- StandardCategoryNames.WORKING,
- I18N.get("ui.cursortool.editing.FeatureDrawingUtil.new"),
- AddNewLayerPlugIn.createBlankFeatureCollection());
- layer.setEditable(true);
- layerViewPanel
- .getContext()
- .warnUser(
-
I18N.get("ui.cursortool.editing.FeatureDrawingUtil.no-layer-is-editable-creating-new-editable-layer"));
- }
- return layerNamePanelProxy.getLayerNamePanel().chooseEditableLayer();
- }
+ private Layer layer(LayerViewPanel layerViewPanel) {
+ if
(layerNamePanelProxy.getLayerNamePanel().chooseEditableLayer() == null) {
+ Layer layer = layerViewPanel.getLayerManager().addLayer(
+ StandardCategoryNames.WORKING,
+
I18N.get("ui.cursortool.editing.FeatureDrawingUtil.new"),
+
AddNewLayerPlugIn.createBlankFeatureCollection());
+ layer.setEditable(true);
+ layerViewPanel
+ .getContext()
+ .warnUser(
+
I18N.get("ui.cursortool.editing.FeatureDrawingUtil.no-layer-is-editable-creating-new-editable-layer"));
+ }
+ return
layerNamePanelProxy.getLayerNamePanel().chooseEditableLayer();
+ }
- /**
- * The calling CursorTool should call #preserveUndoHistory; otherwise the
- * undo history will be (unnecessarily) truncated if a problem occurs.
- *
- * @return null if the geometry is invalid
- */
- public UndoableCommand createAddCommand(final Geometry geometry,
- boolean rollingBackInvalidEdits,
- final LayerViewPanel layerViewPanel, AbstractCursorTool tool) {
- if (rollingBackInvalidEdits && !geometry.isValid()) {
- layerViewPanel
- .getContext()
- .warnUser(
-
I18N.get("ui.cursortool.editing.FeatureDrawingUtil.draw-feature-tool-topology-error"));
- return null;
- }
- // Don't want viewport to change at this stage. [Jon Aquino]
- layerViewPanel.setViewportInitialized(true);
- final Layer layer = layer(layerViewPanel);
- final Feature feature = FeatureUtil.toFeature(editor
- .removeRepeatedPoints(geometry), layer
- .getFeatureCollectionWrapper().getFeatureSchema());
+ /**
+ * The calling CursorTool should call #preserveUndoHistory; otherwise
the
+ * undo history will be (unnecessarily) truncated if a problem occurs.
+ *
+ * @return null if the geometry is invalid
+ */
+ public UndoableCommand createAddCommand(final Geometry geometry,
+ boolean rollingBackInvalidEdits,
+ final LayerViewPanel layerViewPanel, AbstractCursorTool
tool) {
+ if (rollingBackInvalidEdits && !geometry.isValid()) {
+ layerViewPanel
+ .getContext()
+ .warnUser(
+
I18N.get("ui.cursortool.editing.FeatureDrawingUtil.draw-feature-tool-topology-error"));
+ return null;
+ }
+ // Don't want viewport to change at this stage. [Jon Aquino]
+ layerViewPanel.setViewportInitialized(true);
+ final Layer layer = layer(layerViewPanel);
+ final Feature feature = FeatureUtil.toFeature(editor
+ .removeRepeatedPoints(geometry), layer
+
.getFeatureCollectionWrapper().getFeatureSchema());
- // selectGeometry(layerViewPanel, geometry);
-
- featsToAdd = new ArrayList<Feature>();
- featsToAdd.add(feature);
-
- return new UndoableCommand(tool.getName(), layer) {
- public void execute() {
- getLayer().getFeatureCollectionWrapper().add(feature);
+ // selectGeometry(layerViewPanel, geometry);
- if (PersistentBlackboardPlugIn
- .get(layerViewPanel.getWorkBenchFrame().getContext())
- .get(EditOptionsPanel.SELECT_NEW_GEOMETRY_KEY, false)) {
- //if (EditOptionsPanel.geometryCheck.isSelected()) {
- featsToAdd = new ArrayList<Feature>();
- featsToAdd.add(feature);
- SelectionManager selectionManager = layerViewPanel
- .getSelectionManager();
- selectionManager.clear();
- selectionManager.getFeatureSelection().selectItems(
- layer(layerViewPanel), featsToAdd);
- }
- }
+ featsToAdd = new ArrayList<Feature>();
+ featsToAdd.add(feature);
- public void unexecute() {
- getLayer().getFeatureCollectionWrapper().remove(feature);
- }
- };
+ return new UndoableCommand(tool.getName(), layer) {
+ @Override
+ public void execute() {
+
getLayer().getFeatureCollectionWrapper().add(feature);
+ SelectionManager selectionManager =
layerViewPanel
+ .getSelectionManager();
+ if (PersistentBlackboardPlugIn
+
.get(layerViewPanel.getWorkBenchFrame().getContext())
+
.get(EditOptionsPanel.SELECT_NEW_GEOMETRY_KEY, false)) {
+ //if
(EditOptionsPanel.geometryCheck.isSelected()) {
+ featsToAdd = new ArrayList<Feature>();
+ featsToAdd.add(feature);
- }
+ selectionManager.clear();
+
selectionManager.getFeatureSelection().selectItems(
+ layer(layerViewPanel),
featsToAdd);
+ if(PersistentBlackboardPlugIn
+
.get(layerViewPanel.getWorkBenchFrame().getContext())
+
.get(EditOptionsPanel.SELECT_INFO_GEOMETRY_KEY, false)) {
+ WorkbenchFrame wFrame =
JUMPWorkbench.getInstance().getFrame();
+ for (JInternalFrame iFrame :
wFrame
+
.getInternalFrames()) {
+ if (iFrame instanceof
InfoFrame) {
+ ((InfoFrame)
iFrame).getModel().remove(layer(layerViewPanel));
+ ((InfoFrame)
iFrame).getModel().add(
+
layer(layerViewPanel),
+
selectionManager.getFeaturesWithSelectedItems(
+
layer(layerViewPanel)));
+ ((InfoFrame)
iFrame).toFront();
+ return;
- private GeometryEditor editor = new GeometryEditor();
+ }
+ }
+ InfoFrame infoFrame =
+ new InfoFrame(
+
wFrame.getContext(),
+
wFrame.getActiveTaskFrame(),
+
((TaskFrameProxy) wFrame.getActiveTaskFrame()).getTaskFrame());
+ infoFrame.setSize(500, 300);
+ infoFrame.getModel().add(
+
layer(layerViewPanel),
+
selectionManager.getFeaturesWithSelectedItems(
+
layer(layerViewPanel)));
+
wFrame.addInternalFrame(infoFrame);
+ }
+ }
+ }
+ @Override
+ public void unexecute() {
+
getLayer().getFeatureCollectionWrapper().remove(feature);
+ }
+ };
+ }
- /**
- * Apply settings common to all feature-drawing tools.
- */
- public CursorTool prepare(final AbstractCursorTool drawFeatureTool,
- boolean allowSnapping) {
- drawFeatureTool.setColor(Color.red);
- if (allowSnapping) {
- drawFeatureTool.allowSnapping();
- }
- return new DelegatingTool(drawFeatureTool) {
- public String getName() {
- return drawFeatureTool.getName();
- }
+ private GeometryEditor editor = new GeometryEditor();
- public Cursor getCursor() {
- if (Toolkit.getDefaultToolkit().getBestCursorSize(32, 32)
- .equals(new Dimension(0, 0))) {
- return Cursor.getDefaultCursor();
- }
- return Toolkit.getDefaultToolkit().createCustomCursor(
- IconLoader.icon("Pen.gif").getImage(),
- new java.awt.Point(1, 31), drawFeatureTool.getName());
- }
- };
- }
+ /**
+ * Apply settings common to all feature-drawing tools.createAddCommand
+ */
+ public CursorTool prepare(final AbstractCursorTool drawFeatureTool,
+ boolean allowSnapping) {
+ drawFeatureTool.setColor(Color.red);
+ if (allowSnapping) {
+ drawFeatureTool.allowSnapping();
+ }
+ return new DelegatingTool(drawFeatureTool) {
+ @Override
+ public String getName() {
+ return drawFeatureTool.getName();
+ }
- public void drawRing(Polygon polygon, boolean rollingBackInvalidEdits,
- AbstractCursorTool tool, LayerViewPanel panel) {
- Collection selectedFeaturesContainingPolygon =
selectedFeaturesContaining(
- polygon, panel);
- if (selectedFeaturesContainingPolygon.isEmpty()) {
- UndoableCommand cmd = createAddCommand(polygon,
- rollingBackInvalidEdits, panel, tool);
- // createAddCommand() might return null on errors [ede]
- if (cmd instanceof UndoableCommand)
- AbstractPlugIn.execute(cmd, panel);
- } else {
- createHole(polygon, selectedFeaturesContainingPolygon,
- layer(panel), panel, rollingBackInvalidEdits,
- tool.getName());
- }
+ @Override
+ public Cursor getCursor() {
+ if
(Toolkit.getDefaultToolkit().getBestCursorSize(32, 32)
+ .equals(new Dimension(0, 0))) {
+ return Cursor.getDefaultCursor();
+ }
+ return
Toolkit.getDefaultToolkit().createCustomCursor(
+
IconLoader.icon("Pen.gif").getImage(),
+ new java.awt.Point(1, 31),
drawFeatureTool.getName());
+ }
+ };
+ }
- }
+ public void drawRing(Polygon polygon, boolean rollingBackInvalidEdits,
+ AbstractCursorTool tool, LayerViewPanel panel) {
+ Collection selectedFeaturesContainingPolygon =
selectedFeaturesContaining(
+ polygon, panel);
+ if (selectedFeaturesContainingPolygon.isEmpty()) {
+ UndoableCommand cmd = createAddCommand(polygon,
+ rollingBackInvalidEdits, panel, tool);
+ // createAddCommand() might return null on errors [ede]
+ if (cmd instanceof UndoableCommand)
+ AbstractPlugIn.execute(cmd, panel);
+ } else {
+ createHole(polygon, selectedFeaturesContainingPolygon,
+ layer(panel), panel,
rollingBackInvalidEdits,
+ tool.getName());
+ }
- private Collection selectedFeaturesMatchingEndPoint(LineString lineString,
- LayerViewPanel panel) {
- if (layerNamePanelProxy.getLayerNamePanel().chooseEditableLayer() ==
null) {
- return new ArrayList();
- }
- ArrayList selectedFeaturesMatchingEndPoints = new ArrayList();
- for (Iterator i = panel
- .getSelectionManager()
- .getFeaturesWithSelectedItems(
- layerNamePanelProxy.getLayerNamePanel()
- .chooseEditableLayer()).iterator();
i.hasNext();) {
- Feature feature = (Feature) i.next();
- if (!(feature.getGeometry() instanceof LineString)) {
- continue;
- }
- LineString lineGeom = ((LineString) feature.getGeometry());
- if (!(lineGeom.getCoordinate().equals(lineString.getCoordinate())
// 1=1
- || lineGeom.getCoordinate()
- .equals(lineString.getCoordinateN(lineString
- .getNumPoints() - 1)) // 1=n
- || lineGeom.getCoordinateN(lineGeom.getNumPoints() - 1)
- .equals(lineString.getCoordinate()) // m=1
- || lineGeom.getCoordinateN(lineGeom.getNumPoints() - 1).equals(
- lineString.getCoordinateN(lineString.getNumPoints() -
1)))) // m=n
- continue;
- selectedFeaturesMatchingEndPoints.add(feature);
- }
- return selectedFeaturesMatchingEndPoints;
- }
+ }
- /**
- * @param lineString
- * to reverse
- * @return new LineString made from old LineString's points in reverse
order
- */
- public LineString reverse(LineString lineString) {
- CoordinateList coordList = new CoordinateList(
- lineString.getCoordinates());
- Collections.reverse(coordList);
- return new GeometryFactory().createLineString(coordList
- .toCoordinateArray());
- }
+ private Collection selectedFeaturesMatchingEndPoint(LineString
lineString,
+ LayerViewPanel panel) {
+ if
(layerNamePanelProxy.getLayerNamePanel().chooseEditableLayer() == null) {
+ return new ArrayList();
+ }
+ ArrayList selectedFeaturesMatchingEndPoints = new ArrayList();
+ for (Iterator i = panel
+ .getSelectionManager()
+ .getFeaturesWithSelectedItems(
+
layerNamePanelProxy.getLayerNamePanel()
+
.chooseEditableLayer()).iterator(); i.hasNext();) {
+ Feature feature = (Feature) i.next();
+ if (!(feature.getGeometry() instanceof LineString)) {
+ continue;
+ }
+ LineString lineGeom = ((LineString)
feature.getGeometry());
+ if
(!(lineGeom.getCoordinate().equals(lineString.getCoordinate()) // 1=1
+ || lineGeom.getCoordinate()
+
.equals(lineString.getCoordinateN(lineString
+ .getNumPoints() - 1))
// 1=n
+ ||
lineGeom.getCoordinateN(lineGeom.getNumPoints() - 1)
+ .equals(lineString.getCoordinate()) //
m=1
+ ||
lineGeom.getCoordinateN(lineGeom.getNumPoints() - 1).equals(
+
lineString.getCoordinateN(lineString.getNumPoints() - 1)))) // m=n
+ continue;
+ selectedFeaturesMatchingEndPoints.add(feature);
+ }
+ return selectedFeaturesMatchingEndPoints;
+ }
- /**
- * @param ls1
- * first LineString to concatenate
- * @param ls2
- * second LineString to concatenate
- * @return new LineString made of (first - last point) + second
- */
- public LineString concatLineStrings(LineString ls1, LineString ls2) {
- CoordinateList coordList1 = new CoordinateList(ls1.getCoordinates());
- CoordinateList coordList2 = new CoordinateList(ls2.getCoordinates());
- coordList1.remove(coordList1.size() - 1);
- coordList1.addAll(coordList2);
- return new GeometryFactory().createLineString(coordList1
- .toCoordinateArray());
- }
+ /**
+ * @param lineString
+ * to reverse
+ * @return new LineString made from old LineString's points in reverse
order
+ */
+ public LineString reverse(LineString lineString) {
+ CoordinateList coordList = new CoordinateList(
+ lineString.getCoordinates());
+ Collections.reverse(coordList);
+ return new GeometryFactory().createLineString(coordList
+ .toCoordinateArray());
+ }
- /**
- * @param ls1
- * first LineString to merge
- * @param ls2
- * second LineString to merge
- * @return merged LineString if end point in common, otherwise return
second
- * LineString
- */
- public LineString mergeLineStrings(LineString ls1, LineString ls2) {
- if (ls1.getCoordinateN(ls1.getNumPoints() - 1).equals(
- ls2.getCoordinate())) {
- return concatLineStrings(ls1, ls2);
- } else if (ls1.getCoordinateN(ls1.getNumPoints() - 1).equals(
- ls2.getCoordinateN(ls2.getNumPoints() - 1))) {
- return concatLineStrings(ls1, reverse(ls2));
- } else if (ls1.getCoordinate().equals(ls2.getCoordinate())) {
- return concatLineStrings(reverse(ls2), ls1);
- } else if (ls1.getCoordinate().equals(
- ls2.getCoordinateN(ls2.getNumPoints() - 1))) {
- return concatLineStrings(ls2, ls1);
- } else {
- return ls2;
- }
+ /**
+ * @param ls1
+ * first LineString to concatenate
+ * @param ls2
+ * second LineString to concatenate
+ * @return new LineString made of (first - last point) + second
+ */
+ public LineString concatLineStrings(LineString ls1, LineString ls2) {
+ CoordinateList coordList1 = new
CoordinateList(ls1.getCoordinates());
+ CoordinateList coordList2 = new
CoordinateList(ls2.getCoordinates());
+ coordList1.remove(coordList1.size() - 1);
+ coordList1.addAll(coordList2);
+ return new GeometryFactory().createLineString(coordList1
+ .toCoordinateArray());
+ }
- }
+ /**
+ * @param ls1
+ * first LineString to merge
+ * @param ls2
+ * second LineString to merge
+ * @return merged LineString if end point in common, otherwise return
second
+ * LineString
+ */
+ public LineString mergeLineStrings(LineString ls1, LineString ls2) {
+ if (ls1.getCoordinateN(ls1.getNumPoints() - 1).equals(
+ ls2.getCoordinate())) {
+ return concatLineStrings(ls1, ls2);
+ } else if (ls1.getCoordinateN(ls1.getNumPoints() - 1).equals(
+ ls2.getCoordinateN(ls2.getNumPoints() - 1))) {
+ return concatLineStrings(ls1, reverse(ls2));
+ } else if (ls1.getCoordinate().equals(ls2.getCoordinate())) {
+ return concatLineStrings(reverse(ls2), ls1);
+ } else if (ls1.getCoordinate().equals(
+ ls2.getCoordinateN(ls2.getNumPoints() - 1))) {
+ return concatLineStrings(ls2, ls1);
+ } else {
+ return ls2;
+ }
- /**
- * Implement the special check for adding to the end of a selected
- * LineString
- *
- * @param newLineString
- * LineString to create or add to selected
- * @param rollingBackInvalidEdits
- * @param tool
- * AbstractCursorTool - the current cursor tool
- * @param panel
- * LayerViewPanel
- */
- public void drawLineString(LineString newLineString,
- boolean rollingBackInvalidEdits, AbstractCursorTool tool,
- LayerViewPanel panel) {
- Collection matchingLineStringFeatures =
selectedFeaturesMatchingEndPoint(
- newLineString, panel);
- if (matchingLineStringFeatures.size() == 0) {
- AbstractPlugIn.execute(
- createAddCommand(newLineString, rollingBackInvalidEdits,
- panel, tool), panel);
- } else {
- LineString oldLineString = null;
- Iterator iter = matchingLineStringFeatures.iterator();
- EditTransaction transaction = new EditTransaction(
- matchingLineStringFeatures, tool.getName(), layer(panel),
- rollingBackInvalidEdits, true, panel);
- // Geometry empty = new GeometryFactory().createLineString(new
- // Coordinate[0]);
- // for (int i = 0; i < transaction.size(); i++) {
- int count = 0;
- for (Iterator<Feature> i = transaction.getFeatures().iterator(); i
- .hasNext();) {
- Feature feature = i.next();
- oldLineString = (LineString) ((Feature) iter.next())
- .getGeometry();
- newLineString = mergeLineStrings(oldLineString, newLineString);
- if (count > 0)
- transaction
- .setGeometry(feature, transaction.EMPTY_GEOMETRY);
- count++;
- }
- transaction.setGeometry(
- transaction.getFeatures().iterator().next(),
newLineString);
- transaction.commit();
- }
+ }
- }
+ /**
+ * Implement the special check for adding to the end of a selected
+ * LineString
+ *
+ * @param newLineString
+ * LineString to create or add to selected
+ * @param rollingBackInvalidEdits
+ * @param tool
+ * AbstractCursorTool - the current cursor tool
+ * @param panel
+ * LayerViewPanel
+ */
+ public void drawLineString(LineString newLineString,
+ boolean rollingBackInvalidEdits, AbstractCursorTool
tool,
+ LayerViewPanel panel) {
+ Collection matchingLineStringFeatures =
selectedFeaturesMatchingEndPoint(
+ newLineString, panel);
+ if (matchingLineStringFeatures.size() == 0) {
+ AbstractPlugIn.execute(
+ createAddCommand(newLineString,
rollingBackInvalidEdits,
+ panel, tool), panel);
+ } else {
+ LineString oldLineString = null;
+ Iterator iter = matchingLineStringFeatures.iterator();
+ EditTransaction transaction = new EditTransaction(
+ matchingLineStringFeatures,
tool.getName(), layer(panel),
+ rollingBackInvalidEdits, true, panel);
+ // Geometry empty = new
GeometryFactory().createLineString(new
+ // Coordinate[0]);
+ // for (int i = 0; i < transaction.size(); i++) {
+ int count = 0;
+ for (Iterator<Feature> i =
transaction.getFeatures().iterator(); i
+ .hasNext();) {
+ Feature feature = i.next();
+ oldLineString = (LineString) ((Feature)
iter.next())
+ .getGeometry();
+ newLineString = mergeLineStrings(oldLineString,
newLineString);
+ if (count > 0)
+ transaction
+ .setGeometry(feature,
transaction.EMPTY_GEOMETRY);
+ count++;
+ }
+ transaction.setGeometry(
+
transaction.getFeatures().iterator().next(), newLineString);
+ transaction.commit();
+ }
- public void selectGeometry(LayerViewPanel panel, Geometry geom) {
- SelectionManager selectionManager = panel.getSelectionManager();
- if (PersistentBlackboardPlugIn
- .get(panel.getWorkBenchFrame().getContext())
- .get(EditOptionsPanel.SELECT_NEW_GEOMETRY_KEY, false)) {
- //if (EditOptionsPanel.geometryCheck.isSelected()) {
+ }
- this.featsToAdd = new ArrayList();
- this.featsToAdd.add(FeatureUtil.toFeature(geom, layer(panel)
- .getFeatureCollectionWrapper().getFeatureSchema()));
- selectionManager.getFeatureSelection().unselectItems();
- selectionManager.getFeatureSelection().selectItems(layer(panel),
- this.featsToAdd);
- }
- /*
- * else { selectionManager.getFeatureSelection().unselectItems(); }
- */
- }
+ public void selectGeometry(LayerViewPanel panel, Geometry geom) {
+ SelectionManager selectionManager = panel.getSelectionManager();
+ if (PersistentBlackboardPlugIn
+ .get(panel.getWorkBenchFrame().getContext())
+ .get(EditOptionsPanel.SELECT_NEW_GEOMETRY_KEY,
false)) {
+ //if (EditOptionsPanel.geometryCheck.isSelected()) {
+ this.featsToAdd = new ArrayList();
+ this.featsToAdd.add(FeatureUtil.toFeature(geom,
layer(panel)
+
.getFeatureCollectionWrapper().getFeatureSchema()));
+ selectionManager.getFeatureSelection().unselectItems();
+
selectionManager.getFeatureSelection().selectItems(layer(panel),
+ this.featsToAdd);
+ }
+ /*
+ * else {
selectionManager.getFeatureSelection().unselectItems(); }
+ */
+ }
+
}
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
