from:"jump\-pilot\-svn\-\-\- via Jump\-pilot\-devel"

[JPP-Devel] SVN: [5645] plug-ins/CADExtension/trunk

2017-12-24 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5645
  http://sourceforge.net/p/jump-pilot/code/5645
Author:   michaudm
Date: 2017-12-24 12:20:41 + (Sun, 24 Dec 2017)
Log Message:
---
Commit last changes from Peppe + an ant build file for CAD tool

Modified Paths:
--

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockPanel.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/GeometryUtils.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/ImageCellRenderer.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/SaveBlockPlugIn.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/icon/IconLoader.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/utils/EditUtils.java

Added Paths:
---
plug-ins/CADExtension/trunk/build.xml
plug-ins/CADExtension/trunk/lib/

Copied: plug-ins/CADExtension/trunk/build.xml (from rev 5643, 
plug-ins/JumpJGraphT/trunk/build.xml)
===
--- plug-ins/CADExtension/trunk/build.xml   (rev 0)
+++ plug-ins/CADExtension/trunk/build.xml   2017-12-24 12:20:41 UTC (rev 
5645)
@@ -0,0 +1,99 @@
+
+
+   
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ 
+ 
+ 
+
+
+
+
\ No newline at end of file

Modified: 
plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockPanel.java
===
--- 
plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockPanel.java
2017-12-16 11:19:52 UTC (rev 5644)
+++ 
plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockPanel.java
2017-12-24 12:20:41 UTC (rev 5645)
@@ -49,7 +49,7 @@
 @SuppressWarnings("rawtypes")
 public static JComboBox chooseBox;
 
-public static DefaultComboBoxModel model = new 
DefaultComboBoxModel();
+public static DefaultComboBoxModel model = new DefaultComboBoxModel();
 
 public static JPanel block_panel = new JPanel(new GridLayout(0, 1));
 public static JPanel option_panel = new JPanel(new GridLayout(0, 1));
@@ -79,12 +79,12 @@
 public static String star = I18N
 .get("deejump.ui.style.RenderingStylePanel.star");
 public static SpinnerModel rotationModel = new SpinnerNumberModel(0, // 
initial
- // 
value
+// value
 0, // min
 359, // max
 1);
 public static SpinnerModel dimensionModel = new SpinnerNumberModel(100, // 
initial
-// 
value
+// value
 10, // min
 400, // max
 10);
@@ -94,13 +94,13 @@
 
 private static WorkbenchToolBar toolBar = new WorkbenchToolBar(null) {
 /**
- * 
+ *
  */
 private static final long serialVersionUID = 1L;
 
 @Override
 public JButton addPlugIn(Icon icon, PlugIn plugIn,
-EnableCheck enableCheck, WorkbenchContext workbenchContext) {
+ EnableCheck enableCheck, WorkbenchContext 
workbenchContext) {
 return super.addPlugIn(icon, plugIn, enableCheck, 
workbenchContext);
 }
 
@@ -146,7 +146,7 @@
 public static List list;
 
 @SuppressWarnings({ "unchecked", "rawtypes" })
-public JPanel chooseBlockPanel(PlugInContext context) {
+public static  JPanel chooseBlockPanel(PlugInContext context) {
 
 chooseBox = new JComboBox(new Vector(listOfBlockFiles(context)));
 
@@ -153,12 +153,12 @@
 Dimension d = new Dimension(125, chooseBox.getPreferredSize().height);
 chooseBox.setPreferredSize(d);
 
-BlockCellRenderer renderer = new BlockCellRenderer();
+  /*  BlockCellRenderer renderer = new BlockCellRenderer();
 chooseBox.setRenderer(renderer);
 list = listOfBlockFiles(context);
 HashMap icons = ListOfBlocksIcons();
 renderer.setTooltips(list);
-renderer.setIcons(icons);
+renderer.setIcons(icons);*/
 
 model = (DefaultComboBoxModel)

[JPP-Devel] SVN: [5666] plug-ins/CADExtension/trunk

2018-01-07 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5666
  http://sourceforge.net/p/jump-pilot/code/5666
Author:   michaudm
Date: 2018-01-07 21:02:59 + (Sun, 07 Jan 2018)
Log Message:
---
Several corrections in the block tools of the CAD extension

Modified Paths:
--
plug-ins/CADExtension/trunk/build.xml

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/annotation/TextPanel.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockCellRenderer.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockPanel.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockUtils.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/DrawBlockPlugIn.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/DrawBlockTool.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/DrawOrientedBlockPlugIn.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/DrawOrientedBlockTool.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/ImageCellRenderer.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/SaveBlockPlugIn.java

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/language/cadtoolbox_fr.properties

Added Paths:
---

plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockCell.java

Modified: plug-ins/CADExtension/trunk/build.xml
===
--- plug-ins/CADExtension/trunk/build.xml   2018-01-05 13:34:20 UTC (rev 
5665)
+++ plug-ins/CADExtension/trunk/build.xml   2018-01-07 21:02:59 UTC (rev 
5666)
@@ -20,7 +20,7 @@
 
-
+
 
 
 

Modified: 
plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/annotation/TextPanel.java
===
--- 
plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/annotation/TextPanel.java
2018-01-05 13:34:20 UTC (rev 5665)
+++ 
plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/annotation/TextPanel.java
2018-01-07 21:02:59 UTC (rev 5666)
@@ -78,8 +78,8 @@
 text_panel_jlabel2 = new JLabel(
 
I18NPlug.getI18N("org.openjump.core.ui.plugins.block.dialog-dimension"));
 text_panel_jlabel2.setToolTipText(gedtDescription());
-FormUtils.addRowInGBL(text_panel, 1, 0, null, text_panel_jlabel1,
-textRotationSpinner, text_panel_jlabel2, textDimensionSpinner);
+//FormUtils.addRowInGBL(text_panel, 1, 0, null, text_panel_jlabel1,
+//textRotationSpinner, text_panel_jlabel2, 
textDimensionSpinner);
 AddTextPlugIn add = new AddTextPlugIn();
 ChangeTextPlugIn change = new ChangeTextPlugIn();
 

Added: 
plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockCell.java
===
--- 
plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockCell.java 
(rev 0)
+++ 
plug-ins/CADExtension/trunk/src/org/openjump/advancedtools/block/BlockCell.java 
2018-01-07 21:02:59 UTC (rev 5666)
@@ -0,0 +1,153 @@
+package org.openjump.advancedtools.block;
+
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.Envelope;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.io.ParseException;
+import com.vividsolutions.jts.io.WKTReader;
+import com.vividsolutions.jump.I18N;
+import com.vividsolutions.jump.workbench.ui.renderer.java2D.Java2DConverter;
+import org.openjump.core.geomutils.Circle;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.geom.NoninvertibleTransformException;
+import java.awt.geom.Point2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Scanner;
+
+/**
+ * Thin wrapper containing the definition of a block (geometry), and how to 
show it
+ * in a ComboBox (name and icon).
+ */
+public class BlockCell {
+
+
+  public static BlockCell CIRCLE = new BlockCell(
+  I18N.get("deejump.ui.style.RenderingStylePanel.circle"),
+  new Circle(new Coordinate(0, 0), 8).getPoly());
+  public static BlockCell TRIANGLE = new BlockCell(
+  I18N.get("deejump.ui.style.RenderingStylePanel.triangle"),
+  "POLYGON((0 0, 16 0, 8 13.85, 0 0))");
+  public static BlockCell SQUARE = new BlockCell(
+  I18N.get("deejump.ui.style.RenderingStylePanel.square"),
+  "POLYGON((0 0, 16 0, 16 16, 0 16,  0 0))");
+  public static BlockCell CROSS = new BlockCell(
+  I18N.get("deejump.ui.style.RenderingStylePanel.cross"),
+  "POLYGON((5 0, 10 0, 10 5, 15 5, 15 10, 10 10, 10 15, 5 15, 5 10, 0 
10, 0 5, 5 5, 5 0))");
+  public static BlockCell STAR = new BlockCell(
+

[JPP-Devel] SVN: [5667] core/trunk

2018-01-07 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5667
  http://sourceforge.net/p/jump-pilot/code/5667
Author:   michaudm
Date: 2018-01-07 21:15:50 + (Sun, 07 Jan 2018)
Log Message:
---
Update CAD Extension to 0.6 (improvements)

Modified Paths:
--
core/trunk/ChangeLog

Added Paths:
---
core/trunk/lib/plus/cad-tools-0.6.jar

Removed Paths:
-
core/trunk/lib/plus/CadTools-04.jar

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-01-07 21:02:59 UTC (rev 5666)
+++ core/trunk/ChangeLog2018-01-07 21:15:50 UTC (rev 5667)
@@ -3,6 +3,9 @@
 # 2. make sure that lines break at 80 chars for constricted display situations
 #< 80 chars 
-->#
 
+2018-01-07 mmichaud 
+  * Update CADExtension to 0.6 (fixes and improvements)
+
 2018-01-03 Nicolas Ribot 
   * Icons for layers according to geometry type in the Data Store Layer panel
 

Deleted: core/trunk/lib/plus/CadTools-04.jar
===
(Binary files differ)

Added: core/trunk/lib/plus/cad-tools-0.6.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/cad-tools-0.6.jar
===
--- core/trunk/lib/plus/cad-tools-0.6.jar   2018-01-07 21:02:59 UTC (rev 
5666)
+++ core/trunk/lib/plus/cad-tools-0.6.jar   2018-01-07 21:15:50 UTC (rev 
5667)

Property changes on: core/trunk/lib/plus/cad-tools-0.6.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property

--
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

[JPP-Devel] SVN: [5657] core/trunk/src/com/vividsolutions/jump

2018-01-04 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5657
  http://sourceforge.net/p/jump-pilot/code/5657
Author:   edso
Date: 2018-01-04 16:41:14 + (Thu, 04 Jan 2018)
Log Message:
---
comment/disable on-the-fly reprojection, which was never implemented completely 
anyway

Modified Paths:
--
core/trunk/src/com/vividsolutions/jump/coordsys/CoordinateSystem.java
core/trunk/src/com/vividsolutions/jump/coordsys/Reprojector.java
core/trunk/src/com/vividsolutions/jump/workbench/model/LayerManager.java

Modified: core/trunk/src/com/vividsolutions/jump/coordsys/CoordinateSystem.java
===
--- core/trunk/src/com/vividsolutions/jump/coordsys/CoordinateSystem.java   
2018-01-03 16:00:38 UTC (rev 5656)
+++ core/trunk/src/com/vividsolutions/jump/coordsys/CoordinateSystem.java   
2018-01-04 16:41:14 UTC (rev 5657)
@@ -77,8 +77,13 @@
 return name;
 }
 
+/**
+ * @deprecated reprojection will be implemented differently at a later 
point
+ */
+@Deprecated
 public Projection getProjection() {
-return projection;
+throw new UnsupportedOperationException();
+//return projection;
 }
 
 public int getEPSGCode() {

Modified: core/trunk/src/com/vividsolutions/jump/coordsys/Reprojector.java
===
--- core/trunk/src/com/vividsolutions/jump/coordsys/Reprojector.java
2018-01-03 16:00:38 UTC (rev 5656)
+++ core/trunk/src/com/vividsolutions/jump/coordsys/Reprojector.java
2018-01-04 16:41:14 UTC (rev 5657)
@@ -35,16 +35,35 @@
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.CoordinateFilter;
 import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jump.feature.Feature;
 
 
 /**
  * The source and destination coordinate reference systems must have
  * the same datum (for example, WGS 84).
+ * 
+ * @deprecated
  */
+@Deprecated
 public class Reprojector {
-private static Reprojector instance = new Reprojector();
+// [12/2017 ede] reprojection is not properly implemented as of right now
+// therefore use a dummy reprojector that does nothing
+private static Reprojector instance = new Reprojector(){
 
+  @Override
+  public boolean wouldChangeValues(CoordinateSystem source, 
CoordinateSystem destination) {
+return false;
+  }
+
+  @Override
+  public void reproject(Coordinate coordinate, CoordinateSystem source, 
CoordinateSystem destination) {
+  }
+
+  @Override
+  public void reproject(Geometry geometry, CoordinateSystem source, 
CoordinateSystem destination) {
+  }
+  
+};
+
 private Reprojector() {
 }
 

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/model/LayerManager.java
===
--- core/trunk/src/com/vividsolutions/jump/workbench/model/LayerManager.java
2018-01-03 16:00:38 UTC (rev 5656)
+++ core/trunk/src/com/vividsolutions/jump/workbench/model/LayerManager.java
2018-01-04 16:41:14 UTC (rev 5657)
@@ -148,14 +148,17 @@
 
 public void addLayerable(String categoryName, Layerable layerable) {
 
+
 if (layerable instanceof Layer) {
 if (size() == 0 && getCoordinateSystem() == 
CoordinateSystem.UNSPECIFIED) {
 setCoordinateSystem(((Layer) layerable)
 .getFeatureCollectionWrapper().getFeatureSchema()
 .getCoordinateSystem());
-} else {
-reproject((Layer) layerable, coordinateSystem);
 }
+// [12/2017 ede] reprojection is not properly implemented as of right now
+//else {
+//reproject((Layer) layerable, coordinateSystem);
+//}
 layerReferencesToDispose.add(new WeakReference<>(layerable));
 }
 addCategory(categoryName);


--
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

[JPP-Devel] SVN: [5665] core/trunk/src/language/jump_fi.properties

2018-01-05 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5665
  http://sourceforge.net/p/jump-pilot/code/5665
Author:   jratike80
Date: 2018-01-05 13:34:20 + (Fri, 05 Jan 2018)
Log Message:
---
Small fixes to Finnish translations

Modified Paths:
--
core/trunk/src/language/jump_fi.properties

Modified: core/trunk/src/language/jump_fi.properties
===
--- core/trunk/src/language/jump_fi.properties  2018-01-04 18:40:17 UTC (rev 
5664)
+++ core/trunk/src/language/jump_fi.properties  2018-01-05 13:34:20 UTC (rev 
5665)
@@ -1434,7 +1434,7 @@
 org.openjump.core.ui.plugin.tools.MeasureM_FTool.feet=jalkaa
 org.openjump.core.ui.plugin.tools.MeasureM_FTool.meters=metri\u00e4
 org.openjump.core.ui.plugin.tools.MeasurementStyle.area=Pinta-ala\:
-org.openjump.core.ui.plugin.tools.MeasurementStyle.distance=Et\u00e4isyys\:
+org.openjump.core.ui.plugin.tools.MeasurementStyle.distance=Pituus\:
 
org.openjump.core.ui.plugin.tools.MergeSelectedPolygonsWithNeighbourPlugIn.description=Yhdist\u00e4\u00e4
 valitut polygonit naapuripolygonien kanssa. Yhdist\u00e4minen 
tehd\u00e4\u00e4n joko pinta-alaltaan suurimpaan naapuriin tai naapuriin, jonka 
kanssa valitulla polygonilla on pisin yhteinen reunaviiva. Tulos voi olla 
multipolygoni, jos yhdistett\u00e4vill\u00e4 polygoneilla on vain yksi yhteinen 
piste.
 
org.openjump.core.ui.plugin.tools.MergeSelectedPolygonsWithNeighbourPlugIn.features-from-different-layers=Virhe\:
 Kohteet ovat eri tasoilla\!
 
org.openjump.core.ui.plugin.tools.MergeSelectedPolygonsWithNeighbourPlugIn.merged=yhdistetty
@@ -2729,7 +2729,7 @@
 ui.plugin.analysis.GeometryFunction.WrapIntoMulti=Kirjoita multi-geometrioina
 org.openjump.core.ui.plugin.edit.SelectGeometryCollectionsPlugIn=Valitse 
multi-geometriatyyppiset kohteet
 ui.plugin.analysis.GeometryFunction.Remove-Holes=Poista rei\u00E4t
-ui.plugin.analysis.GeometryFunction.Remove-Small-Holes=Poistaa pienet 
rei\u00E4t
+ui.plugin.analysis.GeometryFunction.Remove-Small-Holes=Poista pienet rei\u00E4t
 ui.plugin.analysis.GeometryFunction.Remove-Small-Segments=Yleist\u00E4 (poista 
pienet segmentit)
 Writer.writing-features=Kirjoitetaan kohteita...
 Reader.parsed-{0}-features=J\u00E4sennetty {0} kohdetta.


--
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

[JPP-Devel] SVN: [5658] core/trunk/src/com/vividsolutions/jump/io/ GMLGeometryWriter.java

2018-01-04 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5658
  http://sourceforge.net/p/jump-pilot/code/5658
Author:   edso
Date: 2018-01-04 17:36:40 + (Thu, 04 Jan 2018)
Log Message:
---
minor reformatting of the resulting GML file

Modified Paths:
--
core/trunk/src/com/vividsolutions/jump/io/GMLGeometryWriter.java

Modified: core/trunk/src/com/vividsolutions/jump/io/GMLGeometryWriter.java
===
--- core/trunk/src/com/vividsolutions/jump/io/GMLGeometryWriter.java
2018-01-04 16:41:14 UTC (rev 5657)
+++ core/trunk/src/com/vividsolutions/jump/io/GMLGeometryWriter.java
2018-01-04 17:36:40 UTC (rev 5658)
@@ -278,7 +278,7 @@
* @param writer Writer to write coordinates to
*/
   private void write(Coordinate[] coords, int level, Writer writer) throws 
IOException {
-startLine(writer, level, "");
+startLine(writer, level, "\n");
 int dim = 2;
 
 // [mmichaud 2012-05-05] if there is a single z value, I want to keep it 
@@ -289,7 +289,7 @@
 }
 }
 
-boolean isNewLine = false;
+boolean isNewLine = true;
 for (int i = 0; i < coords.length; i++) {
   if (isNewLine) {
 startLine(writer, level, "  ");
@@ -314,7 +314,8 @@
 isNewLine = true;
   }
 }
-writer.append("\n");
+writer.append("\n");
+startLine(writer, level, "\n");
   }
   
 }


--
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

[JPP-Devel] SVN: [5659] core/trunk/src/com/vividsolutions/jump/io/ParseException.java

2018-01-04 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5659
  http://sourceforge.net/p/jump-pilot/code/5659
Author:   edso
Date: 2018-01-04 17:52:07 + (Thu, 04 Jan 2018)
Log Message:
---
allow ParseException to wrap the causing exception

Modified Paths:
--
core/trunk/src/com/vividsolutions/jump/io/ParseException.java

Modified: core/trunk/src/com/vividsolutions/jump/io/ParseException.java
===
--- core/trunk/src/com/vividsolutions/jump/io/ParseException.java   
2018-01-04 17:36:40 UTC (rev 5658)
+++ core/trunk/src/com/vividsolutions/jump/io/ParseException.java   
2018-01-04 17:52:07 UTC (rev 5659)
@@ -53,6 +53,10 @@
 super(message);
 }
 
+public ParseException(String message, Throwable cause) {
+  super(message, cause);
+}
+
 /**
  * More explictly construct a parse exception.
  * Resulting message will be :message + " in file '" + newFname +"', line 
" + newLineno + ", char " + newCpos
@@ -63,9 +67,13 @@
  * @param newCharPos character position on the line
  */
 public ParseException(String message, String newFileName, int 
newLineNumber, int newCharPos) {
-super(message + " in file '" + newFileName + "', line " + 
newLineNumber +
-", char " + newCharPos);
+  this(message, newFileName, newLineNumber, newCharPos, null);
+}
 
+public ParseException(String message, String newFileName, int 
newLineNumber, int newCharPos, Throwable cause) {
+this(message + " in file '" + newFileName + "', line " + newLineNumber 
+
+", char " + newCharPos, cause);
+
 fileName = newFileName;
 lineNumber = newLineNumber;
 charPos = newCharPos;


--
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

[JPP-Devel] SVN: [5661] core/trunk/src/com/vividsolutions/jump/io/geojson/ GeoJSONFeatureCollectionWrapper.java

2018-01-04 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5661
  http://sourceforge.net/p/jump-pilot/code/5661
Author:   edso
Date: 2018-01-04 18:04:13 + (Thu, 04 Jan 2018)
Log Message:
---
generalized 'GeoJSONWriter.writing-features' to 'Writer.writing-features' to 
make clear it can be used by all writers

Modified Paths:
--

core/trunk/src/com/vividsolutions/jump/io/geojson/GeoJSONFeatureCollectionWrapper.java

Modified: 
core/trunk/src/com/vividsolutions/jump/io/geojson/GeoJSONFeatureCollectionWrapper.java
===
--- 
core/trunk/src/com/vividsolutions/jump/io/geojson/GeoJSONFeatureCollectionWrapper.java
  2018-01-04 17:53:11 UTC (rev 5660)
+++ 
core/trunk/src/com/vividsolutions/jump/io/geojson/GeoJSONFeatureCollectionWrapper.java
  2018-01-04 18:04:13 UTC (rev 5661)
@@ -248,7 +248,7 @@
 String[] featureFields = new String[] { GeoJSONConstants.TYPE,
 GeoJSONConstants.PROPERTIES, GeoJSONConstants.GEOMETRY };
 TaskMonitorUtil.report(monitor,
-I18N.getMessage("GeoJSONWriter.writing-features"));
+I18N.getMessage("Writer.writing-features"));
 for (Feature feature : featureCollection.getFeatures()) {
 
   if (TaskMonitorUtil.isCancelRequested(monitor))


--
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

[JPP-Devel] SVN: [5662] core/trunk/src/com/vividsolutions/jump/task/ TaskMonitorV2Util.java

2018-01-04 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5662
  http://sourceforge.net/p/jump-pilot/code/5662
Author:   edso
Date: 2018-01-04 18:05:26 + (Thu, 04 Jan 2018)
Log Message:
---
javadoc added, cleanup imports

Modified Paths:
--
core/trunk/src/com/vividsolutions/jump/task/TaskMonitorV2Util.java

Modified: core/trunk/src/com/vividsolutions/jump/task/TaskMonitorV2Util.java
===
--- core/trunk/src/com/vividsolutions/jump/task/TaskMonitorV2Util.java  
2018-01-04 18:04:13 UTC (rev 5661)
+++ core/trunk/src/com/vividsolutions/jump/task/TaskMonitorV2Util.java  
2018-01-04 18:05:26 UTC (rev 5662)
@@ -1,8 +1,5 @@
 package com.vividsolutions.jump.task;
 
-import java.util.HashMap;
-import java.util.Hashtable;
-
 public class TaskMonitorV2Util extends TaskMonitorUtil{
 
   /**
@@ -13,6 +10,14 @@
   ((TaskMonitorV2) monitor).setTitle(title);
   }
 
+  /**
+   * support more than int max items for {@link TaskMonitorV2}
+   * 
+   * @param monitor
+   * @param itemsDone
+   * @param totalItems
+   * @param itemDescription
+   */
   public static void report(TaskMonitor monitor, long itemsDone, long 
totalItems,
   String itemDescription) {
 if (monitor == 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

[JPP-Devel] SVN: [5663] core/trunk/src/com/vividsolutions/jump/io

2018-01-04 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5663
  http://sourceforge.net/p/jump-pilot/code/5663
Author:   edso
Date: 2018-01-04 18:09:57 + (Thu, 04 Jan 2018)
Log Message:
---
JML/GML Reader/Writer add EPSG SRID support via WFS gml:boundedBy->gml:Box tag
JML/GML Reader
  - add SAX Locator support to have errors sport line numbers/columns
  - reordered parsing methods into a meaningful order
  - reverted to BasicFeature/FeatureSchema until Schema editing via plugin is 
finished for FlexibleSchema
JML/GML Writer
  - minimized space indention for better readability and to save disk space
  - is now cancelable via TaskMonitor button
  - reports feature count written so far now

Modified Paths:
--
core/trunk/src/com/vividsolutions/jump/io/GMLInputTemplate.java
core/trunk/src/com/vividsolutions/jump/io/GMLReader.java
core/trunk/src/com/vividsolutions/jump/io/GMLWriter.java

Modified: core/trunk/src/com/vividsolutions/jump/io/GMLInputTemplate.java
===
--- core/trunk/src/com/vividsolutions/jump/io/GMLInputTemplate.java 
2018-01-04 18:05:26 UTC (rev 5662)
+++ core/trunk/src/com/vividsolutions/jump/io/GMLInputTemplate.java 
2018-01-04 18:09:57 UTC (rev 5663)
@@ -66,6 +66,7 @@
 boolean loaded = false;
 String collectionTag;
 String featureTag;
+String crsTag;
 ArrayList columnDefinitions = new ArrayList<>(); //list 
of type ColumnDescription
 
 private XMLReader xr;
@@ -75,6 +76,7 @@
 private boolean havecollectionTag = false;
 private boolean havefeatureTag = false;
 private boolean havegeometryElement = false;
+private boolean havecrsTag = false;
 
 //for the jcs column definition
 private int columnDef_valueType = 0; // 0 - undef, 1 = body, 2 = attribute
@@ -550,6 +552,14 @@
 return;
 }
 
+if (qName.equalsIgnoreCase("CRSElement")) {
+  tagBody = tagBody.trim();
+  crsTag = tagBody;
+  havecrsTag = true;
+
+  return;
+}
+
 if (qName.equalsIgnoreCase("name")) {
 columnDef_columnName = tagBody.trim();
 }

Modified: core/trunk/src/com/vividsolutions/jump/io/GMLReader.java
===
--- core/trunk/src/com/vividsolutions/jump/io/GMLReader.java2018-01-04 
18:05:26 UTC (rev 5662)
+++ core/trunk/src/com/vividsolutions/jump/io/GMLReader.java2018-01-04 
18:09:57 UTC (rev 5663)
@@ -44,6 +44,7 @@
 
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
@@ -58,12 +59,15 @@
 import com.vividsolutions.jts.geom.Polygon;
 import com.vividsolutions.jts.geom.PrecisionModel;
 import com.vividsolutions.jump.I18N;
+import com.vividsolutions.jump.coordsys.CoordinateSystem;
 import com.vividsolutions.jump.feature.AttributeType;
+import com.vividsolutions.jump.feature.BasicFeature;
 import com.vividsolutions.jump.feature.Feature;
 import com.vividsolutions.jump.feature.FeatureCollection;
 import com.vividsolutions.jump.feature.FeatureDataset;
-import com.vividsolutions.jump.feature.FlexibleFeature;
-import com.vividsolutions.jump.feature.FlexibleFeatureSchema;
+import com.vividsolutions.jump.feature.FeatureSchema;
+//import com.vividsolutions.jump.feature.FlexibleFeature;
+//import com.vividsolutions.jump.feature.FlexibleFeatureSchema;
 import com.vividsolutions.jump.task.DummyTaskMonitor;
 import com.vividsolutions.jump.task.TaskMonitor;
 import com.vividsolutions.jump.task.TaskMonitorSupport;
@@ -246,7 +250,8 @@
 public class GMLReader extends DefaultHandler implements JUMPReader, 
TaskMonitorSupport {
 
   private static int STATE_GET_COLUMNS = 3;
-  private Collection exceptions;
+  private Collection exceptions = new ArrayList();
+  private Locator locator;
 
   /**
* STATE MEANING 
@@ -263,6 +268,7 @@
   private static int STATE_PARSE_GEOM_SIMPLE = 4;
   private static int STATE_WAIT_COLLECTION_TAG = 1;
   private static int STATE_WAIT_FEATURE_TAG = 2;
+  private static int STATE_WAIT_CRS_TAG = 8;
 
   private final static List simpleGeoms = new ArrayList<>();
   private final static List multiGeoms = new ArrayList<>();
@@ -283,9 +289,9 @@
   private int STATE = STATE_INIT; // list of points
   private Point apoint;
   private Feature currentFeature;
-  private int currentGeometryNumb = 1;
+//  private int currentGeometryNumb = 1;
   private FeatureCollection fc;
-  private FlexibleFeatureSchema fcmd; // list of geometries
+  private FeatureSchema fcmd; // list of geometries
   private Geometry finalGeometry; // list of geometrycollections - list of 
list of
   // geometry
   private String current_geom_qname = "";
@@ -346,6 +352,11 @@
 xr.setErrorHandler(this);
   }
 
+  // get current location for throw errors
+  public void

[JPP-Devel] SVN: [5674] core/trunk/src/com/vividsolutions/jump/io/GMLWriter.java

2018-01-18 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5674
  http://sourceforge.net/p/jump-pilot/code/5674
Author:   edso
Date: 2018-01-18 13:45:07 + (Thu, 18 Jan 2018)
Log Message:
---
fix  bug in SRID boundedBy writer. If the locale is set to Finnish then comma 
is used as decimal separator.

Modified Paths:
--
core/trunk/src/com/vividsolutions/jump/io/GMLWriter.java

Modified: core/trunk/src/com/vividsolutions/jump/io/GMLWriter.java
===
--- core/trunk/src/com/vividsolutions/jump/io/GMLWriter.java2018-01-16 
10:44:08 UTC (rev 5673)
+++ core/trunk/src/com/vividsolutions/jump/io/GMLWriter.java2018-01-18 
13:45:07 UTC (rev 5674)
@@ -38,9 +38,11 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.Locale;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -206,7 +208,7 @@
 //   11.3.6 Inheritance rules for srsName values
 if (getSrid(featureCollection) > 0){
   Envelope env = featureCollection.getEnvelope();
-  DecimalFormat df = new DecimalFormat("#,##0.00");
+  DecimalFormat df = new DecimalFormat("#,##0.00", new 
DecimalFormatSymbols(Locale.US));
   df.setGroupingUsed(false);
   String envString = df.format(env.getMinX()) + "," + 
df.format(env.getMinY()) + " " + df.format(env.getMaxX())
   + "," + df.format(env.getMaxY());


--
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

[JPP-Devel] SVN: [5673] core/trunk/src/org/openjump/core/ui/plugin/raster/ ProfileGraphTool.java

2018-01-16 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5673
  http://sourceforge.net/p/jump-pilot/code/5673
Author:   ma15569
Date: 2018-01-16 10:44:08 + (Tue, 16 Jan 2018)
Log Message:
---
ProfileGraphTool: remove depency to OpenJump Sextante Raster Layer

Modified Paths:
--
core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphTool.java

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphTool.java
===
--- core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphTool.java 
2018-01-15 12:38:34 UTC (rev 5672)
+++ core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphTool.java 
2018-01-16 10:44:08 UTC (rev 5673)
@@ -59,8 +59,6 @@
 import org.openjump.core.apitools.LayerTools;
 import org.openjump.core.attributeoperations.AttributeOp;
 import org.openjump.core.rasterimage.RasterImageLayer;
-import org.openjump.core.rasterimage.sextante.OpenJUMPSextanteRasterLayer;
-import org.openjump.core.rasterimage.sextante.rasterWrappers.GridExtent;
 import org.openjump.core.ui.plot.Plot2DPanelOJ;
 
 import com.vividsolutions.jts.geom.Coordinate;
@@ -82,6 +80,7 @@
 import com.vividsolutions.jump.workbench.ui.LayerViewPanel;
 import com.vividsolutions.jump.workbench.ui.cursortool.MultiClickTool;
 import com.vividsolutions.jump.workbench.ui.images.IconLoader;
+//import org.openjump.core.rasterimage.sextante.OpenJUMPSextanteRasterLayer;
 
 public class ProfileGraphTool extends MultiClickTool {
 
@@ -132,7 +131,7 @@
 private List savedCoordinates = new ArrayList();
 
 private Coordinate currCoord;
-private OpenJUMPSextanteRasterLayer rstLayer = null;
+// private OpenJUMPSextanteRasterLayer rstLayer = null;
 private RasterImageLayer rLayer = null;
 private GeometryFactory gf = new GeometryFactory();
 private FeatureCollection resultFC = null;
@@ -216,23 +215,25 @@
 
I18N.get("pirol.plugIns.EditAttributeByFormulaPlugIn.no-layer-selected"));
 return;
 }
-this.rstLayer = new OpenJUMPSextanteRasterLayer();
+// this.rstLayer = new OpenJUMPSextanteRasterLayer();
 // [mmichaud 2013-05-25] false : this is a temporary image not a file
 // based image
-this.rstLayer.create(rLayer, false);
-this.rstLayer.setFullExtent(); // not sure why this needs to be done 
but
-   // it seems to
-   // be necessary (otherwise I get an NPE
-   // when
-   // doing
-   // this.rstLayer.getWindowCellSize())
-GridExtent extent = this.rstLayer.getWindowGridExtent(); // not sure if
- // this needs
- // to be done 
-
- // but it was
- // in the
- // Sextante
- // class
+// this.rstLayer.create(rLayer, false);
+// this.rstLayer.setFullExtent(); // not sure why this needs to be done
+// but
+// it seems to
+// be necessary (otherwise I get an NPE
+// when
+// doing
+// this.rstLayer.getWindowCellSize())
+// GridExtent extent = this.rstLayer.getWindowGridExtent(); // not sure
+// if
+// this needs
+// to be done -
+// but it was
+// in the
+// Sextante
+// class
 // -- clear the resultFC
 this.resultFC.clear();
 this.nPoints = 0;
@@ -466,15 +467,15 @@
 
 if (dx > 0.0 || dy > 0.0) {
 if (dx > dy) {
-dx /= this.rstLayer.getWindowCellSize().x;
+dx /= rLayer.getMetadata().getOriginalCellSize();// 
this.rstLayer.getWindowCellSize().x;
 n = dx;
 dy /= dx;
-dx = this.rstLayer.getWindowCellSize().x;
+dx = rLayer.getMetadata().getOriginalCellSize();// 
this.rstLayer.getWindowCellSize().x;
 } else {
-dy /= this.rstLayer.getWindowCellSize().y;
+dy /= rLayer.getMetadata().getOriginalCellSize();// 
this.rstLayer.getWindowCellSize().y;
 n = dy;
 dx /= dy;
-dy = this.rstLayer.getWindowCellSize().y;
+dy = rLayer.getMetadata().getOriginalCellSize();// 
this.rstLayer.getWindowCellSize().y;
 }
 
 if (x2 < x) {
@@ -507,8 +508,10 @@
 } else {
 dDX = x - m_dLastX;
 dDY = y - m_dLastY;
-if (this.rstLayer.isNoDataValue(z)
-||

[JPP-Devel] SVN: [5671] core/trunk/ChangeLog

2018-01-14 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5671
  http://sourceforge.net/p/jump-pilot/code/5671
Author:   edso
Date: 2018-01-14 14:06:58 + (Sun, 14 Jan 2018)
Log Message:
---
amend latest changes

Modified Paths:
--
core/trunk/ChangeLog

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-01-13 16:38:55 UTC (rev 5670)
+++ core/trunk/ChangeLog2018-01-14 14:06:58 UTC (rev 5671)
@@ -6,14 +6,29 @@
 2018-01-07 mmichaud 
   * Update CADExtension to 0.6 (fixes and improvements)
 
+2018-01-04 ede
+  * commented/disabled on-the-fly reprojection, which was never implemented 
+completely anyway
+  * JML/GML Reader/Writer add EPSG SRID support via WFS 
+gml:boundedBy->gml:Box tag
+JML/GML Writer
+- is now cancelable via TaskMonitor button
+- reports feature count written so far now
+
 2018-01-03 Nicolas Ribot 
   * Icons for layers according to geometry type in the Data Store Layer panel
 
+2017-12-26 ede
+  * ChangeSRIDPlugin
+- setting SRID tags the feature collection to modified now
+- no change in setting does nothing, no change when cancelled
+- ok button disabled when no change or invalid input
+
 2017-12-10 ede
   * final bugfix: "#463 Starting OJ with java9 throws several exceptions"
 OJ should be generally java 9 ready now
-  * bugfix: KML extension couldn't find it's strings as OJ's I18N didn't use 
-the proper resource bundle
+  * bugfix: KML extension couldn't find it's translation strings as OJ's I18N 
+didn't use the proper resource bundle
 
 2017-12-03 mmichaud 
   * Remove Manifest sealed instruction from VertexSymbols.jar and


--
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

[JPP-Devel] SVN: [5675] core/trunk/src/org/openjump/core/ui/plugin/raster/ RasterImageLayerPropertiesPlugIn.java

2018-01-19 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5675
  http://sourceforge.net/p/jump-pilot/code/5675
Author:   ma15569
Date: 2018-01-19 13:31:51 + (Fri, 19 Jan 2018)
Log Message:
---
added valid/nodata cell number to grid section

Modified Paths:
--

core/trunk/src/org/openjump/core/ui/plugin/raster/RasterImageLayerPropertiesPlugIn.java

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterImageLayerPropertiesPlugIn.java
===
--- 
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterImageLayerPropertiesPlugIn.java
 2018-01-18 13:45:07 UTC (rev 5674)
+++ 
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterImageLayerPropertiesPlugIn.java
 2018-01-19 13:31:51 UTC (rev 5675)
@@ -34,9 +34,8 @@
 import org.openjump.core.ccordsys.utils.SRSInfo;
 import org.openjump.core.ccordsys.utils.SridLookupTable;
 import org.openjump.core.rasterimage.RasterImageLayer;
+import 
org.openjump.core.rasterimage.RasterImageLayer.RasterDataNotFoundException;
 import org.openjump.core.rasterimage.TiffTags;
-import org.openjump.core.rasterimage.sextante.OpenJUMPSextanteRasterLayer;
-import 
org.openjump.core.rasterimage.sextante.rasterWrappers.GridWrapperNotInterpolated;
 import org.openjump.core.ui.swing.DetachableInternalFrame;
 import org.saig.core.gui.swing.sldeditor.util.FormUtils;
 
@@ -69,6 +68,8 @@
  *  Remove statistic panel as already implemented as in the Raster
  *  Statistics plugin. Added a minimal raster projection display:
  *  currently it only displays simple project definition (not EPSG).
+ * @version 0.6 2018_01_19 (Giuseppe Aruta) added Valid/nodata cell number to
+ *  grid section
  */
 
 public class RasterImageLayerPropertiesPlugIn extends AbstractPlugIn {
@@ -75,7 +76,6 @@
 
 // Components
 private JSlider transparencySlider = new JSlider();
-@SuppressWarnings("rawtypes")
 private JPanel transparencySliderPanel = new JPanel(new GridBagLayout());
 private String layer_name;
 private String file_path;
@@ -86,6 +86,8 @@
 private int extent_columns;
 private int extent_rows;
 private String extent_cellnumber;
+private String extent_cellnumbervalid;
+private String extent_cellnumbernodata;
 private String extent_area;
 private String extent_width;
 private String extent_height;
@@ -147,6 +149,10 @@
 
.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.dimension_cell");
 private final static String EXTENT_CELL_NUM = I18N
 
.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.cellnum");
+private final static String EXTENT_CELL_NODATA = I18N
+
.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.nodatacell");
+private final static String EXTENT_CELL_VALID = I18N
+
.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.validcells");
 private final static String EXTENT_AREA = I18N
 
.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.area");
 private final static String BAND = I18N
@@ -171,8 +177,6 @@
 
.get("org.openjump.core.ui.plugin.tools.JoinAttributesSpatiallyPlugIn.mean");
 private static final String R_STD = I18N
 
.get("org.openjump.core.ui.plugin.tools.JoinAttributesSpatiallyPlugIn.standard-dev");
-private static final String GEO_METADATA = I18N
-
.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.geographic_metadata");
 private static final String PROJECTION = I18N
 
.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.projection");
 
@@ -274,6 +278,12 @@
 info += property(EXTENT_CELL_SIZE, extent_cellSizeX + ", "
 + extent_cellSizeY, bgColor1);
 info += property(EXTENT_CELL_NUM, extent_cellnumber, bgColor0);
+if (rLayer.getNumBands() == 1) {
+info += property(EXTENT_CELL_VALID, extent_cellnumbervalid,
+bgColor1);
+info += property(EXTENT_CELL_NODATA, extent_cellnumbernodata,
+bgColor0);
+}
 info += header("", RASTER);
 info += property(RASTER_DPI, raster_dpi, bgColor0);
 info += property(RASTER_DATATYPE, raster_datatype, bgColor1);
@@ -280,7 +290,7 @@
 info += property(RASTER_COLORDEPTH, raster_colordepth, bgColor0);
 info += property(RASTER_BANDS, raster_bands, bgColor1);
 if (rLayer.getNumBands() == 1) {
-info += property(RASTER_NODATA, raster_nodata, bgColor0);
+info += property(RASTER_NODATA + " Pap", raster_nodata, bgColor0);
 }
 for (int b = 0; b < numBands; b++) {
 int numerobanda = b + 1;
@@ -304,12 +314,11 @@
 
 }
 
-@SuppressWarnings("unchecked")
 private JPanel Transparency(final RasterImageLayer layer) {

[JPP-Devel] SVN: [5676] core/trunk/src/org/openjump/core/ui/plugin/raster/statistics/ DEMStatisticsPlugIn.java

2018-01-19 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5676
  http://sourceforge.net/p/jump-pilot/code/5676
Author:   ma15569
Date: 2018-01-19 13:34:00 + (Fri, 19 Jan 2018)
Log Message:
---
removed depency to OpenJUMPSextanteLayer class

Modified Paths:
--

core/trunk/src/org/openjump/core/ui/plugin/raster/statistics/DEMStatisticsPlugIn.java

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/raster/statistics/DEMStatisticsPlugIn.java
===
--- 
core/trunk/src/org/openjump/core/ui/plugin/raster/statistics/DEMStatisticsPlugIn.java
   2018-01-19 13:31:51 UTC (rev 5675)
+++ 
core/trunk/src/org/openjump/core/ui/plugin/raster/statistics/DEMStatisticsPlugIn.java
   2018-01-19 13:34:00 UTC (rev 5676)
@@ -33,7 +33,8 @@
 package org.openjump.core.ui.plugin.raster.statistics;
 
 import java.awt.Color;
-import java.awt.Dimension;
+import java.awt.image.Raster;
+import java.io.IOException;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.Iterator;
@@ -42,8 +43,8 @@
 import javax.swing.Icon;
 
 import org.openjump.core.rasterimage.RasterImageLayer;
-import org.openjump.core.rasterimage.sextante.OpenJUMPSextanteRasterLayer;
-import 
org.openjump.core.rasterimage.sextante.rasterWrappers.GridWrapperNotInterpolated;
+import 
org.openjump.core.rasterimage.RasterImageLayer.RasterDataNotFoundException;
+import org.openjump.sextante.gui.additionalResults.AdditionalResults;
 
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jump.I18N;
@@ -52,15 +53,19 @@
 import com.vividsolutions.jump.workbench.plugin.EnableCheckFactory;
 import com.vividsolutions.jump.workbench.plugin.MultiEnableCheck;
 import com.vividsolutions.jump.workbench.plugin.PlugInContext;
-import com.vividsolutions.jump.workbench.ui.HTMLFrame;
+import com.vividsolutions.jump.workbench.ui.HTMLPanel;
 import com.vividsolutions.jump.workbench.ui.images.IconLoader;
 
 /**
- * Giuseppe Aruta [2015_01_27] Computes various statistics for selected layers.
- * Giuseppe Aruta [2015_01_27] added header with the number of selected raster 
layers Giuseppe
- * Giuseppe Aruta [2015_04_09] Reduce display of large nodata values (es QGIS) 
to
- * readable number
- * Giuseppe Aruta [2015_05_16] Added X*Y Cell size
+ * @author Giuseppe Aruta [2015_01_27] Computes various statistics for selected
+ * layers.
+ * @author Giuseppe Aruta [2015_01_27] added header with the number of selected
+ * raster layers
+ * @author Giuseppe Aruta [2015_04_09] Reduce display of large nodata values 
(es
+ * QGIS) to readable number
+ * @author Giuseppe Aruta [2015_05_16] Added X*Y Cell size
+ * @author Giuseppe Aruta [2018_01_19] Removed depency to
+ * OpenJUMPSextanteRasterLayer class. Clean the code
  */
 public class DEMStatisticsPlugIn extends AbstractPlugIn {
 
@@ -86,14 +91,14 @@
 
.get("org.openjump.core.ui.plugin.raster.DEMStatisticsPlugIn.columns");
 private final static String ROWS = I18N
 
.get("org.openjump.core.ui.plugin.raster.DEMStatisticsPlugIn.rows");
-private final static String UNSPECIFIED = I18N
-.get("coordsys.CoordinateSystem.unspecified");
+private final static String LAYERS = I18N
+
.get("org.openjump.core.ui.plugin.queries.SimpleQuery.selected-layers")
++ " :";
 
 public static MultiEnableCheck createEnableCheck(
 WorkbenchContext workbenchContext) {
 EnableCheckFactory checkFactory = new EnableCheckFactory(
 workbenchContext);
-
 return new MultiEnableCheck()
 .add(checkFactory
 .createWindowWithLayerNamePanelMustBeActiveCheck())
@@ -108,17 +113,16 @@
  * data value
  */
 
-public int nodata(PlugInContext context,
-OpenJUMPSextanteRasterLayer rstLayer) {
+public int nodata(Raster ras, double nodata) throws IOException,
+RasterDataNotFoundException {
 int counter = 0;
-GridWrapperNotInterpolated gwrapper = new GridWrapperNotInterpolated(
-rstLayer, rstLayer.getLayerGridExtent());
-int nx = rstLayer.getLayerGridExtent().getNX();
-int ny = rstLayer.getLayerGridExtent().getNY();
+
+int nx = ras.getWidth();
+int ny = ras.getHeight();
 for (int y = 0; y < ny; y++) {
 for (int x = 0; x < nx; x++) {
-double value = gwrapper.getCellValueAsDouble(x, y, 0);
-if (value == rstLayer.getNoDataValue())
+double value = ras.getSampleDouble(x, y, 0);
+if (value == nodata)
 counter++;
 }
 }
@@ -125,6 +129,7 @@
 return counter;
 }
 
+@Override
 public boolean execute(PlugInContext context) throws Exception {
 
 Locale locale = new Locale("en", "UK");
@@ -132,12 +137,11 @@
 DecimalFormat df = (DecimalFormat) NumberFormat

[JPP-Devel] SVN: [5677] core/trunk/src/com/vividsolutions/jump/io/GMLWriter.java

2018-01-22 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5677
  http://sourceforge.net/p/jump-pilot/code/5677
Author:   edso
Date: 2018-01-22 11:33:09 + (Mon, 22 Jan 2018)
Log Message:
---
always keep envelope in JML/GML as suggested by Jukka on the ml
"[JPP-Devel] New SRID system and unknown SRID"
https://sourceforge.net/p/jump-pilot/mailman/message/36195148/

Modified Paths:
--
core/trunk/src/com/vividsolutions/jump/io/GMLWriter.java

Modified: core/trunk/src/com/vividsolutions/jump/io/GMLWriter.java
===
--- core/trunk/src/com/vividsolutions/jump/io/GMLWriter.java2018-01-19 
13:34:00 UTC (rev 5676)
+++ core/trunk/src/com/vividsolutions/jump/io/GMLWriter.java2018-01-22 
11:33:09 UTC (rev 5677)
@@ -206,19 +206,21 @@
 // write a bounded by box definition setting an srid for the whole 
dataset
 // Workaround or convenience as OGC writes in the WFS 2.0 standard:
 //   11.3.6 Inheritance rules for srsName values
+String srsAttrib="";
 if (getSrid(featureCollection) > 0){
-  Envelope env = featureCollection.getEnvelope();
-  DecimalFormat df = new DecimalFormat("#,##0.00", new 
DecimalFormatSymbols(Locale.US));
-  df.setGroupingUsed(false);
-  String envString = df.format(env.getMinX()) + "," + 
df.format(env.getMinY()) + " " + df.format(env.getMaxX())
-  + "," + df.format(env.getMaxY());
-  buffWriter.write(
-"  \n" +
-"http://www.opengis.net/gml/srs/epsg.xml#"+getSrid(featureCollection)+"\">\n"
 +
-"  " + 
envString + "\n" +
-"\n" +
-"  \n");
+  srsAttrib=" 
srsName=\"http://www.opengis.net/gml/srs/epsg.xml#"+getSrid(featureCollection)+"\"";
 }
+Envelope env = featureCollection.getEnvelope();
+DecimalFormat df = new DecimalFormat("#,##0.00", new 
DecimalFormatSymbols(Locale.US));
+df.setGroupingUsed(false);
+String envString = df.format(env.getMinX()) + "," + 
df.format(env.getMinY()) + " " + df.format(env.getMaxX())
++ "," + df.format(env.getMaxY());
+buffWriter.write(
+  "  \n" +
+  "\n" +
+  "  " + 
envString + "\n" +
+  "\n" +
+  "  \n");
 
 long milliSeconds = 0;
 int count = 0;
@@ -450,7 +452,7 @@
 "\nhttp://www.opengis.net/gml\; 
xmlns:xsi=\"http://www.w3.org/2000/10/XMLSchema-instance\; >\n" +
 inputTemplate + "<" + standard_featureCollection + ">\n");
 
-colHeader = "  <" + standard_feature + "> \n";
+colHeader = "  <" + standard_feature + ">\n";
 
 for (t = 0; t < fcmd.getAttributeCount(); t++) {
 colName = fcmd.getAttributeName(t);
@@ -471,9 +473,8 @@
 result.addItem(colText, colCode);
 }
 
-result.setFeatureFooter(colHeader + "  \n");
-result.setFooterText("  ");
+result.setFooterText("\n\n");
 
 return result;
@@ -498,8 +499,7 @@
 // write a bounded by box definition setting an srid for the whole 
dataset
 // Workaround or convenience as OGC writes in the WFS 2.0 standard:
 //   11.3.6 Inheritance rules for srsName values
-if (getSrid(fc) > 0)
-  result += "boundedBy\n";
+result += "boundedBy\n";
 result += "\n";
 
 //fill in each of the column defs


--
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

[JPP-Devel] SVN: [5670] plug-ins/SextantePlugIn/src/es/unex/sextante/openjump

2018-01-13 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5670
  http://sourceforge.net/p/jump-pilot/code/5670
Author:   ma15569
Date: 2018-01-13 16:38:55 + (Sat, 13 Jan 2018)
Log Message:
---
Fix some Sextante dialog errors. Reactivated AdditionalResults frame

Modified Paths:
--

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteHelpPlugIn.java

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteToolboxPlugin.java

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/help/SextanteHelpFrame.java

Added Paths:
---

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/application_view.png
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/init/

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/init/OJSextanteApiInitialiser.java

Modified: 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteHelpPlugIn.java
===
--- 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteHelpPlugIn.java
2018-01-13 12:54:53 UTC (rev 5669)
+++ 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteHelpPlugIn.java
2018-01-13 16:38:55 UTC (rev 5670)
@@ -12,7 +12,7 @@
 import com.vividsolutions.jump.workbench.ui.images.IconLoader;
 
 import es.unex.sextante.gui.core.SextanteGUI;
-import es.unex.sextante.gui.help.SextanteHelpFrame;
+//import es.unex.sextante.openjump.help.SextanteHelpFrame;
 import es.unex.sextante.gui.help.SextanteHelpWindow;
 import es.unex.sextante.gui.toolbox.ToolboxFrame;
 import es.unex.sextante.openjump.language.I18NPlug;

Modified: 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java
===
--- 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java
 2018-01-13 12:54:53 UTC (rev 5669)
+++ 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java
 2018-01-13 16:38:55 UTC (rev 5670)
@@ -2,33 +2,68 @@
 
 import java.util.ArrayList;
 
+import javax.swing.Icon;
 import javax.swing.ImageIcon;
+import javax.swing.JInternalFrame;
+import javax.swing.JOptionPane;
 
 import org.openjump.core.ui.plugin.AbstractUiPlugIn;
+import org.openjump.sextante.core.ObjectAndDescription;
+import org.openjump.sextante.gui.additionalResults.AdditionalResults;
+import org.openjump.sextante.gui.additionalResults.AdditionalResultsFrame;
 
+import com.vividsolutions.jump.I18N;
 import com.vividsolutions.jump.workbench.plugin.PlugInContext;
 
-import es.unex.sextante.gui.additionalResults.AdditionalResults;
-import es.unex.sextante.gui.core.SextanteGUI;
 import es.unex.sextante.openjump.language.I18NPlug;
+//import es.unex.sextante.gui.additionalResults.AdditionalResults;
 
+//import es.unex.sextante.gui.additionalResults.AdditionalResults;
+
 public class SextanteResultsPlugin extends AbstractUiPlugIn {
 
 public String NO_RESULTS = I18NPlug
 
.getI18N("es.unex.sextante.kosmo.extensions.SextanteResultsPlugin.Results.no_results");
+private String sName = I18N
+
.get("org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Result-viewer");
+private static String sWarning = I18N
+
.get("org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.List-of-results-is-empty");
 
 @Override
 public boolean execute(final PlugInContext context) throws Exception {
 
-final ArrayList results = AdditionalResults.getComponents();
-if (results.size() != 0) {
-SextanteGUI.getGUIFactory().showAdditionalResultsDialog(results);
+ArrayList m_Components = 
AdditionalResults.m_Components;
+if (m_Components == null || m_Components.size() == 0) {
+JOptionPane.showMessageDialog(null, sWarning, sName,
+JOptionPane.WARNING_MESSAGE);
+return false;
+} else {
+
+for (JInternalFrame iFrame : context.getWorkbenchFrame()
+.getInternalFrames()) {
+if (iFrame instanceof AdditionalResultsFrame) {
+
+iFrame.toFront();
+return true;
+
+}
+}
+AdditionalResultsFrame additionalResultsFrame = new 
AdditionalResultsFrame(
+m_Components);
+
+context.getWorkbenchFrame()
+.addInternalFrame(additionalResultsFrame);
+
 }
 
-// else {
-// JOptionPane.showMessageDialog(null, NO_RESULTS,
-// Sextante.getText("Warning"), JOptionPane.WARNING_MESSAGE);
-// }
+/*
+ * final ArrayList results = AdditionalResults.getComponents(); if
+ * (results.size() != 0) {
+ *

[JPP-Devel] SVN: [5672] core/trunk/src/language/jump_es.properties

2018-01-15 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5672
  http://sourceforge.net/p/jump-pilot/code/5672
Author:   ma15569
Date: 2018-01-15 12:38:34 + (Mon, 15 Jan 2018)
Log Message:
---
Correct typos in Spanish

Modified Paths:
--
core/trunk/src/language/jump_es.properties

Modified: core/trunk/src/language/jump_es.properties
===
--- core/trunk/src/language/jump_es.properties  2018-01-14 14:06:58 UTC (rev 
5671)
+++ core/trunk/src/language/jump_es.properties  2018-01-15 12:38:34 UTC (rev 
5672)
@@ -278,7 +278,7 @@
 jump.geom.AffineTransformation.Transformation-is-non-invertible=La 
transformaci\u00f3n no es invertible.
 jump.geom.Matrix.Matrix-A-is-incorrectly-sized=La matriz A est\u00e1 mal 
dimensionada.
 
jump.geom.NotRepresentableException.Projective-point-not-representable-on-the-Cartesian-plane=Punto
 proyectivo no representable en el plano Cartesiano.
-jump.plugin.edit.AffineTransControlPointExtracter.Control-point-collections-must-be-same-size=Las
 Colecciones de Puntos de Control deben tener el mismo tama\u00f1o.
+jump.plugin.edit.AffineTransControlPointExtracter.Control-point-collections-must-be-same-size=Las
 Colecciones de Puntos de Control deben tener el mismo tama\xF1o.
 
jump.plugin.edit.AffineTransControlPointExtracter.Control-Point-LineStrings-are-different-lengths=Los
 Puntos de Control tienen diferentes longitudes.
 
jump.plugin.edit.AffineTransControlPointExtracter.Control-points-must-be-a-single-geometry=Los
 Puntos de Control deben tener una s\u00f3la geometr\u00eda.
 
jump.plugin.edit.AffineTransControlPointExtracter.Control-points-must-be-LineStrings=Los
 Puntos de Control deben ser de tipo LineString.
@@ -473,7 +473,7 @@
 model.StandardCategoryNames.subject=Sujeto
 model.StandardCategoryNames.system=Sistema
 model.StandardCategoryNames.working=Trabajo
-org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions=No
 puedo determinar los tama\u00f1o de la imagen
+org.openjump.core.rasterimage.AddRasterImageLayerWizard.can-not-determine-image-dimensions=No
 puedo determinar los tama\xF1o de la imagen
 
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found=Ningun
 worldfile encontrado
 
org.openjump.core.rasterimage.AddRasterImageLayerWizard.Sextante-Raster-Image=Imagen
 Raster (Sextante)
 
org.openjump.core.rasterimage.AddRasterImageLayerWizard.no-worldfile-found-message
 =Ningun worldfile encontrado por la capa: ''{0}''
@@ -1022,10 +1022,10 @@
 
org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.cell.mean=medio
 
org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.cell.min=min
 
org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.cell.nodata=no
 data
-org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.cell.size=Tama\00F1o
 celda
+org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.cell.size=Tama\xF1o
 celda
 
org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.cell.values=Valores
 de las celdas
 
org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.file.bands=Bandas
 raster
-org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.file.size=Tama\00F1o
 raster
+org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.file.size=Tama\xF1o
 raster
 org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.layer=capa
 
org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.layer_name=Nombre
 capa
 
org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.namefile=Fichero
@@ -1034,7 +1034,7 @@
 
org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.statistics=Estat\u00ecsticas
 org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.name= 
nombre
 org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.type= tipo
-org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.dimension= 
tama00F1o
+org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.dimension= 
tama\xF1o
 
org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.directory=carpeta
 org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.area=area
 org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.xmin= min X
@@ -1047,8 +1047,8 @@
 
org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.colordepth= 
profundidad de color
 
org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.cellnum=numero
 de celdas
 
org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.variance=varianza
-org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.dimension_raster=
 tama\00F1o
-org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.dimension_cell=
 tama\00F1o de celda
+org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.dimension_raster=
 tama\xF1o

[JPP-Devel] SVN: [5680] core/trunk/src/org/openjump/core/ui/plugin/raster/ RasterQueryCursorTool.java

2018-01-25 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5680
  http://sourceforge.net/p/jump-pilot/code/5680
Author:   ma15569
Date: 2018-01-25 13:57:11 + (Thu, 25 Jan 2018)
Log Message:
---
modify status message

Modified Paths:
--
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterQueryCursorTool.java

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterQueryCursorTool.java
===
--- 
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterQueryCursorTool.java
2018-01-25 13:20:24 UTC (rev 5679)
+++ 
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterQueryCursorTool.java
2018-01-25 13:57:11 UTC (rev 5680)
@@ -150,11 +150,8 @@
 coord.y, b);
 if (cellValue != null) {
 if (rLayer.isNoData(cellValue)) {
-cellValues = "("
-+ RASTER_NODATA
-+ ") "
-+ cellValues.concat(Double
-.toString(cellValue));
+cellValues = cellValues.concat(Double
+.toString(cellValue));
 } else {
 cellValues = cellValues.concat(Double
 .toString(cellValue));
@@ -185,7 +182,8 @@
 .getFeatureSchema()));
 }
 getPanel().getContext().setStatusMessage(
-"(" + name + ") " + VALUE + ": " + lastClick);
+"[" + LAYER + ": " + name + "] " + VALUE + ": "
++ lastClick);
 getPanel().setViewportInitialized(true);
 } else {
 getPanel()
@@ -322,7 +320,11 @@
 tentativeCoordinate.y, b);
 if (cellValue != null) {
 if (aLayer.isNoData(cellValue)) {
-cellValues = Double.toString(Double.NaN);
+cellValues = cellValues.concat(Double
+.toString(cellValue))
++ "("
++ RASTER_NODATA
++ ") ";
 } else {
 cellValues = cellValues.concat(Double
 .toString(cellValue));
@@ -349,6 +351,7 @@
 // + cellValues.toString());
 
 getPanel().getContext().setStatusMessage(
-"(" + name + ") " + VALUE + ": " + cellValues.toString());
+"[" + LAYER + ": " + name + "] " + VALUE + ": "
++ cellValues.toString());
 }
 }
\ No newline at end of file


--
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

[JPP-Devel] SVN: [5679] core/trunk/src/org/openjump/core/ui/plugin/raster/ RasterQueryCursorTool.java

2018-01-25 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5679
  http://sourceforge.net/p/jump-pilot/code/5679
Author:   ma15569
Date: 2018-01-25 13:20:24 + (Thu, 25 Jan 2018)
Log Message:
---
small enhancement on RasterQueryCursorTool

Modified Paths:
--
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterQueryCursorTool.java

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterQueryCursorTool.java
===
--- 
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterQueryCursorTool.java
2018-01-22 14:14:14 UTC (rev 5678)
+++ 
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterQueryCursorTool.java
2018-01-25 13:20:24 UTC (rev 5679)
@@ -83,8 +83,9 @@
  * SHIFT to display only last measure. Moving cursor on image shows raster
  * cell value on lower panel
  * 
- * [2014_02_24] Giuseppe Aruta - Fixed minor bug on lower panel
- * [2015_07_08] Giuseppe Aruta - Fixed bug #407 Sextante raster : 
displaying cell values throws NPE 
+ * [2014_02_24] Giuseppe Aruta - Fixed minor bug on lower panel 
[2015_07_08]
+ * Giuseppe Aruta - Fixed bug #407 Sextante raster : displaying cell values
+ * throws NPE
  */
 
 protected Coordinate tentativeCoordinate;
@@ -92,7 +93,8 @@
 
.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.cell.values");
 public static final String LAYER = I18N
 
.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.layer");
-
+private final static String RASTER_NODATA = I18N
+
.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.cell.nodata");
 private String lastClick = "-";
 // protected int width, height; // The dimensions of the image
 
@@ -107,10 +109,12 @@
 
 }
 
+@Override
 public Icon getIcon() {
 return IconLoader.icon("information_16x16.png");
 }
 
+@Override
 public Cursor getCursor() {
 // [ede 03.2103] linux currently support only 2 color cursors
 Image i = !CheckOS.isLinux() ? IconLoader
@@ -119,6 +123,7 @@
 return createCursor(i);
 }
 
+@Override
 protected void gestureFinished() throws NoninvertibleTransformException,
 IOException, RasterDataNotFoundException {
 reportNothingToUndoYet();
@@ -127,7 +132,7 @@
 
 final WorkbenchContext wbcontext = this.getWorkbench().getContext();
 RasterImageLayer aLayer = null;
-   
+
 Layerable[] ls = (Layerable[]) wbcontext.getLayerNamePanel()
 .selectedNodes(RasterImageLayer.class)
 .toArray(new Layerable[] {});
@@ -145,7 +150,11 @@
 coord.y, b);
 if (cellValue != null) {
 if (rLayer.isNoData(cellValue)) {
-cellValues = Double.toString(Double.NaN);
+cellValues = "("
++ RASTER_NODATA
++ ") "
++ cellValues.concat(Double
+.toString(cellValue));
 } else {
 cellValues = cellValues.concat(Double
 .toString(cellValue));
@@ -284,6 +293,7 @@
  * TODO: if user drag on image, measures on lower panel are no more
  * displayed. Try to find a solution
  */
+@Override
 public void mouseDragged(MouseEvent e) {
 // mouseLocationChanged(e);
 }
@@ -293,6 +303,7 @@
  */
 PlugInContext gContext;
 
+@Override
 public void mouseMoved(MouseEvent me) {
 
 final WorkbenchContext wbcontext = this.getWorkbench().getContext();


--
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

[JPP-Devel] SVN: [5668] core/trunk/src/com/vividsolutions/jump/workbench/ui/ GUIUtil.java

2018-01-13 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5668
  http://sourceforge.net/p/jump-pilot/code/5668
Author:   michaudm
Date: 2018-01-13 12:50:33 + (Sat, 13 Jan 2018)
Log Message:
---
Fix a NPE happening with a NewLayerProperties JInternalFrame passed to 
GUIUtil#setBounds

Modified Paths:
--
core/trunk/src/com/vividsolutions/jump/workbench/ui/GUIUtil.java

Modified: core/trunk/src/com/vividsolutions/jump/workbench/ui/GUIUtil.java
===
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/GUIUtil.java
2018-01-07 21:15:50 UTC (rev 5667)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/GUIUtil.java
2018-01-13 12:50:33 UTC (rev 5668)
@@ -1348,7 +1348,7 @@
 (int) other.getLocationOnScreen().getY()
 + (location.fromBottom ? (other.getHeight()
 - componentToMove.getHeight() - location.y) : location.y));
-if (!(componentToMove instanceof Window)) {
+if (!(componentToMove instanceof Window) && !(componentToMove instanceof 
JInternalFrame)) {
   SwingUtilities.convertPointFromScreen(p, componentToMove.getParent());
 }
 componentToMove.setBounds(p.x, p.y, width, height);


--
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

[JPP-Devel] SVN: [5669] core/trunk/src/org/openjump/core/ccordsys/utils/SRSInfo.java

2018-01-13 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5669
  http://sourceforge.net/p/jump-pilot/code/5669
Author:   michaudm
Date: 2018-01-13 12:54:53 + (Sat, 13 Jan 2018)
Log Message:
---
Add a registry to manage CRS created by CTS library

Modified Paths:
--
core/trunk/src/org/openjump/core/ccordsys/utils/SRSInfo.java

Modified: core/trunk/src/org/openjump/core/ccordsys/utils/SRSInfo.java
===
--- core/trunk/src/org/openjump/core/ccordsys/utils/SRSInfo.java
2018-01-13 12:50:33 UTC (rev 5668)
+++ core/trunk/src/org/openjump/core/ccordsys/utils/SRSInfo.java
2018-01-13 12:54:53 UTC (rev 5669)
@@ -18,8 +18,10 @@
 public static final String UNDEFINED = "0";
 public static final String USERDEFINED = "USER-DEFINED";
 
+// Add LOCAL_CoordinateReferenceSystem to manage internal identifiers
+// attributed by CTS library for new Coordinate Reference System
 public enum Registry {
-SRID, EPSG, ESRI, IGNF, SRORG
+SRID, EPSG, ESRI, IGNF, SRORG, LOCAL_CoordinateReferenceSystem
 }
 
 private String source = ""; // The source of SRS information (ex. prj file


--
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

[JPP-Devel] SVN: [5698] plug-ins/SextantePlugIn/src/es/unex/sextante/openjump

2018-01-30 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5698
  http://sourceforge.net/p/jump-pilot/code/5698
Author:   ma15569
Date: 2018-01-30 17:05:15 + (Tue, 30 Jan 2018)
Log Message:
---
Reactivated SextanteAdditionalResult on the code. Fix export output raster 
problem

Modified Paths:
--

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/OpenJUMPRasterLayer.java

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteExtension.java

Modified: 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/OpenJUMPRasterLayer.java
===
--- 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/OpenJUMPRasterLayer.java
 2018-01-29 12:20:25 UTC (rev 5697)
+++ 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/OpenJUMPRasterLayer.java
 2018-01-30 17:05:15 UTC (rev 5698)
@@ -3,10 +3,10 @@
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
-import java.awt.image.DataBuffer;
 import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 import java.io.BufferedWriter;
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -16,11 +16,23 @@
 
 import javax.media.jai.PlanarImage;
 import javax.media.jai.RasterFactory;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 
 import org.openjump.core.rasterimage.GeoTiffConstants;
 import org.openjump.core.rasterimage.RasterImageLayer;
+import org.openjump.core.rasterimage.Stats;
 import org.openjump.core.rasterimage.TiffTags;
 import org.openjump.core.rasterimage.WorldFileHandler;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 
 import com.sun.media.jai.codec.TIFFEncodeParam;
 import com.sun.media.jai.codec.TIFFField;
@@ -35,9 +47,6 @@
 import es.unex.sextante.outputs.IOutputChannel;
 
 public class OpenJUMPRasterLayer extends AbstractRasterLayer {
-
-private static final double DEFAULT_NO_DATA_VALUE = -9.;
-
 private String m_sFilename;
 private String m_sName = "";
 private AnalysisExtent m_LayerExtent;
@@ -45,94 +54,74 @@
 private Raster m_Raster;
 RasterImageLayer m_Layer;
 
-public void create(final RasterImageLayer layer) throws IOException {
+public void create(RasterImageLayer layer) throws IOException {
+this.m_Layer = layer;
+this.m_Raster = layer.getRasterData(null);
+this.m_sName = layer.getName();
+this.m_sFilename = layer.getImageFileName();
+Envelope env = layer.getWholeImageEnvelope();
+this.m_LayerExtent = new AnalysisExtent();
+this.m_LayerExtent.setCellSize((env.getMaxX() - env.getMinX())
+/ this.m_Raster.getWidth());
+this.m_LayerExtent.setXRange(env.getMinX(), env.getMaxX(), true);
+this.m_LayerExtent.setYRange(env.getMinY(), env.getMaxY(), true);
+this.m_dNoDataValue = layer.getNoDataValue();
 
-// [Giuseppe Aruta 8 Oct. 2016] add few modification to correct bug 
#410
-
-/*
- * [sstein 26 Oct. 2010] - don't use code below because the raster data
- * should be loaded new from file. It happened in tests that with the
- * code below data from another raster, created last, was used instead.
- * (e.g. calculated Point-KDE first, and then Line-KDE=> then getting
- * the polygon grid from the point-KDE raster delivered the Line-KDE
- * raster as poly grid)
- * 
- * m_BaseDataObject = layer; //[sstein 2 Aug 2010], changed so we work
- * now with the raster and not the image, which may be scaled for
- * display. //m_Raster = layer.getImage().getData(); m_Raster =
- * layer.getRasterData(); //-- end m_sName = layer.getName();
- * m_sFilename = layer.getImageFileName(); Envelope env =
- * layer.getEnvelope(); m_LayerExtent = new GridExtent();
- * m_LayerExtent.setXRange(env.getMinX(), env.getMaxX());
- * m_LayerExtent.setYRange(env.getMinY(), env.getMaxY());
- * m_LayerExtent.setCellSize((env.getMaxX() - env.getMinX()) /
- * (double)m_Raster.getWidth()); m_dNoDataValue = 
DEFAULT_NO_DATA_VALUE;
- */
-
+// [Giuseppe Aruta 30 Gen. 2018] deactivated as OJ calculate anyhow
+// statistics (and writes .xml file) when loads raster
+// m_Stats = stats(layer);
+// --
+// [Giuseppe Aruta 30 Gen. 2018] - Uncomment [8 Oct. 2016] and reused
+// the previous version (Sextante
+// 0.6) as the previous method duplicates layer name ("rastername"

[JPP-Devel] SVN: [5700] core/trunk

2018-01-30 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5700
  http://sourceforge.net/p/jump-pilot/code/5700
Author:   ma15569
Date: 2018-01-30 17:28:17 + (Tue, 30 Jan 2018)
Log Message:
---
2018-01-30 Giuseppe Aruta
   * Upgraded Sextante building to version gen2018a to solve a bug on 
 exporting raster data. Moved Toolboxframe as OJ internal frame

Modified Paths:
--
core/trunk/ChangeLog
core/trunk/Changes.txt
core/trunk/TODO.txt

Added Paths:
---
core/trunk/lib/plus/ojsextante_binding_gen2018a.jar

Removed Paths:
-
core/trunk/lib/plus/ojsextante_binding_gen2018.jar

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-01-30 17:08:57 UTC (rev 5699)
+++ core/trunk/ChangeLog2018-01-30 17:28:17 UTC (rev 5700)
@@ -5,6 +5,10 @@
 
 * Changes.txt updated until here **
 
+2018-01-30 Giuseppe Aruta
+   * Upgraded Sextante building to version gen2018a to solve a bug on 
+ exporting raster data. Moved Toolboxframe as OJ internal frame
+
 2018-01-28 mmichaud 
   * Update Cadplan VertexSymbol (finnish translation + java 1.7 compatibility)
   * Update Cadplan JumpPrinter (finnish translation + OpenJUMP 1.11 
compatibility)

Modified: core/trunk/Changes.txt
===
--- core/trunk/Changes.txt  2018-01-30 17:08:57 UTC (rev 5699)
+++ core/trunk/Changes.txt  2018-01-30 17:28:17 UTC (rev 5700)
@@ -97,8 +97,8 @@
   * Update graph extension to 0.5.6 (new finnish translation)
   * Update csv-driver extension to 1.0.2 (new finnish translation)
   * Update topology extension to 0.9.2 (new finnish translation)
-  * Update Sextante: Sextante help opens as OpenJUMP
-internal frame
+  * Update Sextante: Toolbox frame and Sextante help  open as OpenJUMP
+internal frames
   * Upgraded ColorChooser to version 9: 
- correct #461 ColorChooser creates inconsistent schema
- enlarged color icons

Modified: core/trunk/TODO.txt
===
--- core/trunk/TODO.txt 2018-01-30 17:08:57 UTC (rev 5699)
+++ core/trunk/TODO.txt 2018-01-30 17:28:17 UTC (rev 5700)
@@ -2,6 +2,15 @@
 ## OpenJUMP TODO
 ##
 
+2018-gen-31 Giuseppe Aruta (Peppe)
+Improve migration of Sextante Additional Results as internal OJ
+plugin.
+Resume original Sexante ver. 1.0 libraries source codes (Sextante.jar, 
+Sextante-gui.jar and Sextante-algorithms.jar) in order to correct some
+internal bugs which cannot be done via OJ binding
+Explore possibility to port AdbToolbox Raster plugins to OJ as alternative
+to Sextante 
+
 2011-jul-04 mmichaud 
 Improve documentation
 - update the wiki (which is does not fit 1.4.1 version any more)

Deleted: core/trunk/lib/plus/ojsextante_binding_gen2018.jar
===
(Binary files differ)

Added: core/trunk/lib/plus/ojsextante_binding_gen2018a.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/ojsextante_binding_gen2018a.jar
===
--- core/trunk/lib/plus/ojsextante_binding_gen2018a.jar 2018-01-30 17:08:57 UTC 
(rev 5699)
+++ core/trunk/lib/plus/ojsextante_binding_gen2018a.jar 2018-01-30 17:28:17 UTC 
(rev 5700)

Property changes on: core/trunk/lib/plus/ojsextante_binding_gen2018a.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property

--
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

[JPP-Devel] SVN: [5699] plug-ins/SextantePlugIn/dist

2018-01-30 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5699
  http://sourceforge.net/p/jump-pilot/code/5699
Author:   ma15569
Date: 2018-01-30 17:08:57 + (Tue, 30 Jan 2018)
Log Message:
---
added gennuary a build

Added Paths:
---
plug-ins/SextantePlugIn/dist/ext/
plug-ins/SextantePlugIn/dist/ojsextante_binding_gen2018a.jar

Added: plug-ins/SextantePlugIn/dist/ojsextante_binding_gen2018a.jar
===
(Binary files differ)

Index: plug-ins/SextantePlugIn/dist/ojsextante_binding_gen2018a.jar
===
--- plug-ins/SextantePlugIn/dist/ojsextante_binding_gen2018a.jar
2018-01-30 17:05:15 UTC (rev 5698)
+++ plug-ins/SextantePlugIn/dist/ojsextante_binding_gen2018a.jar
2018-01-30 17:08:57 UTC (rev 5699)

Property changes on: 
plug-ins/SextantePlugIn/dist/ojsextante_binding_gen2018a.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property

--
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

[JPP-Devel] SVN: [5701] core/trunk/src/org/openjump/core/ui/plugin/raster/ RasterImageLayerPropertiesPlugIn.java

2018-01-30 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5701
  http://sourceforge.net/p/jump-pilot/code/5701
Author:   ma15569
Date: 2018-01-31 06:01:19 + (Wed, 31 Jan 2018)
Log Message:
---
removed typo

Modified Paths:
--

core/trunk/src/org/openjump/core/ui/plugin/raster/RasterImageLayerPropertiesPlugIn.java

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterImageLayerPropertiesPlugIn.java
===
--- 
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterImageLayerPropertiesPlugIn.java
 2018-01-30 17:28:17 UTC (rev 5700)
+++ 
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterImageLayerPropertiesPlugIn.java
 2018-01-31 06:01:19 UTC (rev 5701)
@@ -290,7 +290,7 @@
 info += property(RASTER_COLORDEPTH, raster_colordepth, bgColor0);
 info += property(RASTER_BANDS, raster_bands, bgColor1);
 if (rLayer.getNumBands() == 1) {
-info += property(RASTER_NODATA + " Pap", raster_nodata, bgColor0);
+info += property(RASTER_NODATA, raster_nodata, bgColor0);
 }
 for (int b = 0; b < numBands; b++) {
 int numerobanda = b + 1;


--
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

[JPP-Devel] SVN: [5694] plug-ins/CadPlan_VertexSymbols/trunk

2018-01-28 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5694
  http://sourceforge.net/p/jump-pilot/code/5694
Author:   michaudm
Date: 2018-01-28 20:48:34 + (Sun, 28 Jan 2018)
Log Message:
---
Vertex Symbols extension : add an ant build file a version number and fix a 
compatibility problem with java 1.7

Modified Paths:
--
plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexDialog.java

plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexSymbolsExtension.java

Added Paths:
---
plug-ins/CadPlan_VertexSymbols/trunk/build.xml

Copied: plug-ins/CadPlan_VertexSymbols/trunk/build.xml (from rev 5684, 
plug-ins/CsvDriver/trunk/build.xml)
===
--- plug-ins/CadPlan_VertexSymbols/trunk/build.xml  
(rev 0)
+++ plug-ins/CadPlan_VertexSymbols/trunk/build.xml  2018-01-28 20:48:34 UTC 
(rev 5694)
@@ -0,0 +1,95 @@
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+   
+
+
+
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file

Modified: 
plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexDialog.java
===
--- plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexDialog.java 
2018-01-28 20:46:06 UTC (rev 5693)
+++ plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexDialog.java 
2018-01-28 20:48:34 UTC (rev 5694)
@@ -311,7 +311,7 @@
  VertexParams.showFill = showFillCB.isSelected();
  VertexParams.dotted = dottedCB.isSelected();
  VertexParams.sizeByScale = sizeByScaleCB.isSelected();
- VertexParams.type = getType();
+ VertexParams.type = getVertexType();
  VertexParams.sides = getSides(VertexParams.type);
 //System.out.println("getSides="+VertexParams.sides);   //***
  VertexParams.selectedImage = imagePanel.getSelectedImage();
@@ -347,7 +347,7 @@
 return vectorPanel.symbolPanel.sides[2];
 }
 
-public int getType()
+public int getVertexType()
 {
 //for (int i=0; i < vectorPanel.symbolPanel.vertexRB.length; i++)
 //{

Modified: 
plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexSymbolsExtension.java
===
--- 
plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexSymbolsExtension.java
   2018-01-28 20:46:06 UTC (rev 5693)
+++ 
plug-ins/CadPlan_VertexSymbols/trunk/src/com/cadplan/jump/VertexSymbolsExtension.java
   2018-01-28 20:48:34 UTC (rev 5694)
@@ -37,4 +37,8 @@
 {
 new VertexSymbolsPlugIn().initialize(context);
 }
+
+public String getVersion() {
+return "0.181 (2018-01-28)";
+}
 }


--
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

[JPP-Devel] SVN: [5695] plug-ins/CadPlan_JumpPrinter/trunk

2018-01-28 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5695
  http://sourceforge.net/p/jump-pilot/code/5695
Author:   michaudm
Date: 2018-01-28 21:22:53 + (Sun, 28 Jan 2018)
Log Message:
---
Upgrade JumpPrinter : add ant file + version number, replace obsolete 
de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer by 
current version of RasterImageLayer in the code.

Modified Paths:
--

plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/FurnitureImagePanel.java
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/MapImagePrinter.java

plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/PrinterExtension.java

Added Paths:
---
plug-ins/CadPlan_JumpPrinter/trunk/build.xml

Copied: plug-ins/CadPlan_JumpPrinter/trunk/build.xml (from rev 5694, 
plug-ins/CadPlan_VertexSymbols/trunk/build.xml)
===
--- plug-ins/CadPlan_JumpPrinter/trunk/build.xml
(rev 0)
+++ plug-ins/CadPlan_JumpPrinter/trunk/build.xml2018-01-28 21:22:53 UTC 
(rev 5695)
@@ -0,0 +1,96 @@
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+   
+
+
+
+
+ 
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file

Modified: 
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/FurnitureImagePanel.java
===
--- 
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/FurnitureImagePanel.java
2018-01-28 20:48:34 UTC (rev 5694)
+++ 
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/FurnitureImagePanel.java
2018-01-28 21:22:53 UTC (rev 5695)
@@ -30,7 +30,7 @@
 
 
 import com.cadplan.designer.GridBagDesigner;
-import com.cadplan.fileio.*;
+//import com.cadplan.fileio.*;
 import com.cadplan.fileioA.FileChooser;
 
 public class FurnitureImagePanel extends JPanel implements ActionListener, 
AdjustmentListener

Modified: 
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/MapImagePrinter.java
===
--- 
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/MapImagePrinter.java
2018-01-28 20:48:34 UTC (rev 5694)
+++ 
plug-ins/CadPlan_JumpPrinter/trunk/src/com/cadplan/jump/MapImagePrinter.java
2018-01-28 21:22:53 UTC (rev 5695)
@@ -120,10 +120,10 @@
 Layerable layer = (Layerable) ijj.next();
 try
 {
-Class dummy = 
Class.forName("de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer");
-if((AbstractLayerable) layer instanceof 
de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)
+Class dummy = 
Class.forName("org.openjump.core.rasterimage.RasterImageLayer");
+if((AbstractLayerable) layer instanceof 
org.openjump.core.rasterimage.RasterImageLayer)
 {
-boolean isVisible = 
((de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)layer).isVisible();
+boolean isVisible = 
((org.openjump.core.rasterimage.RasterImageLayer)layer).isVisible();
 if(isVisible) rasterLayers.add(layer);
 if(debug) 
System.out.println("Layer:"+layer.getName()+"Layer is Raster*** 
 visible:"+isVisible);
 }
@@ -172,11 +172,11 @@
 }
 else
 {
- bimage = 
((de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)layer).createImage(context.getLayerViewPanel());
- imageEnvelope = 
((de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)layer).getEnvelope();
- transparencyLevel = 
((de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)layer).getTransparencyLevel();
- imageX = 
((de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)layer).getXOffset();
- imageY = 
((de.fhOsnabrueck.jump.pirol.utilities.RasterImageSupport.RasterImageLayer)layer).getYOffset();
+ bimage =

[JPP-Devel] SVN: [5696] core/trunk

2018-01-28 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5696
  http://sourceforge.net/p/jump-pilot/code/5696
Author:   michaudm
Date: 2018-01-28 21:37:26 + (Sun, 28 Jan 2018)
Log Message:
---
Upgrade JumpPrinter and VertexSymbol from Cadplan

Modified Paths:
--
core/trunk/ChangeLog
core/trunk/Changes.txt

Added Paths:
---
core/trunk/lib/plus/JumpPrinter-1.88.jar
core/trunk/lib/plus/VertexSymbols-0.181.jar

Removed Paths:
-
core/trunk/lib/plus/JumpPrinter.jar
core/trunk/lib/plus/VertexSymbols.jar

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-01-28 21:22:53 UTC (rev 5695)
+++ core/trunk/ChangeLog2018-01-28 21:37:26 UTC (rev 5696)
@@ -5,6 +5,10 @@
 
 * Changes.txt updated until here **
 
+2018-01-28 mmichaud 
+  * Update Cadplan VertexSymbol (finnish translation + java 1.7 compatibility)
+  * Update Cadplan JumpPrinter (finnish translation + OpenJUMP 1.11 
compatibility)
+
 2018-01-28 Giuseppe Aruta
   * Update ColorChooser to version 1.1 with new Finnic translation
 

Modified: core/trunk/Changes.txt
===
--- core/trunk/Changes.txt  2018-01-28 21:22:53 UTC (rev 5695)
+++ core/trunk/Changes.txt  2018-01-28 21:37:26 UTC (rev 5696)
@@ -105,7 +105,9 @@
   * Updated ColorChooser plugin to version 1.0
 - added recent color submenu
 - adopted fugue icons to plugins
-  * Update ColorChooser to version 1.1 with new Finnic translation
+  * Update ColorChooser to version 1.1 with new Finnish translation
+  * Upgrade Cadplan VertexSymbol plugin to 0.181 (new finnish translation)
+  * Upgrade Cadplan JumpPrinter plugin to 1.88 (new finnish translation)
 
 
 Version 1.11 release rev.5434 (released on 13. April 2017)

Added: core/trunk/lib/plus/JumpPrinter-1.88.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/JumpPrinter-1.88.jar
===
--- core/trunk/lib/plus/JumpPrinter-1.88.jar2018-01-28 21:22:53 UTC (rev 
5695)
+++ core/trunk/lib/plus/JumpPrinter-1.88.jar2018-01-28 21:37:26 UTC (rev 
5696)

Property changes on: core/trunk/lib/plus/JumpPrinter-1.88.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: core/trunk/lib/plus/JumpPrinter.jar
===
(Binary files differ)

Added: core/trunk/lib/plus/VertexSymbols-0.181.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/VertexSymbols-0.181.jar
===
--- core/trunk/lib/plus/VertexSymbols-0.181.jar 2018-01-28 21:22:53 UTC (rev 
5695)
+++ core/trunk/lib/plus/VertexSymbols-0.181.jar 2018-01-28 21:37:26 UTC (rev 
5696)

Property changes on: core/trunk/lib/plus/VertexSymbols-0.181.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: core/trunk/lib/plus/VertexSymbols.jar
===
(Binary files differ)


--
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

[JPP-Devel] SVN: [5693] plug-ins/openjump_lib/

2018-01-28 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5693
  http://sourceforge.net/p/jump-pilot/code/5693
Author:   michaudm
Date: 2018-01-28 20:46:06 + (Sun, 28 Jan 2018)
Log Message:
---
Add a shared directory containing openjump jars files useful for plugin 
development

Added Paths:
---
plug-ins/openjump_lib/


--
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

[JPP-Devel] SVN: [5682] plug-ins/GraphToolboxPlugin/trunk/build.xml

2018-01-27 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5682
  http://sourceforge.net/p/jump-pilot/code/5682
Author:   michaudm
Date: 2018-01-27 20:15:02 + (Sat, 27 Jan 2018)
Log Message:
---
Package 0.5.6 including last translation drom Jukka

Modified Paths:
--
plug-ins/GraphToolboxPlugin/trunk/build.xml

Modified: plug-ins/GraphToolboxPlugin/trunk/build.xml
===
--- plug-ins/GraphToolboxPlugin/trunk/build.xml 2018-01-27 20:07:19 UTC (rev 
5681)
+++ plug-ins/GraphToolboxPlugin/trunk/build.xml 2018-01-27 20:15:02 UTC (rev 
5682)
@@ -17,7 +17,7 @@
 
 
 
-
+
 
 
 


--
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

[JPP-Devel] SVN: [5683] plug-ins/TopologyPlugin/trunk/build.xml

2018-01-27 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5683
  http://sourceforge.net/p/jump-pilot/code/5683
Author:   michaudm
Date: 2018-01-27 20:24:39 + (Sat, 27 Jan 2018)
Log Message:
---
Bundle version 0.9.2 including Jukka's I18N updates

Modified Paths:
--
plug-ins/TopologyPlugin/trunk/build.xml

Modified: plug-ins/TopologyPlugin/trunk/build.xml
===
--- plug-ins/TopologyPlugin/trunk/build.xml 2018-01-27 20:15:02 UTC (rev 
5682)
+++ plug-ins/TopologyPlugin/trunk/build.xml 2018-01-27 20:24:39 UTC (rev 
5683)
@@ -17,7 +17,7 @@
 
 
 
-
+
 
 
 


--
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

[JPP-Devel] SVN: [5684] plug-ins/CsvDriver/trunk/build.xml

2018-01-27 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5684
  http://sourceforge.net/p/jump-pilot/code/5684
Author:   michaudm
Date: 2018-01-27 20:25:24 + (Sat, 27 Jan 2018)
Log Message:
---
Bundle version 1.0.2 including Jukka's I18N updates

Modified Paths:
--
plug-ins/CsvDriver/trunk/build.xml

Modified: plug-ins/CsvDriver/trunk/build.xml
===
--- plug-ins/CsvDriver/trunk/build.xml  2018-01-27 20:24:39 UTC (rev 5683)
+++ plug-ins/CsvDriver/trunk/build.xml  2018-01-27 20:25:24 UTC (rev 5684)
@@ -16,7 +16,7 @@
 
 
 
-
+
 
 
 


--
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

[JPP-Devel] SVN: [5686] core/trunk

2018-01-27 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5686
  http://sourceforge.net/p/jump-pilot/code/5686
Author:   michaudm
Date: 2018-01-27 20:38:02 + (Sat, 27 Jan 2018)
Log Message:
---
Update 3 plugins to include recent finnish translations (csv-driver, graph 
toolbox and topology plugin)

Modified Paths:
--
core/trunk/ChangeLog

Added Paths:
---
core/trunk/lib/plus/csv-driver-1.0.2.jar
core/trunk/lib/plus/graph-toolbox-0.5.6.jar
core/trunk/lib/plus/topology-0.9.2.jar

Removed Paths:
-
core/trunk/lib/plus/csv-driver-1.0.1.jar
core/trunk/lib/plus/graph-toolbox-0.5.5.jar
core/trunk/lib/plus/topology-0.9.1.jar

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-01-27 20:33:44 UTC (rev 5685)
+++ core/trunk/ChangeLog2018-01-27 20:38:02 UTC (rev 5686)
@@ -5,6 +5,9 @@
 
 2018-01-27 mmichaud 
   * For LayerProperties, don't read srs with cts library
+  * Update graph extension to 0.5.6 (new finnish translation)
+  * Update csv-driver extension to 1.0.2 (new finnish translation)
+  * Update topology extension to 0.9.2 (new finnish translation)
 
 2018-01-07 mmichaud 
   * Update CADExtension to 0.6 (fixes and improvements)

Deleted: core/trunk/lib/plus/csv-driver-1.0.1.jar
===
(Binary files differ)

Added: core/trunk/lib/plus/csv-driver-1.0.2.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/csv-driver-1.0.2.jar
===
--- core/trunk/lib/plus/csv-driver-1.0.2.jar2018-01-27 20:33:44 UTC (rev 
5685)
+++ core/trunk/lib/plus/csv-driver-1.0.2.jar2018-01-27 20:38:02 UTC (rev 
5686)

Property changes on: core/trunk/lib/plus/csv-driver-1.0.2.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: core/trunk/lib/plus/graph-toolbox-0.5.5.jar
===
(Binary files differ)

Added: core/trunk/lib/plus/graph-toolbox-0.5.6.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/graph-toolbox-0.5.6.jar
===
--- core/trunk/lib/plus/graph-toolbox-0.5.6.jar 2018-01-27 20:33:44 UTC (rev 
5685)
+++ core/trunk/lib/plus/graph-toolbox-0.5.6.jar 2018-01-27 20:38:02 UTC (rev 
5686)

Property changes on: core/trunk/lib/plus/graph-toolbox-0.5.6.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: core/trunk/lib/plus/topology-0.9.1.jar
===
(Binary files differ)

Added: core/trunk/lib/plus/topology-0.9.2.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/topology-0.9.2.jar
===
--- core/trunk/lib/plus/topology-0.9.2.jar  2018-01-27 20:33:44 UTC (rev 
5685)
+++ core/trunk/lib/plus/topology-0.9.2.jar  2018-01-27 20:38:02 UTC (rev 
5686)

Property changes on: core/trunk/lib/plus/topology-0.9.2.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property

--
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

[JPP-Devel] SVN: [5685] plug-ins

2018-01-27 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5685
  http://sourceforge.net/p/jump-pilot/code/5685
Author:   michaudm
Date: 2018-01-27 20:33:44 + (Sat, 27 Jan 2018)
Log Message:
---
Change version number in source code for csvdriver, graph plugin and topology 
plugin

Modified Paths:
--

plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/CSVDriverConfiguration.java

plug-ins/GraphToolboxPlugin/trunk/src/fr/michaelm/jump/plugin/graph/GraphExtension.java

plug-ins/TopologyPlugin/trunk/src/fr/michaelm/jump/plugin/topology/TopologyExtension.java

Modified: 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/CSVDriverConfiguration.java
===
--- 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/CSVDriverConfiguration.java
   2018-01-27 20:25:24 UTC (rev 5684)
+++ 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/CSVDriverConfiguration.java
   2018-01-27 20:33:44 UTC (rev 5685)
@@ -43,8 +43,9 @@
 /**
  * Extension loading a driver for csv and other character delimited text files
  * @author Michal MICHAUD
- * @version 1.0.1 (2017-05-07)
+ * @version 1.0.2 (2018-01-27)
  */
+// 1.0.2 (2018-01-27) add I18N for finnish language
 // 1.0.1 (2017-05-07) fix parser to parse correctly non quoted fields 
including double quotes
 // 1.0.0 (2017-02-09) writer : add encoding option
 //reader : do not keep columns used to make the feature 
geometry
@@ -76,7 +77,7 @@
 }
 
 public String getVersion() {
-return "1.0.1 (2017-05-07)";
+return "1.0.2 (2018-01-27)";
 }
 
 public void configure(PlugInContext context) throws Exception {

Modified: 
plug-ins/GraphToolboxPlugin/trunk/src/fr/michaelm/jump/plugin/graph/GraphExtension.java
===
--- 
plug-ins/GraphToolboxPlugin/trunk/src/fr/michaelm/jump/plugin/graph/GraphExtension.java
 2018-01-27 20:25:24 UTC (rev 5684)
+++ 
plug-ins/GraphToolboxPlugin/trunk/src/fr/michaelm/jump/plugin/graph/GraphExtension.java
 2018-01-27 20:33:44 UTC (rev 5685)
@@ -35,8 +35,9 @@
  * CycleFinderPlugIn : computes a graph from a linear network and find 
base cycles
  * 
  * @author Michal Michaud
- * @version 0.5.5 (2017-06-10)
+ * @version 0.5.6 (2018-01-27)
  */
+//version 0.5.6 (2018-01-27) add some translations in finnish
 //version 0.5.5 (2017-06-10) improvement of HydrographicNetworkAnalysis and 
Skeleton PlugIns
 //version 0.5.0 (2017-04-10) add HydrographicNetworkAnalysisPlugIn
 //version 0.4.1 (2017-02-03) fix a small I18N problem
@@ -56,7 +57,7 @@
 }
 
 public String getVersion() {
-return "0.5.5 (2017-06-10)";
+return "0.5.6 (2018-01-27)";
 }
 
 public void configure(PlugInContext context) throws Exception {

Modified: 
plug-ins/TopologyPlugin/trunk/src/fr/michaelm/jump/plugin/topology/TopologyExtension.java
===
--- 
plug-ins/TopologyPlugin/trunk/src/fr/michaelm/jump/plugin/topology/TopologyExtension.java
   2018-01-27 20:25:24 UTC (rev 5684)
+++ 
plug-ins/TopologyPlugin/trunk/src/fr/michaelm/jump/plugin/topology/TopologyExtension.java
   2018-01-27 20:33:44 UTC (rev 5685)
@@ -34,6 +34,7 @@
 import com.vividsolutions.jump.workbench.plugin.PlugInContext;
 
 // History
+// 0.9.2 (2018-01-27) : add finnish translations
 // 0.9.1 (2016-11-21) : remove RemoveMicroSegmentsPlugIn, replaced by
 //  
com.vividsolutions.jump.workbench.ui.plugin.analysis.RemoveSmallSegments
 //  included in the core of OpenJUMP
@@ -74,7 +75,7 @@
 }
 
 public String getVersion() {
-return "0.9.1 (2016-06-18)";
+return "0.9.2 (2018-01-27)";
 }
 
 public void configure(PlugInContext context) throws Exception {


--
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

[JPP-Devel] SVN: [5697] core/trunk/pom.xml

2018-01-29 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5697
  http://sourceforge.net/p/jump-pilot/code/5697
Author:   edso
Date: 2018-01-29 12:20:25 + (Mon, 29 Jan 2018)
Log Message:
---
fix release/snapshot only PLUS version on loading TIF monoband raster as 
Sexante raster fails

Modified Paths:
--
core/trunk/pom.xml

Modified: core/trunk/pom.xml
===
--- core/trunk/pom.xml  2018-01-28 21:37:26 UTC (rev 5696)
+++ core/trunk/pom.xml  2018-01-29 12:20:25 UTC (rev 5697)
@@ -1061,7 +1061,9 @@
 
it.geosolutions.imageio-ext
imageio-ext-tiff
-${imageio-ext.version}
+   
+   1.1.13
+   provided
 
 
 org.deegree2


--
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

[JPP-Devel] SVN: [5690] plug-ins/Color_chooser

2018-01-27 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5690
  http://sourceforge.net/p/jump-pilot/code/5690
Author:   ma15569
Date: 2018-01-28 07:37:16 + (Sun, 28 Jan 2018)
Log Message:
---
Updated ColoChooser binding list

Modified Paths:
--

plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/extension/FeatureColorChooserExtension.java

Added Paths:
---
plug-ins/Color_chooser/dist/ColorChooser-1.0.jar

Added: plug-ins/Color_chooser/dist/ColorChooser-1.0.jar
===
(Binary files differ)

Index: plug-ins/Color_chooser/dist/ColorChooser-1.0.jar
===
--- plug-ins/Color_chooser/dist/ColorChooser-1.0.jar2018-01-28 07:28:58 UTC 
(rev 5689)
+++ plug-ins/Color_chooser/dist/ColorChooser-1.0.jar2018-01-28 07:37:16 UTC 
(rev 5690)

Property changes on: plug-ins/Color_chooser/dist/ColorChooser-1.0.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: 
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/extension/FeatureColorChooserExtension.java
===
--- 
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/extension/FeatureColorChooserExtension.java
2018-01-28 07:28:58 UTC (rev 5689)
+++ 
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/extension/FeatureColorChooserExtension.java
2018-01-28 07:37:16 UTC (rev 5690)
@@ -8,7 +8,7 @@
 public class FeatureColorChooserExtension extends Extension {
 
 private static final String NAME = "Feature Color Chooser PlugIn (Giuseppe 
Aruta - adapted from SkyJUMP sourceforge.net/projects/skyjump/)";
-private static final String VERSION = "0.8 (2016-12-04)";
+private static final String VERSION = "1.1 (2018-1-28)";
 
 public String getName() {
 return NAME;


--
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

[JPP-Devel] SVN: [5687] plug-ins/SextantePlugIn

2018-01-27 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5687
  http://sourceforge.net/p/jump-pilot/code/5687
Author:   ma15569
Date: 2018-01-28 07:22:47 + (Sun, 28 Jan 2018)
Log Message:
---
Remove depency to OpenJUMP AdditionalResult.class as it requires new other 
tests before to realize. Sextante help opens as OJ internal frame.
Added new build: ojsextante_binding_gen2018.jar

Modified Paths:
--

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/gui/OpenJUMPPostProcessTask.java

Added Paths:
---
plug-ins/SextantePlugIn/dist/ojsextante_binding_gen2018.jar

Added: plug-ins/SextantePlugIn/dist/ojsextante_binding_gen2018.jar
===
(Binary files differ)

Index: plug-ins/SextantePlugIn/dist/ojsextante_binding_gen2018.jar
===
--- plug-ins/SextantePlugIn/dist/ojsextante_binding_gen2018.jar 2018-01-27 
20:38:02 UTC (rev 5686)
+++ plug-ins/SextantePlugIn/dist/ojsextante_binding_gen2018.jar 2018-01-28 
07:22:47 UTC (rev 5687)

Property changes on: plug-ins/SextantePlugIn/dist/ojsextante_binding_gen2018.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java
===
--- 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java
 2018-01-27 20:38:02 UTC (rev 5686)
+++ 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java
 2018-01-28 07:22:47 UTC (rev 5687)
@@ -4,19 +4,18 @@
 
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
-import javax.swing.JInternalFrame;
 import javax.swing.JOptionPane;
 
 import org.openjump.core.ui.plugin.AbstractUiPlugIn;
-import org.openjump.sextante.core.ObjectAndDescription;
-import org.openjump.sextante.gui.additionalResults.AdditionalResults;
-import org.openjump.sextante.gui.additionalResults.AdditionalResultsFrame;
 
-import com.vividsolutions.jump.I18N;
-import com.vividsolutions.jump.workbench.plugin.PlugInContext;
-
+import es.unex.sextante.core.Sextante;
+import es.unex.sextante.gui.additionalResults.AdditionalResults;
+import es.unex.sextante.gui.core.SextanteGUI;
 import es.unex.sextante.openjump.language.I18NPlug;
 //import es.unex.sextante.gui.additionalResults.AdditionalResults;
+//import org.openjump.sextante.gui.additionalResults.AdditionalResultsFrame;
+import com.vividsolutions.jump.workbench.plugin.PlugInContext;
+import com.vividsolutions.jump.I18N;
 
 //import es.unex.sextante.gui.additionalResults.AdditionalResults;
 
@@ -32,39 +31,37 @@
 @Override
 public boolean execute(final PlugInContext context) throws Exception {
 
-ArrayList m_Components = 
AdditionalResults.m_Components;
-if (m_Components == null || m_Components.size() == 0) {
-JOptionPane.showMessageDialog(null, sWarning, sName,
-JOptionPane.WARNING_MESSAGE);
-return false;
-} else {
+/*
+ * ArrayList m_Components =
+ * AdditionalResults.m_Components; if (m_Components == null ||
+ * m_Components.size() == 0) { JOptionPane.showMessageDialog(null,
+ * sWarning, sName, JOptionPane.WARNING_MESSAGE); return false; } else 
{
+ * 
+ * for (JInternalFrame iFrame : context.getWorkbenchFrame()
+ * .getInternalFrames()) { if (iFrame instanceof 
AdditionalResultsFrame)
+ * {
+ * 
+ * iFrame.toFront(); return true;
+ * 
+ * } } AdditionalResultsFrame additionalResultsFrame = new
+ * AdditionalResultsFrame( m_Components);
+ * 
+ * context.getWorkbenchFrame()
+ * .addInternalFrame(additionalResultsFrame);
+ * 
+ * }
+ */
 
-for (JInternalFrame iFrame : context.getWorkbenchFrame()
-.getInternalFrames()) {
-if (iFrame instanceof AdditionalResultsFrame) {
+final ArrayList results = AdditionalResults.getComponents();
+if (results.size() != 0) {
+SextanteGUI.getGUIFactory().showAdditionalResultsDialog(results);
+}
 
-iFrame.toFront();
-return true;
-
-}
-}
-AdditionalResultsFrame additionalResultsFrame = new 
AdditionalResultsFrame(
-m_Components);
-
-context.getWorkbenchFrame()
-.addInternalFrame(additionalResultsFrame);
-
+else {
+JOptionPane.showMessageDialog(null, NO_RESULTS,
+Sextante.getText("Warning"), JOptionPane.WARNING_MESSAGE);
 }
 
-/*
-

[JPP-Devel] SVN: [5688] core/trunk/lib/plus

2018-01-27 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5688
  http://sourceforge.net/p/jump-pilot/code/5688
Author:   ma15569
Date: 2018-01-28 07:26:13 + (Sun, 28 Jan 2018)
Log Message:
---
Updadated Sextante to version ojsextante_binding_gen2018.jar

Added Paths:
---
core/trunk/lib/plus/ojsextante_binding_gen2018.jar

Removed Paths:
-
core/trunk/lib/plus/ojsextante_binding_dec2016c.jar

Deleted: core/trunk/lib/plus/ojsextante_binding_dec2016c.jar
===
(Binary files differ)

Added: core/trunk/lib/plus/ojsextante_binding_gen2018.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/ojsextante_binding_gen2018.jar
===
--- core/trunk/lib/plus/ojsextante_binding_gen2018.jar  2018-01-28 07:22:47 UTC 
(rev 5687)
+++ core/trunk/lib/plus/ojsextante_binding_gen2018.jar  2018-01-28 07:26:13 UTC 
(rev 5688)

Property changes on: core/trunk/lib/plus/ojsextante_binding_gen2018.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property

--
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

[JPP-Devel] SVN: [5691] core/trunk

2018-01-27 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5691
  http://sourceforge.net/p/jump-pilot/code/5691
Author:   ma15569
Date: 2018-01-28 07:40:39 + (Sun, 28 Jan 2018)
Log Message:
---
Updated ColorChooser plugin to version 1.1 with new finnic translation

Modified Paths:
--
core/trunk/ChangeLog

Added Paths:
---
core/trunk/lib/plus/ColorChooser-1.1.jar

Removed Paths:
-
core/trunk/lib/plus/ColorChooser-1.0.jar

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-01-28 07:37:16 UTC (rev 5690)
+++ core/trunk/ChangeLog2018-01-28 07:40:39 UTC (rev 5691)
@@ -4,6 +4,9 @@
 #< 80 chars 
-->#
 
 2018-01-28 Giuseppe Aruta
+  * Update ColorChooser to version 1.1 with new Finnic translation
+
+2018-01-28 Giuseppe Aruta
   * Update Sextante: Sextante help opens as OpenJUMP
 internal frame
 

Deleted: core/trunk/lib/plus/ColorChooser-1.0.jar
===
(Binary files differ)

Added: core/trunk/lib/plus/ColorChooser-1.1.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/ColorChooser-1.1.jar
===
--- core/trunk/lib/plus/ColorChooser-1.1.jar2018-01-28 07:37:16 UTC (rev 
5690)
+++ core/trunk/lib/plus/ColorChooser-1.1.jar2018-01-28 07:40:39 UTC (rev 
5691)

Property changes on: core/trunk/lib/plus/ColorChooser-1.1.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property

--
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

[JPP-Devel] SVN: [5692] core/trunk

2018-01-28 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5692
  http://sourceforge.net/p/jump-pilot/code/5692
Author:   edso
Date: 2018-01-28 13:26:33 + (Sun, 28 Jan 2018)
Log Message:
---
transfer Changelog entries into Changes.txt to prepare next release

Modified Paths:
--
core/trunk/ChangeLog
core/trunk/Changes.txt

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-01-28 07:40:39 UTC (rev 5691)
+++ core/trunk/ChangeLog2018-01-28 13:26:33 UTC (rev 5692)
@@ -3,6 +3,8 @@
 # 2. make sure that lines break at 80 chars for constricted display situations
 #< 80 chars 
-->#
 
+* Changes.txt updated until here **
+
 2018-01-28 Giuseppe Aruta
   * Update ColorChooser to version 1.1 with new Finnic translation
 

Modified: core/trunk/Changes.txt
===
--- core/trunk/Changes.txt  2018-01-28 07:40:39 UTC (rev 5691)
+++ core/trunk/Changes.txt  2018-01-28 13:26:33 UTC (rev 5692)
@@ -3,12 +3,111 @@
   Highlights
 
   New Features
+  * Added TaskProperty plugin to read and modify project properties
+  * New Network Properties options: connection and read timeouts are now 
+configurable in the Network Properties options' tab.
+These timeout values are also applied to WMS and WFS Web Services 
+connections
+  * Added Synchronize windows zoom (only) tool
+  * Integration of Coordinate Transformation PlugIn in OpenJUMP core
+  * Add ShowCenterView plugin: it shows a red crosshair in the center of 
+the view. See Feature request #201 "Add crosshair to synchronized projects"
+  * Add a Arcgis-like remodeler tool in editing toolbox
+  * add Plugin to open OpenJUMP wiki pages on default internet browser.
+Online links available on help menu
 
   Improvements
+  * Task Frame title shows also projection description if it is set
+and matches any value available into srid.txt SRS registry file
+  * PostgreSQL JDBC driver : set the ApplicationName driver's property to allow
+OpenJUMP to advertise its name to PostgreSQL backend
+  * AutoAssignAttributePlugIn : accept boolean and long as target attributes
+  * AutoAssignAttributePlugIn : inverse options order (simple to more complex)
+  * BlendLineStringsPlugIn : improve quality, performance and make it undoable
+  * Deactivate ReplaceValuePlugIn (use AutoAssignAttributePlugIn instead)
+  * Improvement from ioan to honor IncrementalAngle constraint even on the
+first segment
+  * Spatial Index support for SQLite/Spatialte datasources: checks if geometry
+columns are indexed and builds custom SQL queries to use index according to
+detected SQLite flavors
+  * Spatial Index support for SQLite/Spatialite datasources: quotes identifiers
+when generating SQL queries
+  * Added radius/circumference/area display to DrawConstrainedCircleTool as
+suggested by Jukka [JPP-Devel] Show area while drawing circles? Sept 21 
2017
+  * Add postgis driver options to narrow database geometry type
+  * Add z-interpolation to remodeler tool
+  * RasterImageLayer : Spatial reference system srid and its location
+are now stored as metadata on loading file. Updated Raster Info plugin.
+  * added methods for handling multiple ApplicationExitHandler in the
+WorkbenchFrame. Set the old getApplicationExitHandler() and
+setApplicationExitHandler() methods deprecated.
+  * ConnectionManager adjusted for the new ApplicationExitHandler stuff.
+  * always print help output when a wrong parameter/option was given
+  * added --help switch as users might expect it
+  * add appendToClassPathForInstrumentation method to PlugInClassLoader
+so that it can be started from IDE using code instrumentation
+  * add support of image layers to "Affine Transformation (from parameters)"
+plugin, only BMP, GIF, JPG, JP2, PNG and TIF are supported
+  * ChangeSRIDPlugin
+- setting SRID tags the feature collection to modified now
+- no change in setting does nothing, no change when cancelled
+- ok button disabled when no change or invalid input
+  * Icons for layers according to geometry type in the Data Store Layer panel
+  * commented/disabled on-the-fly reprojection, which was never implemented 
+completely anyway
+  * JML/GML Reader/Writer add EPSG SRID support via WFS 
+gml:boundedBy->gml:Box tag
+JML/GML Writer
+- is now cancelable via TaskMonitor button
+- reports feature count written so far now
 
   Bug Fixes
+  * ExtractPointsPlugIn : keep original feature id in attribute
+  * SpatialJoinPlugIn : A and B attribute prefix were reversed
+  * Shapefile : handling of dbf containing deleted records
+  * Fix combine layers : guarantee unique name for the new attribute
+  * fix bug 460: "Create Grid may jam OpenJUMP"
+CreateGridPlugIn is now cancelable and shows

[JPP-Devel] SVN: [5702] core/trunk/src/org/deegree

2018-02-22 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5702
  http://sourceforge.net/p/jump-pilot/code/5702
Author:   michaudm
Date: 2018-02-23 07:47:43 + (Fri, 23 Feb 2018)
Log Message:
---
Small cleaning (test svn repository access)

Modified Paths:
--
core/trunk/src/org/deegree/datatypes/QualifiedName.java
core/trunk/src/org/deegree/model/spatialschema/GMLGeometryAdapter.java
core/trunk/src/org/deegree/model/spatialschema/JTSAdapter.java

Modified: core/trunk/src/org/deegree/datatypes/QualifiedName.java
===
--- core/trunk/src/org/deegree/datatypes/QualifiedName.java 2018-01-31 
06:01:19 UTC (rev 5701)
+++ core/trunk/src/org/deegree/datatypes/QualifiedName.java 2018-02-23 
07:47:43 UTC (rev 5702)
@@ -44,8 +44,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.deegree.framework.log.ILogger;
-import org.deegree.framework.log.LoggerFactory;
 import org.deegree.framework.util.StringTools;
 
 import com.vividsolutions.jump.workbench.Logger;
@@ -73,18 +71,12 @@
 
 private String s = null;
 
-private static Map nsp = null;
-static {
-if ( nsp == null ) {
-nsp = Collections.synchronizedMap( new HashMap() );
-}
-}
+private static Map nsp =
+Collections.synchronizedMap( new HashMap() );
 
 
 /**
  * Creates a new QualifiedName instance from a 
QName
- *
- * @param name
  */
 public QualifiedName( QName name ) {
 try {
@@ -154,6 +146,7 @@
 
 /**
  * @param prefix
+ *prefix to be used for this QualifiedName
  * @param localName
  *local/simple name (e.g. deegree)
  * @param namespace
@@ -167,7 +160,7 @@
 }
 
 private void buildString() {
-StringBuffer sb = new StringBuffer( 50 );
+StringBuilder sb = new StringBuilder( 50 );
 if ( prefix != null && prefix.length() != 0 ) {
 sb.append( prefix ).append( ':' );
 }
@@ -236,10 +229,7 @@
  */
 public boolean isInNamespace( URI ns ) {
 if ( ns == null ) {
-if ( this.namespace == null ) {
-return true;
-}
-return false;
+return this.namespace == null;
 }
 return ns.equals( this.namespace );
 }
@@ -246,7 +236,7 @@
 
 @Override
 public String toString() {
-StringBuffer result = new StringBuffer( 150 );
+StringBuilder result = new StringBuilder( 150 );
 result.append( this.s );
 if ( this.prefix != null && this.prefix.length() > 0 ) {
 result.append( " (" );

Modified: core/trunk/src/org/deegree/model/spatialschema/GMLGeometryAdapter.java
===
--- core/trunk/src/org/deegree/model/spatialschema/GMLGeometryAdapter.java  
2018-01-31 06:01:19 UTC (rev 5701)
+++ core/trunk/src/org/deegree/model/spatialschema/GMLGeometryAdapter.java  
2018-02-23 07:47:43 UTC (rev 5702)
@@ -160,7 +160,7 @@
  * 
  * 
  * 
- * @param element
+ * @param element XML element
  * @param srsName default SRS for the geometry
  * @return corresponding Geometry instance
  * @throws GeometryException if type unsupported or conversion failed
@@ -1438,7 +1438,7 @@
  * creates a GML expression of a point geometry
  * 
  * @param point point geometry
- * @return
+ * @param pw the PrintWriter to print to
  */
 protected static void exportPoint( Point point, PrintWriter pw ) {
 
@@ -1477,7 +1477,7 @@
  * creates a GML expression of a curve geometry
  * 
  * @param o curve geometry
- * @return
+ * @param pw the PrintWriter to print to
  * @throws GeometryException
  */
 protected static void exportCurve( Curve o, PrintWriter pw ) throws 
GeometryException {
@@ -1524,7 +1524,8 @@
 }
 
 /**
- * @param sur
+ * @param surface surface to print
+ * @param pw the PrintWriter to print to
  * @throws RemoteException
  * @throws GeometryException
  */
@@ -1550,7 +1551,7 @@
 pw.println("");
 } else {
 
-String srs = null;
+String srs;
 if (crs != null) {
 srs = "";
 } else {
@@ -1576,8 +1577,9 @@
 }
 
 /**
- * @param surface
- * @param pw
+ * Print the surface interior rings
+ * @param surface surface to print
+ * @param pw the PrintWriter to print to
  * @param patch
  */
 protected static void printInteriorRing( Surface surface, PrintWriter pw, 
SurfacePatch patch,
@@ -1608,8 +1610,9 @@
 }
 
 /**
- * @param surface
- * @param pw
+ * Print the surface exterior ring
+ * @param surface surface to print
+ * @param pw the PrintWriter to print to
  * @param patch
  */
 protected static void printExteriorRing(

[JPP-Devel] SVN: [5655] core/trunk/src/org/openjump/core/ui/plugin/layer/ ChangeSRIDPlugIn.java

2017-12-26 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5655
  http://sourceforge.net/p/jump-pilot/code/5655
Author:   edso
Date: 2017-12-26 17:42:23 + (Tue, 26 Dec 2017)
Log Message:
---
setting SRID tags the feature collection to modified now
no change in setting does nothing
no change when cancelled
ok button disabled when no change or invalid input

Modified Paths:
--
core/trunk/src/org/openjump/core/ui/plugin/layer/ChangeSRIDPlugIn.java

Modified: core/trunk/src/org/openjump/core/ui/plugin/layer/ChangeSRIDPlugIn.java
===
--- core/trunk/src/org/openjump/core/ui/plugin/layer/ChangeSRIDPlugIn.java  
2017-12-25 20:16:38 UTC (rev 5654)
+++ core/trunk/src/org/openjump/core/ui/plugin/layer/ChangeSRIDPlugIn.java  
2017-12-26 17:42:23 UTC (rev 5655)
@@ -1,11 +1,21 @@
 package org.openjump.core.ui.plugin.layer;
 
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JComponent;
 import javax.swing.JOptionPane;
+import javax.swing.JTextField;
+import javax.swing.border.Border;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 
 import org.openjump.core.ccordsys.srid.SRIDStyle;
 
 import com.vividsolutions.jump.I18N;
-import com.vividsolutions.jump.workbench.imagery.ReferencedImageStyle;
 import com.vividsolutions.jump.workbench.model.Layer;
 import com.vividsolutions.jump.workbench.model.UndoableCommand;
 import com.vividsolutions.jump.workbench.plugin.AbstractPlugIn;
@@ -17,50 +27,110 @@
 import com.vividsolutions.jump.workbench.ui.plugin.FeatureInstaller;
 
 public class ChangeSRIDPlugIn extends AbstractPlugIn {
-public void initialize(PlugInContext context) throws Exception {
-EnableCheckFactory enableCheckFactory = new EnableCheckFactory(
-context.getWorkbenchContext());
-EnableCheck enableCheck = new MultiEnableCheck().add(
-enableCheckFactory
-.createWindowWithLayerManagerMustBeActiveCheck()).add(
-enableCheckFactory.createExactlyNLayersMustBeSelectedCheck(1));
-new FeatureInstaller(context.getWorkbenchContext()).addMainMenuPlugin(
-this, new String[] { MenuNames.LAYER }, getName() + "...",
-false, null, enableCheck);
+  public void initialize(PlugInContext context) throws Exception {
+EnableCheckFactory enableCheckFactory = new 
EnableCheckFactory(context.getWorkbenchContext());
+EnableCheck enableCheck = new MultiEnableCheck()
+
.add(enableCheckFactory.createWindowWithLayerManagerMustBeActiveCheck())
+.add(enableCheckFactory.createExactlyNLayersMustBeSelectedCheck(1));
+new 
FeatureInstaller(context.getWorkbenchContext()).addMainMenuPlugin(this, new 
String[] { MenuNames.LAYER },
+getName() + "...", false, null, enableCheck);
+  }
+
+  public String getName() {
+return 
I18N.get("org.openjump.core.ui.plugin.layer.ChangeSRIDPlugIn.Change-SRID");
+  }
+
+  public boolean execute(PlugInContext context) throws Exception {
+reportNothingToUndoYet(context);
+final Layer layer = context.getSelectedLayer(0);
+final SRIDStyle sridStyle = (SRIDStyle) layer.getStyle(SRIDStyle.class);
+final int oldSRID = sridStyle.getSRID();
+String input = "";
+
+final JButton okay = new JButton(I18N.get("ui.OKCancelPanel.ok"));
+okay.addActionListener(new ActionListener() {
+  @Override
+  public void actionPerformed(ActionEvent e) {
+JOptionPane pane = getOptionPane((JComponent) e.getSource());
+pane.setValue(okay);
+  }
+});
+okay.setEnabled(false);
+final JButton cancel = new JButton(I18N.get("ui.OKCancelPanel.cancel"));
+cancel.addActionListener(new ActionListener() {
+  @Override
+  public void actionPerformed(ActionEvent e) {
+JOptionPane pane = getOptionPane((JComponent) e.getSource());
+pane.setValue(cancel);
+  }
+});
+
+final JTextField field = new JTextField("0123456789");
+// add some padding
+Border padding = BorderFactory.createEmptyBorder(1, 3, 1, 3);
+final Border defaultBorder = 
BorderFactory.createCompoundBorder(field.getBorder(), padding);
+final Border redBorder = 
BorderFactory.createCompoundBorder(BorderFactory.createLineBorder(Color.red), 
padding);
+field.setBorder(defaultBorder);
+field.setText("" + oldSRID);
+// switch ok button on/off
+field.getDocument().addDocumentListener(new DocumentListener() {
+  protected void update() {
+String value = field.getText().trim();
+boolean changed = !value.equals("" + oldSRID);
+boolean valid = value.matches("\\d+");
+field.setBorder(valid ? defaultBorder : redBorder);
+okay.setEnabled(changed && valid);
+  }
+  public void insertUpdate(DocumentEvent e) {
+update();
+

[JPP-Devel] SVN: [5651] core/trunk/src/com/vividsolutions/jump/io

2017-12-25 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5651
  http://sourceforge.net/p/jump-pilot/code/5651
Author:   edso
Date: 2017-12-25 19:53:18 + (Mon, 25 Dec 2017)
Log Message:
---
pretty much commented completely
extend the proper GMLWriter/Reader now, which is much cleaner as wrapping makes 
virtually no sense
classes report errors now as getExceptions() wasn't implemented properly before

Modified Paths:
--
core/trunk/src/com/vividsolutions/jump/io/JMLReader.java
core/trunk/src/com/vividsolutions/jump/io/JMLWriter.java

Modified: core/trunk/src/com/vividsolutions/jump/io/JMLReader.java
===
--- core/trunk/src/com/vividsolutions/jump/io/JMLReader.java2017-12-25 
14:56:54 UTC (rev 5650)
+++ core/trunk/src/com/vividsolutions/jump/io/JMLReader.java2017-12-25 
19:53:18 UTC (rev 5651)
@@ -82,36 +82,36 @@
  * 
  * 
  */
-public class JMLReader extends AbstractJUMPReader {
+public class JMLReader extends GMLReader {
 
-/** Creates new JMLReader */
-public JMLReader() {
-}
-
-/**
- * Read a JML file - passes the work off to {@link GMLReader}.
- *
- *@param dp 'InputFile' or 'DefaultValue' for the input JML file
- */
-public FeatureCollection read(DriverProperties dp)
-throws Exception {
-GMLReader gmlReader;
-String inputFname;
-
-inputFname = dp.getProperty(DataSource.FILE_KEY);
-
-if (inputFname == null) {
-inputFname = dp.getProperty(DriverProperties.DEFAULT_VALUE_KEY);
-}
-
-if (inputFname == null) {
-throw new IllegalParametersException(
-"call to JMLReader.read() has DataProperties w/o a InputFile 
specified");
-}
-
-gmlReader = new GMLReader();
-gmlReader.setTaskMonitor(getTaskMonitor());
-
-return gmlReader.read(dp);
-}
+///** Creates new JMLReader */
+//public JMLReader() {
+//}
+//
+///**
+// * Read a JML file - passes the work off to {@link GMLReader}.
+// *
+// *@param dp 'InputFile' or 'DefaultValue' for the input JML file
+// */
+//public FeatureCollection read(DriverProperties dp)
+//throws Exception {
+//GMLReader gmlReader;
+//String inputFname;
+//
+//inputFname = dp.getProperty(DataSource.FILE_KEY);
+//
+//if (inputFname == null) {
+//inputFname = dp.getProperty(DriverProperties.DEFAULT_VALUE_KEY);
+//}
+//
+//if (inputFname == null) {
+//throw new IllegalParametersException(
+//"call to JMLReader.read() has DataProperties w/o a InputFile 
specified");
+//}
+//
+//gmlReader = new GMLReader();
+//gmlReader.setTaskMonitor(getTaskMonitor());
+//
+//return gmlReader.read(dp);
+//}
 }

Modified: core/trunk/src/com/vividsolutions/jump/io/JMLWriter.java
===
--- core/trunk/src/com/vividsolutions/jump/io/JMLWriter.java2017-12-25 
14:56:54 UTC (rev 5650)
+++ core/trunk/src/com/vividsolutions/jump/io/JMLWriter.java2017-12-25 
19:53:18 UTC (rev 5651)
@@ -67,35 +67,35 @@
  * 
  * 
  */
-public class JMLWriter implements JUMPWriter {
+public class JMLWriter extends GMLWriter /*implements JUMPWriter */ {
 
-/** Creates new JMLWriter */
-public JMLWriter() {
-}
-
-/**
- * Writes the feature collection to the specified file in JML format.
- * @param featureCollection features to write
- * @param dp 'OutputFile' or 'DefaultValue' to specify what file to write.
- */
-public void write(FeatureCollection featureCollection, DriverProperties dp)
-throws Exception {
-GMLWriter gmlWriter;
-String outputFname;
-
-outputFname = dp.getProperty(DataSource.FILE_KEY);
-
-if (outputFname == null) {
-outputFname = dp.getProperty(DriverProperties.DEFAULT_VALUE_KEY);
-}
-
-if (outputFname == null) {
-throw new IllegalParametersException(
-"call to JMLWriter.write() has DataProperties w/o a OutputFile 
specified");
-}
-
-gmlWriter = new GMLWriter();
-
-gmlWriter.write(featureCollection, dp);
-}
+///** Creates new JMLWriter */
+//public JMLWriter() {
+//}
+//
+///**
+// * Writes the feature collection to the specified file in JML format.
+// * @param featureCollection features to write
+// * @param dp 'OutputFile' or 'DefaultValue' to specify what file to 
write.
+// */
+//public void write(FeatureCollection featureCollection, DriverProperties 
dp)
+//throws Exception {
+//GMLWriter gmlWriter;
+//String outputFname;
+//
+//outputFname = dp.getProperty(DataSource.FILE_KEY);
+//
+//if (outputFname == null) {
+//outputFname = dp.getProperty(DriverProperties.DEFAULT_VALUE_KEY);
+//}
+//
+//

[JPP-Devel] SVN: [5653] core/trunk/src/org/openjump/core/ccordsys/srid/ EnsureAllLayersHaveSRIDStylePlugIn.java

2017-12-25 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5653
  http://sourceforge.net/p/jump-pilot/code/5653
Author:   edso
Date: 2017-12-25 20:13:20 + (Mon, 25 Dec 2017)
Log Message:
---
make sure SridStyle is initialized from FeatureSchema crs value first

Modified Paths:
--

core/trunk/src/org/openjump/core/ccordsys/srid/EnsureAllLayersHaveSRIDStylePlugIn.java

Modified: 
core/trunk/src/org/openjump/core/ccordsys/srid/EnsureAllLayersHaveSRIDStylePlugIn.java
===
--- 
core/trunk/src/org/openjump/core/ccordsys/srid/EnsureAllLayersHaveSRIDStylePlugIn.java
  2017-12-25 20:11:50 UTC (rev 5652)
+++ 
core/trunk/src/org/openjump/core/ccordsys/srid/EnsureAllLayersHaveSRIDStylePlugIn.java
  2017-12-25 20:13:20 UTC (rev 5653)
@@ -9,6 +9,7 @@
 
 import javax.swing.JInternalFrame;
 
+import com.vividsolutions.jump.coordsys.CoordinateSystem;
 import com.vividsolutions.jump.feature.Feature;
 import com.vividsolutions.jump.util.Block;
 import com.vividsolutions.jump.workbench.model.CategoryEvent;
@@ -66,10 +67,19 @@
 return;
 }
 SRIDStyle sridStyle = new SRIDStyle();
-if (layer.getFeatureCollectionWrapper().size() > 0) {
-sridStyle.setSRID(((Feature) layer.getFeatureCollectionWrapper()
-.iterator().next()).getGeometry().getSRID());
+int srid = sridStyle.getSRID();
+
+// freshly loaded featcolls only set the featureschema's property
+CoordinateSystem cs = 
layer.getFeatureCollectionWrapper().getFeatureSchema().getCoordinateSystem();
+if (!cs.equals(CoordinateSystem.UNSPECIFIED)) {
+  srid = cs.getEPSGCode();
 }
+// OR fetch it from first geometry
+else if (layer.getFeatureCollectionWrapper().size() > 0) {
+srid = ((Feature) layer.getFeatureCollectionWrapper()
+.iterator().next()).getGeometry().getSRID();
+}
+sridStyle.setSRID(srid);
 layer.addStyle(sridStyle);
 }
 private void initializeCurrentAndFutureInternalFrames(


--
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

[JPP-Devel] SVN: [5654] core/trunk/src/org/openjump/core/ccordsys/srid/SRIDStyle.java

2017-12-25 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5654
  http://sourceforge.net/p/jump-pilot/code/5654
Author:   edso
Date: 2017-12-25 20:16:38 + (Mon, 25 Dec 2017)
Log Message:
---
have SRIDStyle update the corresponding FeatureSchema setting, to be used in 
JumpWriters

Modified Paths:
--
core/trunk/src/org/openjump/core/ccordsys/srid/SRIDStyle.java

Modified: core/trunk/src/org/openjump/core/ccordsys/srid/SRIDStyle.java
===
--- core/trunk/src/org/openjump/core/ccordsys/srid/SRIDStyle.java   
2017-12-25 20:13:20 UTC (rev 5653)
+++ core/trunk/src/org/openjump/core/ccordsys/srid/SRIDStyle.java   
2017-12-25 20:16:38 UTC (rev 5654)
@@ -5,9 +5,6 @@
 
 import com.vividsolutions.jts.util.Assert;
 import com.vividsolutions.jump.coordsys.CoordinateSystem;
-import com.vividsolutions.jump.coordsys.Geographic;
-import com.vividsolutions.jump.coordsys.Planar;
-import com.vividsolutions.jump.coordsys.Projection;
 import com.vividsolutions.jump.feature.Feature;
 import com.vividsolutions.jump.workbench.model.CategoryEvent;
 import com.vividsolutions.jump.workbench.model.FeatureEvent;
@@ -23,7 +20,12 @@
 public class SRIDStyle implements Style {
 
 private int srid = 0;
+private int lastUpdateSrid = srid;
 
+public SRIDStyle() {
+  super();
+}
+
 public void paint(Feature f, Graphics2D g, Viewport viewport)
 throws Exception {
 }
@@ -34,6 +36,7 @@
 if (initialized) {
 return;
 }
+
 updateSRIDs(layer);
 layer.getLayerManager().addLayerListener(new LayerListener() {
 public void featuresChanged(FeatureEvent e) {
@@ -51,9 +54,18 @@
 }
 
 public void updateSRIDs(Layer layer) {
-for (Object feature : 
layer.getFeatureCollectionWrapper().getFeatures()) {
-((Feature)feature).getGeometry().setSRID(srid);
-}
+  // nothing to do
+  if (lastUpdateSrid == srid)
+return;
+  
+  // apply srid to whole layer (btw. of FeatureSchema)
+  
layer.getFeatureCollectionWrapper().getFeatureSchema().setCoordinateSystem(new 
CoordinateSystem("", srid, null));
+  // apply srid for each geometry
+  for (Object feature : layer.getFeatureCollectionWrapper().getFeatures()) 
{
+  ((Feature)feature).getGeometry().setSRID(srid);
+  }
+  
+  lastUpdateSrid = srid;
 }
 
 public Object clone() {


--
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

[JPP-Devel] SVN: [5656] core/trunk

2018-01-03 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5656
  http://sourceforge.net/p/jump-pilot/code/5656
Author:   elnico
Date: 2018-01-03 16:00:38 + (Wed, 03 Jan 2018)
Log Message:
---
Icons for layers according to geometry type in the Data Store Layer panel

Modified Paths:
--
core/trunk/ChangeLog

core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/DataStoreLayerRenderData.java

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2017-12-26 17:42:23 UTC (rev 5655)
+++ core/trunk/ChangeLog2018-01-03 16:00:38 UTC (rev 5656)
@@ -3,6 +3,9 @@
 # 2. make sure that lines break at 80 chars for constricted display situations
 #< 80 chars 
-->#
 
+2018-01-03 Nicolas Ribot 
+  * Icons for layers according to geometry type in the Data Store Layer panel
+
 2017-12-10 ede
   * final bugfix: "#463 Starting OJ with java9 throws several exceptions"
 OJ should be generally java 9 ready now

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/DataStoreLayerRenderData.java
===
--- 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/DataStoreLayerRenderData.java
  2017-12-26 17:42:23 UTC (rev 5655)
+++ 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/DataStoreLayerRenderData.java
  2018-01-03 16:00:38 UTC (rev 5656)
@@ -7,10 +7,24 @@
 
 import com.vividsolutions.jump.datastore.DataStoreLayer;
 import java.awt.Color;
+
+import com.vividsolutions.jump.workbench.ui.images.IconLoader;
 import org.netbeans.swing.outline.RenderDataProvider;
 
+import javax.swing.*;
+
 public class DataStoreLayerRenderData implements RenderDataProvider {
 
+// icons to display according to node geometry type
+private ImageIcon gc = IconLoader.icon("EditGeometryCollection.gif");
+private ImageIcon point = IconLoader.icon("EditPoint.gif");
+private ImageIcon mpoint = IconLoader.icon("EditMultiPoint.gif");
+private ImageIcon line = IconLoader.icon("EditLineString.gif");
+private ImageIcon mline = IconLoader.icon("EditMultiLineString.gif");
+private ImageIcon poly = IconLoader.icon("EditPolygon.gif");
+private ImageIcon mpoly = IconLoader.icon("EditMultiPolygon.gif");
+private ImageIcon lring = IconLoader.icon("EditLinearRing.gif");
+
 @Override
 public java.awt.Color getBackground(Object o) {
 if (!(o instanceof String)) {
@@ -41,8 +55,33 @@
 
 @Override
 public javax.swing.Icon getIcon(Object o) {
-return null;
-
+// Nicolas Ribot: 03 jan 2018: adds custom icons according to layer 
geometry type
+if (o instanceof DataStoreLayer) {
+switch (((DataStoreLayer) o).getGeoCol().getType().toLowerCase()) {
+case "geometrycollection":
+case "geometry":
+case "sdo_geometry":
+return this.gc;
+case "point":
+return this.point;
+case "multipoint":
+return this.mpoint;
+case "linestring":
+return this.line;
+case "multilinestring":
+return this.mline;
+case "polygon":
+return this.poly;
+case "multipolygon":
+return this.mpoly;
+case "linearring":
+return this.lring;
+default:
+return null;
+}
+} else {
+return null;
+}
 }
 
 @Override


--
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

[JPP-Devel] SVN: [5888] core/trunk/src/org/openjump/core/ui/plugin/raster

2018-06-21 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5888
  http://sourceforge.net/p/jump-pilot/code/5888
Author:   michaudm
Date: 2018-06-21 20:15:09 + (Thu, 21 Jun 2018)
Log Message:
---
Fix last peppe commit on Profile

Modified Paths:
--
core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileUtils.java

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphPlugIn.java
===
--- core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphPlugIn.java   
2018-06-21 07:54:25 UTC (rev 5887)
+++ core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphPlugIn.java   
2018-06-21 20:15:09 UTC (rev 5888)
@@ -160,7 +160,7 @@
 
 }
 
-private void setDialogValues(MultiInputDialog dialog, PlugInContext 
context) {
+private void setDialogValues(final MultiInputDialog dialog, PlugInContext 
context) {
 final Collection rlayers = context.getTask()
 .getLayerManager().getLayerables(RasterImageLayer.class);
 final ArrayList srsArray = new ArrayList();

Modified: core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileUtils.java
===
--- core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileUtils.java 
2018-06-21 07:54:25 UTC (rev 5887)
+++ core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileUtils.java 
2018-06-21 20:15:09 UTC (rev 5888)
@@ -337,7 +337,7 @@
 
 final JButton slopeBtn = new JButton(
 IconLoader.icon("profileSlope.png"));
-slopeBtn.setToolTipText(ProfileGraphPlugIn.SLOPE);
+slopeBtn.setToolTipText(SLOPE);
 slopeBtn.addActionListener(new ActionListener() {
 @Override
 public void actionPerformed(ActionEvent e) {


--
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

[JPP-Devel] SVN: [5889] core/trunk/src/language/jump_fr.properties

2018-06-21 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5889
  http://sourceforge.net/p/jump-pilot/code/5889
Author:   michaudm
Date: 2018-06-21 20:31:48 + (Thu, 21 Jun 2018)
Log Message:
---
French language file

Modified Paths:
--
core/trunk/src/language/jump_fr.properties

Modified: core/trunk/src/language/jump_fr.properties
===
--- core/trunk/src/language/jump_fr.properties  2018-06-21 20:15:09 UTC (rev 
5888)
+++ core/trunk/src/language/jump_fr.properties  2018-06-21 20:31:48 UTC (rev 
5889)
@@ -2894,15 +2894,15 @@
 org.openjump.core.ui.plugin.raster.ProfileGraphTool.Description = Cr\xE9er un 
profil topographique \xE0 partir d'une couche raster en suivant une ligne. Un 
profil des pentes peut \xEAtre g\xE9n\xE9r\xE9 pour comparer avec le profil 
topographique.
 org.openjump.core.ui.plugin.raster.ProfileGraphTool.Travel-time = Temps de 
parcours
 org.openjump.core.ui.plugin.tools.aggregate.Aggregator.BooleanMajority = 
Majorit\xE9 (bool\xE9en)
-org.openjump.core.ui.plugin.raster.ProfileGraphTool.Choose-slope-profile=\#T\:Choose
 the type of slope profile
-org.openjump.core.ui.plugin.raster.ProfileGraphTool.Relative-slope=\#T\:Relative
 slope
-org.openjump.core.ui.plugin.raster.ProfileGraphTool.Absolute-slope=\#T\:Absolute
 slope
-org.openjump.core.ui.plugin.raster.ProfileGraphTool.vertical-axes-label=\#T\:Vertical
 axes label
-org.openjump.core.ui.plugin.raster.ProfileGraphTool.horizontal-axes-label=\#T\:Horizontal
 axes label
-org.openjump.core.ui.plugin.raster.ProfileGraphTool.travel-time-tooltip=\#T\:Calculate
 travel time according to the speeds (flat, uphill, downhill). Depending to the 
map unit (m or ft) output travel time is in kilometres per hour [m]   or miles 
per hour [ft or ftUS]
-org.openjump.core.ui.plugin.raster.ProfileGraphTool.calculate-travel-time=\#T\:Calculate
 travel time
-ui.GenericNames.hours=\#T\:hours
-ui.GenericNames.minutes=\#T\:minutes
-ui.GenericNames.flat=\#T\:flat speed
-ui.GenericNames.uphill=\#T\:uphill speed
-ui.GenericNames.downhill=\#T\:downhill speed
\ No newline at end of file
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.Choose-slope-profile = 
Choisir le type de profil
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.Relative-slope = Pentes 
relatives
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.Absolute-slope = Pentes 
absolues
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.vertical-axes-label = Nom 
de l'axe vertical
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.horizontal-axes-label = 
Nom de l'axe horizontal
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.travel-time-tooltip = 
Calculer le temps de parcours en fonction des vitesses (\xE0 plat, \xE0 la 
mont\xE9e, \xE0 la descente). En fonction de l'unit\xE9 de la carte (m ou ft) 
la vitesse est en km/h [m] ou en miles/heure [ft ou ftUS]
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.calculate-travel-time = 
Calculer le temps de parcours
+ui.GenericNames.hours = heures
+ui.GenericNames.minutes = minutes
+ui.GenericNames.flat = vitesse \xE0 plat
+ui.GenericNames.uphill = vitesse \xE0 la mont\xE9e
+ui.GenericNames.downhill = vitesse \xE0 la descente
\ No newline at end of file


--
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

[JPP-Devel] SVN: [5890] core/trunk/src/org/openjump/core/ui/plugin/raster/ ProfileUtils.java

2018-06-21 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5890
  http://sourceforge.net/p/jump-pilot/code/5890
Author:   ma15569
Date: 2018-06-22 05:39:45 + (Fri, 22 Jun 2018)
Log Message:
---
Removed the icon that doesn't exist

Modified Paths:
--
core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileUtils.java

Modified: core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileUtils.java
===
--- core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileUtils.java 
2018-06-21 20:31:48 UTC (rev 5889)
+++ core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileUtils.java 
2018-06-22 05:39:45 UTC (rev 5890)
@@ -456,7 +456,7 @@
 });
 // To do: giving a downslope/upslope/flat speed, it calculates the
 // travel time along the profile
-final JButton timeBtn = new 
JButton(IconLoader.icon("fugue/clock.png"));
+final JButton timeBtn = new JButton(TIMES);
 timeBtn.setToolTipText(TIMES);
 timeBtn.addActionListener(new ActionListener() {
 @Override


--
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

[JPP-Devel] SVN: [5892] core/trunk/src/com/vividsolutions/jump/workbench/ui/images/ IconLoader.java

2018-06-22 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5892
  http://sourceforge.net/p/jump-pilot/code/5892
Author:   ma15569
Date: 2018-06-22 12:28:22 + (Fri, 22 Jun 2018)
Log Message:
---
adapted from Ede's suggest

Modified Paths:
--
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/IconLoader.java

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/IconLoader.java
===
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/images/IconLoader.java  
2018-06-22 11:57:38 UTC (rev 5891)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/images/IconLoader.java  
2018-06-22 12:28:22 UTC (rev 5892)
@@ -51,25 +51,15 @@
 // start
 private static HashMap iconCache = new HashMap<>();
 
-// default icon if the choosen one doesn't exist //
+// default icon if the choosen one doesn't exist
 // Adapted from Kosmo SAIG
 public final static ImageIcon DEFAULT_UNKNOW_ICON = new ImageIcon(
 IconLoader.class.getResource("default_icon.png"));
 
 public static ImageIcon icon(String filename) {
-ImageIcon icon = null;
-try {
-icon = 
getIcon(IconLoader.class.getResource(resolveFile(filename)));
-} catch (final Exception e) {
-icon = DEFAULT_UNKNOW_ICON;
-}
-return icon;
+return getIcon(IconLoader.class.getResource(resolveFile(filename)));
 }
 
-// public static ImageIcon icon(String filename) {
-// return getIcon(IconLoader.class.getResource(resolveFile(filename)));
-// }
-
 public static BufferedImage image(String filename) {
 final ImageIcon icon = getIcon(IconLoader.class
 .getResource(resolveFile(filename)));
@@ -115,6 +105,7 @@
 Logger.error(e);
 }
 if (icon == null) {
+icon = DEFAULT_UNKNOW_ICON;
 Logger.error("icon '" + key + "' is 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

[JPP-Devel] SVN: [5891] core/trunk/src/com/vividsolutions/jump/workbench/ui/images

2018-06-22 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5891
  http://sourceforge.net/p/jump-pilot/code/5891
Author:   ma15569
Date: 2018-06-22 11:57:38 + (Fri, 22 Jun 2018)
Log Message:
---
Apply patch to use a default icon id the choosen on does not exist

Modified Paths:
--
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/IconLoader.java

Added Paths:
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/default_icon.png

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/ui/images/IconLoader.java
===
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/images/IconLoader.java  
2018-06-22 05:39:45 UTC (rev 5890)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/images/IconLoader.java  
2018-06-22 11:57:38 UTC (rev 5891)
@@ -1,4 +1,3 @@
-
 /*
  * The Unified Mapping Platform (JUMP) is an extensible, interactive GUI 
  * for visualizing and manipulating spatial features with geometry and 
attributes.
@@ -48,75 +47,97 @@
  * Gets an icon from this class' package.
  */
 public class IconLoader {
-  // cache icons, in case they are requested more than once to speedup OJ start
-  private static HashMap iconCache = new HashMap<>();
+// cache icons, in case they are requested more than once to speedup OJ
+// start
+private static HashMap iconCache = new HashMap<>();
 
-  public static ImageIcon icon(String filename) {
-return getIcon(IconLoader.class.getResource(resolveFile(filename)));
-  }
+// default icon if the choosen one doesn't exist //
+// Adapted from Kosmo SAIG
+public final static ImageIcon DEFAULT_UNKNOW_ICON = new ImageIcon(
+IconLoader.class.getResource("default_icon.png"));
 
-  public static BufferedImage image(String filename) {
-ImageIcon icon = getIcon(
-IconLoader.class.getResource(resolveFile(filename)));
-Image image = icon.getImage();
+public static ImageIcon icon(String filename) {
+ImageIcon icon = null;
+try {
+icon = 
getIcon(IconLoader.class.getResource(resolveFile(filename)));
+} catch (final Exception e) {
+icon = DEFAULT_UNKNOW_ICON;
+}
+return icon;
+}
 
-// create a buffered image with transparency
-BufferedImage bufImg = new BufferedImage(image.getWidth(null),
-image.getHeight(null), BufferedImage.TYPE_INT_ARGB);
+// public static ImageIcon icon(String filename) {
+// return getIcon(IconLoader.class.getResource(resolveFile(filename)));
+// }
 
-// draw the image on to the buffered image
-Graphics2D bGr = bufImg.createGraphics();
-bGr.drawImage(image, 0, 0, null);
-bGr.dispose();
+public static BufferedImage image(String filename) {
+final ImageIcon icon = getIcon(IconLoader.class
+.getResource(resolveFile(filename)));
+final Image image = icon.getImage();
 
-return bufImg;
-  }
+// create a buffered image with transparency
+final BufferedImage bufImg = new BufferedImage(image.getWidth(null),
+image.getHeight(null), BufferedImage.TYPE_INT_ARGB);
 
-  protected static ImageIcon getIcon(URL url) {
-// check for null
-if (url == null)
-  throw new InvalidParameterException("parameter url must not be null.");
+// draw the image on to the buffered image
+final Graphics2D bGr = bufImg.createGraphics();
+bGr.drawImage(image, 0, 0, null);
+bGr.dispose();
 
-String key = url.toExternalForm();
-// System.out.println(key);
-ImageIcon icon = null;
-// check cache
-icon = iconCache.get(key);
-if (icon != null)
-  return icon;
+return bufImg;
+}
 
-// try loading the image
-try {
-  // we keep using ImageIcon, as other loaders like ImageIO, commons 
Imaging
-  // choke on our icon gifs currently
-  icon = new ImageIcon(url);
-  // cache the image
-  iconCache.put(key, icon);
-} catch (Exception e) {
-  Logger.error(e);
+protected static ImageIcon getIcon(URL url) {
+// check for null
+if (url == null) {
+throw new InvalidParameterException(
+"parameter url must not be null.");
+}
+
+final String key = url.toExternalForm();
+// System.out.println(key);
+ImageIcon icon = null;
+// check cache
+icon = iconCache.get(key);
+if (icon != null) {
+return icon;
+}
+
+// try loading the image
+try {
+// we keep using ImageIcon, as other loaders like ImageIO, commons
+// Imaging
+// choke on our icon gifs currently
+icon = new ImageIcon(url);
+// cache the image
+iconCache.put(key, icon);
+} catch (final Exception e) {
+Logger.error(e);
+}
+if (icon == null) {
+Logger.error("icon

[JPP-Devel] SVN: [5913] core/trunk/src/language

2018-08-02 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5913
  http://sourceforge.net/p/jump-pilot/code/5913
Author:   michaudm
Date: 2018-08-02 06:37:29 + (Thu, 02 Aug 2018)
Log Message:
---
Flip respective roles of postgis savers : postgis / postgis (new) -> postgis 
(legacy) / postgis (R/W)

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

Modified: core/trunk/src/language/jump.properties
===
--- core/trunk/src/language/jump.properties 2018-07-11 06:54:29 UTC (rev 
5912)
+++ core/trunk/src/language/jump.properties 2018-08-02 06:37:29 UTC (rev 
5913)
@@ -568,7 +568,7 @@
 
org.openjump.core.ui.plugin.datastore.RefreshDataStoreQueryPlugIn.Only-datastore-query-layers-must-be-selected
 = Only datastore query layers must be selected
 
org.openjump.core.ui.plugin.datastore.RefreshDataStoreQueryPlugIn.Refresh-datastore-query
 = Refresh Datastore Query
 
org.openjump.core.ui.plugin.datastore.postgis.PostGISSaveDataSourceQueryChooser.error
 = Error\!
-org.openjump.core.ui.plugin.datastore.postgis.PostGISSaveDataSourceQueryChooser.postgis-table
 = PostGIS Table
+org.openjump.core.ui.plugin.datastore.postgis.PostGISSaveDataSourceQueryChooser.postgis-table=PostGIS
 Table (legacy)
 
org.openjump.core.ui.plugin.datastore.postgis.PostGISSaveDataSourceQueryChooser.unique-identifier-is-needed
 = A unique identifier is needed\!
 
org.openjump.core.ui.plugin.datastore.postgis.PostGISSaveDataSourceQueryChooser.no-connection-choosen
 = No connection choosen\!
 
org.openjump.core.ui.plugin.datastore.postgis.PostGISSaveDataSourceQueryChooser.no-table-choosen
 = No table choosen\!
@@ -617,7 +617,7 @@
 
org.openjump.core.ui.plugin.datastore.postgis2.PostGISSaveDataSourceQueryChooser.no-connection-choosen
 = No connection has been choosen
 
org.openjump.core.ui.plugin.datastore.postgis2.PostGISSaveDataSourceQueryChooser.no-table-choosen
 = No table has been choosen
 
org.openjump.core.ui.plugin.datastore.postgis2.PostGISSaveDataSourceQueryChooser.selected-connection-is-not-postgis
 = Selected connection is not a PostGIS connection
-org.openjump.core.ui.plugin.datastore.postgis2.PostGISSaveDataSourceQueryChooser.PostGIS-Table
 = PostGIS Table (new)
+org.openjump.core.ui.plugin.datastore.postgis2.PostGISSaveDataSourceQueryChooser.PostGIS-Table=PostGIS
 Table (R/W)
 org.openjump.core.ui.plugin.datastore.postgis2.PostGISSaveDriverPanel.title = 
Save to PostGIS Table
 org.openjump.core.ui.plugin.datastore.DataStoreSaveDriverPanel.convert-nan-z = 
Convert NaN Z to valid Z
 
org.openjump.core.ui.plugin.datastore.postgis2.PostGISSaveDriverPanel.create-database-primary-key
 = Create a Primary Key column (gid) for this Table

Modified: core/trunk/src/language/jump_cz.properties
===
--- core/trunk/src/language/jump_cz.properties  2018-07-11 06:54:29 UTC (rev 
5912)
+++ core/trunk/src/language/jump_cz.properties  2018-08-02 06:37:29 UTC (rev 
5913)
@@ -498,7 +498,7 @@
 
org.openjump.core.ui.plugin.datastore.RefreshDataStoreQueryPlugIn.Only-datastore-query-layers-must-be-selected
 = Vybr\u00E1ny mohou b\u00FDt pouze vrstvy dotaz\u016F do datab\u00E1ze
 
org.openjump.core.ui.plugin.datastore.RefreshDataStoreQueryPlugIn.Refresh-datastore-query
 = Obnovit dotaz do datab\u00E1ze
 
org.openjump.core.ui.plugin.datastore.postgis.PostGISSaveDataSourceQueryChooser.error
 = Chyba\!
-org.openjump.core.ui.plugin.datastore.postgis.PostGISSaveDataSourceQueryChooser.postgis-table
 = Tabulka v PostGIS
+org.openjump.core.ui.plugin.datastore.postgis.PostGISSaveDataSourceQueryChooser.postgis-table=Tabulka
 v PostGIS (legacy)
 
org.openjump.core.ui.plugin.datastore.postgis.PostGISSaveDataSourceQueryChooser.unique-identifier-is-needed
 = Je pot\u0159eba jedine\u010Dn\u00FD identifik\u00E1tor\!
 
org.openjump.core.ui.plugin.datastore.postgis.PostGISSaveDataSourceQueryChooser.no-connection-choosen
 = Nen\u00ED vybr\u00E1no \u017E\u00E1dn\u00E9 p\u0159ipojen\u00ED\!
 
org.openjump.core.ui.plugin.datastore.postgis.PostGISSaveDataSourceQueryChooser.no-table-choosen
 = Nen\u00ED vybr\u00E1na \u017E\u00E1dn\u00E1 tabulka\!
@@ -536,7 +536,7 @@

[JPP-Devel] SVN: [5917] core/trunk

2018-08-19 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5917
  http://sourceforge.net/p/jump-pilot/code/5917
Author:   michaudm
Date: 2018-08-19 07:27:05 + (Sun, 19 Aug 2018)
Log Message:
---
Add SelectAllOrderedFeaturesFromAttributeTablePlugIn

Modified Paths:
--
core/trunk/ChangeLog
core/trunk/scripts/default-plugins.xml
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/edit/SelectAllLayerItemsPlugIn.java

Added Paths:
---

core/trunk/src/org/openjump/core/ui/plugin/mousemenu/SelectAllOrderedFeaturesFromAttributeTablePlugIn.java

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-08-18 10:16:05 UTC (rev 5916)
+++ core/trunk/ChangeLog2018-08-19 07:27:05 UTC (rev 5917)
@@ -3,6 +3,11 @@
 # 2. make sure that lines break at 80 chars for constricted display situations
 #< 80 chars 
-->#
 
+2018-08-19 mmichaud 
+  * Add two plugins :
+- GenerateUniqueRandomIdPlugIn (menu tools/edit attributes)
+- SelectAllOrderedFeaturesFromAttributeTablePlugIn (AttributeTable context 
menu)
+
 2018-07-01 mmichaud 
   * Update GraphToolbox and MatchingPlugIn extensions
 

Modified: core/trunk/scripts/default-plugins.xml
===
--- core/trunk/scripts/default-plugins.xml  2018-08-18 10:16:05 UTC (rev 
5916)
+++ core/trunk/scripts/default-plugins.xml  2018-08-19 07:27:05 UTC (rev 
5917)
@@ -1715,6 +1715,12 @@
 
 
 
+
org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn
+
+
+
+
+
 
com.vividsolutions.jump.workbench.ui.plugin.clipboard.CutSelectedItemsPlugIn
 
 

Modified: core/trunk/src/language/jump.properties
===
--- core/trunk/src/language/jump.properties 2018-08-18 10:16:05 UTC (rev 
5916)
+++ core/trunk/src/language/jump.properties 2018-08-19 07:27:05 UTC (rev 
5917)
@@ -1000,6 +1000,8 @@
 org.openjump.core.ui.plugin.mousemenu.SaveDatasetsPlugIn.replaces-file = 
replaces file
 org.openjump.core.ui.plugin.mousemenu.SaveDatasetsPlugIn.with-empty-geometry = 
with empty geometry
 
org.openjump.core.ui.plugin.mousemenu.SaveDatasetsPlugIn.with-mixed-geometry-types
 = with mixed geometry types
+org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn
 = Select all ordered features
+org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn.selected-features
 = objets s\xE9lectionn\xE9s
 
org.openjump.core.ui.plugin.mousemenu.SelectLayersWithSelectedItemsPlugIn.SelectLayersWithSelectedItems
 = Select Layers With Selected Items
 org.openjump.core.ui.plugin.mousemenu.SplitFeaturesPlugIn = Split features
 org.openjump.core.ui.plugin.mousemenu.SplitPolygonsNodeLinesPlugIn = Split 
polygons and node lines

Modified: core/trunk/src/language/jump_cz.properties
===
--- core/trunk/src/language/jump_cz.properties  2018-08-18 10:16:05 UTC (rev 
5916)
+++ core/trunk/src/language/jump_cz.properties  2018-08-19 07:27:05 UTC (rev 
5917)
@@ -2907,4 +2907,6 @@
 ui.GenericNames.downhill=\#T\:downhill speed
 ui.GenericNames.select-layers=\#T\:Select layers
 
org.openjump.core.ui.plugin.raster.DEMStatisticsPlugIn.select-multiple-layers=\#T\:Ctrl/Shift
 and mouse click to select more layers
-org.openjump.core.ui.plugin.tools.GenerateUniqueRandomIdPlugIn=#T:Generate 
unique random identifier
\ No newline at end of file
+org.openjump.core.ui.plugin.tools.GenerateUniqueRandomIdPlugIn=#T:Generate 
unique random identifier
+org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn=#T:Select
 all ordered features
+org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn.selected-features=#T:objets
 s\xE9lectionn\xE9s
\ No newline at end of file

Modified: core/trunk/src/language/jump_de.properties
===
---

[JPP-Devel] SVN: [5914] core/trunk/src/org/openjump/core/ui/plugin/raster/ ProfileGraphTool.java

2018-08-17 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5914
  http://sourceforge.net/p/jump-pilot/code/5914
Author:   ma15569
Date: 2018-08-17 14:44:52 + (Fri, 17 Aug 2018)
Log Message:
---
Updated methods from newer class

Modified Paths:
--
core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphTool.java

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphTool.java
===
--- core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphTool.java 
2018-08-02 06:37:29 UTC (rev 5913)
+++ core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphTool.java 
2018-08-17 14:44:52 UTC (rev 5914)
@@ -118,7 +118,7 @@
 reportNothingToUndoYet();
 savedCoordinates.clear();
 display(getCoordinates(), getPanel());
-if (ProfileUtils.getLayer() == null) {
+if (ProfileGraphGUI.getLayer() == null) {
 getPanel()
 .getContext()
 .warnUser(
@@ -134,7 +134,7 @@
 coordinates[i] = c;
 i++;
 }
-ProfileUtils.calculateProfile(coordinates);
+ProfileGraphGUI.calculateProfile(coordinates);
 }
 
 private void display(List coordinates, LayerViewPanel panel)


--
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

[JPP-Devel] SVN: [5919] core/trunk

2018-08-22 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5919
  http://sourceforge.net/p/jump-pilot/code/5919
Author:   michaudm
Date: 2018-08-22 06:49:20 + (Wed, 22 Aug 2018)
Log Message:
---
Fix LayerView to make it compatible with project persistence

Modified Paths:
--
core/trunk/ChangeLog
core/trunk/src/com/vividsolutions/jump/workbench/model/LayerView.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerNameRenderer.java

core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/AddNewLayerViewPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/file/open/OpenProjectWizard.java

Added Paths:
---
core/trunk/src/com/vividsolutions/jump/workbench/model/LayerView.java2xml

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-08-21 20:33:57 UTC (rev 5918)
+++ core/trunk/ChangeLog2018-08-22 06:49:20 UTC (rev 5919)
@@ -3,6 +3,9 @@
 # 2. make sure that lines break at 80 chars for constricted display situations
 #< 80 chars 
-->#
 
+2018-08-22 mmichaud 
+  * Fix LayerView to make it compatible with project persistence
+
 2018-08-19 mmichaud 
   * Add two plugins :
 - GenerateUniqueRandomIdPlugIn (menu tools/edit attributes)

Modified: core/trunk/src/com/vividsolutions/jump/workbench/model/LayerView.java
===
--- core/trunk/src/com/vividsolutions/jump/workbench/model/LayerView.java   
2018-08-21 20:33:57 UTC (rev 5918)
+++ core/trunk/src/com/vividsolutions/jump/workbench/model/LayerView.java   
2018-08-22 06:49:20 UTC (rev 5919)
@@ -1,7 +1,8 @@
 package com.vividsolutions.jump.workbench.model;
 
-import com.vividsolutions.jump.feature.FeatureCollection;
+import com.vividsolutions.jump.feature.*;
 
+import java.util.ArrayList;
 import java.util.Collection;
 
 public class LayerView extends Layer {
@@ -8,16 +9,44 @@
 
   private Layer layer;
 
-  public LayerView(Layer layer) {
-super(layer.getName(), layer.getBasicStyle().getFillColor(), 
layer.getFeatureCollectionWrapper(), layer.getLayerManager());
+  /**
+   * Called by Java2XML
+   */
+  public LayerView() {
+  }
+
+  // 2018-08-22 : add layerName attribute (original name of the underlying 
layer)
+  // to increase compatibility with java2xml and to make it possible to build 
the
+  // LayerView from the xml project file before the underlying Layer is 
completely
+  // initialized
+  String layerName;
+  public String getLayerName() {
+return layerName;
+  }
+  public void setLayerName(String layerName) {
+this.layerName = layerName;
+  }
+
+  @Override
+  public void setLayerManager(LayerManager layerManager) {
+super.setLayerManager(layerManager);
+this.layer = layerManager.getLayer(getLayerName());
+  }
+
+  public LayerView(final String layerName, LayerManager layerManager) {
+super(layerName,
+layerManager.generateLayerFillColor(),
+layerManager.getLayer(layerName).getFeatureCollectionWrapper(),
+layerManager);
+this.layerName = layerName;
+this.layer = layerManager.getLayer(layerName);
 boolean firingEvents = getLayerManager().isFiringEvents();
 getLayerManager().setFiringEvents(false);
 try {
-  setName(getName().replaceAll(layer.getName(),"").trim());
+  setName(getName().replaceAll(this.layer.getName(),"").trim());
 } finally {
   getLayerManager().setFiringEvents(firingEvents);
 }
-this.layer = layer;
   }
 
 
@@ -43,6 +72,28 @@
 super.setFeatureCollectionWrapper(observableFeatureCollection);
   }
 
+
+  @Override
+  public FeatureCollectionWrapper getFeatureCollectionWrapper() {
+// When the LayerView is build from the project xml file, it may be built
+// before underlying Layer is defined...
+if (layer != null) {
+  return layer.getFeatureCollectionWrapper();
+} else {
+  // ... in this case, try again to load data from the underlying Layer
+  // next time the application need to display the data.
+  this.layer = getLayerManager().getLayer(layerName);
+  if (this.layer != null) {
+return layer.getFeatureCollectionWrapper();
+  } else {
+return new ObservableFeatureCollection(
+FeatureDatasetFactory.createFromGeometry(new 
ArrayList())
+);
+  }
+}
+  }
+
+
   public Layer getLayer() {
 return layer;
   }

Added: core/trunk/src/com/vividsolutions/jump/workbench/model/LayerView.java2xml
===
--- core/trunk/src/com/vividsolutions/jump/workbench/model/LayerView.java2xml   
(rev 0)
+++ core/trunk/src/com/vividsolutions/jump/workbench/model/LayerView.java2xml   
2018-08-22 06:49:20 UTC (rev 5919)
@@ -0,0 +1,22 @@
+
+
+  
+  
+  
+  
+  
+  
+  
+
+
+
+  
+  
+  
+  
+  
+  
+
+  
+  
+
\ No

[JPP-Devel] SVN: [5924] core/trunk

2018-08-24 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5924
  http://sourceforge.net/p/jump-pilot/code/5924
Author:   michaudm
Date: 2018-08-24 06:08:20 + (Fri, 24 Aug 2018)
Log Message:
---
Improve LayerView naming and saving, allow views based on view

Modified Paths:
--
core/trunk/ChangeLog
core/trunk/src/com/vividsolutions/jump/workbench/model/LayerView.java
core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerNameRenderer.java
core/trunk/src/language/jump_fr.properties

core/trunk/src/org/openjump/core/ui/plugin/file/SaveLayersWithoutDataSourcePlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/file/open/OpenProjectWizard.java

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-08-22 17:02:04 UTC (rev 5923)
+++ core/trunk/ChangeLog2018-08-24 06:08:20 UTC (rev 5924)
@@ -3,6 +3,9 @@
 # 2. make sure that lines break at 80 chars for constricted display situations
 #< 80 chars 
-->#
 
+2018-08-24 mmichaud 
+  * Improve LayerView naming and saving, allow views based on view
+
 2018-08-22 Giuseppe Aruta
   * WMSLegendPlugIn. Added capability to export WMS legend to PNG image file
   

Modified: core/trunk/src/com/vividsolutions/jump/workbench/model/LayerView.java
===
--- core/trunk/src/com/vividsolutions/jump/workbench/model/LayerView.java   
2018-08-22 17:02:04 UTC (rev 5923)
+++ core/trunk/src/com/vividsolutions/jump/workbench/model/LayerView.java   
2018-08-24 06:08:20 UTC (rev 5924)
@@ -33,6 +33,8 @@
 this.layer = layerManager.getLayer(getLayerName());
   }
 
+  //private String properName = "v";
+
   public LayerView(final String layerName, LayerManager layerManager) {
 super(layerName,
 layerManager.generateLayerFillColor(),
@@ -43,13 +45,35 @@
 boolean firingEvents = getLayerManager().isFiringEvents();
 getLayerManager().setFiringEvents(false);
 try {
-  setName(getName().replaceAll(this.layer.getName(),"").trim());
+  setName("v");
+  //this.properName = layerManager.uniqueLayerName(properName);
+  //setName(getName().replaceAll(this.layer.getName(),"").trim());
+  //setName(properName);
+  setName(layerManager.uniqueLayerName(getName()));
 } finally {
   getLayerManager().setFiringEvents(firingEvents);
 }
   }
 
+  //@Override
+  //public String getName() {
+  //  return properName;
+  //}
 
+  //public void setName(String properName) {
+  //  this.properName = properName;
+  //}
+
+  public String getFullName() {
+//if (layer == null)
+//  return "-> " + getLayerName() + " - " + getName();
+if (layer instanceof LayerView)
+  return ((LayerView) layer).getFullName() + " - " + getName();
+else
+  return "-> " + getLayerName() + " - " + getName();
+  }
+
+
   @Override
   public void setFeatureCollection(FeatureCollection featureCollection) {
 

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerNameRenderer.java
===
--- core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerNameRenderer.java  
2018-08-22 17:02:04 UTC (rev 5923)
+++ core/trunk/src/com/vividsolutions/jump/workbench/ui/LayerNameRenderer.java  
2018-08-24 06:08:20 UTC (rev 5924)
@@ -276,8 +276,9 @@
 Layerable layerable = (Layerable) value;
 if (layerable instanceof LayerView) {
   LayerView view = (LayerView)layerable;
-  label.setText("-> " + view.getLayerName() + " - " +
-  view.getName().replaceAll(view.getLayerName(), ""));
+  //label.setText("-> " + view.getLayerName() + " - " +
+  //view.getName().replaceAll(view.getLayerName(), ""));
+  label.setText(view.getFullName());
 } else {
   label.setText(layerable.getName());
 }

Modified: core/trunk/src/language/jump_fr.properties
===
--- core/trunk/src/language/jump_fr.properties  2018-08-22 17:02:04 UTC (rev 
5923)
+++ core/trunk/src/language/jump_fr.properties  2018-08-24 06:08:20 UTC (rev 
5924)
@@ -2868,7 +2868,7 @@
 org.openjump.core.ui.plugin.raster.ProfileGraphTool.draw-linstring-as-trace = 
Dessiner la ligne devant servir au calcul du profil
 
org.openjump.core.ui.plugin.raster.ProfileGraphTool.use-selected-linstring-as-trace
 = Utiliser la ligne s\xE9lectionn\xE9e pour le profil
 org.openjump.core.ui.plugin.raster.ProfileGraphTool.select-one-linstring = 
S\xE9lectionner une ligne
-com.vividsolutions.jump.workbench.ui.plugin.AddNewLayerViewPlugIn=Ajouter une 
vue
+com.vividsolutions.jump.workbench.ui.plugin.AddNewLayerViewPlugIn = Cr\xE9er 
une vue sur la couche
 com.vividsolutions.jump.util.StatisticIndices.Coefficient-of-variation = 
Coefficient de variation

[JPP-Devel] SVN: [5925] core/trunk/src/org/libtiff/jai/codec/XTIFFExt.java

2018-08-24 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5925
  http://sourceforge.net/p/jump-pilot/code/5925
Author:   ma15569
Date: 2018-08-24 08:56:28 + (Fri, 24 Aug 2018)
Log Message:
---
Private TIFF Tags

Added Paths:
---
core/trunk/src/org/libtiff/jai/codec/XTIFFExt.java

Added: core/trunk/src/org/libtiff/jai/codec/XTIFFExt.java
===
--- core/trunk/src/org/libtiff/jai/codec/XTIFFExt.java  
(rev 0)
+++ core/trunk/src/org/libtiff/jai/codec/XTIFFExt.java  2018-08-24 08:56:28 UTC 
(rev 5925)
@@ -0,0 +1,189 @@
+package org.libtiff.jai.codec;
+
+public class XTIFFExt extends XTIFF {
+
+// Private TIFF Tags
+// (https://www.awaresystems.be/imaging/tiff/tifftags/private.html)
+// Added
+// a) to manage nodata and possible Metadata (currently managed by external
+// xml file
+// b) to keep name compatibility for geotiff tags and have a description
+
+/**
+ * Name GDAL_NODATA
+ * 
+ * @Type ASCII
+ * @Count N
+ * @Description Used by the GDAL library, contains an ASCII encoded nodata
+ *  or background pixel value.
+ * 
+ *  In the geospatial image processing field especially (and in
+ *  other fields) it is common to use a special pixel value to
+ *  mark geospatial areas for which no information is 
available.
+ *  This is often called a "nodata" or "background" value.
+ *  Applications often treat these pixels as transparent and
+ *  they are often not included in spatial statistics for the
+ *  image. Non-geospatial applications might still use the
+ *  nodata value to track a special value that should be 
treated
+ *  as transparent since currently TIFF palettes don't include
+ *  an alpha value.
+ * 
+ *  The GDAL_NODATA tag is intended to keep track of what pixel
+ *  value is being used for this background nodata value. It is
+ *  ASCII encoded so that if the pixel value 255 was to be
+ *  treated as nodata, then the tag would have the value "255".
+ * 
+ *  If this tag is absent there is assume to be no nodata value
+ *  in effect for the image. If the image has more than one
+ *  sample it is assumed that all samples have the same nodata
+ *  value.
+ * 
+ *  This tag is currently only supported by the GDAL library.
+ */
+public static final int GDAL_NODATA = 42113;
+/**
+ * Name GDAL_METADATA
+ * 
+ * @Type ASCII
+ * @Count N
+ * @Description Used by the GDAL library, holds an XML list of name=value
+ *  'metadata' values about the image as a whole, and about
+ *  specific samples.
+ * 
+ *  Contains an XML fragment that looks like this example:
+ * 
+ *   BV02021.CA 
NASA-FAO
+ *  13, ARTEMIS NEWNASA Meters (elevation) 0 0.003
+ *  
+ * 
+ *  The  names are the name of a metadata keyword, and 
the
+ *  text contents of the Item are it's value. Normal XML
+ *  escaping applies. The GDALMetadata tag may have zero or 
more
+ *  Item sub-elements. Generally speaking the item names should
+ *  be well behaved tokens (alpha-numeric + underscores) though
+ *  that isn't strictly enforced. Also, normally the names are
+ *  assumed to be unique.
+ * 
+ *  The "sample" attribute on an Item can be used to indicate a
+ *  metadata item that applies only to one sample in a
+ *  multi-sample TIFF image. Sample numbering starts from 0.
+ * 
+ *  The "role" attribute can be used to identify a specific
+ *  semantic with a metadata item. GDAL has several specific
+ *  pieces of metadata with particular interpretations and 
these
+ *  are identified with role attributes. At a future date some
+ *  of these specific roles may be documented here.
+ * 
+ *  This is an unregistered tag used only by the GDAL library
+ *  and applications built on it to hold Metadata about
+ *  geospatial datasets.
+ */
+
+public static final int GDAL_METADATA = 42112;
+/**
+ * Name ModelPixelScaleTag
+ * 
+ * @Type DOUBLE
+ * @Count 3
+ * @Description Used in interchangeable GeoTIFF files. This tag is
+ *  optionally provided for defining exact affine
+ *  transformations between raster and model space. Baseline
+ *  GeoTIFF files may use this tag or ModelTransformationTag,

[JPP-Devel] SVN: [5918] core/trunk/src/org/openjump/core/ui/plugin/datastore/ transaction/DataStoreTransactionManagerPlugIn.java

2018-08-21 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5918
  http://sourceforge.net/p/jump-pilot/code/5918
Author:   michaudm
Date: 2018-08-21 20:33:57 + (Tue, 21 Aug 2018)
Log Message:
---
Protection against NPE

Modified Paths:
--

core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManagerPlugIn.java

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManagerPlugIn.java
===
--- 
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManagerPlugIn.java
 2018-08-19 07:27:05 UTC (rev 5917)
+++ 
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManagerPlugIn.java
 2018-08-21 20:33:57 UTC (rev 5918)
@@ -82,7 +82,8 @@
 Logger.info("Task loaded : " + task.getName());
 java.util.List layers = 
taskEvent.getTask().getLayerManager().getLayers();
 for (Layer layer : layers) {
-if (layer.getDataSourceQuery().getDataSource() instanceof 
WritableDataStoreDataSource) {
+if (layer.getDataSourceQuery() != null &&
+layer.getDataSourceQuery().getDataSource() 
instanceof WritableDataStoreDataSource) {
 getTransactionManager().registerLayer(layer, task);
 }
 }


--
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

[JPP-Devel] SVN: [5927] plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/ OpenJUMPRasterLayer.java

2018-08-25 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5927
  http://sourceforge.net/p/jump-pilot/code/5927
Author:   ma15569
Date: 2018-08-25 16:31:05 + (Sat, 25 Aug 2018)
Log Message:
---
Moved Sextante raster file export to OpenJUMP inner methods (RasterImageIO 
class) so any enhencement in OJ raster output will affect Sextante raster output

Modified Paths:
--

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/OpenJUMPRasterLayer.java

Modified: 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/OpenJUMPRasterLayer.java
===
--- 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/OpenJUMPRasterLayer.java
 2018-08-24 10:54:19 UTC (rev 5926)
+++ 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/OpenJUMPRasterLayer.java
 2018-08-25 16:31:05 UTC (rev 5927)
@@ -3,6 +3,7 @@
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
+import java.awt.image.DataBuffer;
 import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 import java.io.BufferedWriter;
@@ -10,6 +11,7 @@
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.ByteOrder;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
@@ -25,6 +27,10 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.openjump.core.rasterimage.GeoTiffConstants;
+import org.openjump.core.rasterimage.GridAscii;
+import org.openjump.core.rasterimage.GridFloat;
+import org.openjump.core.rasterimage.RasterImageIO;
+import org.openjump.core.rasterimage.RasterImageIO.CellSizeXY;
 import org.openjump.core.rasterimage.RasterImageLayer;
 import org.openjump.core.rasterimage.Stats;
 import org.openjump.core.rasterimage.TiffTags;
@@ -55,18 +61,24 @@
 RasterImageLayer m_Layer;
 
 public void create(RasterImageLayer layer) throws IOException {
-this.m_Layer = layer;
-this.m_Raster = layer.getRasterData(null);
-this.m_sName = layer.getName();
-this.m_sFilename = layer.getImageFileName();
-Envelope env = layer.getWholeImageEnvelope();
-this.m_LayerExtent = new AnalysisExtent();
-this.m_LayerExtent.setCellSize((env.getMaxX() - env.getMinX())
-/ this.m_Raster.getWidth());
-this.m_LayerExtent.setXRange(env.getMinX(), env.getMaxX(), true);
-this.m_LayerExtent.setYRange(env.getMinY(), env.getMaxY(), true);
-this.m_dNoDataValue = layer.getNoDataValue();
+m_Layer = layer;
+m_Raster = layer.getRasterData(null);
+m_sName = layer.getName();
+m_sFilename = layer.getImageFileName();
+final Envelope env = layer.getWholeImageEnvelope();
+m_LayerExtent = new AnalysisExtent();
+m_LayerExtent.setCellSize((env.getMaxX() - env.getMinX())
+/ m_Raster.getWidth());
+m_LayerExtent.setXRange(env.getMinX(), env.getMaxX(), true);
+m_LayerExtent.setYRange(env.getMinY(), env.getMaxY(), true);
+m_dNoDataValue = layer.getNoDataValue();
 
+
+
+// [Giuseppe Aruta 25 Aug. 2018] Moved raster file export to OpenJUMP
+//inner methods (RasterImageIO class) so any enhencement in OJ raster
+//output will affect Sextante raster output
+// --
 // [Giuseppe Aruta 30 Gen. 2018] deactivated as OJ calculate anyhow
 // statistics (and writes .xml file) when loads raster
 // m_Stats = stats(layer);
@@ -89,39 +101,39 @@
 public void create(RasterImageLayer layer, boolean loadFromFile)
 throws IOException {
 if (!loadFromFile) {
-this.m_Layer = layer;
+m_Layer = layer;
 
 // [sstein 2 Aug 2010], changed so we work now with the raster and
 // not the image, which may be scaled for display.
 // m_Raster = layer.getImage().getData();
-this.m_Raster = layer.getRasterData(null);
+m_Raster = layer.getRasterData(null);
 
-this.m_sName = layer.getName();
-this.m_sFilename = layer.getImageFileName();
-Envelope env = layer.getWholeImageEnvelope();
-this.m_LayerExtent = new AnalysisExtent();
+m_sName = layer.getName();
+m_sFilename = layer.getImageFileName();
+final Envelope env = layer.getWholeImageEnvelope();
+m_LayerExtent = new AnalysisExtent();
 // [sstein 18 Mar 2013], set cell size first, and then the extent,
 // otherwise maxX and maxY will be reset
-this.m_LayerExtent.setCellSize((env.getMaxX() - env.getMinX())
-/ this.m_Raster.getWidth());
-this.m_LayerExtent.setXRange(env.getMinX(), env.getMaxX(), true);
-this.m_LayerExtent.setYRange(env.getMinY(), env.getMaxY(), true);
+

[JPP-Devel] SVN: [5928] plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/ OpenJUMPRasterLayer.java

2018-08-25 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5928
  http://sourceforge.net/p/jump-pilot/code/5928
Author:   ma15569
Date: 2018-08-25 16:46:57 + (Sat, 25 Aug 2018)
Log Message:
---
revert changing: some problems on style rater

Modified Paths:
--

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/OpenJUMPRasterLayer.java

Modified: 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/OpenJUMPRasterLayer.java
===
--- 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/OpenJUMPRasterLayer.java
 2018-08-25 16:31:05 UTC (rev 5927)
+++ 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/core/OpenJUMPRasterLayer.java
 2018-08-25 16:46:57 UTC (rev 5928)
@@ -3,7 +3,6 @@
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
-import java.awt.image.DataBuffer;
 import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 import java.io.BufferedWriter;
@@ -11,7 +10,6 @@
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.ByteOrder;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
@@ -27,10 +25,6 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.openjump.core.rasterimage.GeoTiffConstants;
-import org.openjump.core.rasterimage.GridAscii;
-import org.openjump.core.rasterimage.GridFloat;
-import org.openjump.core.rasterimage.RasterImageIO;
-import org.openjump.core.rasterimage.RasterImageIO.CellSizeXY;
 import org.openjump.core.rasterimage.RasterImageLayer;
 import org.openjump.core.rasterimage.Stats;
 import org.openjump.core.rasterimage.TiffTags;
@@ -61,24 +55,18 @@
 RasterImageLayer m_Layer;
 
 public void create(RasterImageLayer layer) throws IOException {
-m_Layer = layer;
-m_Raster = layer.getRasterData(null);
-m_sName = layer.getName();
-m_sFilename = layer.getImageFileName();
-final Envelope env = layer.getWholeImageEnvelope();
-m_LayerExtent = new AnalysisExtent();
-m_LayerExtent.setCellSize((env.getMaxX() - env.getMinX())
-/ m_Raster.getWidth());
-m_LayerExtent.setXRange(env.getMinX(), env.getMaxX(), true);
-m_LayerExtent.setYRange(env.getMinY(), env.getMaxY(), true);
-m_dNoDataValue = layer.getNoDataValue();
+this.m_Layer = layer;
+this.m_Raster = layer.getRasterData(null);
+this.m_sName = layer.getName();
+this.m_sFilename = layer.getImageFileName();
+Envelope env = layer.getWholeImageEnvelope();
+this.m_LayerExtent = new AnalysisExtent();
+this.m_LayerExtent.setCellSize((env.getMaxX() - env.getMinX())
+/ this.m_Raster.getWidth());
+this.m_LayerExtent.setXRange(env.getMinX(), env.getMaxX(), true);
+this.m_LayerExtent.setYRange(env.getMinY(), env.getMaxY(), true);
+this.m_dNoDataValue = layer.getNoDataValue();
 
-
-
-// [Giuseppe Aruta 25 Aug. 2018] Moved raster file export to OpenJUMP
-//inner methods (RasterImageIO class) so any enhencement in OJ raster
-//output will affect Sextante raster output
-// --
 // [Giuseppe Aruta 30 Gen. 2018] deactivated as OJ calculate anyhow
 // statistics (and writes .xml file) when loads raster
 // m_Stats = stats(layer);
@@ -101,39 +89,39 @@
 public void create(RasterImageLayer layer, boolean loadFromFile)
 throws IOException {
 if (!loadFromFile) {
-m_Layer = layer;
+this.m_Layer = layer;
 
 // [sstein 2 Aug 2010], changed so we work now with the raster and
 // not the image, which may be scaled for display.
 // m_Raster = layer.getImage().getData();
-m_Raster = layer.getRasterData(null);
+this.m_Raster = layer.getRasterData(null);
 
-m_sName = layer.getName();
-m_sFilename = layer.getImageFileName();
-final Envelope env = layer.getWholeImageEnvelope();
-m_LayerExtent = new AnalysisExtent();
+this.m_sName = layer.getName();
+this.m_sFilename = layer.getImageFileName();
+Envelope env = layer.getWholeImageEnvelope();
+this.m_LayerExtent = new AnalysisExtent();
 // [sstein 18 Mar 2013], set cell size first, and then the extent,
 // otherwise maxX and maxY will be reset
-m_LayerExtent.setCellSize((env.getMaxX() - env.getMinX())
-/ m_Raster.getWidth());
-m_LayerExtent.setXRange(env.getMinX(), env.getMaxX(), true);
-m_LayerExtent.setYRange(env.getMinY(), env.getMaxY(), true);
+this.m_LayerExtent.setCellSize((env.getMaxX() - env.getMinX())
+/ this.m_Raster.getWidth());
+

[JPP-Devel] SVN: [5933] core/trunk/src/language

2018-08-28 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5933
  http://sourceforge.net/p/jump-pilot/code/5933
Author:   ma15569
Date: 2018-08-28 12:46:05 + (Tue, 28 Aug 2018)
Log Message:
---
Updated language files

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

Modified: core/trunk/src/language/jump.properties
===
--- core/trunk/src/language/jump.properties 2018-08-27 15:25:30 UTC (rev 
5932)
+++ core/trunk/src/language/jump.properties 2018-08-28 12:46:05 UTC (rev 
5933)
@@ -2929,4 +2929,5 @@
 
org.openjump.core.ui.plugin.raster.ProfileGraphTool.vertical-axes-label=Vertical
 axes label
 
org.openjump.core.ui.plugin.raster.ProfileGraphTool.horizontal-axes-label=Horizontal
 axes label
 
org.openjump.core.ui.plugin.raster.ProfileGraphTool.travel-time-tooltip=Calculate
 travel time according to the speeds (flat, uphill, downhill). Depending to the 
map unit (m or ft) output travel time is in kilometres per hour [m]   or miles 
per hour [ft or ftUS]
-org.openjump.core.ui.plugin.raster.ProfileGraphTool.calculate-travel-time=Calculate
 travel time
\ No newline at end of file
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.calculate-travel-time=Calculate
 travel time
+org.openjump.core.ui.plugin.style= Show legend
\ No newline at end of file

Modified: core/trunk/src/language/jump_cz.properties
===
--- core/trunk/src/language/jump_cz.properties  2018-08-27 15:25:30 UTC (rev 
5932)
+++ core/trunk/src/language/jump_cz.properties  2018-08-28 12:46:05 UTC (rev 
5933)
@@ -2909,4 +2909,5 @@
 
org.openjump.core.ui.plugin.raster.DEMStatisticsPlugIn.select-multiple-layers=\#T\:Ctrl/Shift
 and mouse click to select more layers
 org.openjump.core.ui.plugin.tools.GenerateUniqueRandomIdPlugIn=#T:Generate 
unique random identifier
 
org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn=#T:Select
 all ordered features
-org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn.selected-features=#T:objets
 s\xE9lectionn\xE9s
\ No newline at end of file
+org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn.selected-features=#T:objets
 s\xE9lectionn\xE9s
+org.openjump.core.ui.plugin.style=\#T\:Show legend
\ No newline at end of file

Modified: core/trunk/src/language/jump_de.properties
===
--- core/trunk/src/language/jump_de.properties  2018-08-27 15:25:30 UTC (rev 
5932)
+++ core/trunk/src/language/jump_de.properties  2018-08-28 12:46:05 UTC (rev 
5933)
@@ -2901,4 +2901,5 @@
 
org.openjump.core.ui.plugin.raster.DEMStatisticsPlugIn.select-multiple-layers=\#T\:Ctrl/Shift
 and mouse click to select more layers
 org.openjump.core.ui.plugin.tools.GenerateUniqueRandomIdPlugIn=#T:Generate 
unique random identifier
 
org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn=#T:Select
 all ordered features
-org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn.selected-features=#T:objets
 s\xE9lectionn\xE9s
\ No newline at end of file
+org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn.selected-features=#T:objets
 s\xE9lectionn\xE9s
+org.openjump.core.ui.plugin.style=\#T\:Show legend
\ No newline at end of file

Modified: core/trunk/src/language/jump_es.properties
===
--- core/trunk/src/language/jump_es.properties  2018-08-27 15:25:30 UTC (rev 
5932)
+++ core/trunk/src/language/jump_es.properties  2018-08-28 12:46:05 UTC (rev 
5933)
@@ -2880,4 +2880,5 @@
 
org.openjump.core.ui.plugin.raster.DEMStatisticsPlugIn.select-multiple-layers=Ctrl/Shift
 y click con el rat\xF2n para seleccionar mas capas
 org.openjump.core.ui.plugin.tools.GenerateUniqueRandomIdPlugIn=#T:Generate 
unique random identifier
 
org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn=#T:Select
 all ordered features
-org.openjump.core.ui.plugin.mousemenu.SelectAllOrderedFeaturesFromAttributeTablePlugIn.selected-features=#T:objets
 s\xE9lectionn\xE9s
\ No newline at end of

[JPP-Devel] SVN: [5935] core/trunk/ChangeLog

2018-08-28 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5935
  http://sourceforge.net/p/jump-pilot/code/5935
Author:   ma15569
Date: 2018-08-28 12:49:14 + (Tue, 28 Aug 2018)
Log Message:
---
Reactivated Raster Layer legend with option to save legend to image file

Modified Paths:
--
core/trunk/ChangeLog

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-08-28 12:48:05 UTC (rev 5934)
+++ core/trunk/ChangeLog2018-08-28 12:49:14 UTC (rev 5935)
@@ -3,6 +3,9 @@
 # 2. make sure that lines break at 80 chars for constricted display situations
 #< 80 chars 
-->#
 
+2018-08-28 Giuseppe Aruta
+  * Reactivated Raster Legend plugin with option to save legend to image
+
 2018-08-27 ede
   * rework version detection for 'openjdk version "12-ea"' in start scripts
   * linux/mac starter remove javax.se.ee when run w/ java 11+


--
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

[JPP-Devel] SVN: [5938] core/trunk

2018-08-29 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5938
  http://sourceforge.net/p/jump-pilot/code/5938
Author:   ma15569
Date: 2018-08-29 06:51:09 + (Wed, 29 Aug 2018)
Log Message:
---
Added OpenKLEM extension for topographic and Hydrological analysis

Modified Paths:
--
core/trunk/ChangeLog
core/trunk/etc/readme.txt

Added Paths:
---
core/trunk/lib/plus/OpenKLEM-20180828.jar
core/trunk/lib/plus/OpenKLEMOJ-20180828.jar

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-08-29 06:12:31 UTC (rev 5937)
+++ core/trunk/ChangeLog2018-08-29 06:51:09 UTC (rev 5938)
@@ -4,6 +4,9 @@
 #< 80 chars 
-->#
 
 2018-08-28 Giuseppe Aruta
+  * Added OpenKLEM extension for topographic and Hydrological analysis
+
+2018-08-28 Giuseppe Aruta
   * Reactivated Raster Legend plugin with option to save legend to image
 
 2018-08-27 ede

Modified: core/trunk/etc/readme.txt
===
--- core/trunk/etc/readme.txt   2018-08-29 06:12:31 UTC (rev 5937)
+++ core/trunk/etc/readme.txt   2018-08-29 06:51:09 UTC (rev 5938)
@@ -137,6 +137,9 @@
utils-*.jar
  Measure Toolbox (Giuseppe Aruta) - GPL3 - gpl-3.0.txt
   MeasureToolbox_*.jar
+ OpenKLEM (Geomatica) - GPL2 - gpl-3.0.txt
+  OpenKLEM-*.jar
+  OpenKLEMOJ-*.jar
  OSM Driver (Stefan Steiniger) - GPL2 - gpl-2.txt
   oj_osm_reader_v*.jar
  Printer (com.cadplan.jump) - GPL2 - gpl-2.txt

Added: core/trunk/lib/plus/OpenKLEM-20180828.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/OpenKLEM-20180828.jar
===
--- core/trunk/lib/plus/OpenKLEM-20180828.jar   2018-08-29 06:12:31 UTC (rev 
5937)
+++ core/trunk/lib/plus/OpenKLEM-20180828.jar   2018-08-29 06:51:09 UTC (rev 
5938)

Property changes on: core/trunk/lib/plus/OpenKLEM-20180828.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: core/trunk/lib/plus/OpenKLEMOJ-20180828.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/OpenKLEMOJ-20180828.jar
===
--- core/trunk/lib/plus/OpenKLEMOJ-20180828.jar 2018-08-29 06:12:31 UTC (rev 
5937)
+++ core/trunk/lib/plus/OpenKLEMOJ-20180828.jar 2018-08-29 06:51:09 UTC (rev 
5938)

Property changes on: core/trunk/lib/plus/OpenKLEMOJ-20180828.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property

--
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

[JPP-Devel] SVN: [5936] plug-ins

2018-08-28 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5936
  http://sourceforge.net/p/jump-pilot/code/5936
Author:   ma15569
Date: 2018-08-29 05:24:12 + (Wed, 29 Aug 2018)
Log Message:
---
Added OpenKLEM source code to repository

Added Paths:
---
plug-ins/OpenKLEM/
plug-ins/OpenKLEM/OpenKLEMCore/
plug-ins/OpenKLEM/OpenKLEMCore/dist/
plug-ins/OpenKLEM/OpenKLEMCore/dist/OpenKLEM-20180828-source.zip
plug-ins/OpenKLEM/OpenKLEMCore/dist/OpenKLEM-20180828.jar
plug-ins/OpenKLEM/OpenKLEMCore/trunk/
plug-ins/OpenKLEM/OpenKLEMCore/trunk/lib/
plug-ins/OpenKLEM/OpenKLEMCore/trunk/lib/jep-2.4.0.jar
plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/
plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/ChangeLog
plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/
plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/
plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/Log.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/aspect/

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/aspect/AspectCalculator.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/aspect/AspectStripe.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/cn/

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/cn/CurveNumberCalculator.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/cn/LandUseSoilGroupTuple.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/cn/SoilGroupLandUseTable.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/cn/ValuesRange.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/drainageTime/

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/drainageTime/DrainageTimeCalculator.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/drainageTime/DrainageTimeStripe.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/drainageTime/VelocityCalculator.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/exceptions/

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/exceptions/NotSpatiallyConsistentGridsException.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/fill/

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/fill/DemFiller.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/fill/DemFillerStripe.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/fill/DemFillerStripe2.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/fill/FlatAreasProcessor.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/fill/FlatAreasProcessor2.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/fill/FlatAreasProcessorStripe.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/flowdir/

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/flowdir/BitOps.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/flowdir/FlowDirsCalculator.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/flowdir/FlowDirsStripe.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/grid/

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/grid/BasicGrid.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/grid/BooleanBasicGrid.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/grid/ByteBasicGrid.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/grid/DoubleBasicGrid.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/grid/FloatBasicGrid.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/grid/FlowDirBasicGrid.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/grid/GridDestriper.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/grid/GridStriper.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/grid/IntBasicGrid.java

plug-ins/OpenKLEM/OpenKLEMCore/trunk/src/com/geomaticaeambiente/openjump/klem/grid/LongBasicGrid.java

[JPP-Devel] SVN: [5937] plug-ins/OpenKLEM

2018-08-29 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5937
  http://sourceforge.net/p/jump-pilot/code/5937
Author:   ma15569
Date: 2018-08-29 06:12:31 + (Wed, 29 Aug 2018)
Log Message:
---
Updated documentation and libraries

Modified Paths:
--
plug-ins/OpenKLEM/doc/README.txt

Added Paths:
---
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/lib/simple-odf-0.8.1-incubating.jar

Added: 
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/lib/simple-odf-0.8.1-incubating.jar
===
(Binary files differ)

Index: 
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/lib/simple-odf-0.8.1-incubating.jar
===
--- 
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/lib/simple-odf-0.8.1-incubating.jar
2018-08-29 05:24:12 UTC (rev 5936)
+++ 
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/lib/simple-odf-0.8.1-incubating.jar
2018-08-29 06:12:31 UTC (rev 5937)

Property changes on: 
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/lib/simple-odf-0.8.1-incubating.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: plug-ins/OpenKLEM/doc/README.txt
===
--- plug-ins/OpenKLEM/doc/README.txt2018-08-29 05:24:12 UTC (rev 5936)
+++ plug-ins/OpenKLEM/doc/README.txt2018-08-29 06:12:31 UTC (rev 5937)
@@ -1,6 +1,7 @@
  OpenKLEM  -
 
-OpenKlem is an extension of OpenJUMP for hydrological analysis, it includes 
also a module for simulating flood hydrograph (Kinematik Local Excess Model, 
KLEM).
+OpenKlem is an extension of OpenJUMP for hydrological analysis, 
+it includes also a module for simulating flood hydrograph (Kinematik Local 
Excess Model, KLEM).
 
 Source code is available here:
 https://bitbucket.org/geomaticaeambiente/openklem
@@ -7,18 +8,47 @@
 
 OpenKLEM is distributed under GNU https://www.gnu.org/licenses/gpl-2.0.html
 
-OpenKLEM is already integrated into OpenJUMP PLUS.  
-To install OpenKLEM into OpenJUMP CORE, copy OpenKLEM-**.jar and 
OpenKLEMOJ-**.jar into OpenJUMP/LIB/EXT folder. It requires 
jfreechart-1.0.13.jar, jcommon-1.0.16.jar and jep-2.4.1.jar to be located into 
OJ/LIB/EXT folder
 
-(Optional) to activate "Export to OpenOffice" option, copy all files from 
"OpenDocument libraries" folder
-into OpenJUMP/LIB/EXT folder
+--- Set up ---
 
+OpenJUMP plus: OpenKLEM is already integrated into OpenJUMP PLUS.  
 
+OpenJUMP Core: To install OpenKLEM into OpenJUMP CORE, copy OpenKLEM-**.jar 
and OpenKLEMOJ-**.jar into OpenJUMP/LIB/EXT folder. 
+It requires the following libraries to be located into OJ/LIB/EXT folder
+jfreechart-1.0.13.jar (*)  
+jcommon-1.0.16.jar (*)  
+jep-2.4.1.jar (**)  
 
-ChangeLog
+(*) available at 
https://sourceforge.net/p/jump-pilot/code/HEAD/tree/plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/lib/
+(**) available at 
https://sourceforge.net/p/jump-pilot/code/HEAD/tree/plug-ins/OpenKLEM/OpenKLEMCore/trunk/lib/
 
- OpenKLEM Base -
 
+
+--- Extra ---
+
+To activate the optional tool "Export to OpenOffice"  you need to have 
"OpenDocument libraries" installed into
+your OpenJUMP:
+commons-validator-1.4.1.jar
+java-rdfa-o.4.2.jar
+jena-core-2.13.0.jar
+jena-iri-1.1.2,jar
+odfdom-java-0.8.10-incubating.jar
+simple-odf-0.8.1-incubating.jar
+
+1) Download OpenDocument libraries from OpenJUMP repository, located ether at 
OpenJUMP SVN:
+   
https://sourceforge.net/p/jump-pilot/code/HEAD/tree/plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/lib/
+Or at GeoArbores sourceforge site:
+ 
https://sourceforge.net/projects/opensit/files/Openjump/OpenKLEM/OpenKLEM20180726/OpenDocument%20libraries/
+
+2) Create a folder OpenJUMP/lib/ext/Opendocument and copy the selected 
libraries into it
+
+
+
+
+--- Change log ---
+
+OpenKLEM Base
+
 2018-13-07 
   * Class: com.geomaticaeambiente.openjump.klem.slope.SlopeStripe
 Added radians output
@@ -29,7 +59,7 @@
  to deactivated some warning on compiling
   * Delate class it.geomaticaambiente.klem.klemDA as creating error on 
compiling
 
- OpenKLEMOJ  -
+OpenKLEMOJ
 
 2018-06-18 
   * General. Changed icons to famfamfam or OJ ones. Added gpl_2 file


--
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

[JPP-Devel] SVN: [5939] core/trunk/etc/readme.txt

2018-08-29 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5939
  http://sourceforge.net/p/jump-pilot/code/5939
Author:   ma15569
Date: 2018-08-29 08:01:13 + (Wed, 29 Aug 2018)
Log Message:
---
Updated readme

Modified Paths:
--
core/trunk/etc/readme.txt

Modified: core/trunk/etc/readme.txt
===
--- core/trunk/etc/readme.txt   2018-08-29 06:51:09 UTC (rev 5938)
+++ core/trunk/etc/readme.txt   2018-08-29 08:01:13 UTC (rev 5939)
@@ -137,7 +137,8 @@
utils-*.jar
  Measure Toolbox (Giuseppe Aruta) - GPL3 - gpl-3.0.txt
   MeasureToolbox_*.jar
- OpenKLEM (Geomatica) - GPL2 - gpl-3.0.txt
+ OpenKLEM (Geomatica) - GPL2 - gpl-2.0.txt
+ topographic and hydrological analysis
   OpenKLEM-*.jar
   OpenKLEMOJ-*.jar
  OSM Driver (Stefan Steiniger) - GPL2 - gpl-2.txt


--
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

[JPP-Devel] SVN: [5916] core/trunk/src/org/openjump/core/rasterimage/ AddRasterImageLayerWizard.java

2018-08-18 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5916
  http://sourceforge.net/p/jump-pilot/code/5916
Author:   ma15569
Date: 2018-08-18 10:16:05 + (Sat, 18 Aug 2018)
Log Message:
---
applyed a patch to partially solve  bug 479 (OpenJUMp doen't recognize 
RasterImageLayer SRS on loading anymore). SRS is recognized for GeoTIFF file. 
It seems not sitll working for SRS stored into sidecar files (aux.xml or .prj)

Modified Paths:
--
core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java

Modified: 
core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java
===
--- core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java 
2018-08-18 10:03:14 UTC (rev 5915)
+++ core/trunk/src/org/openjump/core/rasterimage/AddRasterImageLayerWizard.java 
2018-08-18 10:16:05 UTC (rev 5916)
@@ -10,6 +10,7 @@
 import javax.imageio.ImageIO;
 
 import org.openjump.core.ccordsys.utils.ProjUtils;
+import org.openjump.core.ccordsys.utils.SRSInfo;
 import org.openjump.core.ui.plugin.file.OpenRecentPlugIn;
 import org.openjump.core.ui.plugin.file.open.ChooseProjectPanel;
 import 
org.openjump.core.ui.plugin.layer.pirolraster.LoadSextanteRasterImagePlugIn;
@@ -39,7 +40,7 @@
 
 public static final String KEY = AddRasterImageLayerWizard.class.getName();
 
-private WorkbenchContext workbenchContext;
+private final WorkbenchContext workbenchContext;
 private ChooseProjectPanel chooseProjectPanel;
 private SelectRasterImageFilesPanel selectFilesPanel;
 
@@ -101,10 +102,10 @@
  */
 @Override
 public void run(WizardDialog dialog, TaskMonitor monitor) {
-this.properties = new PropertiesHandler(
+properties = new PropertiesHandler(
 AddRasterImageLayerWizard.propertiesFile);
 if (files == null) {
-File[] selectedFiles = selectFilesPanel.getSelectedFiles();
+final File[] selectedFiles = selectFilesPanel.getSelectedFiles();
 open(selectedFiles, monitor);
 } else {
 open(files, monitor);
@@ -112,7 +113,7 @@
 }
 
 private void open(File[] files, TaskMonitor monitor) {
-for (File file : files) {
+for (final File file : files) {
 open(file, monitor);
 }
 }
@@ -120,29 +121,29 @@
 public void open(File file, TaskMonitor monitor) {
 try {
 try {
-this.properties.setProperty(
-LoadSextanteRasterImagePlugIn.KEY_PATH, 
file.getPath());
+properties.setProperty(LoadSextanteRasterImagePlugIn.KEY_PATH,
+file.getPath());
 
-this.properties.store(" " + this.KEY_ZOOM_TO_INSERTED_IMAGE
+properties.store(" " + KEY_ZOOM_TO_INSERTED_IMAGE
 + I18N.get("RasterImagePlugIn.28")
-+ this.KEY_ALLWAYSACCEPT_TWF_EXT
++ KEY_ALLWAYSACCEPT_TWF_EXT
 + I18N.get("RasterImagePlugIn.29")
 + LoadSextanteRasterImagePlugIn.KEY_PATH
 + I18N.get("RasterImagePlugIn.30"));
 
-String selectedFilename = file.getPath();
-this.imageFileName = selectedFilename;
-this.cachedLayer = selectedFilename.substring(
+final String selectedFilename = file.getPath();
+imageFileName = selectedFilename;
+cachedLayer = selectedFilename.substring(
 selectedFilename.lastIndexOf(File.separator) + 1,
 selectedFilename.lastIndexOf("."));
 
 // boolean imageAdded = false;
 
-Point imageDimensions = RasterImageIO
+final Point imageDimensions = RasterImageIO
 .getImageDimensions(selectedFilename);
-Envelope env = this.getGeoReferencing(selectedFilename,
-this.allwaysLookForTFWExtension, imageDimensions,
-this.workbenchContext);
+final Envelope env = getGeoReferencing(selectedFilename,
+allwaysLookForTFWExtension, imageDimensions,
+workbenchContext);
 
 if (env != null) {
 addImage(workbenchContext, env, imageDimensions);
@@ -153,7 +154,7 @@
 } finally {
 // reader.close();
 }
-} catch (Exception e) {
+} catch (final Exception e) {
 monitor.report(e);
 }
 }
@@ -165,7 +166,7 @@
 context.getWorkbench().getFrame().addTaskFrame();
 }
 
-String newLayerName = context.getLayerManager().uniqueLayerName(
+final String newLayerName = context.getLayerManager().uniqueLayerName(
 cachedLayer);
 
 String catName = StandardCategoryNames.WORKING;
@@ -174,27

[JPP-Devel] SVN: [5915] core/trunk

2018-08-18 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5915
  http://sourceforge.net/p/jump-pilot/code/5915
Author:   michaudm
Date: 2018-08-18 10:03:14 + (Sat, 18 Aug 2018)
Log Message:
---
Add GenerateUniqueRandomIdPlugIn

Modified Paths:
--
core/trunk/scripts/default-plugins.xml
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

Added Paths:
---

core/trunk/src/org/openjump/core/ui/plugin/tools/GenerateUniqueRandomIdPlugIn.java

Modified: core/trunk/scripts/default-plugins.xml
===
--- core/trunk/scripts/default-plugins.xml  2018-08-17 14:44:52 UTC (rev 
5914)
+++ core/trunk/scripts/default-plugins.xml  2018-08-18 10:03:14 UTC (rev 
5915)
@@ -831,6 +831,9 @@
 org.openjump.core.ui.plugin.tools.GenerateRandomStringPlugIn
 
 
+org.openjump.core.ui.plugin.tools.GenerateUniqueRandomIdPlugIn
+
+
 
de.fho.jump.pirol.plugins.EditAttributeByFormula.EditAttributeByFormulaPlugIn
 
 

Modified: core/trunk/src/language/jump.properties
===
--- core/trunk/src/language/jump.properties 2018-08-17 14:44:52 UTC (rev 
5914)
+++ core/trunk/src/language/jump.properties 2018-08-18 10:03:14 UTC (rev 
5915)
@@ -1472,7 +1472,7 @@
 org.openjump.core.ui.plugin.tools.GenerateRandomNumberPlugIn.min-value = Min 
Value
 org.openjump.core.ui.plugin.tools.GenerateRandomNumberPlugIn.max-value = Max 
Value
 
org.openjump.core.ui.plugin.tools.GenerateRandomNumberPlugIn.no-editable-layer-with-numeric-attribute
 = No editable layer with numeric attribute
-org.openjump.core.ui.plugin.tools.GenerateRandomStringPlugIn = #T:Generate 
random string values
+org.openjump.core.ui.plugin.tools.GenerateRandomStringPlugIn = Generate random 
string values
 org.openjump.core.ui.plugin.tools.GenerateRandomStringPlugIn.min-length = Min 
Length
 
org.openjump.core.ui.plugin.tools.GenerateRandomStringPlugIn.min-length-tooltip 
= Min length of the generated string
 org.openjump.core.ui.plugin.tools.GenerateRandomStringPlugIn.max-length = Max 
Length
@@ -1487,6 +1487,7 @@
 
org.openjump.core.ui.plugin.tools.GenerateRandomStringPlugIn.no-editable-layer-with-string-attribute
 = No editable layer with string attribute
 
org.openjump.core.ui.plugin.tools.GenerateRandomStringPlugIn.non-empty-attribute
 = Attribute is not empty
 org.openjump.core.ui.plugin.tools.GenerateRandomStringPlugIn.overwrite-prompt 
= Do you want to overwrite existing values ?
+org.openjump.core.ui.plugin.tools.GenerateUniqueRandomIdPlugIn = Generate 
unique random identifier
 
org.openjump.core.ui.plugin.tools.JoinAttributesSpatiallyPlugIn.Join-Attributes-Spatially
 = Join Attributes Spatially
 
org.openjump.core.ui.plugin.tools.JoinAttributesSpatiallyPlugIn.Joins-attributes-of-source-layer-according-to-a-spatial-and-a-statistic-criterion
 = Joins attributes of source layer according to a spatial and a statistical 
criterion.
 org.openjump.core.ui.plugin.tools.JoinAttributesSpatiallyPlugIn.buffer-radius 
= buffer radius

Modified: core/trunk/src/language/jump_cz.properties
===
--- core/trunk/src/language/jump_cz.properties  2018-08-17 14:44:52 UTC (rev 
5914)
+++ core/trunk/src/language/jump_cz.properties  2018-08-18 10:03:14 UTC (rev 
5915)
@@ -2906,4 +2906,5 @@
 ui.GenericNames.uphill=\#T\:uphill speed
 ui.GenericNames.downhill=\#T\:downhill speed
 ui.GenericNames.select-layers=\#T\:Select layers
-org.openjump.core.ui.plugin.raster.DEMStatisticsPlugIn.select-multiple-layers=\#T\:Ctrl/Shift
 and mouse click to select more layers
\ No newline at end of file
+org.openjump.core.ui.plugin.raster.DEMStatisticsPlugIn.select-multiple-layers=\#T\:Ctrl/Shift
 and mouse click to select more layers
+org.openjump.core.ui.plugin.tools.GenerateUniqueRandomIdPlugIn=#T:Generate 
unique random identifier
\ No newline at end of file

Modified: core/trunk/src/language/jump_de.properties
===
--- core/trunk/src/language/jump_de.properties  2018-08-17 14:44:52 UTC (rev 
5914)
+++ core/trunk/src/language/jump_de.properties  2018-08-18 10:03:14 UTC (rev 
5915)
@@ -2898,4 +2898,5 @@

[JPP-Devel] SVN: [5929] core/trunk

2018-08-27 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5929
  http://sourceforge.net/p/jump-pilot/code/5929
Author:   edso
Date: 2018-08-27 12:20:07 + (Mon, 27 Aug 2018)
Log Message:
---
rework version detection for 'openjdk version "12-ea"'

Modified Paths:
--
core/trunk/ChangeLog
core/trunk/scripts/oj_windows.bat

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-08-25 16:46:57 UTC (rev 5928)
+++ core/trunk/ChangeLog2018-08-27 12:20:07 UTC (rev 5929)
@@ -3,6 +3,9 @@
 # 2. make sure that lines break at 80 chars for constricted display situations
 #< 80 chars 
-->#
 
+2018-08-27 ede
+  * oj_windows.bat rework version detection for 'openjdk version "12-ea"'
+
 2018-08-24 mmichaud 
   * Improve LayerView naming and saving, allow views based on view
 
@@ -663,7 +666,7 @@
   * bugfix : old postgis driver could not save layer with pk != dbid
 
 2016-09-01 Giuseppe Aruta  
-  * File projection detection: Added IGNF and IGN G\xE9oportail codes
+  * File projection detection: Added IGNF and IGN G�oportail codes
   * File projection detection: Added measure units
   
 2016-07-18 ede
@@ -1070,7 +1073,7 @@
 - polygon width
 - polygon length
 - circularity (Miller)
-- compacity (Grav\xE9lius)
+- compacity (Grav�lius)
 
 2015-06-26 bertazza
   * Raster styles: some bugs fixed.
@@ -2731,7 +2734,7 @@
   * Finish to fix 3513864 : add an icon to RasterImageLayer
   
 2012-04-02 ede
-  * Finish 3510778 with the help of Larry (Michaa\xBF\xBDl's fix was 
inefficient)
+  * Finish 3510778 with the help of Larry (Michaa��l's fix was inefficient)
   * workaround for bug 
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7122141
 and FeatureInstaller cleaning
 

Modified: core/trunk/scripts/oj_windows.bat
===
--- core/trunk/scripts/oj_windows.bat   2018-08-25 16:46:57 UTC (rev 5928)
+++ core/trunk/scripts/oj_windows.bat   2018-08-27 12:20:07 UTC (rev 5929)
@@ -99,11 +99,12 @@
 call :concat "; " %%i
 for /F "tokens=1-3 delims= " %%a in ("%%i") do (
rem -- memorize version number string --
-   if "%%a"=="java" ( 
-   if "%%b"=="version" ( 
+   if "%%a"=="java" if "%%b"=="version" ( 
set JAVAVER=%%c
)
-   )
+   if /I "%%a"=="openjdk" if "%%b"=="version" ( 
+   set JAVAVER=%%c
+   )
 )
 )
 set "JAVA_VERSIONSTRING=%concat%"
@@ -118,17 +119,24 @@
 rem @echo Output: %JAVAVER%
 
 for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do (
+if [%%v] neq [] call :extractLeadingNumbers "%%v" major
 rem @echo Major: %%v
-set JAVAVER_MAJOR=%%v
+if [%%w] neq [] call :extractLeadingNumbers "%%w" minor
 rem @echo Minor: %%w
-set JAVAVER_MINOR=%%w
-rem @echo Build: %%x
-set JAVAVER_PATCH=%%x
+if [%%x] neq [] call :extractLeadingNumbers "%%x" patch
+rem @echo Patch: %%x
 )
+if [%major%] neq [] ( set "JAVAVER_MAJOR=%major%" ) else (
+echo ERROR: Could not detect java version number.
+set "ERROR=1"
+goto :end
+)
+if [%minor%] neq [] ( set "JAVAVER_MINOR=%minor%" ) else ( set 
"JAVAVER_MINOR=0" )
+if [%patch%] neq [] ( set "JAVAVER_PATCH=%patch%" ) else ( set 
"JAVAVER_PATCH=0" )
 
-rem -- java9+ needs some packages explicitly added/exported --
-set /a JAVAVER_NUMBER=JAVAVER_MAJOR
-if %JAVAVER_NUMBER% geq 9 (
+
+rem -- java9-java11 need some packages explicitly added/exported --
+if %JAVAVER_MAJOR% geq 9 if %JAVAVER_MAJOR% lss 12 (
   set JAVA_OPTS=%JAVA_OPTS% --add-exports 
java.base/jdk.internal.loader=ALL-UNNAMED ^
 --add-exports java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED ^
 --add-exports java.desktop/com.sun.java.swing.plaf.motif=ALL-UNNAMED ^
@@ -388,5 +396,20 @@
 set "JAVA_MEM_STRING=Xmx to %value%M"
 goto:eof
 
+rem This extracts the first numerical series in the input string
+:extractLeadingNumbers inputString returnVar
+setlocal enableextensions disabledelayedexpansion
+rem Retrieve the string from arguments
+set "string=%~1"
 
+rem Use numbers as delimiters (so they are removed) to retrieve the rest of 
the string
+for /f "tokens=1-2 delims=0123456789 " %%a in ("%string:^"=%") do set 
"delimiters=%%a%%b"
+
+rem Use the retrieved characters as delimiters to retrieve the first numerical 
serie
+for /f "delims=%delimiters% " %%a in ("%string:^"=%") do set "numbers=%%a"
+
+rem Return the found data to caller and leave
+endlocal & set "%~2=%numbers%"
+goto :eof
+
 :eof


--
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

[JPP-Devel] SVN: [5931] core/trunk

2018-08-27 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5931
  http://sourceforge.net/p/jump-pilot/code/5931
Author:   edso
Date: 2018-08-27 13:53:00 + (Mon, 27 Aug 2018)
Log Message:
---
remove javax.se.ee when run w/ java 11+ on linux/mac

Modified Paths:
--
core/trunk/ChangeLog
core/trunk/scripts/oj_linux.sh

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-08-27 13:43:30 UTC (rev 5930)
+++ core/trunk/ChangeLog2018-08-27 13:53:00 UTC (rev 5931)
@@ -5,6 +5,7 @@
 
 2018-08-27 ede
   * oj_windows.bat rework version detection for 'openjdk version "12-ea"'
+  * linux/mac starter remove javax.se.ee when run w/ java 11+
 
 2018-08-24 mmichaud 
   * Improve LayerView naming and saving, allow views based on view

Modified: core/trunk/scripts/oj_linux.sh
===
--- core/trunk/scripts/oj_linux.sh  2018-08-27 13:43:30 UTC (rev 5930)
+++ core/trunk/scripts/oj_linux.sh  2018-08-27 13:53:00 UTC (rev 5931)
@@ -242,9 +242,13 @@
   JAVA_OPTS="--add-exports java.base/jdk.internal.loader=ALL-UNNAMED \
 --add-exports java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED \
 --add-exports java.desktop/com.sun.java.swing.plaf.motif=ALL-UNNAMED \
---add-exports java.desktop/com.sun.imageio.spi=ALL-UNNAMED --add-modules 
java.se.ee \
+--add-exports java.desktop/com.sun.imageio.spi=ALL-UNNAMED \
 $JAVA_OPTS"
 fi
+# java ee was removed from jdk in java 11
+if awk "BEGIN{if( $JAVA_VERSION >= 9 && $JAVA_VERSION < 11 )exit 0;else exit 
1}"; then
+  JAVA_OPTS="--add-modules java.se.ee $JAVA_OPTS"
+fi
 
 # in case some additional archives were placed in native dir inbetween
 extract_libs "$JUMP_NATIVE_DIR"


--
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

[JPP-Devel] SVN: [5932] core/trunk

2018-08-27 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5932
  http://sourceforge.net/p/jump-pilot/code/5932
Author:   edso
Date: 2018-08-27 15:25:30 + (Mon, 27 Aug 2018)
Log Message:
---
rework version detection for 'openjdk version "12-ea"' in start scripts

Modified Paths:
--
core/trunk/ChangeLog
core/trunk/scripts/oj_linux.sh

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-08-27 13:53:00 UTC (rev 5931)
+++ core/trunk/ChangeLog2018-08-27 15:25:30 UTC (rev 5932)
@@ -4,7 +4,7 @@
 #< 80 chars 
-->#
 
 2018-08-27 ede
-  * oj_windows.bat rework version detection for 'openjdk version "12-ea"'
+  * rework version detection for 'openjdk version "12-ea"' in start scripts
   * linux/mac starter remove javax.se.ee when run w/ java 11+
 
 2018-08-24 mmichaud 

Modified: core/trunk/scripts/oj_linux.sh
===
--- core/trunk/scripts/oj_linux.sh  2018-08-27 13:53:00 UTC (rev 5931)
+++ core/trunk/scripts/oj_linux.sh  2018-08-27 15:25:30 UTC (rev 5932)
@@ -167,7 +167,7 @@
 
 # java version check
 JAVA_VERSIONSTRING="$("$JAVA" -version 2>&1)"
-JAVA_VERSION=$(echo $JAVA_VERSIONSTRING | awk -F'[ \056]' 
'{gsub(/["\047]+/,"")}/version [0-9]+\.[0-9]+/{print $3"."$4; exit}' )
+JAVA_VERSION=$( echo $JAVA_VERSIONSTRING | awk 
'BEGIN{done=0}{gsub(/["\047]+/,"")}/[a-zA-Z]+ version 
[0-9]+/{split($3,a,"[^0-9]"); if(match(a[2],/^[0-9]+$/)){print 
a[1]"."a[2]}else{print a[1]".0"}; done=1}END{if(!done)exit 1}' ) 
 JAVA_ARCH=$(echo $JAVA_VERSIONSTRING | grep -q -i 64-bit && echo x64 || echo 
x86)
 JAVA_NEEDED="1.6"
 if ! is_decimal "$JAVA_VERSION"; then


--
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

[JPP-Devel] SVN: [5921] core/trunk/src/org/openjump/sextante/gui/additionalResults/ AdditionalResultsFrame.java

2018-08-22 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5921
  http://sourceforge.net/p/jump-pilot/code/5921
Author:   ma15569
Date: 2018-08-22 15:28:45 + (Wed, 22 Aug 2018)
Log Message:
---
Add generic save view to image of JPanel in a JScrollPane

Modified Paths:
--

core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java

Modified: 
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java
===
--- 
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java
  2018-08-22 15:24:29 UTC (rev 5920)
+++ 
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java
  2018-08-22 15:28:45 UTC (rev 5921)
@@ -454,8 +454,43 @@
 } else if (returnVal == JFileChooser.CANCEL_OPTION) {
 return;
 }
+
 }
 
+// [Giuseppe Aruta 2018-08-22] add generic save view to
+// image of JPanel in a JScrollPane
+else if (view instanceof JPanel) {
+final JPanel panel = (JPanel) pane.getViewport()
+.getView();
+final int w = panel.getWidth();
+final int h = panel.getHeight();
+final BufferedImage bi = new BufferedImage(w, h,
+BufferedImage.TYPE_INT_RGB);
+final Graphics2D g = bi.createGraphics();
+panel.paint(g);
+
+filter = new FileNameExtensionFilter(
+"Portable Network Graphics (png)", "png");
+final JFileChooser fc = new 
GUIUtil.FileChooserWithOverwritePrompting(
+"png");
+fc.setFileFilter(filter);
+fc.addChoosableFileFilter(filter);
+final int returnVal = fc
+.showSaveDialog(AdditionalResultsFrame.this);
+fc.getWidth();
+fc.getHeight();
+if (returnVal == JFileChooser.APPROVE_OPTION) {
+try {
+file = new File(fc.getSelectedFile() + ".png");
+ImageIO.write(bi, "png", file);
+saved(file);
+} catch (final Exception e) {
+notsaved();
+Logger(this.getClass(), e);
+}
+}
+}
+
 } else if (c instanceof PlotPanel) {
 final PlotPanel panel = (PlotPanel) c;
 filter = new FileNameExtensionFilter(


--
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

[JPP-Devel] SVN: [5920] core/trunk/src/org/openjump/core/rasterimage/styler/ui

2018-08-22 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5920
  http://sourceforge.net/p/jump-pilot/code/5920
Author:   ma15569
Date: 2018-08-22 15:24:29 + (Wed, 22 Aug 2018)
Log Message:
---
Added String code to solve a bug (the absence was creating null poit exception 
on some ext plugins)

Modified Paths:
--

core/trunk/src/org/openjump/core/rasterimage/styler/ui/ColorsLabelLegendComponent.java

core/trunk/src/org/openjump/core/rasterimage/styler/ui/GradientLabelLegendComponent.java

Modified: 
core/trunk/src/org/openjump/core/rasterimage/styler/ui/ColorsLabelLegendComponent.java
===
--- 
core/trunk/src/org/openjump/core/rasterimage/styler/ui/ColorsLabelLegendComponent.java
  2018-08-22 06:49:20 UTC (rev 5919)
+++ 
core/trunk/src/org/openjump/core/rasterimage/styler/ui/ColorsLabelLegendComponent.java
  2018-08-22 15:24:29 UTC (rev 5920)
@@ -7,8 +7,11 @@
 import java.awt.Graphics;
 import java.util.Map;
 import java.util.TreeMap;
+
 import javax.swing.JComponent;
 
+import com.vividsolutions.jump.I18N;
+
 /**
  *
  * @author GeomaticaEAmbiente
@@ -23,9 +26,10 @@
  * @param rasterName
  * @throws Exception
  */
-public ColorsLabelLegendComponent(TreeMap colorMapEntries, 
double noDataValue, String rasterName) throws Exception {
+public ColorsLabelLegendComponent(TreeMap colorMapEntries,
+double noDataValue, String rasterName) throws Exception {
 
-this.colorMapEntries_tm = colorMapEntries;
+colorMapEntries_tm = colorMapEntries;
 this.noDataValue = noDataValue;
 this.rasterName = rasterName;
 }
@@ -34,12 +38,12 @@
 public void paintComponent(Graphics g) {
 super.paintComponent(g);
 
-int x = 20;
+final int x = 20;
 int y;
-int startY = 45;
-int step = 30;
+final int startY = 45;
+final int step = 30;
 int maxWidth = 100;
-FontMetrics m = g.getFontMetrics();
+final FontMetrics m = g.getFontMetrics();
 
 int i = 0, w;
 Color color;
@@ -54,10 +58,12 @@
 
 g.setFont(new Font("Tahoma", Font.PLAIN, 11));
 
-//for (int n = 0; n < colorMapEntry.length; n++) {//for (Iterator iter 
= pairs.iterator(); iter.hasNext();) {
+// for (int n = 0; n < colorMapEntry.length; n++) {//for (Iterator iter
+// = pairs.iterator(); iter.hasNext();) {
 
-for(Map.Entry colorMapEntry : 
colorMapEntries_tm.entrySet()) {
-
+for (final Map.Entry colorMapEntry : colorMapEntries_tm
+.entrySet()) {
+
 if (colorMapEntry.getKey() == noDataValue) {
 noDataColor = colorMapEntry.getValue();
 continue;
@@ -72,8 +78,8 @@
 g.setColor(Color.black);
 g.drawRect(x, y, 40, 25);
 
-//g.setColor(Color.black);
-String value = Double.toString(colorMapEntry.getKey());
+// g.setColor(Color.black);
+final String value = Double.toString(colorMapEntry.getKey());
 g.drawString(value, x + 60, y + 18);
 
 w = m.stringWidth(value);
@@ -85,8 +91,10 @@
 y = startY + (step * i++);
 
 g.setFont(new Font("Tahoma", Font.ITALIC, 11));
-g.drawString("NoDataValue", x, y + 20);
-
+// g.drawString("NoDataValue", x, y + 20);
+final String jLabel_NoDataTitle = I18N
+
.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.cell.nodata");
+g.drawString(jLabel_NoDataTitle, x, y + 20);
 g.setFont(new Font("Tahoma", Font.PLAIN, 11));
 y = startY + (step * i++);
 
@@ -93,11 +101,11 @@
 g.setColor(Color.BLACK);
 
 g.drawRect(x, y, 40, 25);
-if(noDataColor != null){
+if (noDataColor != null) {
 g.setColor(noDataColor);
 g.fillRect(x, y, 40, 25);
 g.setColor(Color.BLACK);
-}  
+}
 g.drawString(Double.toString(noDataValue), x + 60, y + 18);
 
 dimension = new Dimension(maxWidth, startY + (step * i++));
@@ -105,9 +113,9 @@
 
 }
 
-private final java.util.ResourceBundle bundle
-= 
java.util.ResourceBundle.getBundle("org/openjump/core/rasterimage/styler/resources/Bundle");
 // NOI18N
-private final TreeMap colorMapEntries_tm;
+private final java.util.ResourceBundle bundle = java.util.ResourceBundle
+
.getBundle("org/openjump/core/rasterimage/styler/resources/Bundle"); // NOI18N
+private final TreeMap colorMapEntries_tm;
 private final double noDataValue;
 private Dimension dimension;
 private final String rasterName;

Modified: 
core/trunk/src/org/openjump/core/rasterimage/styler/ui/GradientLabelLegendComponent.java
===
--- 
core/trunk/src/org/openjump/core/rasterimage/styler/ui/GradientLabelLegendComponent.java
2018-08-22

[JPP-Devel] SVN: [5922] core/trunk/src/org/openjump/core/ui/plugin/wms/ WMSLegendPlugIn.java

2018-08-22 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5922
  http://sourceforge.net/p/jump-pilot/code/5922
Author:   ma15569
Date: 2018-08-22 17:00:47 + (Wed, 22 Aug 2018)
Log Message:
---
Added capability to export WMS legend to PNG image file

Modified Paths:
--
core/trunk/src/org/openjump/core/ui/plugin/wms/WMSLegendPlugIn.java

Modified: core/trunk/src/org/openjump/core/ui/plugin/wms/WMSLegendPlugIn.java
===
--- core/trunk/src/org/openjump/core/ui/plugin/wms/WMSLegendPlugIn.java 
2018-08-22 15:28:45 UTC (rev 5921)
+++ core/trunk/src/org/openjump/core/ui/plugin/wms/WMSLegendPlugIn.java 
2018-08-22 17:00:47 UTC (rev 5922)
@@ -2,27 +2,38 @@
 
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.Font;
+import java.awt.Graphics2D;
 import java.awt.GridBagLayout;
 import java.awt.Image;
+import java.awt.event.ActionEvent;
+import java.awt.image.BufferedImage;
+import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Iterator;
 import java.util.List;
 
+import javax.imageio.ImageIO;
 import javax.swing.BoxLayout;
 import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JLayeredPane;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
 import org.openjump.core.apitools.LayerTools;
+import org.openjump.core.ui.io.file.FileNameExtensionFilter;
 import org.openjump.core.ui.swing.DetachableInternalFrame;
 
 import com.vividsolutions.jump.I18N;
+import com.vividsolutions.jump.workbench.JUMPWorkbench;
 import com.vividsolutions.jump.workbench.WorkbenchContext;
 import com.vividsolutions.jump.workbench.model.WMSLayer;
 import com.vividsolutions.jump.workbench.plugin.AbstractPlugIn;
@@ -29,6 +40,7 @@
 import com.vividsolutions.jump.workbench.plugin.EnableCheckFactory;
 import com.vividsolutions.jump.workbench.plugin.MultiEnableCheck;
 import com.vividsolutions.jump.workbench.plugin.PlugInContext;
+import com.vividsolutions.jump.workbench.ui.GUIUtil;
 import com.vividsolutions.jump.workbench.ui.images.IconLoader;
 import com.vividsolutions.wms.AbstractWMSRequest;
 import com.vividsolutions.wms.MapLayer;
@@ -47,11 +59,12 @@
 private static ImageIcon ICON = IconLoader.icon("globe3_13.png");
 private JScrollPane scrollPane = new JScrollPane();
 
+@Override
 public boolean execute(final PlugInContext context) throws Exception {
 final WMSLayer layer = (WMSLayer) LayerTools.getSelectedLayerable(
 context, WMSLayer.class);
 
-DetachableInternalFrame frame = new DetachableInternalFrame();
+final DetachableInternalFrame frame = new DetachableInternalFrame();
 frame.setTitle(PANEL + " (" + layer.getName() + ")");
 frame.setResizable(true);
 frame.setClosable(true);
@@ -60,13 +73,64 @@
 frame.setFrameIcon(ICON);
 frame.setSize(200, 500);
 frame.setLayer(JLayeredPane.PALETTE_LAYER);
-scrollPane = new JScrollPane(getLegendPanel(context));
-frame.add(scrollPane, BorderLayout.CENTER);
+scrollPane = new JScrollPane(getLegendPanel(context),
+JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+final JPanel panel = new JPanel();
+panel.setLayout(new BorderLayout());
+panel.add(scrollPane, BorderLayout.CENTER);
+panel.setPreferredSize(scrollPane.getPreferredSize());
+frame.add(panel, BorderLayout.NORTH);
+final JPanel okPanel = new JPanel();
+final JButton saveButton = new JButton(SAVE) {
 
+private static final long serialVersionUID = 1L;
+
+@Override
+public Dimension getPreferredSize() {
+return new Dimension(100, 25);
+}
+};
+
+final JButton closeButton = new JButton(CLOSE) {
+private static final long serialVersionUID = 2L;
+
+@Override
+public Dimension getPreferredSize() {
+return new Dimension(100, 25);
+}
+};
+
+saveButton.addActionListener(new java.awt.event.ActionListener() {
+@Override
+public void actionPerformed(ActionEvent e) {
+save(scrollPane);
+// frame.dispose();
+return;
+}
+});
+
+closeButton.addActionListener(new java.awt.event.ActionListener() {
+
+@Override
+public void actionPerformed(ActionEvent e) {
+
+frame.dispose();
+
+return;
+}
+});
+
+okPanel.add(saveButton, BorderLayout.WEST);
+okPanel.add(closeButton, BorderLayout.EAST);
+
+

[JPP-Devel] SVN: [5923] core/trunk/ChangeLog

2018-08-22 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5923
  http://sourceforge.net/p/jump-pilot/code/5923
Author:   ma15569
Date: 2018-08-22 17:02:04 + (Wed, 22 Aug 2018)
Log Message:
---
Updated ChangeLog file

Modified Paths:
--
core/trunk/ChangeLog

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-08-22 17:00:47 UTC (rev 5922)
+++ core/trunk/ChangeLog2018-08-22 17:02:04 UTC (rev 5923)
@@ -3,6 +3,9 @@
 # 2. make sure that lines break at 80 chars for constricted display situations
 #< 80 chars 
-->#
 
+2018-08-22 Giuseppe Aruta
+  * WMSLegendPlugIn. Added capability to export WMS legend to PNG image file
+  
 2018-08-22 mmichaud 
   * Fix LayerView to make it compatible with project persistence
 


--
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

[JPP-Devel] SVN: [5926] core/trunk/src/org/openjump/core/rasterimage/styler/ui

2018-08-24 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5926
  http://sourceforge.net/p/jump-pilot/code/5926
Author:   ma15569
Date: 2018-08-24 10:54:19 + (Fri, 24 Aug 2018)
Log Message:
---
Font: armonized to Tahoma type. Dimension used  bigger for better print quality 
(12 to 14 pp)

Modified Paths:
--

core/trunk/src/org/openjump/core/rasterimage/styler/ui/ColorsLabelLegendComponent.java

core/trunk/src/org/openjump/core/rasterimage/styler/ui/GradientLabelLegendComponent.java

Modified: 
core/trunk/src/org/openjump/core/rasterimage/styler/ui/ColorsLabelLegendComponent.java
===
--- 
core/trunk/src/org/openjump/core/rasterimage/styler/ui/ColorsLabelLegendComponent.java
  2018-08-24 08:56:28 UTC (rev 5925)
+++ 
core/trunk/src/org/openjump/core/rasterimage/styler/ui/ColorsLabelLegendComponent.java
  2018-08-24 10:54:19 UTC (rev 5926)
@@ -53,10 +53,10 @@
 g.fillRect(0, 0, getWidth(), getHeight());
 g.setColor(Color.black);
 
-g.setFont(new Font("Tahoma", Font.BOLD, 12));
+g.setFont(new Font("Tahoma", Font.BOLD, 14));
 g.drawString(rasterName, x, 20);
 
-g.setFont(new Font("Tahoma", Font.PLAIN, 11));
+g.setFont(new Font("Tahoma", Font.PLAIN, 12));
 
 // for (int n = 0; n < colorMapEntry.length; n++) {//for (Iterator iter
 // = pairs.iterator(); iter.hasNext();) {
@@ -90,10 +90,10 @@
 
 y = startY + (step * i++);
 
-g.setFont(new Font("Tahoma", Font.ITALIC, 11));
+g.setFont(new Font("Tahoma", Font.PLAIN, 12));
 // g.drawString("NoDataValue", x, y + 20);
 final String jLabel_NoDataTitle = I18N
-
.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.cell.nodata");
+.get("org.openjump.core.ui.plugin.raster.nodata.nodata");
 g.drawString(jLabel_NoDataTitle, x, y + 20);
 g.setFont(new Font("Tahoma", Font.PLAIN, 11));
 y = startY + (step * i++);

Modified: 
core/trunk/src/org/openjump/core/rasterimage/styler/ui/GradientLabelLegendComponent.java
===
--- 
core/trunk/src/org/openjump/core/rasterimage/styler/ui/GradientLabelLegendComponent.java
2018-08-24 08:56:28 UTC (rev 5925)
+++ 
core/trunk/src/org/openjump/core/rasterimage/styler/ui/GradientLabelLegendComponent.java
2018-08-24 10:54:19 UTC (rev 5926)
@@ -83,7 +83,7 @@
 // final JLabel jLabel_NoDataTitle = new JLabel(
 // bundle.getString("LegendDialog.NoDataValue.text"));
 final JLabel jLabel_NoDataTitle = new JLabel(
-
I18N.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.cell.nodata"));
+I18N.get("org.openjump.core.ui.plugin.raster.nodata.nodata"));
 final JLabel jLabel_NoDataColor = new JLabel();
 final JLabel jLabel_NoDataValue = new JLabel(
 Double.toString(noDataValue));
@@ -93,7 +93,7 @@
 
 // Set components aspect
 // Raster name
-jLabel_RasterName.setFont(new Font("Tahoma", Font.BOLD, 12));
+jLabel_RasterName.setFont(new Font("Tahoma", Font.BOLD, 14));
 jLabel_RasterName.setPreferredSize(new Dimension(50, 14));
 gridBagConstraints.gridx = 0;
 gridBagConstraints.gridy = 0;
@@ -118,6 +118,7 @@
 jLabel_MaxValue.setText(Double.toString(GUIUtils.round(maxValue, 3)));
 jLabel_MaxValue.setMinimumSize(new java.awt.Dimension(50, 14));
 jLabel_MaxValue.setPreferredSize(new java.awt.Dimension(50, 14));
+jLabel_MaxValue.setFont(new Font("Tahoma", Font.PLAIN, 12));
 gridBagConstraints.gridx = 1;
 gridBagConstraints.gridy = 1;
 gridBagConstraints.gridheight = 1;
@@ -129,6 +130,7 @@
 jLabel_MinValue.setText(Double.toString(GUIUtils.round(minValue, 3)));
 jLabel_MinValue.setMinimumSize(new java.awt.Dimension(50, 14));
 jLabel_MinValue.setPreferredSize(new java.awt.Dimension(50, 14));
+jLabel_MinValue.setFont(new Font("Tahoma", Font.PLAIN, 12));
 gridBagConstraints.gridx = 1;
 gridBagConstraints.gridy = 2;
 gridBagConstraints.gridheight = 1;
@@ -139,6 +141,7 @@
 // NoData title label
 jLabel_NoDataTitle.setMinimumSize(new java.awt.Dimension(70, 14));
 jLabel_NoDataTitle.setPreferredSize(new java.awt.Dimension(70, 14));
+jLabel_NoDataTitle.setFont(new Font("Tahoma", Font.PLAIN, 12));
 gridBagConstraints.gridx = 0;
 gridBagConstraints.gridy = 3;
 gridBagConstraints.gridwidth = 2;
@@ -153,6 +156,7 @@
 jLabel_NoDataColor.setMaximumSize(new java.awt.Dimension(40, 25));
 jLabel_NoDataColor.setMinimumSize(new java.awt.Dimension(40, 25));
 jLabel_NoDataColor.setPreferredSize(new java.awt.Dimension(40, 25));
+jLabel_NoDataColor.setFont(new Font("Tahoma", Font.PLAIN, 12));

[JPP-Devel] SVN: [5930] core/trunk/scripts/oj_windows.bat

2018-08-27 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5930
  http://sourceforge.net/p/jump-pilot/code/5930
Author:   edso
Date: 2018-08-27 13:43:30 + (Mon, 27 Aug 2018)
Log Message:
---
finetune jre parameters for modern jre's

Modified Paths:
--
core/trunk/scripts/oj_windows.bat

Modified: core/trunk/scripts/oj_windows.bat
===
--- core/trunk/scripts/oj_windows.bat   2018-08-27 12:20:07 UTC (rev 5929)
+++ core/trunk/scripts/oj_windows.bat   2018-08-27 13:43:30 UTC (rev 5930)
@@ -136,12 +136,16 @@
 
 
 rem -- java9-java11 need some packages explicitly added/exported --
-if %JAVAVER_MAJOR% geq 9 if %JAVAVER_MAJOR% lss 12 (
+if %JAVAVER_MAJOR% geq 9 (
   set JAVA_OPTS=%JAVA_OPTS% --add-exports 
java.base/jdk.internal.loader=ALL-UNNAMED ^
 --add-exports java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED ^
 --add-exports java.desktop/com.sun.java.swing.plaf.motif=ALL-UNNAMED ^
---add-exports java.desktop/com.sun.imageio.spi=ALL-UNNAMED --add-modules 
java.se.ee
+--add-exports java.desktop/com.sun.imageio.spi=ALL-UNNAMED
 )
+rem -- java ee was removed from jdk in java 11
+if %JAVAVER_MAJOR% geq 9 if %JAVAVER_MAJOR% lss 11 (
+  set JAVA_OPTS=%JAVA_OPTS% --add-modules java.se.ee
+)
 
 rem -- detect if java is 64bit --
 for /f "delims=" %%v in ('echo "%JAVA_VERSIONSTRING%"^|findstr /I "64-Bit"') 
do (


--
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

[JPP-Devel] SVN: [5911] plug-ins/MatchingPlugIn/trunk

2018-07-11 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5911
  http://sourceforge.net/p/jump-pilot/code/5911
Author:   michaudm
Date: 2018-07-11 06:51:45 + (Wed, 11 Jul 2018)
Log Message:
---
Restore I18N for matcher names of MatchingPlugIn

Modified Paths:
--
plug-ins/MatchingPlugIn/trunk/build.xml

plug-ins/MatchingPlugIn/trunk/src/fr/michaelm/jump/plugin/match/MatchingExtension.java

plug-ins/MatchingPlugIn/trunk/src/fr/michaelm/jump/plugin/match/matching.properties

plug-ins/MatchingPlugIn/trunk/src/fr/michaelm/jump/plugin/match/matching_fr.properties

Modified: plug-ins/MatchingPlugIn/trunk/build.xml
===
--- plug-ins/MatchingPlugIn/trunk/build.xml 2018-07-02 11:41:46 UTC (rev 
5910)
+++ plug-ins/MatchingPlugIn/trunk/build.xml 2018-07-11 06:51:45 UTC (rev 
5911)
@@ -16,7 +16,7 @@
 
 
 
-
+
 
 
 

Modified: 
plug-ins/MatchingPlugIn/trunk/src/fr/michaelm/jump/plugin/match/MatchingExtension.java
===
--- 
plug-ins/MatchingPlugIn/trunk/src/fr/michaelm/jump/plugin/match/MatchingExtension.java
  2018-07-02 11:41:46 UTC (rev 5910)
+++ 
plug-ins/MatchingPlugIn/trunk/src/fr/michaelm/jump/plugin/match/MatchingExtension.java
  2018-07-11 06:51:45 UTC (rev 5911)
@@ -28,9 +28,10 @@
 /**
  * Extension containing matching processing also known as join.
  * @author Michaël Michaud
- * @version 0.8.0 (2018-06-17)
+ * @version 0.8.1 (2018-07-11)
  */ 
 // History
+// 0.8.1 (2018-07-11) : restore I18N for GeometryMatcher names
 // 0.8.0 (2018-06-17) : refactor to use add/getParameter, the OJ aggregation
 //  classes and long and boolean attribute types
 // 0.7.5 (2017-03-26) : clean headers and remove dead code before inclusion in
@@ -70,7 +71,7 @@
 }
 
 public String getVersion() {
-return "0.8.0 (2018-06-17)";
+return "0.8.1 (2018-07-11)";
 }
 
 public void configure(PlugInContext context) throws Exception {

Modified: 
plug-ins/MatchingPlugIn/trunk/src/fr/michaelm/jump/plugin/match/matching.properties
===
--- 
plug-ins/MatchingPlugIn/trunk/src/fr/michaelm/jump/plugin/match/matching.properties
 2018-07-02 11:41:46 UTC (rev 5910)
+++ 
plug-ins/MatchingPlugIn/trunk/src/fr/michaelm/jump/plugin/match/matching.properties
 2018-07-11 06:51:45 UTC (rev 5911)
@@ -34,38 +34,38 @@
 un-matched = un-matched
 Links = Links
 
-# Geometric-matcher = Geometric matcher
-# matcher.MatchAllMatcher = Match All
-#
-# matcher.EqualsExactGeom3dMatcher = Equals Exact (Geom3d)
-# matcher.EqualsNormalizedGeom3dMatcher = Equals Normalized (Geom3d)
-# matcher.EqualsExactGeom2dMatcher = Equals Exact (Geom2d)
-# matcher.EqualsNormalizedGeom2dMatcher = Equals Normalized (Geom2d)
-# matcher.EqualsTopologicalGeomMatcher = Equals Topological
-# matcher.EqualsWithCoordinateToleranceMatcher = Equals With Coordinate 
Tolerance
-#
-# matcher.IsWithinMatcher = IsWithin
-# matcher.OverlapsMatcher = Overlaps
-# matcher.OverlappedByMatcher = OverlappedBy
-# matcher.IntersectsMatcher = Intersects
-# matcher.Intersects0DMatcher = Intersects (0D intersetion)
-# matcher.Intersects1DMatcher = Intersects (1D intersection)
-# matcher.Intersects2DMatcher = Intersects (2D intersection)
-#
-# matcher.CentroidDistanceMatcher = Centroid Distance
-# matcher.MinimumDistanceMatcher = Minimum Distance
-# matcher.HausdorffDistanceMatcher = Hausdorff Distance
-# matcher.SemiHausdorffDistanceMatcher = Semi-Hausdorff Distance
-# matcher.ShapeMatcher = Shape Matcher
-#
-# matcher.MatchAllAttributesMatcher = Match All Attributes
-# matcher.MatchAllStringsMatcher = Match All Strings
-# matcher.StringEqualityMatcher = String Equality
-# matcher.StringEqualityIgnoreCaseMatcher = String Equality (Ignore Case)
-# matcher.StringEqualityIgnoreCaseAndAccentMatcher = String Equality (Ignore 
Case And Accents)
-# matcher.LevenshteinDistanceMatcher = Levenshtein Distance
-# matcher.DamarauLevenshteinDistanceMatcher = Damarau-Levenshtein Distance
+Geometric-matcher = Geometric matcher
+matcher.MatchAllMatcher = Match All
 
+matcher.EqualsExactGeom3dMatcher = Equals Exact (Geom3d)
+matcher.EqualsNormalizedGeom3dMatcher = Equals Normalized (Geom3d)
+matcher.EqualsExactGeom2dMatcher = Equals Exact (Geom2d)
+matcher.EqualsNormalizedGeom2dMatcher = Equals Normalized (Geom2d)
+matcher.EqualsTopologicalGeomMatcher = Equals Topological
+matcher.EqualsWithCoordinateToleranceMatcher = Equals With Coordinate Tolerance
+
+matcher.IsWithinMatcher = IsWithin
+matcher.OverlapsMatcher = Overlaps
+matcher.OverlappedByMatcher = OverlappedBy
+matcher.IntersectsMatcher = Intersects
+matcher.Intersects0DMatcher = Intersects (0D intersetion)
+matcher.Intersects1DMatcher = Intersects (1D intersection)
+matcher.Intersects2DMatcher = Intersects (2D intersection)
+
+matcher.CentroidDistanceMatcher = Centroid Distance

[JPP-Devel] SVN: [5912] core/trunk/lib/plus

2018-07-11 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5912
  http://sourceforge.net/p/jump-pilot/code/5912
Author:   michaudm
Date: 2018-07-11 06:54:29 + (Wed, 11 Jul 2018)
Log Message:
---
Restore 18N for matcher names of MatchingPlugIn

Added Paths:
---
core/trunk/lib/plus/matching-0.8.1.jar

Removed Paths:
-
core/trunk/lib/plus/matching-0.8.0.jar

Deleted: core/trunk/lib/plus/matching-0.8.0.jar
===
(Binary files differ)

Added: core/trunk/lib/plus/matching-0.8.1.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/matching-0.8.1.jar
===
--- core/trunk/lib/plus/matching-0.8.1.jar  2018-07-11 06:51:45 UTC (rev 
5911)
+++ core/trunk/lib/plus/matching-0.8.1.jar  2018-07-11 06:54:29 UTC (rev 
5912)

Property changes on: core/trunk/lib/plus/matching-0.8.1.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property

--
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

[JPP-Devel] SVN: [5678] core/trunk/src/com/vividsolutions/jump/io/GMLReader.java

2018-01-22 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5678
  http://sourceforge.net/p/jump-pilot/code/5678
Author:   edso
Date: 2018-01-22 14:14:14 + (Mon, 22 Jan 2018)
Log Message:
---
move SRID parsing to the end to speed up GML/JML parsing
minor clarifications

Modified Paths:
--
core/trunk/src/com/vividsolutions/jump/io/GMLReader.java

Modified: core/trunk/src/com/vividsolutions/jump/io/GMLReader.java
===
--- core/trunk/src/com/vividsolutions/jump/io/GMLReader.java2018-01-22 
11:33:09 UTC (rev 5677)
+++ core/trunk/src/com/vividsolutions/jump/io/GMLReader.java2018-01-22 
14:14:14 UTC (rev 5678)
@@ -269,7 +269,7 @@
   private static int STATE_PARSE_GEOM_SIMPLE = 4;
   private static int STATE_WAIT_COLLECTION_TAG = 1;
   private static int STATE_WAIT_FEATURE_TAG = 2;
-  private static int STATE_WAIT_CRS_TAG = 8;
+  private static int STATE_WAIT_GMLBOX_TAG = 8;
 
   private final static List simpleGeoms = new ArrayList<>();
   private final static List multiGeoms = new ArrayList<>();
@@ -642,38 +642,7 @@
 
 return;
   }
-  
   if ((STATE == STATE_WAIT_FEATURE_TAG)
-  && GMLinput.crsTag != null && 
compareToIgnoreCaseWithOptionalGmlColonPrefix(qName, GMLinput.crsTag) ) {
-// found the crs1 tag
-
-return;
-  }
-
-  if ((STATE == STATE_WAIT_FEATURE_TAG)
-  && compareToIgnoreCaseWithOptionalGmlColonPrefix(qName, "Box") ) {
-// found the crs2 box tag
-
-// fetch srid id
-for (int i = 0; i < atts.getLength(); i++) {
-  String attName = atts.getQName(i);
-  if (attName.equalsIgnoreCase("srsName")){
-String attValue = atts.getValue(i);
-String sridString = attValue.substring(attValue.lastIndexOf("#") + 
1);
-
-try {
-  SRID = Integer.valueOf(sridString);
-} catch (NumberFormatException e) {
-  addParseException("srid '"+sridString+"'is not a number.", e);
-}
-  }
-}
-STATE = STATE_WAIT_FEATURE_TAG;
-
-return;
-  }
-
-  if ((STATE == STATE_WAIT_FEATURE_TAG)
   && (qName.compareToIgnoreCase(GMLinput.featureTag) == 0)) {
 // found the feature tag
 // System.out.println("found feature");
@@ -761,6 +730,35 @@
 current_geom_qname = qName;
   }
 
+  if ((STATE == STATE_WAIT_FEATURE_TAG)
+  && GMLinput.crsTag != null && 
compareToIgnoreCaseWithOptionalGmlColonPrefix(qName, GMLinput.crsTag) ) {
+// found the crs1 tag
+STATE = STATE_WAIT_GMLBOX_TAG;
+
+return;
+  }
+  if ((STATE == STATE_WAIT_GMLBOX_TAG)
+  && compareToIgnoreCaseWithOptionalGmlColonPrefix(qName, "Box") ) {
+// found the crs2 box tag
+
+// fetch srid id
+for (int i = 0; i < atts.getLength(); i++) {
+  String attName = atts.getQName(i);
+  if (attName.equalsIgnoreCase("srsName")){
+String attValue = atts.getValue(i);
+String sridString = attValue.substring(attValue.lastIndexOf("#") + 
1);
+
+try {
+  SRID = Integer.valueOf(sridString);
+} catch (NumberFormatException e) {
+  addParseException("srid '"+sridString+"'is not a number.", e);
+}
+  }
+}
+STATE = STATE_WAIT_FEATURE_TAG;
+return;
+  }
+
 } catch (Exception e) {
   e.printStackTrace(System.err);
   throw new SAXException(e.getMessage());
@@ -999,14 +997,14 @@
 tagBody = new StringBuffer();
 
 return; // still look for start collection tag
-  } else if (STATE == STATE_WAIT_CRS_TAG) {
-if (compareToIgnoreCaseWithOptionalGmlColonPrefix(qName, "Box")) {
-  STATE = STATE_WAIT_COLLECTION_TAG;
-}
-return; // still looking for 
   }
-  
-  
+  else if (STATE == STATE_WAIT_GMLBOX_TAG && 
+  compareToIgnoreCaseWithOptionalGmlColonPrefix(qName, "boundedBy")) {
+// found , return to feature parsing
+STATE = STATE_WAIT_FEATURE_TAG;
+return;
+  }
+
 } catch (Exception e) {
   e.printStackTrace();
   throw new SAXException(e.getMessage());


--
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

[JPP-Devel] SVN: [5705] core/trunk/src/org/openjump/sextante/gui/additionalResults

2018-03-12 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5705
  http://sourceforge.net/p/jump-pilot/code/5705
Author:   ma15569
Date: 2018-03-12 12:41:55 + (Mon, 12 Mar 2018)
Log Message:
---
Correct bug on AdditionalResult class. Added save button on 
AdditionalResultFrame

Modified Paths:
--

core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResults.java

core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java

Modified: 
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResults.java
===
--- 
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResults.java
   2018-03-04 14:12:21 UTC (rev 5704)
+++ 
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResults.java
   2018-03-12 12:41:55 UTC (rev 5705)
@@ -40,7 +40,7 @@
 return;
 }
 
-AdditionalResultsFrame additionalResults = new AdditionalResultsFrame(
+final AdditionalResultsFrame additionalResults = new 
AdditionalResultsFrame(
 m_Components);
 
 additionalResults.setVisible(true);
@@ -85,7 +85,7 @@
 public static void addComponentAndShow(final ObjectAndDescription oad) {
 
 m_Components.add(oad);
-for (JInternalFrame iFrame : wFrame.getInternalFrames()) {
+for (final JInternalFrame iFrame : wFrame.getInternalFrames()) {
 if (iFrame instanceof AdditionalResultsFrame) {
 
 iFrame.toFront();
@@ -93,7 +93,7 @@
 
 }
 }
-AdditionalResultsFrame additionalResultsFrame = new 
AdditionalResultsFrame(
+final AdditionalResultsFrame additionalResultsFrame = new 
AdditionalResultsFrame(
 m_Components);
 
 // additionalResults.setVisible(true);
@@ -125,7 +125,7 @@
 public static void addAdditionalResult(final String name,
 final Object object) {
 
-ObjectAndDescription ob = new ObjectAndDescription(name, object);
+final ObjectAndDescription ob = new ObjectAndDescription(name, object);
 addComponent(ob);
 }
 
@@ -144,8 +144,8 @@
 final Object[] objects) {
 
 for (int i = 0; i < objects.length; i++) {
-ObjectAndDescription ob = new ObjectAndDescription(name + "_" + i,
-objects[i]);
+final ObjectAndDescription ob = new ObjectAndDescription(name + "_"
++ i, objects[i]);
 
 addComponent(ob);
 }
@@ -168,9 +168,9 @@
 public static void addAdditionalResultAndShow(final String name,
 final Object object, boolean hideLeftPanel) {
 
-ObjectAndDescription ob = new ObjectAndDescription(name, object);
+final ObjectAndDescription ob = new ObjectAndDescription(name, object);
 addComponent(ob);
-for (JInternalFrame iFrame : wFrame.getInternalFrames()) {
+for (final JInternalFrame iFrame : wFrame.getInternalFrames()) {
 if (iFrame instanceof AdditionalResultsFrame) {
 ((AdditionalResultsFrame) iFrame).update();
 iFrame.toFront();
@@ -178,11 +178,11 @@
 
 }
 }
-AdditionalResultsFrame additionalResultsFrame = new 
AdditionalResultsFrame(
+final AdditionalResultsFrame additionalResultsFrame = new 
AdditionalResultsFrame(
 m_Components);
 additionalResultsFrame.update();
 if (hideLeftPanel) {
-additionalResultsFrame.getLeftPanel().setVisible(false);
+additionalResultsFrame.getLeftPanel().setVisible(true);
 }
 // additionalResults.setVisible(true);
 wFrame.addInternalFrame(additionalResultsFrame, true, true);
@@ -222,12 +222,12 @@
 final Object[] objects) {
 
 for (int i = 0; i < objects.length; i++) {
-ObjectAndDescription ob = new ObjectAndDescription(name + "_" + i,
-objects[i]);
+final ObjectAndDescription ob = new ObjectAndDescription(name + "_"
++ i, objects[i]);
 
 addComponent(ob);
 }
-for (JInternalFrame iFrame : wFrame.getInternalFrames()) {
+for (final JInternalFrame iFrame : wFrame.getInternalFrames()) {
 if (iFrame instanceof AdditionalResultsFrame) {
 ((AdditionalResultsFrame) iFrame).update();
 iFrame.toFront();
@@ -236,7 +236,7 @@
 
 }
 }
-AdditionalResultsFrame additionalResultsFrame = new 
AdditionalResultsFrame(
+final AdditionalResultsFrame additionalResultsFrame = new 
AdditionalResultsFrame(
 m_Components);
 
 // additionalResults.setVisible(true);

Modified: 
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java
===
---

[JPP-Devel] SVN: [5706] core/trunk/src/language

2018-03-12 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5706
  http://sourceforge.net/p/jump-pilot/code/5706
Author:   ma15569
Date: 2018-03-12 12:59:56 + (Mon, 12 Mar 2018)
Log Message:
---
Updated language codes

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

Modified: core/trunk/src/language/jump.properties
===
--- core/trunk/src/language/jump.properties 2018-03-12 12:41:55 UTC (rev 
5705)
+++ core/trunk/src/language/jump.properties 2018-03-12 12:59:56 UTC (rev 
5706)
@@ -1133,6 +1133,9 @@
 org.openjump.core.ui.plugin.raster.ProfileGraphTool.ending-point = Ending 
point coordinates
 org.openjump.core.ui.plugin.raster.ProfileGraphTool.mean-slope = Mean slope
 org.openjump.core.ui.plugin.raster.ProfileGraphTool.cell-statistics = Cell 
statistics
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.draw-linstring-as-trace = 
Draw a linestring as trace 
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.use-selected-linstring-as-trace
 = Use selected linestring as trace 
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.select-one-linstring = 
Select one linestring 
 org.openjump.core.ui.plugin.raster.RasterQueryPlugIn = Pixel inspection
 org.openjump.core.ui.plugin.raster.RasterQueryPlugIn.value = value
 org.openjump.core.ui.plugin.raster.RasterQueryPlugIn.previous.value = Previous 
value

Modified: core/trunk/src/language/jump_cz.properties
===
--- core/trunk/src/language/jump_cz.properties  2018-03-12 12:41:55 UTC (rev 
5705)
+++ core/trunk/src/language/jump_cz.properties  2018-03-12 12:59:56 UTC (rev 
5706)
@@ -2860,4 +2860,7 @@
 
org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Html=#T:Html
 texts
 
org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Table=#T:Tables
 
org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Image=#T:Images
 and Plots
-ui.AttributeTablePanel.featurecollection =#T:Collection of features
\ No newline at end of file
+ui.AttributeTablePanel.featurecollection =#T:Collection of features
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.draw-linstring-as-trace 
=#T:Draw a linestring as trace 
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.use-selected-linstring-as-trace
 =#T:Use selected linestring as trace 
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.select-one-linstring 
=#T:Select one linestring 
\ No newline at end of file

Modified: core/trunk/src/language/jump_de.properties
===
--- core/trunk/src/language/jump_de.properties  2018-03-12 12:41:55 UTC (rev 
5705)
+++ core/trunk/src/language/jump_de.properties  2018-03-12 12:59:56 UTC (rev 
5706)
@@ -2856,4 +2856,7 @@
 
org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Html=#T:Html
 texts
 
org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Table=#T:Tables
 
org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Image=#T:Images
 and Plots
-ui.AttributeTablePanel.featurecollection =#T:Collection of features
\ No newline at end of file
+ui.AttributeTablePanel.featurecollection =#T:Collection of features
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.draw-linstring-as-trace 
=#T:Draw a linestring as trace 
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.use-selected-linstring-as-trace
 =#T:Use selected linestring as trace 
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.select-one-linstring 
=#T:Select one linestring 
\ No newline at end of file

Modified: core/trunk/src/language/jump_es.properties
===
--- core/trunk/src/language/jump_es.properties  2018-03-12 12:41:55 UTC (rev 
5705)
+++ core/trunk/src/language/jump_es.properties  2018-03-12 12:59:56 UTC (rev 
5706)
@@ -2835,4 +2835,7 @@
 
org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Html=#T:Html
 texts
 
org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Table=#T:Tables
 
org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Image=#T:Images
 and Plots
-ui.AttributeTablePanel.featurecollection =Colecci\u00f3n de

[JPP-Devel] SVN: [5707] core/trunk/src/org/openjump/core/ui/plugin/raster

2018-03-12 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5707
  http://sourceforge.net/p/jump-pilot/code/5707
Author:   ma15569
Date: 2018-03-12 13:40:57 + (Mon, 12 Mar 2018)
Log Message:
---
Updated ProfileGraph plugin: options to choose trace profile from a selected 
linestring, or to draw it. Output on Additional result frame

Modified Paths:
--
core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphTool.java

Added Paths:
---
core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileUtils.java

Property Changed:

core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphTool.java

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphPlugIn.java
===
--- core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphPlugIn.java   
2018-03-12 12:59:56 UTC (rev 5706)
+++ core/trunk/src/org/openjump/core/ui/plugin/raster/ProfileGraphPlugIn.java   
2018-03-12 13:40:57 UTC (rev 5707)
@@ -29,68 +29,184 @@
  * USA
  *
  * (850)862-7321
- * www.ashs.isa.com
  */
 
 package org.openjump.core.ui.plugin.raster;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import javax.swing.Icon;
+import javax.swing.JRadioButton;
 
+import org.openjump.core.apitools.LayerTools;
 import org.openjump.core.rasterimage.RasterImageLayer;
 
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.LineString;
 import com.vividsolutions.jump.I18N;
+import com.vividsolutions.jump.feature.Feature;
+import com.vividsolutions.jump.task.TaskMonitor;
+import com.vividsolutions.jump.workbench.JUMPWorkbench;
 import com.vividsolutions.jump.workbench.WorkbenchContext;
-import com.vividsolutions.jump.workbench.plugin.AbstractPlugIn;
 import com.vividsolutions.jump.workbench.plugin.EnableCheckFactory;
 import com.vividsolutions.jump.workbench.plugin.MultiEnableCheck;
 import com.vividsolutions.jump.workbench.plugin.PlugInContext;
+import com.vividsolutions.jump.workbench.plugin.ThreadedBasePlugIn;
+import com.vividsolutions.jump.workbench.ui.GUIUtil;
 import com.vividsolutions.jump.workbench.ui.MenuNames;
+import com.vividsolutions.jump.workbench.ui.MultiInputDialog;
 import com.vividsolutions.jump.workbench.ui.images.IconLoader;
 
-public class ProfileGraphPlugIn extends AbstractPlugIn {
-ProfileGraphTool profileTool;
-private final static String sErrorSeeOutputWindow = I18N
-
.get("org.openjump.core.ui.plugin.tools.MeasureM_FPlugIn.Error-see-output-window");
-private String sName = "Create Thiessen Polygons";
+//import org.openjump.core.rasterimage.sextante.OpenJUMPSextanteRasterLayer;
 
+public class ProfileGraphPlugIn extends ThreadedBasePlugIn {
+
+/**
+ * 2015_01_31. Giuseppe Aruta Add new panel which display profile info:
+ * length, mean slope, coordinates of starting and ending points, cell
+ * dimension, cell statistics.
+ */
+
+private final List savedCoordinates = new 
ArrayList();
+
+private RasterImageLayer rLayer = null;
+
+final static String drawn = I18N
+
.get("org.openjump.core.ui.plugin.raster.ProfileGraphTool.draw-linstring-as-trace");
+final static String selected = I18N
+
.get("org.openjump.core.ui.plugin.raster.ProfileGraphTool.use-selected-linstring-as-trace");;
+private String sName;
+private final String warning = I18N
+
.get("org.openjump.core.ui.plugin.raster.ProfileGraphTool.select-one-linstring");;
+final static String MONITOR_STRING = "Calculating profile...";
+
+private boolean drawnType = true;
+private boolean selectedType = false;
+public static MultiInputDialog dialog;
+JRadioButton radioButton1 = new JRadioButton(drawn, drawnType);
+JRadioButton radioButton2 = new JRadioButton(selected, selectedType);
+
+@Override
 public void initialize(PlugInContext context) throws Exception {
-
-this.sName = I18N
+sName = I18N
 
.get("org.openjump.core.ui.plugin.raster.ProfileGraphPlugIn.Profile-Graph");
-
-// 
context.getWorkbenchContext().getWorkbench().getFrame().getToolBar().addPlugIn(getIcon(),
-// this, new MultiEnableCheck(), context.getWorkbenchContext());
 context.getFeatureInstaller().addMainMenuPlugin(this,
-new String[] { MenuNames.RASTER }, this.sName + "...", false,
+new String[] { MenuNames.RASTER }, sName + "...", false,
 getIcon(), createEnableCheck(context.getWorkbenchContext()));
-profileTool = new ProfileGraphTool();
 }
 
-public boolean execute(PlugInContext context) throws Exception {
-try {
-

[JPP-Devel] SVN: [5709] core/trunk/src/org/openjump/core/ui/plugin/raster/statistics/ DEMStatisticsPlugIn.java

2018-03-12 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5709
  http://sourceforge.net/p/jump-pilot/code/5709
Author:   ma15569
Date: 2018-03-12 15:07:52 + (Mon, 12 Mar 2018)
Log Message:
---
DEMStatisticPlugIn  output html loaded as object into AdditionalResult frame

Modified Paths:
--

core/trunk/src/org/openjump/core/ui/plugin/raster/statistics/DEMStatisticsPlugIn.java

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/raster/statistics/DEMStatisticsPlugIn.java
===
--- 
core/trunk/src/org/openjump/core/ui/plugin/raster/statistics/DEMStatisticsPlugIn.java
   2018-03-12 14:03:57 UTC (rev 5708)
+++ 
core/trunk/src/org/openjump/core/ui/plugin/raster/statistics/DEMStatisticsPlugIn.java
   2018-03-12 15:07:52 UTC (rev 5709)
@@ -97,7 +97,7 @@
 
 public static MultiEnableCheck createEnableCheck(
 WorkbenchContext workbenchContext) {
-EnableCheckFactory checkFactory = new EnableCheckFactory(
+final EnableCheckFactory checkFactory = new EnableCheckFactory(
 workbenchContext);
 return new MultiEnableCheck()
 .add(checkFactory
@@ -117,13 +117,14 @@
 RasterDataNotFoundException {
 int counter = 0;
 
-int nx = ras.getWidth();
-int ny = ras.getHeight();
+final int nx = ras.getWidth();
+final int ny = ras.getHeight();
 for (int y = 0; y < ny; y++) {
 for (int x = 0; x < nx; x++) {
-double value = ras.getSampleDouble(x, y, 0);
-if (value == nodata)
+final double value = ras.getSampleDouble(x, y, 0);
+if (value == nodata) {
 counter++;
+}
 }
 }
 return counter;
@@ -132,15 +133,15 @@
 @Override
 public boolean execute(PlugInContext context) throws Exception {
 
-Locale locale = new Locale("en", "UK");
-String pattern = "###.";
-DecimalFormat df = (DecimalFormat) NumberFormat
+final Locale locale = new Locale("en", "UK");
+final String pattern = "###.";
+final DecimalFormat df = (DecimalFormat) NumberFormat
 .getNumberInstance(locale);
 df.applyPattern(pattern);
 final WorkbenchContext wbcontext = context.getWorkbenchContext();
-int ras = wbcontext.getLayerNamePanel()
+final int ras = wbcontext.getLayerNamePanel()
 .selectedNodes(RasterImageLayer.class).size();
-HTMLPanel out = new HTMLPanel();
+final HTMLPanel out = new HTMLPanel();
 out.setRecordNavigationControlVisible(false);
 out.createNewDocument();
 out.setBackground(Color.lightGray);
@@ -159,34 +160,35 @@
 + " " + YMIN
 + " " + CELL_SIZE
 + "");
-for (Iterator i = wbcontext.getLayerNamePanel()
+for (final Iterator i = wbcontext.getLayerNamePanel()
 .selectedNodes(RasterImageLayer.class).iterator(); 
i.hasNext();) {
-RasterImageLayer slayer = (RasterImageLayer) i.next();
-Raster raster = slayer.getRasterData(null);
-Double nodata = slayer.getNoDataValue();
-double minRas = slayer.getMetadata().getStats().getMin(0);
-double maxRas = slayer.getMetadata().getStats().getMax(0);
-double meanRas = slayer.getMetadata().getStats().getMean(0);
-Envelope extent = slayer.getWholeImageEnvelope(); // Envelope of
-  // layer
+final RasterImageLayer slayer = (RasterImageLayer) i.next();
+final Raster raster = slayer.getRasterData(null);
+final Double nodata = slayer.getNoDataValue();
+final double minRas = slayer.getMetadata().getStats().getMin(0);
+final double maxRas = slayer.getMetadata().getStats().getMax(0);
+final double meanRas = slayer.getMetadata().getStats().getMean(0);
+final Envelope extent = slayer.getWholeImageEnvelope(); // Envelope
+// of
+// layer
 String min = df.format(minRas);// Min value of
// cells
-String max = df.format(maxRas);// Max value of
+final String max = df.format(maxRas);// Max value of
 df.format(meanRas);
 
-Locale locale1 = new Locale("en", "UK");
-String pattern1 = "###.## ";
-DecimalFormat df1 = (DecimalFormat) NumberFormat
+final Locale locale1 = new Locale("en", "UK");
+final String pattern1 = "###.## ";
+final DecimalFormat df1 = (DecimalFormat) NumberFormat
 .getNumberInstance(locale1);
 df.applyPattern(pattern1);
-String cellSizex =

[JPP-Devel] SVN: [5708] core/trunk

2018-03-12 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5708
  http://sourceforge.net/p/jump-pilot/code/5708
Author:   ma15569
Date: 2018-03-12 14:03:57 + (Mon, 12 Mar 2018)
Log Message:
---
 * Activated  Additional Result framemork: outputs other than vector or 
  raster are loaded as objects into a convenient frame where user can  
  save/delete/rename these objects.
  The following objects can be saved into the Additional Result frame:
  - Texts in Jlabel, JtextPane, JtextArea, HTMLPane: saved as .html file
  - JTabel objects: saved as .csv file
  - graphics added to PlotPane: saved as .png file
  -  Other object: saved to .png file
  - FeatureCollection into a FeatureCollectionPanel: saved to .jml/.shp
  Additional Results framework has been adapted from Sextante.
 * Added option to ProfileGraphPlugIn to use selected line as profile trace
   Graphics and table Outputs are saved  into Additional Result frame

Modified Paths:
--
core/trunk/ChangeLog
core/trunk/scripts/default-plugins.xml

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-03-12 13:40:57 UTC (rev 5707)
+++ core/trunk/ChangeLog2018-03-12 14:03:57 UTC (rev 5708)
@@ -5,6 +5,20 @@
 
 * Changes.txt updated until here **
 
+2018-03-12 Giuseppe Aruta
+* Activated  Additional Result framemork: outputs other than vector or 
+  raster are loaded as objects into a convenient frame where user can  
+  save/delete/rename these objects.
+  The following objects can be saved into the Additional Result frame:
+  - Texts in Jlabel, JtextPane, JtextArea, HTMLPane: saved as .html file
+  - JTabel objects: saved as .csv file
+  - graphics added to PlotPane: saved as .png file
+  -  Other object: saved to .png file
+  - FeatureCollection into a FeatureCollectionPanel: saved to .jml/.shp
+  Additional Results framework has been adapted from Sextante.
+ * Added option to ProfileGraphPlugIn to use selected line as profile trace
+   Graphics and table Outputs are saved  into Additional Result frame
+
 2018-01-30 Giuseppe Aruta
* Upgraded Sextante building to version gen2018a to solve a bug on 
  exporting raster data. Moved Toolboxframe as OJ internal frame

Modified: core/trunk/scripts/default-plugins.xml
===
--- core/trunk/scripts/default-plugins.xml  2018-03-12 13:40:57 UTC (rev 
5707)
+++ core/trunk/scripts/default-plugins.xml  2018-03-12 14:03:57 UTC (rev 
5708)
@@ -935,12 +935,12 @@
 
 
 
-
+
 
 com.vividsolutions.jump.workbench.ui.plugin.GenerateLogPlugIn
 


--
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

[JPP-Devel] SVN: [5711] core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/ LayerStatisticsPlugIn.java

2018-03-12 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5711
  http://sourceforge.net/p/jump-pilot/code/5711
Author:   ma15569
Date: 2018-03-12 15:33:11 + (Mon, 12 Mar 2018)
Log Message:
---
LayerStatistics opens into Additional Results frame

Modified Paths:
--

core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/LayerStatisticsPlugIn.java

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/LayerStatisticsPlugIn.java
===
--- 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/LayerStatisticsPlugIn.java
   2018-03-12 15:22:08 UTC (rev 5710)
+++ 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/LayerStatisticsPlugIn.java
   2018-03-12 15:33:11 UTC (rev 5711)
@@ -1,4 +1,3 @@
-
 /*
  * The Unified Mapping Platform (JUMP) is an extensible, interactive GUI 
  * for visualizing and manipulating spatial features with geometry and 
attributes.
@@ -35,6 +34,8 @@
 
 import java.util.Iterator;
 
+import org.openjump.sextante.gui.additionalResults.AdditionalResults;
+
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
@@ -48,10 +49,9 @@
 import com.vividsolutions.jump.workbench.plugin.EnableCheckFactory;
 import com.vividsolutions.jump.workbench.plugin.MultiEnableCheck;
 import com.vividsolutions.jump.workbench.plugin.PlugInContext;
-import com.vividsolutions.jump.workbench.ui.HTMLFrame;
+import com.vividsolutions.jump.workbench.ui.HTMLPanel;
 import com.vividsolutions.jump.workbench.ui.MenuNames;
 
-
 /**
  * Computes various statistics for selected layers.
  */
@@ -60,76 +60,91 @@
 public LayerStatisticsPlugIn() {
 }
 
-public void initialize(PlugInContext context) throws Exception
-{
-   FeatureInstaller featureInstaller = new 
FeatureInstaller(context.getWorkbenchContext());
-   featureInstaller.addMainMenuPlugin(
-   this,
-   new String[] {MenuNames.TOOLS, 
MenuNames.STATISTICS},
-this.getName() + "...",
-false, //checkbox
-null,  //icon
+@Override
+public void initialize(PlugInContext context) throws Exception {
+final FeatureInstaller featureInstaller = new FeatureInstaller(
+context.getWorkbenchContext());
+featureInstaller.addMainMenuPlugin(this, new String[] {
+MenuNames.TOOLS, MenuNames.STATISTICS }, getName() + "...",
+false, // checkbox
+null, // icon
 createEnableCheck(context.getWorkbenchContext()));
 }
-
-public static MultiEnableCheck createEnableCheck(WorkbenchContext 
workbenchContext) {
-EnableCheckFactory checkFactory = new 
EnableCheckFactory(workbenchContext);
 
-return new MultiEnableCheck()
-
.add(checkFactory.createWindowWithLayerNamePanelMustBeActiveCheck())
-
.add(checkFactory.createAtLeastNLayersMustBeSelectedCheck(1));
+public static MultiEnableCheck createEnableCheck(
+WorkbenchContext workbenchContext) {
+final EnableCheckFactory checkFactory = new EnableCheckFactory(
+workbenchContext);
+
+return new MultiEnableCheck().add(
+checkFactory.createWindowWithLayerNamePanelMustBeActiveCheck())
+.add(checkFactory.createAtLeastNLayersMustBeSelectedCheck(1));
 }
-
+
+@Override
 public boolean execute(PlugInContext context) throws Exception {
-//Call #getSelectedLayers before #clear, because #clear will surface
-//output window. [Jon Aquino]
-Layer[] selectedLayers = context.getSelectedLayers();
-HTMLFrame out = context.getOutputFrame();
+// Call #getSelectedLayers before #clear, because #clear will surface
+// output window. [Jon Aquino]
+final Layer[] selectedLayers = context.getSelectedLayers();
+// HTMLFrame out = context.getOutputFrame();
+final HTMLPanel out = new HTMLPanel();
+out.setRecordNavigationControlVisible(false);
 out.createNewDocument();
-out.addHeader(1, 
I18N.get("ui.plugin.LayerStatisticsPlugIn.layer-statistics"));
+out.addHeader(1,
+I18N.get("ui.plugin.LayerStatisticsPlugIn.layer-statistics"));
 
-LayerStatistics totalStats = new LayerStatistics();
-Envelope totalEnv = new Envelope();
+final LayerStatistics totalStats = new LayerStatistics();
+final Envelope totalEnv = new Envelope();
 
-for (Layer layer : selectedLayers) {
-LayerStatistics ls = layerStatistics(layer, totalStats);
+for (final Layer layer : selectedLayers) {
+final LayerStatistics ls = layerStatistics(layer, totalStats);
 
-out.addHeader(2,

[JPP-Devel] SVN: [5710] core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/ StatisticOverViewPlugIn.java

2018-03-12 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5710
  http://sourceforge.net/p/jump-pilot/code/5710
Author:   ma15569
Date: 2018-03-12 15:22:08 + (Mon, 12 Mar 2018)
Log Message:
---
Feature statistics is opened into Additional Results frame

Modified Paths:
--

core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/StatisticOverViewPlugIn.java

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/StatisticOverViewPlugIn.java
===
--- 
core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/StatisticOverViewPlugIn.java
2018-03-12 15:07:52 UTC (rev 5709)
+++ 
core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/StatisticOverViewPlugIn.java
2018-03-12 15:22:08 UTC (rev 5710)
@@ -27,7 +27,13 @@
  */
 package org.openjump.core.ui.plugin.tools.statistics;
 
+import java.awt.Dimension;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+
 import org.openjump.core.apitools.FeatureCollectionTools;
+import org.openjump.sextante.gui.additionalResults.AdditionalResults;
 
 import com.vividsolutions.jump.I18N;
 import com.vividsolutions.jump.feature.Feature;
@@ -40,67 +46,88 @@
 import com.vividsolutions.jump.workbench.plugin.PlugInContext;
 import com.vividsolutions.jump.workbench.ui.MenuNames;
 
-
 /**
- * PlugIn that gives a quick impression on the value ranges, means (modes) and 
the deviation of the layer features' 
- * attribute values.
+ * PlugIn that gives a quick impression on the value ranges, means (modes) and
+ * the deviation of the layer features' attribute values.
  *
- * @author Ole Rahn, sstein
- * modified: [sstein] 16.Feb.2009 adaptation for OpenJUMP
+ * @author Ole Rahn, sstein modified: [sstein] 16.Feb.2009 adaptation for
+ * OpenJUMP
  */
-public class StatisticOverViewPlugIn extends AbstractPlugIn{
-
-private static final String sStatisticsOverview =
-
I18N.get("org.openjump.core.ui.plugin.tools.statistics.StatisticOverViewPlugIn.Attribute-Statistics-Overview");
-   
-public void initialize(PlugInContext context) throws Exception
-{ 
-WorkbenchContext workbenchContext = context.getWorkbenchContext();
-context.getFeatureInstaller().addMainMenuPlugin(
-   this, 
-   new String[] { MenuNames.TOOLS, 
MenuNames.STATISTICS}, 
-   this.getName() + "...", 
-   false, 
-   null, 
-   this.createEnableCheck(workbenchContext));
+public class StatisticOverViewPlugIn extends AbstractPlugIn {
+
+private static final String sStatisticsOverview = I18N
+
.get("org.openjump.core.ui.plugin.tools.statistics.StatisticOverViewPlugIn.Attribute-Statistics-Overview");
+
+@Override
+public void initialize(PlugInContext context) throws Exception {
+final WorkbenchContext workbenchContext = 
context.getWorkbenchContext();
+context.getFeatureInstaller().addMainMenuPlugin(this,
+new String[] { MenuNames.TOOLS, MenuNames.STATISTICS },
+getName() + "...", false, null,
+createEnableCheck(workbenchContext));
 }
-
+
+@Override
 public String getName() {
 return sStatisticsOverview;
 }
-
+
 /**
- *@inheritDoc
+ * @inheritDoc
  */
 public String getIconString() {
 return "statsOverview.png";
 }
-
+
 /**
- *@inheritDoc
+ * @inheritDoc
  */
+@Override
 public boolean execute(PlugInContext context) throws Exception {
-
-Layer layer = context.getSelectedLayer(0);
-FeatureCollection featureColl = 
layer.getFeatureCollectionWrapper().getWrappee();
-Feature[] features = 
FeatureCollectionTools.FeatureCollection2FeatureArray(featureColl);
 
+final Layer layer = context.getSelectedLayer(0);
+final FeatureCollection featureColl = layer
+.getFeatureCollectionWrapper().getWrappee();
+final Feature[] features = FeatureCollectionTools
+.FeatureCollection2FeatureArray(featureColl);
+
 // mmichaud fix bug 3229892 (2011-04-05)
 if (features.length == 0) {
-
context.getWorkbenchFrame().warnUser(I18N.get("org.openjump.core.ui.plugin.tools.statistics.StatisticOverViewPlugIn.Selected-layer-is-empty"));
+context.getWorkbenchFrame()
+.warnUser(
+
I18N.get("org.openjump.core.ui.plugin.tools.statistics.StatisticOverViewPlugIn.Selected-layer-is-empty"));
 return false;
 }
-StatisticOverViewDialog dialog =  new 
StatisticOverViewDialog(context.getWorkbenchFrame(), this.getName(), false, 
features);
-
-dialog.setVisible(true);
-
+final StatisticOverViewTableModel tableModel = new 
StatisticOverViewTableModel(
+

[JPP-Devel] SVN: [5712] core/trunk

2018-03-14 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5712
  http://sourceforge.net/p/jump-pilot/code/5712
Author:   ma15569
Date: 2018-03-14 09:05:39 + (Wed, 14 Mar 2018)
Log Message:
---
* Smal enhancement on AdditionalResul Frame, JSplitPanel divider and added dxf 
export for plot (only on jFileChooser, not yer working)
* Moved Statistics>Plot>(All) and Statistic>Classify attributes output plot 
into AdditionalResul Frame 

Modified Paths:
--
core/trunk/ChangeLog

core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/ClassifyAttributesPlugIn.java

core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/CreateBarPlotPlugIn.java

core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/CreateHistogramPlugIn.java

core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/CreateScatterPlotPlugIn.java

core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-03-12 15:33:11 UTC (rev 5711)
+++ core/trunk/ChangeLog2018-03-14 09:05:39 UTC (rev 5712)
@@ -5,6 +5,12 @@
 
 * Changes.txt updated until here **
 
+2018-03-14 Giuseppe Aruta
+ * Smal enhancement on AdditionalResul Frame, JSplitPanel divider and
+   added dxf export for plot (only on jFileChooser, not yer working)
+ * Moved Statistics>Plot>(All) and Statistic>Classify attributes output
+   plot into AdditionalResul Frame 
+
 2018-03-12 Giuseppe Aruta
 * Activated  Additional Result framemork: outputs other than vector or 
   raster are loaded as objects into a convenient frame where user can  

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/ClassifyAttributesPlugIn.java
===
--- 
core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/ClassifyAttributesPlugIn.java
   2018-03-12 15:33:11 UTC (rev 5711)
+++ 
core/trunk/src/org/openjump/core/ui/plugin/tools/statistics/ClassifyAttributesPlugIn.java
   2018-03-14 09:05:39 UTC (rev 5712)
@@ -34,7 +34,6 @@
  ***/
 package org.openjump.core.ui.plugin.tools.statistics;
 
-import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -43,11 +42,11 @@
 
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
-import javax.swing.JInternalFrame;
 
 import org.openjump.core.apitools.FeatureSchemaTools;
 import org.openjump.core.attributeoperations.Classifier1D;
 import org.openjump.core.ui.plot.Plot2DPanelOJ;
+import org.openjump.sextante.gui.additionalResults.AdditionalResults;
 
 import com.vividsolutions.jump.I18N;
 import com.vividsolutions.jump.feature.AttributeType;
@@ -72,19 +71,20 @@
 import com.vividsolutions.jump.workbench.ui.plugin.FeatureInstaller;
 
 //TODO: remove for other classification plugins the "save" option (taken from 
histogram plugin)
-public class ClassifyAttributesPlugIn extends AbstractPlugIn implements 
ThreadedPlugIn{
+public class ClassifyAttributesPlugIn extends AbstractPlugIn implements
+ThreadedPlugIn {
 
 private MultiInputDialog dialog;
-
-private String sideBarText = "Classifies attribute data with the chosen 
method.\n" +
-"The result is added 
as new field to the attribute table.";
+
+private String sideBarText = "Classifies attribute data with the chosen 
method.\n"
++ "The result is added as new field to the attribute table.";
 private String CLASSIFIER = "select classification method";
 private String T2 = "number of classes";
 private String CLAYER = "select layer";
 private String ATTRIBUTE = "select attribute";
-private String OPTIMIZEWITHKMEANS = "optimize with k-means" ;
+private String OPTIMIZEWITHKMEANS = "optimize with k-means";
 private String PROCESSNULLASZERO = "process null as zero";
-
+
 private String sClassbreaks = "class breaks";
 private String sDatapoints = "data points";
 private String sCount = "count";
@@ -93,387 +93,454 @@
 private String sDisplayBreaks = "Display Breaks";
 private String sClassifying = "classifying";
 private String sAddingField = "adding field";
-
+
 private Layer selLayer = null;
-private int ranges = 7; 
+private int ranges = 7;
 private FeatureCollection fc = null;
 private String selAttribute = null;
 private String selClassifier = null;
 private Boolean useKmeans = false;
 private boolean nullAsZero = false;
-
+
 private String sName = "Classify Attributes";
-   private String sWarning = "problems appeared";
-   private String sNotEnoughValuesWarning = "valid values is not enough";
+private String sWarning = "problems appeared";
+private

[JPP-Devel] SVN: [5715] core/trunk/src/org/openjump/sextante/gui/additionalResults/ AdditionalResultsFrame.java

2018-03-15 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5715
  http://sourceforge.net/p/jump-pilot/code/5715
Author:   ma15569
Date: 2018-03-15 06:22:35 + (Thu, 15 Mar 2018)
Log Message:
---
work around to solve save problems [it works on local OJ copy but not on 
downloaded one (?)]

Modified Paths:
--

core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java

Modified: 
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java
===
--- 
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java
  2018-03-14 16:12:36 UTC (rev 5714)
+++ 
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java
  2018-03-15 06:22:35 UTC (rev 5715)
@@ -64,9 +64,10 @@
 import com.vividsolutions.jump.workbench.ui.FeatureCollectionPanel;
 import com.vividsolutions.jump.workbench.ui.GUIUtil;
 import com.vividsolutions.jump.workbench.ui.HTMLPanel;
+
+import de.fho.jump.pirol.utilities.settings.PirolPlugInSettings;
 //-da rimuovere
 //import com.vividsolutions.jump.workbench.ui.OKCancelApplyPanel;
-import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
 
 public class AdditionalResultsFrame extends DetachableInternalFrame {
 
@@ -370,19 +371,22 @@
 private static final String FILE_CHOOSER_DIRECTORY_KEY = 
SaveFileDataSourceQueryChooser.class
 .getName() + " - FILE CHOOSER DIRECTORY";
 
-protected void save() {
-final JFileChooser fc = new 
GUIUtil.FileChooserWithOverwritePrompting();
+public void save() {
+// final JFileChooser fc = new
+// GUIUtil.FileChooserWithOverwritePrompting();
+
 // fc.setPreferredSize(new Dimension(FILE_BROWSER_WIDTH,
 // FILE_BROWSER_HEIGHT));
-final File filedir = new File((String) PersistentBlackboardPlugIn.get(
-JUMPWorkbench.getInstance().getContext()).get(
-FILE_CHOOSER_DIRECTORY_KEY));
+// final File filedir = new File((String)
+// PersistentBlackboardPlugIn.get(
+// JUMPWorkbench.getInstance().getContext()).get(
+// FILE_CHOOSER_DIRECTORY_KEY));
 FileNameExtensionFilter filter;
-if (LAST_DIR != null) {
-fc.setCurrentDirectory(new File(LAST_DIR));
-} else {
-fc.setCurrentDirectory(filedir);
-}
+// if (LAST_DIR != null) {
+// fc.setCurrentDirectory(new File(LAST_DIR));
+// } else {
+// fc.setCurrentDirectory(filedir);
+// }
 final File file;
 if (m_Path != null) {
 try {
@@ -392,6 +396,7 @@
 .getUserObject();
 final Component c = (Component) oad.getObject();
 if (c instanceof FeatureCollectionPanel) {
+
 final FeatureCollectionPanel panel = 
(FeatureCollectionPanel) c;
 final FeatureCollection fcoll = panel
 .getFeatureCollection();
@@ -400,9 +405,12 @@
 } else {
 filter = new FileNameExtensionFilter("SHP", "shp");
 }
+final JFileChooser fc = new JFileChooser(
+PirolPlugInSettings.configDirectory());
 fc.setFileFilter(filter);
 fc.addChoosableFileFilter(filter);
-final int returnVal = fc.showSaveDialog(this);
+final int returnVal = fc
+.showSaveDialog(AdditionalResultsFrame.this);
 // FILE_BROWSER_WIDTH = fc.getWidth();
 // FILE_BROWSER_HEIGHT = fc.getHeight();
 if (returnVal == JFileChooser.APPROVE_OPTION) {
@@ -421,10 +429,13 @@
 if (view instanceof JTextPane) {
 final JTextPane text = (JTextPane) pane.getViewport()
 .getView();
+final JFileChooser fc = new JFileChooser(
+PirolPlugInSettings.configDirectory());
 filter = new FileNameExtensionFilter("HTML", "html");
 fc.setFileFilter(filter);
 fc.addChoosableFileFilter(filter);
-final int returnVal = fc.showSaveDialog(this);
+final int returnVal = fc
+.showSaveDialog(AdditionalResultsFrame.this);
 fc.getWidth();
 fc.getHeight();
 if (returnVal == JFileChooser.APPROVE_OPTION) {
@@ -446,9 +457,12 @@
 } else if (view instanceof JLabel) {
 final String text = ((JLabel) view).getText();
 filter = new FileNameExtensionFilter("HTML", "html");
+final JFileChooser

[JPP-Devel] SVN: [5713] core/trunk

2018-03-14 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5713
  http://sourceforge.net/p/jump-pilot/code/5713
Author:   ma15569
Date: 2018-03-14 15:01:11 + (Wed, 14 Mar 2018)
Log Message:
---
Additional Result frame: added export profile to .dxf on output options. Added 
related dxf class support from AdbToolbox
(it.betastudio.adbtoolbox.libs.DxfExport)

Modified Paths:
--
core/trunk/ChangeLog

core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsFrame.java

Added Paths:
---
core/trunk/src/it/betastudio/adbtoolbox/libs/DxfExport.java

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-03-14 09:05:39 UTC (rev 5712)
+++ core/trunk/ChangeLog2018-03-14 15:01:11 UTC (rev 5713)
@@ -6,6 +6,10 @@
 * Changes.txt updated until here **
 
 2018-03-14 Giuseppe Aruta
+  * Raster>Profile. Added export profile to .dxf on Additional Frame 
+output options
+
+2018-03-14 Giuseppe Aruta
  * Smal enhancement on AdditionalResul Frame, JSplitPanel divider and
added dxf export for plot (only on jFileChooser, not yer working)
  * Moved Statistics>Plot>(All) and Statistic>Classify attributes output

Added: core/trunk/src/it/betastudio/adbtoolbox/libs/DxfExport.java
===
--- core/trunk/src/it/betastudio/adbtoolbox/libs/DxfExport.java 
(rev 0)
+++ core/trunk/src/it/betastudio/adbtoolbox/libs/DxfExport.java 2018-03-14 
15:01:11 UTC (rev 5713)
@@ -0,0 +1,380 @@
+package it.betastudio.adbtoolbox.libs;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import javax.swing.JOptionPane;
+
+
+/**
+ *
+ * @author Beta Studio
+ */
+public class DxfExport {
+
+public DxfExport(){
+
+dxfOut = new String();
+
+}
+
+public void writeHeader(double minX, double minY, double maxX, double 
maxY){
+
+dxfOut = "0";
+appString("SECTION");
+appString(2);
+appString("HEADER");
+appString(9);
+appString("$ACADVER");
+appString(1);
+appString("AC1009");
+
+appString(9);
+appString("$EXTMIN");
+appString(10);
+appString(minX);
+appString(20);
+appString(minY);
+appString(30);
+appString(0);
+appString(9);
+appString("$EXTMAX");
+appString(10);
+appString(maxX);
+appString(20);
+appString(maxY);
+appString(30);
+appString(0);
+
+appString(9);
+appString("$LIMMIN");
+appString(10);
+appString(minX);
+appString(20);
+appString(minY);
+appString(9);
+appString("$LIMMAX");
+appString(10);
+appString(maxX);
+appString(20);
+appString(maxY);
+//appString(9);
+//appString("$CLAYER");
+//appString(8);
+//appString(layerName);
+appString(0);
+appString("ENDSEC");
+
+}
+
+public void writeStartSec(){
+
+appString(0);
+appString("SECTION");
+
+}
+
+public void writeEndSec(){
+
+appString(0);
+appString("ENDSEC");
+
+}
+
+public void writeTablesStart(){
+
+appString(2);
+appString("TABLES");
+
+}
+
+public void writeTableStart(){
+
+appString(0);
+appString("TABLE");   
+
+}
+
+public void writeTableEnd(){
+
+appString(0);
+appString("ENDTAB");  
+
+}
+
+public void writeLayersStart(){
+
+appString(2);
+appString("LAYER");
+appString(70);
+appString(1);
+
+}
+
+public void writeLayer(String layName, int colourNr){
+
+appString(0);
+appString("LAYER");
+appString(2);
+appString(layName);
+appString(62);
+appString(colourNr);
+appString(70);
+appString(0);
+appString(6);
+appString("CONTINUOUS");
+
+}
+
+public void writeVPort(double centerX, double centerY, double minX, double 
minY, double maxX, double maxY){
+
+appString(2);
+appString("VPORT");
+appString(5);
+appString(8);
+appString(100);
+appString("AcDbSymbolTable");
+appString(70);
+appString(2);
+appString(0);
+appString("VPORT");
+appString(5);
+appString("4A");
+appString(100);
+appString("AcDbSymbolTableRecord");
+appString(100);
+appString("AcDbViewportTableRecord");
+appString(2);
+appString("*Active");
+appString(70);
+appString(0);
+appString(10);
+appString(minX);
+appString(20);
+appString(minY);
+appString(11);
+

[JPP-Devel] SVN: [5724] plug-ins/CadPlan_JumpChart/trunk/language

2018-04-03 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5724
  http://sourceforge.net/p/jump-pilot/code/5724
Author:   ma15569
Date: 2018-04-03 10:38:47 + (Tue, 03 Apr 2018)
Log Message:
---
Added Spanish language file

Modified Paths:
--
plug-ins/CadPlan_JumpChart/trunk/language/JumpChartPlugin_it.properties

Added Paths:
---
plug-ins/CadPlan_JumpChart/trunk/language/JumpChartPlugin_es.properties

Added: plug-ins/CadPlan_JumpChart/trunk/language/JumpChartPlugin_es.properties
===
--- plug-ins/CadPlan_JumpChart/trunk/language/JumpChartPlugin_es.properties 
(rev 0)
+++ plug-ins/CadPlan_JumpChart/trunk/language/JumpChartPlugin_es.properties 
2018-04-03 10:38:47 UTC (rev 5724)
@@ -0,0 +1,44 @@
+#JumpChartPlugin_es.properties
+JumpChart.Dialog.About=Acerda
+JumpChart.Dialog.Accept=Aceptar
+JumpChart.Dialog.Attributes=Atributes
+JumpChart.Dialog.Auto=Auto
+JumpChart.Dialog.Bar=Barras
+JumpChart.Dialog.Cancel=Cancelar
+JumpChart.Dialog.ChartType=Tipo de diagrama
+JumpChart.Dialog.ClearAll=Cancelar todo
+JumpChart.Dialog.Clockwise=Horario
+JumpChart.Dialog.Column=Columna
+JumpChart.Dialog.Fixed=Definido
+JumpChart.Dialog.Legend=Leyenda
+JumpChart.Dialog.Linear=Lineal
+JumpChart.Dialog.LocalScale=Escala local
+JumpChart.Dialog.Order=Orden
+JumpChart.Dialog.Pie=Circular
+JumpChart.Dialog.PieEast=Circular Est
+JumpChart.Dialog.PieNorth=Circular Norte
+JumpChart.Dialog.Scale=Escala
+JumpChart.Dialog.SelectAll=Seleccionar todo
+JumpChart.Dialog.SelectedLayer=Capa seleccionada
+JumpChart.Dialog.ShowLabels=Mostrar etiquetas
+JumPChart.Dialog.ShowScale=Mostrar escala
+JumpChart.Dialog.Size=Tama\u00F1o
+JumpChart.Dialog.UnderLabels=Mostrar etiquetas individuales
+JumpChart.Dialog.Uniform=Uniformemente
+JumpChart.Dialog.Variable=Variable
+JumpChart.Dialog.Width=Ancho circular
+JumpChart.MenuItem=Diagrama
+JumpChart.MenuName=Extensi\u00F3n
+JumpChart.message1=Debes seleccionar una capa
+JumpChart.message2=Error en la escala o en el ancho de los campos de valor
+JumpChart.message3=Debes elegir al menos un atributo
+JumpChart.message4=Los valores de desplazamiento deben ser enteros (Integer)
+JumpChart.message5=Seleccione el atributo per 'Nombre'
+JumpChart.message6=No se encuentra el atributo 'Nombre'
+JumpChart.Order.Accept=Aceptar
+JumpChart.Order.Cancel=Cancelar
+JumpChart.Order.MoveDown=Mover abajo
+JumpChart.Order.MoveUp=Mover arriba
+JumpChart.Order.Order=Orden atributos
+umpChart.Dialog.Labels=Etiquetas
+umpChart.Dialog.Offsets=Desplazamento origen


Property changes on: 
plug-ins/CadPlan_JumpChart/trunk/language/JumpChartPlugin_es.properties
___
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: 
plug-ins/CadPlan_JumpChart/trunk/language/JumpChartPlugin_it.properties
===
--- plug-ins/CadPlan_JumpChart/trunk/language/JumpChartPlugin_it.properties 
2018-03-31 10:07:17 UTC (rev 5723)
+++ plug-ins/CadPlan_JumpChart/trunk/language/JumpChartPlugin_it.properties 
2018-04-03 10:38:47 UTC (rev 5724)
@@ -35,7 +35,7 @@
 JumpChart.message3=Devi scegliere almeno un attributo
 JumpChart.message4=I valori di offset devono essere interi (Integer)
 JumpChart.message5=Seleziona l'attributo per 'Nome'
-JumpChart.message6=Attributo 'Nome? non trovato
+JumpChart.message6=Attributo 'Nome' non trovato
 JumpChart.Order.Accept=OK
 JumpChart.Order.Cancel=Cancella
 JumpChart.Order.MoveDown=Muovo sotto


--
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

[JPP-Devel] SVN: [5726] core/trunk

2018-04-03 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5726
  http://sourceforge.net/p/jump-pilot/code/5726
Author:   ma15569
Date: 2018-04-03 11:36:21 + (Tue, 03 Apr 2018)
Log Message:
---
Added Boolean and Long Attributes to Paste Schema PlugIn

Modified Paths:
--
core/trunk/ChangeLog

core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/PasteSchemaPlugIn.java

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-04-03 11:05:42 UTC (rev 5725)
+++ core/trunk/ChangeLog2018-04-03 11:36:21 UTC (rev 5726)
@@ -5,6 +5,9 @@
 
 * Changes.txt updated until here **
 
+2018-04-03 Giuseppe Aruta
+  * Added Boolen and Long attributes to Paste Schema plugin
+
 2018-03-14 Giuseppe Aruta
   * Raster>Profile. Added export profile to .dxf on Additional Frame 
 output options

Modified: 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/PasteSchemaPlugIn.java
===
--- 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/PasteSchemaPlugIn.java
   2018-04-03 11:05:42 UTC (rev 5725)
+++ 
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/PasteSchemaPlugIn.java
   2018-04-03 11:36:21 UTC (rev 5726)
@@ -35,10 +35,12 @@
 package com.vividsolutions.jump.workbench.ui.plugin;
 
 import java.awt.Toolkit;
-import java.awt.datatransfer.*;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+
 import javax.swing.ImageIcon;
 import javax.swing.JPopupMenu;
 
@@ -54,147 +56,167 @@
 import com.vividsolutions.jump.workbench.plugin.EnableCheckFactory;
 import com.vividsolutions.jump.workbench.plugin.MultiEnableCheck;
 import com.vividsolutions.jump.workbench.plugin.PlugInContext;
+import com.vividsolutions.jump.workbench.ui.GUIUtil;
 import com.vividsolutions.jump.workbench.ui.images.IconLoader;
-import com.vividsolutions.jump.workbench.ui.plugin.FeatureInstaller;
-import com.vividsolutions.jump.workbench.ui.GUIUtil;
-import com.vividsolutions.jump.workbench.ui.MenuNames;
 
 /**
- * Apply a Feature Schema to a FeatureCollection.
- * Attributes already in the FeatureCollection schema are ignored.
- */ 
+ * Apply a Feature Schema to a FeatureCollection. Attributes already in the
+ * FeatureCollection schema are ignored.
+ */
 public class PasteSchemaPlugIn extends AbstractPlugIn {
-   
-   public static ImageIcon ICON = IconLoader.icon("schema_paste.png");
-
+
+public static ImageIcon ICON = IconLoader.icon("schema_paste.png");
+
+@Override
 public void initialize(PlugInContext context) throws Exception {
-
-WorkbenchContext workbenchContext = context.getWorkbenchContext();
-FeatureInstaller featureInstaller = new 
FeatureInstaller(workbenchContext);
-
-JPopupMenu layerNamePopupMenu = 
-context
-.getWorkbenchContext()
-.getWorkbench()
-.getFrame()
-.getLayerNamePopupMenu();
-
-featureInstaller.addPopupMenuItem(layerNamePopupMenu, this, 
-   new String[] { I18N.get("ui.MenuNames.SCHEMA") }, 
-   getName(),
-false, 
-getIcon(),
+
+final WorkbenchContext workbenchContext = 
context.getWorkbenchContext();
+final FeatureInstaller featureInstaller = new FeatureInstaller(
+workbenchContext);
+
+final JPopupMenu layerNamePopupMenu = context.getWorkbenchContext()
+.getWorkbench().getFrame().getLayerNamePopupMenu();
+
+featureInstaller.addPopupMenuItem(layerNamePopupMenu, this,
+new String[] { I18N.get("ui.MenuNames.SCHEMA") }, getName(),
+false, getIcon(),
 CopySchemaPlugIn.createEnableCheck(workbenchContext));
 }
 
+@Override
 public boolean execute(PlugInContext context) throws Exception {
-
-Transferable transferable = 
GUIUtil.getContents(Toolkit.getDefaultToolkit().getSystemClipboard());
 
+final Transferable transferable = GUIUtil.getContents(Toolkit
+.getDefaultToolkit().getSystemClipboard());
+
 if (transferable.isDataFlavorSupported(DataFlavor.stringFlavor)) {
-   String schemaString = (String) 
transferable.getTransferData(DataFlavor.stringFlavor);
-   if (!schemaString.endsWith("\n"))
-   schemaString = schemaString + "\n";
-   FeatureSchema cbFeatureSchema = new FeatureSchema();
-   boolean isSchema = (schemaString.length() > 0);
-   
-   if (isSchema) {
-   int tabIndex = schemaString.indexOf("\t");
-   int crIndex = schemaString.indexOf("\n");
-

[JPP-Devel] SVN: [5725] plug-ins/CadPlan_JumpChart/trunk/src/com/cadplan/jump/ ChartParams.java

2018-04-03 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5725
  http://sourceforge.net/p/jump-pilot/code/5725
Author:   ma15569
Date: 2018-04-03 11:05:42 + (Tue, 03 Apr 2018)
Log Message:
---
Updated Jump Chart serial number

Modified Paths:
--
plug-ins/CadPlan_JumpChart/trunk/src/com/cadplan/jump/ChartParams.java

Modified: plug-ins/CadPlan_JumpChart/trunk/src/com/cadplan/jump/ChartParams.java
===
--- plug-ins/CadPlan_JumpChart/trunk/src/com/cadplan/jump/ChartParams.java  
2018-04-03 10:38:47 UTC (rev 5724)
+++ plug-ins/CadPlan_JumpChart/trunk/src/com/cadplan/jump/ChartParams.java  
2018-04-03 11:05:42 UTC (rev 5725)
@@ -31,7 +31,7 @@
  */
 public class ChartParams
 {
-public static String version = "0.99";
+public static String version = "1.00";
 public static final int PIE_EAST = 0;
 public static final int PIE_NORTH = 1;
 public static final int BAR = 2;


--
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

[JPP-Devel] SVN: [5744] core/trunk/ChangeLog

2018-04-07 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5744
  http://sourceforge.net/p/jump-pilot/code/5744
Author:   michaudm
Date: 2018-04-07 08:55:30 + (Sat, 07 Apr 2018)
Log Message:
---
mark 1.12 release in changelog + update and beautify

Modified Paths:
--
core/trunk/ChangeLog

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-04-07 08:49:08 UTC (rev 5743)
+++ core/trunk/ChangeLog2018-04-07 08:55:30 UTC (rev 5744)
@@ -5,28 +5,31 @@
 
 * Changes.txt updated until here **
 
+2018-04-07
+  * WritableDataStoreDataSource can now have their own TransactionManager
+
 2018-04-06 Giuseppe Aruta
-  * Enhanced version of Feature Schema Panel: added Copy/Paste/Save to 
-file/Load from file schema actions to Schema toolbar
+  * Enhanced version of Feature Schema Panel: added Copy/Paste/Save to
+file/Load from file schema actions to Schema toolbar
 
 2018-04-03 Giuseppe Aruta
-  * Added Boolen and Long attributes to Paste Schema plugin
+  * Added Boolen and Long attributes to Paste Schema plugin
 
 2018-03-14 Giuseppe Aruta
-  * Raster>Profile. Added export profile to .dxf on Additional Frame 
-output options
+  * Raster>Profile. Added export profile to .dxf on Additional Frame
+output options
 
 2018-03-14 Giuseppe Aruta
- * Smal enhancement on AdditionalResul Frame, JSplitPanel divider and
-   added dxf export for plot (only on jFileChooser, not yer working)
- * Moved Statistics>Plot>(All) and Statistic>Classify attributes output
-   plot into AdditionalResul Frame 
+  * Smal enhancement on AdditionalResul Frame, JSplitPanel divider and
+added dxf export for plot (only on jFileChooser, not yer working)
+  * Moved Statistics>Plot>(All) and Statistic>Classify attributes output
+plot into AdditionalResul Frame
 
 2018-03-12 Giuseppe Aruta
-* Activated  Additional Result framemork: outputs other than vector or 
-  raster are loaded as objects into a convenient frame where user can  
-  save/delete/rename these objects.
-  The following objects can be saved into the Additional Result frame:
+  * Activated  Additional Result framemork: outputs other than vector or
+raster are loaded as objects into a convenient frame where user can
+save/delete/rename these objects.
+The following objects can be saved into the Additional Result frame:
   - Texts in Jlabel, JtextPane, JtextArea, HTMLPane: saved as .html file
   - JTabel objects: saved as .csv file
   - graphics added to PlotPane: saved as .png file
@@ -33,12 +36,14 @@
   -  Other object: saved to .png file
   - FeatureCollection into a FeatureCollectionPanel: saved to .jml/.shp
   Additional Results framework has been adapted from Sextante.
- * Added option to ProfileGraphPlugIn to use selected line as profile trace
-   Graphics and table Outputs are saved  into Additional Result frame
+  * Added option to ProfileGraphPlugIn to use selected line as profile trace
+Graphics and table Outputs are saved  into Additional Result frame
 
+* release 1.12 
*
+
 2018-01-30 Giuseppe Aruta
-   * Upgraded Sextante building to version gen2018a to solve a bug on 
- exporting raster data. Moved Toolboxframe as OJ internal frame
+  * Upgraded Sextante building to version gen2018a to solve a bug on
+exporting raster data. Moved Toolboxframe as OJ internal frame
 
 2018-01-28 mmichaud 
   * Update Cadplan VertexSymbol (finnish translation + java 1.7 compatibility)


--
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

[JPP-Devel] SVN: [5745] core/trunk/ChangeLog

2018-04-07 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5745
  http://sourceforge.net/p/jump-pilot/code/5745
Author:   michaudm
Date: 2018-04-07 09:08:25 + (Sat, 07 Apr 2018)
Log Message:
---
update changelog file

Modified Paths:
--
core/trunk/ChangeLog

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-04-07 08:55:30 UTC (rev 5744)
+++ core/trunk/ChangeLog2018-04-07 09:08:25 UTC (rev 5745)
@@ -5,7 +5,7 @@
 
 * Changes.txt updated until here **
 
-2018-04-07
+2018-04-07 mmichaud 
   * WritableDataStoreDataSource can now have their own TransactionManager
 
 2018-04-06 Giuseppe Aruta
@@ -20,7 +20,7 @@
 output options
 
 2018-03-14 Giuseppe Aruta
-  * Smal enhancement on AdditionalResul Frame, JSplitPanel divider and
+  * Small enhancement on AdditionalResult Frame, JSplitPanel divider and
 added dxf export for plot (only on jFileChooser, not yer working)
   * Moved Statistics>Plot>(All) and Statistic>Classify attributes output
 plot into AdditionalResul Frame
@@ -32,10 +32,10 @@
 The following objects can be saved into the Additional Result frame:
   - Texts in Jlabel, JtextPane, JtextArea, HTMLPane: saved as .html file
   - JTabel objects: saved as .csv file
-  - graphics added to PlotPane: saved as .png file
-  -  Other object: saved to .png file
+  - Graphics added to PlotPane: saved as .png file
+  - Other object: saved to .png file
   - FeatureCollection into a FeatureCollectionPanel: saved to .jml/.shp
-  Additional Results framework has been adapted from Sextante.
+Additional Results framework has been adapted from Sextante.
   * Added option to ProfileGraphPlugIn to use selected line as profile trace
 Graphics and table Outputs are saved  into Additional Result frame
 


--
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

[JPP-Devel] SVN: [5746] plug-ins/SextantePlugIn/src/es/unex/sextante/openjump

2018-04-07 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5746
  http://sourceforge.net/p/jump-pilot/code/5746
Author:   ma15569
Date: 2018-04-07 10:55:50 + (Sat, 07 Apr 2018)
Log Message:
---
Moved all result output to OpenJUMP Additional result frame

Modified Paths:
--

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java

plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/gui/OpenJUMPPostProcessTask.java

Modified: 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java
===
--- 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java
 2018-04-07 09:08:25 UTC (rev 5745)
+++ 
plug-ins/SextantePlugIn/src/es/unex/sextante/openjump/extensions/SextanteResultsPlugin.java
 2018-04-07 10:55:50 UTC (rev 5746)
@@ -4,26 +4,31 @@
 
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
+import javax.swing.JInternalFrame;
 import javax.swing.JOptionPane;
 
 import org.openjump.core.ui.plugin.AbstractUiPlugIn;
+import org.openjump.sextante.core.ObjectAndDescription;
+import org.openjump.sextante.gui.additionalResults.AdditionalResults;
+import org.openjump.sextante.gui.additionalResults.AdditionalResultsFrame;
 
-import es.unex.sextante.core.Sextante;
-import es.unex.sextante.gui.additionalResults.AdditionalResults;
-import es.unex.sextante.gui.core.SextanteGUI;
-import es.unex.sextante.openjump.language.I18NPlug;
+import com.vividsolutions.jump.I18N;
 //import es.unex.sextante.gui.additionalResults.AdditionalResults;
 //import org.openjump.sextante.gui.additionalResults.AdditionalResultsFrame;
 import com.vividsolutions.jump.workbench.plugin.PlugInContext;
-import com.vividsolutions.jump.I18N;
 
+//import es.unex.sextante.core.Sextante;
 //import es.unex.sextante.gui.additionalResults.AdditionalResults;
+//import es.unex.sextante.gui.core.SextanteGUI;
+import es.unex.sextante.openjump.language.I18NPlug;
 
+//import es.unex.sextante.gui.additionalResults.AdditionalResults;
+
 public class SextanteResultsPlugin extends AbstractUiPlugIn {
 
 public String NO_RESULTS = I18NPlug
 
.getI18N("es.unex.sextante.kosmo.extensions.SextanteResultsPlugin.Results.no_results");
-private String sName = I18N
+private final String sName = I18N
 
.get("org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Result-viewer");
 private static String sWarning = I18N
 
.get("org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.List-of-results-is-empty");
@@ -30,40 +35,45 @@
 
 @Override
 public boolean execute(final PlugInContext context) throws Exception {
+//[Giuseppe Aruta 2018-04-07] Now it opens OpenJUMP Additional results frame
+
+final ArrayList m_Components = 
AdditionalResults.m_Components;
+if (m_Components == null || m_Components.size() == 0) {
+JOptionPane.showMessageDialog(null, sWarning, sName,
+JOptionPane.WARNING_MESSAGE);
+return false;
+} else {
 
-/*
- * ArrayList m_Components =
- * AdditionalResults.m_Components; if (m_Components == null ||
- * m_Components.size() == 0) { JOptionPane.showMessageDialog(null,
- * sWarning, sName, JOptionPane.WARNING_MESSAGE); return false; } else 
{
- * 
- * for (JInternalFrame iFrame : context.getWorkbenchFrame()
- * .getInternalFrames()) { if (iFrame instanceof 
AdditionalResultsFrame)
- * {
- * 
- * iFrame.toFront(); return true;
- * 
- * } } AdditionalResultsFrame additionalResultsFrame = new
- * AdditionalResultsFrame( m_Components);
- * 
- * context.getWorkbenchFrame()
- * .addInternalFrame(additionalResultsFrame);
- * 
- * }
- */
+for (final JInternalFrame iFrame : context.getWorkbenchFrame()
+.getInternalFrames()) {
+if (iFrame instanceof AdditionalResultsFrame) {
 
-final ArrayList results = AdditionalResults.getComponents();
-if (results.size() != 0) {
-SextanteGUI.getGUIFactory().showAdditionalResultsDialog(results);
-}
+iFrame.toFront();
+return true;
 
-else {
-JOptionPane.showMessageDialog(null, NO_RESULTS,
-Sextante.getText("Warning"), JOptionPane.WARNING_MESSAGE);
+}
+}
+final AdditionalResultsFrame additionalResultsFrame = new 
AdditionalResultsFrame(
+m_Components);
+
+context.getWorkbenchFrame()
+.addInternalFrame(additionalResultsFrame);
+
 }
-
 return true;
 
+// final ArrayList results = AdditionalResults.getComponents();
+// if (results.size() != 0) {
+//

[JPP-Devel] SVN: [5743] core/trunk/src/org/openjump

2018-04-07 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5743
  http://sourceforge.net/p/jump-pilot/code/5743
Author:   michaudm
Date: 2018-04-07 08:49:08 + (Sat, 07 Apr 2018)
Log Message:
---
Now, WritableDataStoreDataSource can have their own TransactionManager

Modified Paths:
--
core/trunk/src/org/openjump/OpenJumpConfiguration.java

core/trunk/src/org/openjump/core/ui/plugin/datastore/AddWritableDataStoreLayerWizard.java

core/trunk/src/org/openjump/core/ui/plugin/datastore/DataStoreDataSourceFactory.java

core/trunk/src/org/openjump/core/ui/plugin/datastore/SaveToDataStoreWizard.java

core/trunk/src/org/openjump/core/ui/plugin/datastore/WritableDataStoreDataSource.java

core/trunk/src/org/openjump/core/ui/plugin/datastore/h2/H2DataStoreDataSource.java

core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis2/PostGISDataStoreDataSource.java

core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManager.java

core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManagerPlugIn.java

core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/Evolution.java

core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/TransactionManagerPanel.java
core/trunk/src/org/openjump/core/ui/plugin/file/SaveWizardPlugIn.java

Modified: core/trunk/src/org/openjump/OpenJumpConfiguration.java
===
--- core/trunk/src/org/openjump/OpenJumpConfiguration.java  2018-04-06 
17:00:47 UTC (rev 5742)
+++ core/trunk/src/org/openjump/OpenJumpConfiguration.java  2018-04-07 
08:49:08 UTC (rev 5743)
@@ -29,6 +29,7 @@
 import org.openjump.core.ui.io.file.FileLayerLoader;
 import org.openjump.core.ui.plugin.datastore.AddDataStoreLayerWizard;
 import org.openjump.core.ui.plugin.datastore.AddWritableDataStoreLayerWizard;
+import 
org.openjump.core.ui.plugin.datastore.transaction.DataStoreTransactionManager;
 import org.openjump.core.ui.plugin.file.DataSourceQueryChooserOpenWizard;
 import org.openjump.core.ui.plugin.file.OpenWizardPlugIn;
 import org.openjump.core.ui.plugin.layer.pirolraster.RasterImageContextMenu;
@@ -145,8 +146,9 @@
 OpenWizardPlugIn.addWizard(workbenchContext, addRasterImageLayerWizard);
 
 // [mmichaud 2013-11-08] add new AddWritableDataStoreLayerWizard
-  AddWritableDataStoreLayerWizard addWritableDataStoreLayerWizard = new 
AddWritableDataStoreLayerWizard(
-  workbenchContext);
+  AddWritableDataStoreLayerWizard addWritableDataStoreLayerWizard =
+  new AddWritableDataStoreLayerWizard(
+  workbenchContext, 
DataStoreTransactionManager.getTransactionManager());
   OpenWizardPlugIn.addWizard(workbenchContext, 
addWritableDataStoreLayerWizard);
 
 // [mmichaud 2012-09-01] changed how RasterImageLayerRendererFactory is 
initialized to fix bug 3526653

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/datastore/AddWritableDataStoreLayerWizard.java
===
--- 
core/trunk/src/org/openjump/core/ui/plugin/datastore/AddWritableDataStoreLayerWizard.java
   2018-04-06 17:00:47 UTC (rev 5742)
+++ 
core/trunk/src/org/openjump/core/ui/plugin/datastore/AddWritableDataStoreLayerWizard.java
   2018-04-07 08:49:08 UTC (rev 5743)
@@ -3,7 +3,7 @@
 import java.awt.Color;
 import java.util.Collection;
 
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 
 import org.openjump.core.ccordsys.srid.SRIDStyle;
 import 
org.openjump.core.ui.plugin.datastore.transaction.DataStoreTransactionManager;
@@ -38,13 +38,32 @@
 
 private AddWritableDataStoreLayerWizardPanel dataStoreWizardPanel;
 
+private DataStoreTransactionManager txManager;
+
 private WorkbenchContext workbenchContext;
 
 private ChooseProjectPanel chooseProjectPanel;
 
-public AddWritableDataStoreLayerWizard(WorkbenchContext workbenchContext) {
+public AddWritableDataStoreLayerWizard(
+String name,
+ImageIcon icon,
+WorkbenchContext workbenchContext,
+DataStoreTransactionManager txManager) {
+super(name, icon,
+AddWritableDataStoreLayerWizardPanel.class.getName());
+this.txManager = txManager;
+this.workbenchContext = workbenchContext;
+dataStoreWizardPanel = new 
AddWritableDataStoreLayerWizardPanel(workbenchContext);
+addPanel(dataStoreWizardPanel);
+chooseProjectPanel = new ChooseProjectPanel(workbenchContext, 
dataStoreWizardPanel.getID());
+addPanel(chooseProjectPanel);
+}
+
+public AddWritableDataStoreLayerWizard(WorkbenchContext workbenchContext,
+DataStoreTransactionManager txManager) {
 super(I18N.get(KEY), IconLoader.icon("database_writable_add.png"),
 AddWritableDataStoreLayerWizardPanel.class.getName());
+this.txManager = txManager;

[JPP-Devel] SVN: [5752] core/trunk/src/language/jump_fr.properties

2018-04-07 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5752
  http://sourceforge.net/p/jump-pilot/code/5752
Author:   michaudm
Date: 2018-04-07 19:43:38 + (Sat, 07 Apr 2018)
Log Message:
---
Update french file

Modified Paths:
--
core/trunk/src/language/jump_fr.properties

Modified: core/trunk/src/language/jump_fr.properties
===
--- core/trunk/src/language/jump_fr.properties  2018-04-07 18:07:02 UTC (rev 
5751)
+++ core/trunk/src/language/jump_fr.properties  2018-04-07 19:43:38 UTC (rev 
5752)
@@ -2864,6 +2864,6 @@
 
org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Table=Tables
 
org.openjump.sextante.gui.additionalResults.AdditionalResultsPlugIn.Image=Images
 and Graphiques
 ui.AttributeTablePanel.featurecollection = Table attributaire
-org.openjump.core.ui.plugin.raster.ProfileGraphTool.draw-linstring-as-trace 
=#T:Draw a linestring as trace 
-org.openjump.core.ui.plugin.raster.ProfileGraphTool.use-selected-linstring-as-trace
 =#T:Use selected linestring as trace 
-org.openjump.core.ui.plugin.raster.ProfileGraphTool.select-one-linstring 
=#T:Select one linestring 
\ No newline at end of file
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.draw-linstring-as-trace = 
Dessiner la ligne devant servir au calcul du profil
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.use-selected-linstring-as-trace
 = Utiliser la ligne s\xE9lectionn\xE9e pour le profil
+org.openjump.core.ui.plugin.raster.ProfileGraphTool.select-one-linstring = 
S\xE9lectionner une ligne
\ No newline at end of file


--
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

[JPP-Devel] SVN: [5749] core/trunk

2018-04-07 Thread jump-pilot-svn--- via Jump-pilot-devel

Revision: 5749
  http://sourceforge.net/p/jump-pilot/code/5749
Author:   ma15569
Date: 2018-04-07 17:25:31 + (Sat, 07 Apr 2018)
Log Message:
---
Updated some plugins: see ChangeLog.txt file

Modified Paths:
--
core/trunk/ChangeLog

Added Paths:
---
core/trunk/lib/plus/CadTools-0.7.jar
core/trunk/lib/plus/JumpChart-1.00.jar
core/trunk/lib/plus/JumpFillPattern-0.3.jar
core/trunk/lib/plus/VertexSymbols-0.19.jar
core/trunk/lib/plus/ojsextante_binding_apr2018.jar

Removed Paths:
-
core/trunk/lib/plus/JumpChart.jar
core/trunk/lib/plus/JumpFillPattern.jar
core/trunk/lib/plus/VertexSymbols-0.181.jar
core/trunk/lib/plus/cad-tools-0.6.jar
core/trunk/lib/plus/ojsextante_binding_gen2018a.jar

Modified: core/trunk/ChangeLog
===
--- core/trunk/ChangeLog2018-04-07 17:11:52 UTC (rev 5748)
+++ core/trunk/ChangeLog2018-04-07 17:25:31 UTC (rev 5749)
@@ -5,6 +5,24 @@
 
 * Changes.txt updated until here **
 
+2018-04-07 Giuseppe Aruta
+
+  * Updated plugins
+1) JumpChart plugin ver.  1.00. Correct a bug(*)
+added Italian language file. Homologate frame button bar to OpenJUMP 
+dialog style
+2) VertexSymbols plugin ver. 0.19. Correct a bug(*).
+Homologate frame button bar to OpenJUMP dialog style
+3) Sextante plugin ver. apr_2018. Homologate Sextante result outputs 
+(like text, table, image) to OpenJUMP Additional result frame
+4) CAD Toolbox plugin ver. 0.97: some enhencements on toolbox frame. 
+Line decoration symbols are drawn at an equispace distance along the 
+linestring instead to one per segments of linestring
+5) JumpFillPattern plugin ver. 0.3: moved JumpFillPattern About panel to 
+Help menu and added to it some info on how create and use patterns
+(*)
+   
 2018-04-07 mmichaud 
   * WritableDataStoreDataSource can now have their own TransactionManager
 

Added: core/trunk/lib/plus/CadTools-0.7.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/CadTools-0.7.jar
===
--- core/trunk/lib/plus/CadTools-0.7.jar2018-04-07 17:11:52 UTC (rev 
5748)
+++ core/trunk/lib/plus/CadTools-0.7.jar2018-04-07 17:25:31 UTC (rev 
5749)

Property changes on: core/trunk/lib/plus/CadTools-0.7.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: core/trunk/lib/plus/JumpChart-1.00.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/JumpChart-1.00.jar
===
--- core/trunk/lib/plus/JumpChart-1.00.jar  2018-04-07 17:11:52 UTC (rev 
5748)
+++ core/trunk/lib/plus/JumpChart-1.00.jar  2018-04-07 17:25:31 UTC (rev 
5749)

Property changes on: core/trunk/lib/plus/JumpChart-1.00.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: core/trunk/lib/plus/JumpChart.jar
===
(Binary files differ)

Added: core/trunk/lib/plus/JumpFillPattern-0.3.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/JumpFillPattern-0.3.jar
===
--- core/trunk/lib/plus/JumpFillPattern-0.3.jar 2018-04-07 17:11:52 UTC (rev 
5748)
+++ core/trunk/lib/plus/JumpFillPattern-0.3.jar 2018-04-07 17:25:31 UTC (rev 
5749)

Property changes on: core/trunk/lib/plus/JumpFillPattern-0.3.jar
___
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: core/trunk/lib/plus/JumpFillPattern.jar
===
(Binary files differ)

Deleted: core/trunk/lib/plus/VertexSymbols-0.181.jar
===
(Binary files differ)

Added: core/trunk/lib/plus/VertexSymbols-0.19.jar
===
(Binary files differ)

Index: core/trunk/lib/plus/VertexSymbols-0.19.jar
===
--- core/trunk/lib/plus/VertexSymbols-0.19.jar  2018-04-07 17:11:52 UTC (rev 
5748)
+++ core/trunk/lib/plus/VertexSymbols-0.19.jar  2018-04-07 17:25:31 UTC (rev 
5749)

Property changes on: core/trunk/lib/plus/VertexSymbols-0.19.jar
___

< 1 2 3 4 5 6 7 8 9 10 >

301 - 400 of 1191 matches

Mail list logo