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

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

Revision: 6364
          http://sourceforge.net/p/jump-pilot/code/6364
Author:   michaudm
Date:     2020-07-31 20:51:43 +0000 (Fri, 31 Jul 2020)
Log Message:
-----------
version 1.0.3 of csv driver: fix serialization in jmp project file

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/FieldSeparator.java
    
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/FieldSeparator.java2xml
    
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/SaveCSVFileDataSourceQueryChooser.java

Modified: plug-ins/CsvDriver/trunk/build.xml
===================================================================
--- plug-ins/CsvDriver/trunk/build.xml  2020-07-31 20:43:46 UTC (rev 6363)
+++ plug-ins/CsvDriver/trunk/build.xml  2020-07-31 20:51:43 UTC (rev 6364)
@@ -16,7 +16,7 @@
     <property name="resources"     value="resources" />
     
     <!-- plugins -->
-    <property name="csv-driver-version"        value="1.0.2" />
+    <property name="csv-driver-version"        value="1.0.3" />
     <!--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-07-31 20:43:46 UTC (rev 6363)
+++ 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/CSVDriverConfiguration.java
       2020-07-31 20:51:43 UTC (rev 6364)
@@ -43,8 +43,9 @@
 /**
  * Extension loading a driver for csv and other character delimited text files
  * @author Micha&euml;l MICHAUD
- * @version 1.0.2 (2018-01-27)
+ * @version 1.0.3 (2020-07-31)
  */
+// 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
 // 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
@@ -77,7 +78,7 @@
     }
 
     public String getVersion() {
-        return "1.0.2 (2018-01-27)";
+        return "1.0.3 (2020-07-31)";
     }
 
     public void configure(PlugInContext context) throws Exception {

Modified: 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/FieldSeparator.java
===================================================================
--- 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/FieldSeparator.java   
    2020-07-31 20:43:46 UTC (rev 6363)
+++ 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/FieldSeparator.java   
    2020-07-31 20:51:43 UTC (rev 6364)
@@ -51,6 +51,13 @@
         this.separator = separator;
     }
 
+    public FieldSeparator(String sep) {
+        if (sep.equals("{tab}")) this.separator = '\t';
+        else if (sep.equals("{whitespace}")) this.separator = ' ';
+        else if (sep != null & sep.length() > 0) this.separator = 
sep.charAt(0);
+        else this.separator = '\t';
+    }
+
     public char getSeparator() {
         return separator;
     }
@@ -58,6 +65,13 @@
     public void setSeparator(char sep) {
         this.separator = sep;
     }
+
+    public void setSeparator(String sep) {
+        if (sep.equals("{tab}")) this.separator = '\t';
+        else if (sep.equals("{whitespace}")) this.separator = ' ';
+        else if (sep != null & sep.length() > 0) this.separator = 
sep.charAt(0);
+        else this.separator = '\t';
+    }
     
     public Pattern getFieldPattern() {
         if (fieldPattern == null) {
@@ -93,7 +107,7 @@
 
     public String toString() {
         if (separator == '\t') return "{tab}";
-        if (separator == ' ')  return "{whitespace}";
+        if (separator == ' ' )  return "{whitespace}";
         return "" + separator;
     }
 

Modified: 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/FieldSeparator.java2xml
===================================================================
--- 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/FieldSeparator.java2xml
   2020-07-31 20:43:46 UTC (rev 6363)
+++ 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/FieldSeparator.java2xml
   2020-07-31 20:51:43 UTC (rev 6364)
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <root>
-  <element xml-name="field-separator" java-name="separator"/>
+  <attribute xml-name="field-separator" java-name="separator"/>
 </root>

Modified: 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/SaveCSVFileDataSourceQueryChooser.java
===================================================================
--- 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/SaveCSVFileDataSourceQueryChooser.java
    2020-07-31 20:43:46 UTC (rev 6363)
+++ 
plug-ins/CsvDriver/trunk/src/fr/michaelm/jump/drivers/csv/SaveCSVFileDataSourceQueryChooser.java
    2020-07-31 20:51:43 UTC (rev 6364)
@@ -31,7 +31,6 @@
 
 import 
com.vividsolutions.jump.workbench.datasource.SaveFileDataSourceQueryChooser;
 import com.vividsolutions.jump.workbench.WorkbenchContext;
-import org.openjump.core.ui.swing.factory.field.FieldComponentFactoryRegistry;
 
 import static fr.michaelm.jump.drivers.csv.FieldSeparator.*;
 



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