[JPP-Devel] SVN: [6408] plug-ins/CsvDriver/trunk

[jump-pilot-svn--- via Jump-pilot-devel]

Revision: 6408
          http://sourceforge.net/p/jump-pilot/code/6408
Author:   michaudm
Date:     2020-09-01 22:04:18 +0000 (Tue, 01 Sep 2020)
Log Message:
-----------
version 1.1.1 : fix error message and accept txt extension for wkt driver

Modified Paths:
--------------
    plug-ins/CsvDriver/trunk/build.xml
    
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/CSVDriverConfiguration.java
    plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/CSVFile.java

Modified: plug-ins/CsvDriver/trunk/build.xml
===================================================================
--- plug-ins/CsvDriver/trunk/build.xml  2020-09-01 16:09:03 UTC (rev 6407)
+++ plug-ins/CsvDriver/trunk/build.xml  2020-09-01 22:04:18 UTC (rev 6408)
@@ -16,7 +16,7 @@
     <property name="resources"     value="resources" />
     
     <!-- plugins -->
-    <property name="csv-driver-version"        value="1.1.0" />
+    <property name="csv-driver-version"        value="1.1.1" />
     <!--property name="openjump-ext" 
value="C:/Users/Micha&#x00EB;l/DEVELOPPEMENTS/OpenJUMP-2012/dist/openjump-1.6.2beta/lib/ext"
 /-->
     <!--property name="openjump-ext" value="C:\Program 
Files\OpenJUMP-1.6.3-r3576-CORE\lib\ext" /-->
 

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
       2020-09-01 16:09:03 UTC (rev 6407)
+++ 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/CSVDriverConfiguration.java
       2020-09-01 22:04:18 UTC (rev 6408)
@@ -43,8 +43,9 @@
 /**
  * Extension loading a driver for csv and other character delimited text files
  * @author Micha&euml;l MICHAUD
- * @version 1.0.4 (2020-08-09)
+ * @version 1.1.1 (2020-09-02)
  */
+// 1.1.1 (2020-09-02) fix error message and add txt as a possible extension 
for wkt driver
 // 1.1.0 (2020-08-09) add hu i18n file, wkt loader now accept files with csv 
extension, cleanup
 // 1.0.3 (2020-07-31) fix serialization of fieldSeparator in jmp file (need OJ 
r6363)
 // 1.0.2 (2018-01-27) add I18N for finnish language
@@ -79,7 +80,7 @@
     }
 
     public String getVersion() {
-        return "1.0.3 (2020-07-31)";
+        return "1.1.1 (2020-09-02)";
     }
 
     public void configure(PlugInContext context) {
@@ -201,6 +202,7 @@
         List<String> wktExtensions = new ArrayList<>();
         wktExtensions.add("wkt");
         wktExtensions.add("csv");
+        wktExtensions.add("txt");
 
         DataSourceFileLayerLoader wktOptionsFileLoader = new 
DataSourceFileLayerLoader(
             wcontext, CSVDataSource.class, "wkt (set options)", wktExtensions) 
{

Modified: plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/CSVFile.java
===================================================================
--- plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/CSVFile.java      
2020-09-01 16:09:03 UTC (rev 6407)
+++ plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/CSVFile.java      
2020-09-01 22:04:18 UTC (rev 6408)
@@ -559,7 +559,7 @@
                 return WKT_READER.read(fields[geometryColumns[0]]);
             } catch (ParseException e) {
                 throw new ParseException("Can't parse string '" + 
fields[geometryColumns[0]] +
-                    "' as double with this CSVFile using fieldSeparator '" + 
fieldSeparator + "'");
+                    "' as WKT with this CSVFile using fieldSeparator '" + 
fieldSeparator + "'");
             }
         }
         else if (geometryColumns.length == 2) {



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