Revision: 4582
http://sourceforge.net/p/jump-pilot/code/4582
Author: michaudm
Date: 2015-12-07 21:41:57 +0000 (Mon, 07 Dec 2015)
Log Message:
-----------
Improvement of CutFeaturesTool
Modified Paths:
--------------
core/trunk/src/language/jump.properties
core/trunk/src/language/jump_cz.properties
core/trunk/src/language/jump_de.properties
core/trunk/src/language/jump_es.properties
core/trunk/src/language/jump_fi.properties
core/trunk/src/language/jump_fr.properties
core/trunk/src/language/jump_hu.properties
core/trunk/src/language/jump_it.properties
core/trunk/src/language/jump_ja_JP.properties
core/trunk/src/language/jump_ml.properties
core/trunk/src/language/jump_pt.properties
core/trunk/src/language/jump_pt_BR.properties
core/trunk/src/language/jump_ta_IN.properties
core/trunk/src/language/jump_te.properties
core/trunk/src/language/jump_zh_CN.properties
core/trunk/src/language/jump_zh_HK.properties
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/CutFeaturesTool.java
Modified: core/trunk/src/language/jump.properties
===================================================================
--- core/trunk/src/language/jump.properties 2015-12-07 21:25:19 UTC (rev
4581)
+++ core/trunk/src/language/jump.properties 2015-12-07 21:41:57 UTC (rev
4582)
@@ -2587,4 +2587,5 @@
org.openjump.core.ui.plugin.wms.WMSLegendPlugIn.message=Error or no legend
associated to selected layer
org.openjump.core.ui.plugin.mousemenu.MeasureSelectedFeaturePlugIn.name=Measure
selected feature
org.openjump.core.ui.plugin.mousemenu.MeasureSelectedFeaturePlugIn.message1=not
supported for this type of operation
-org.openjump.core.ui.plugin.tools.CutFeaturesTool = Cut polygons or linestrings
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.CutFeaturesTool = Cut polygons or linestrings
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut
= GeometryCollections have not been cut
\ No newline at end of file
Modified: core/trunk/src/language/jump_cz.properties
===================================================================
--- core/trunk/src/language/jump_cz.properties 2015-12-07 21:25:19 UTC (rev
4581)
+++ core/trunk/src/language/jump_cz.properties 2015-12-07 21:41:57 UTC (rev
4582)
@@ -2571,4 +2571,5 @@
Select options to decompose multi-geometries into several features or to
eliminate degenerate parts (parts with a lower dimension than original
geometry).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=\#T\:Explode
multi-geometries
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=\#T\:valid
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
\ No newline at end of file
Modified: core/trunk/src/language/jump_de.properties
===================================================================
--- core/trunk/src/language/jump_de.properties 2015-12-07 21:25:19 UTC (rev
4581)
+++ core/trunk/src/language/jump_de.properties 2015-12-07 21:41:57 UTC (rev
4582)
@@ -2567,4 +2567,5 @@
Select options to decompose multi-geometries into several features or to
eliminate degenerate parts (parts with a lower dimension than original
geometry).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=\#T\:Explode
multi-geometries
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=\#T\:valid
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
\ No newline at end of file
Modified: core/trunk/src/language/jump_es.properties
===================================================================
--- core/trunk/src/language/jump_es.properties 2015-12-07 21:25:19 UTC (rev
4581)
+++ core/trunk/src/language/jump_es.properties 2015-12-07 21:41:57 UTC (rev
4582)
@@ -2547,4 +2547,5 @@
Seleccionar opciones para descomponer m\xFAltiples geometr\xEDas en varios
elementos o eliminar partes degeneradas (partes con una dimensi\xF3n inferior a
la geometr\xEDa original).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=Descomponer
multi-geometr\xEDa
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=valido
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=Remover
las partes degeneradas
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=Remover
las partes degeneradas
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
\ No newline at end of file
Modified: core/trunk/src/language/jump_fi.properties
===================================================================
--- core/trunk/src/language/jump_fi.properties 2015-12-07 21:25:19 UTC (rev
4581)
+++ core/trunk/src/language/jump_fi.properties 2015-12-07 21:41:57 UTC (rev
4582)
@@ -2546,4 +2546,5 @@
Select options to decompose multi-geometries into several features or to
eliminate degenerate parts (parts with a lower dimension than original
geometry).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=\#T\:Explode
multi-geometries
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=\#T\:valid
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
\ No newline at end of file
Modified: core/trunk/src/language/jump_fr.properties
===================================================================
--- core/trunk/src/language/jump_fr.properties 2015-12-07 21:25:19 UTC (rev
4581)
+++ core/trunk/src/language/jump_fr.properties 2015-12-07 21:41:57 UTC (rev
4582)
@@ -2573,4 +2573,5 @@
Utiliser les options pour d\xE9composer les multi-geom\xE9tries r\xE9sultantes
en plusieurs objets ou pour \xE9liminer les parties d\xE9g\xE9n\xE9r\xE9es (de
dimension inf\xE9rieure \xE0 la g\xE9om\xE9rie originale).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=D\xE9composer
les multi-g\xE9om\xE9tries
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=valide
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=Supprimer
les parties d\xE9g\xE9n\xE9r\xE9es
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=Supprimer
les parties d\xE9g\xE9n\xE9r\xE9es
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=Les
GeometryCollection n'ont pas \xE9t\xE9 d\xE9coup\xE9es
\ No newline at end of file
Modified: core/trunk/src/language/jump_hu.properties
===================================================================
--- core/trunk/src/language/jump_hu.properties 2015-12-07 21:25:19 UTC (rev
4581)
+++ core/trunk/src/language/jump_hu.properties 2015-12-07 21:41:57 UTC (rev
4582)
@@ -2566,4 +2566,5 @@
Select options to decompose multi-geometries into several features or to
eliminate degenerate parts (parts with a lower dimension than original
geometry).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=\#T\:Explode
multi-geometries
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=\#T\:valid
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
\ No newline at end of file
Modified: core/trunk/src/language/jump_it.properties
===================================================================
--- core/trunk/src/language/jump_it.properties 2015-12-07 21:25:19 UTC (rev
4581)
+++ core/trunk/src/language/jump_it.properties 2015-12-07 21:41:57 UTC (rev
4582)
@@ -2547,4 +2547,5 @@
Seleziona le opzioni per decomporre multi-geometrie in differenti elementi o
eliminare parti degenerate (parti con dimensioni minori rispetto alla geometria
originale).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=Esplodi
multi-geometrie
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=valido
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=Rimuovi
parti degenerate
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=Rimuovi
parti degenerate
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
\ No newline at end of file
Modified: core/trunk/src/language/jump_ja_JP.properties
===================================================================
--- core/trunk/src/language/jump_ja_JP.properties 2015-12-07 21:25:19 UTC
(rev 4581)
+++ core/trunk/src/language/jump_ja_JP.properties 2015-12-07 21:41:57 UTC
(rev 4582)
@@ -2567,4 +2567,5 @@
Select options to decompose multi-geometries into several features or to
eliminate degenerate parts (parts with a lower dimension than original
geometry).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=\#T\:Explode
multi-geometries
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=\#T\:valid
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
\ No newline at end of file
Modified: core/trunk/src/language/jump_ml.properties
===================================================================
--- core/trunk/src/language/jump_ml.properties 2015-12-07 21:25:19 UTC (rev
4581)
+++ core/trunk/src/language/jump_ml.properties 2015-12-07 21:41:57 UTC (rev
4582)
@@ -3838,4 +3838,5 @@
Select options to decompose multi-geometries into several features or to
eliminate degenerate parts (parts with a lower dimension than original
geometry).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=\#T\:Explode
multi-geometries
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=\#T\:valid
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
\ No newline at end of file
Modified: core/trunk/src/language/jump_pt.properties
===================================================================
--- core/trunk/src/language/jump_pt.properties 2015-12-07 21:25:19 UTC (rev
4581)
+++ core/trunk/src/language/jump_pt.properties 2015-12-07 21:41:57 UTC (rev
4582)
@@ -2564,4 +2564,5 @@
Select options to decompose multi-geometries into several features or to
eliminate degenerate parts (parts with a lower dimension than original
geometry).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=\#T\:Explode
multi-geometries
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=\#T\:valid
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
\ No newline at end of file
Modified: core/trunk/src/language/jump_pt_BR.properties
===================================================================
--- core/trunk/src/language/jump_pt_BR.properties 2015-12-07 21:25:19 UTC
(rev 4581)
+++ core/trunk/src/language/jump_pt_BR.properties 2015-12-07 21:41:57 UTC
(rev 4582)
@@ -2564,4 +2564,5 @@
Select options to decompose multi-geometries into several features or to
eliminate degenerate parts (parts with a lower dimension than original
geometry).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=\#T\:Explode
multi-geometries
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=\#T\:valid
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
\ No newline at end of file
Modified: core/trunk/src/language/jump_ta_IN.properties
===================================================================
--- core/trunk/src/language/jump_ta_IN.properties 2015-12-07 21:25:19 UTC
(rev 4581)
+++ core/trunk/src/language/jump_ta_IN.properties 2015-12-07 21:41:57 UTC
(rev 4582)
@@ -2563,4 +2563,5 @@
Select options to decompose multi-geometries into several features or to
eliminate degenerate parts (parts with a lower dimension than original
geometry).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=\#T\:Explode
multi-geometries
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=\#T\:valid
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
\ No newline at end of file
Modified: core/trunk/src/language/jump_te.properties
===================================================================
--- core/trunk/src/language/jump_te.properties 2015-12-07 21:25:19 UTC (rev
4581)
+++ core/trunk/src/language/jump_te.properties 2015-12-07 21:41:57 UTC (rev
4582)
@@ -3072,4 +3072,6 @@
Select options to decompose multi-geometries into several features or to
eliminate degenerate parts (parts with a lower dimension than original
geometry).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=\#T\:Explode
multi-geometries
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=\#T\:valid
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
+org.openjump.core.ui.plugin.tools.EraseLayerAWithLayerBPlugIn.layer-to-erase=
\ No newline at end of file
Modified: core/trunk/src/language/jump_zh_CN.properties
===================================================================
--- core/trunk/src/language/jump_zh_CN.properties 2015-12-07 21:25:19 UTC
(rev 4581)
+++ core/trunk/src/language/jump_zh_CN.properties 2015-12-07 21:41:57 UTC
(rev 4582)
@@ -2727,4 +2727,5 @@
Select options to decompose multi-geometries into several features or to
eliminate degenerate parts (parts with a lower dimension than original
geometry).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=\#T\:Explode
multi-geometries
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=\#T\:valid
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
\ No newline at end of file
Modified: core/trunk/src/language/jump_zh_HK.properties
===================================================================
--- core/trunk/src/language/jump_zh_HK.properties 2015-12-07 21:25:19 UTC
(rev 4581)
+++ core/trunk/src/language/jump_zh_HK.properties 2015-12-07 21:41:57 UTC
(rev 4582)
@@ -2727,4 +2727,5 @@
Select options to decompose multi-geometries into several features or to
eliminate degenerate parts (parts with a lower dimension than original
geometry).
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.decompose-multi=\#T\:Explode
multi-geometries
org.openjump.core.ui.plugin.tools.MakeValidPlugIn.result-layer-suffix=\#T\:valid
-org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.MakeValidPlugIn.remove-degenerate-parts=\#T\:Remove
degenerate parts
+org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometry-collections-have-not-been-cut=\#T\:GeometryCollections
have not been cut
\ No newline at end of file
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
2015-12-07 21:25:19 UTC (rev 4581)
+++
core/trunk/src/org/openjump/core/ui/plugin/edittoolbox/cursortools/CutFeaturesTool.java
2015-12-07 21:41:57 UTC (rev 4582)
@@ -112,7 +112,11 @@
if (this.geomSelected.contains(this.geomDraw)) {
return;
}
- if (!(this.geomSelected instanceof GeometryCollection) &&
this.geomDraw.intersects(this.geomSelected)) {
+ if ((this.geomSelected instanceof GeometryCollection)) {
+ context.getWorkbench().getFrame().warnUser(
+
I18N.get("org.openjump.core.ui.plugin.tools.CutFeaturesTool.geometryCollection-cannot-be-processed"));
+ }
+ else if (this.geomDraw.intersects(this.geomSelected)) {
if (this.geomSelected instanceof Polygon || this.geomSelected
instanceof MultiPolygon) {
edtr.deleteFeature(featureSelected);
List<Geometry> div = splitPolygon(this.geomDraw,
this.geomSelected);
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
