Revision: 4349
http://sourceforge.net/p/jump-pilot/code/4349
Author: michaudm
Date: 2015-03-22 15:59:51 +0000 (Sun, 22 Mar 2015)
Log Message:
-----------
Fix a regression introduced by an API change in OJ to solve xml/charset issue
(r4215)
Revision Links:
--------------
http://sourceforge.net/p/jump-pilot/code/4215
Modified Paths:
--------------
plug-ins/KmlDriver/trunk/build.xml
plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLDriverConfiguration.java
plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLGeometryWriter.java
plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLOutputTemplate.java
plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLReader.java
plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLReader2.java
Removed Paths:
-------------
plug-ins/KmlDriver/trunk/lib/OpenJUMP-1.5.2.jar
plug-ins/KmlDriver/trunk/lib/jts-1.12.jar
Modified: plug-ins/KmlDriver/trunk/build.xml
===================================================================
--- plug-ins/KmlDriver/trunk/build.xml 2015-03-22 14:39:24 UTC (rev 4348)
+++ plug-ins/KmlDriver/trunk/build.xml 2015-03-22 15:59:51 UTC (rev 4349)
@@ -18,7 +18,7 @@
<!-- plugins -->
<!-- drivers -->
- <property name="kml-driver-version" value="0.2.2" />
+ <property name="kml-driver-version" value="0.2.3" />
<!-- ===================================================================
-->
@@ -42,12 +42,14 @@
debug="on"
deprecation="false"
verbose="no"
- includeantruntime="false"
+ includeantruntime="false"
+ source="1.5"
target="1.5">
<!--fork="true" executable="G:\Program
Files\Java\jdk1.5.0_15\bin\javac.exe"-->
<!--compilerarg value="-Xlint:unchecked"/-->
<!--include name="fr/michaelm/jump/drivers/geoconcept/**/*"/-->
<exclude name="**/clean/*"/>
+ <exclude name="**/KmlReader2.java"/>
<classpath refid="classpath"/>
</javac>
<copy todir="${build}" >
Deleted: plug-ins/KmlDriver/trunk/lib/OpenJUMP-1.5.2.jar
===================================================================
(Binary files differ)
Deleted: plug-ins/KmlDriver/trunk/lib/jts-1.12.jar
===================================================================
(Binary files differ)
Modified:
plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLDriverConfiguration.java
===================================================================
---
plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLDriverConfiguration.java
2015-03-22 14:39:24 UTC (rev 4348)
+++
plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLDriverConfiguration.java
2015-03-22 15:59:51 UTC (rev 4349)
@@ -33,10 +33,13 @@
* This is the entry class to declare the kml driver to JUMP.
* Put the .jar file containing the driver in your installation ext directory.
* @author Michaël Michaud
- * @version 0.2.1
+ * @version 0.2.3
*/
// History
-// 0.2.1 (2014-12-20) foix encoding problem (cf #383)
+// 0.2.3 (2015-03-22) fix a regression introduced in 4215 with a change in core
+// OpenJUMP (making xml based drivers charset aware)
+// 0.2.2 (2014-12-21) make kml parser charset aware
+// 0.2.1 (2014-12-20) fix encoding problem (cf #383)
// 0.2 (2014) version included in OpenJUMP 1.7 and 1.8 PLUS
// 0.1 (2011-09-17) : first version taken from SkyJUMP source
public class KMLDriverConfiguration extends Extension {
@@ -45,5 +48,5 @@
new KMLDataSourceQueryChooserInstallerPlugIn().initialize(context);
}
public String getName() {return "KML driver";}
- public String getVersion() {return "0.2.2 (2014-12-21)";}
+ public String getVersion() {return "0.2.3 (2015-03-22)";}
}
Modified:
plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLGeometryWriter.java
===================================================================
--- plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLGeometryWriter.java
2015-03-22 14:39:24 UTC (rev 4348)
+++ plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLGeometryWriter.java
2015-03-22 15:59:51 UTC (rev 4349)
@@ -117,7 +117,7 @@
/**
* Sets the <code>gid</code> attribute to be output on the Geometry element.
* If <code>null</code> no attribute will be output.
- * @param srsName
+ * @param gid
*/
public void setGID(String gid)
{
@@ -301,7 +301,7 @@
* Takes a list of coordinates and converts it to KML.<br>
* 2d and 3d aware.
* Terminates the coordinate output with a newline.
- *@param cs array of coordinates
+ *@param coords array of coordinates
*/
private void write(Coordinate[] coords, int level, StringBuffer buf) {
CoordinateSystem destination = null;
Modified:
plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLOutputTemplate.java
===================================================================
--- plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLOutputTemplate.java
2015-03-22 14:39:24 UTC (rev 4348)
+++ plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLOutputTemplate.java
2015-03-22 15:59:51 UTC (rev 4349)
@@ -36,6 +36,7 @@
package com.isa.jump.plugin;
import java.io.BufferedReader;
+import java.io.InputStreamReader;
import java.util.ArrayList;
import com.vividsolutions.jump.io.*;
@@ -84,8 +85,8 @@
/**
* Calls the main load() method with the stream name as "Unknown Stream"
*/
- public void load(java.io.Reader r) throws Exception {
- load(r, "Unknown Stream");
+ public void load(java.io.InputStream inputStream) throws Exception {
+ load(inputStream, "Unknown Stream");
}
/**
@@ -93,16 +94,15 @@
*/
private String getLine(BufferedReader br) throws Exception {
lineNumber++;
-
return br.readLine();
}
/**
*Main function - parse a GMLOuputTemplate.
- *@param r actual reader to read from
+ *@param inputStream actual reader to read from
*@param readerName name of the stream (for error reporting)
*/
- public void load(java.io.Reader r, String readerName)
+ public void load(java.io.InputStream inputStream, String readerName)
throws Exception {
int index;
int index2;
@@ -111,7 +111,9 @@
String token;
String textAccum;
boolean justFoundTag = false;
- BufferedReader buffRead = new BufferedReader(r);
+ //BufferedReader buffRead = new BufferedReader(r);
+ InputStreamReader isr = new InputStreamReader(inputStream);
+ BufferedReader buffRead = new BufferedReader(isr);
streamName = readerName;
Modified: plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLReader.java
===================================================================
--- plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLReader.java
2015-03-22 14:39:24 UTC (rev 4348)
+++ plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLReader.java
2015-03-22 15:59:51 UTC (rev 4349)
@@ -151,14 +151,17 @@
s += "</JCSGMLInputTemplate>";
GMLInputTemplate template = new GMLInputTemplate();
- StringReader sr = new StringReader(s);
-
+ ByteArrayInputStream is = null;
try {
- template.load(sr);
+ is = new ByteArrayInputStream(s.getBytes("UTF-8"));
+ template.load(new ByteArrayInputStream(s.getBytes("UTF-8")));
}catch ( Exception ex) {
ex.printStackTrace();
} finally {
- sr.close();
+ if (is != null) {
+ try {is.close();}
+ catch(IOException ioe) {}
+ }
}
return template;
Modified: plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLReader2.java
===================================================================
--- plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLReader2.java
2015-03-22 14:39:24 UTC (rev 4348)
+++ plug-ins/KmlDriver/trunk/src/com/isa/jump/plugin/KMLReader2.java
2015-03-22 15:59:51 UTC (rev 4349)
@@ -38,6 +38,8 @@
import java.io.LineNumberReader;
import java.io.StringReader;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
import java.util.StringTokenizer;
import org.xml.sax.Attributes;
@@ -89,6 +91,7 @@
private static final String nameElement = "Name";
private static final String descriptionElement = "Description";
//private static final String simpleField = "SimpleField";
+ List<Exception> exceptions = new ArrayList<Exception>();
//private boolean inFolder = false;
private boolean inPlacemark = false;
@@ -810,5 +813,9 @@
throw exception;
}
+ public Collection<Exception> getExceptions() {
+ return exceptions;
+ }
+
}
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
