Revision: 6375
http://sourceforge.net/p/jump-pilot/code/6375
Author: edso
Date: 2020-08-16 16:48:26 +0000 (Sun, 16 Aug 2020)
Log Message:
-----------
revert batik upgrade but raise from batik 1.6 to 1.6.1 still, holding fingers
crossed
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/pom.xml
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java
Added Paths:
-----------
core/trunk/lib/batik-all-1.6.1.jar
Removed Paths:
-------------
core/trunk/lib/batik-all-1.13.jar
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2020-08-09 17:59:45 UTC (rev 6374)
+++ core/trunk/ChangeLog 2020-08-16 16:48:26 UTC (rev 6375)
@@ -4,6 +4,10 @@
# 3. be concise but convey the change in a way that ordinary users understand
#<-------------------------------- 80 chars
---------------------------------->#
+2020-08-16 ede
+ * reverted apache batik (used for svg rendering) to 1.6 due to
+ incompatibilities with printing extensions (Sky/Cadplan)
+
2020-08-09 mmichaud <m.michael.mich...@orange.fr>
* #494 : upgrade csv driver to 1.1.0 + hungarian i18n file
Deleted: core/trunk/lib/batik-all-1.13.jar
===================================================================
(Binary files differ)
Added: core/trunk/lib/batik-all-1.6.1.jar
===================================================================
(Binary files differ)
Index: core/trunk/lib/batik-all-1.6.1.jar
===================================================================
--- core/trunk/lib/batik-all-1.6.1.jar 2020-08-09 17:59:45 UTC (rev 6374)
+++ core/trunk/lib/batik-all-1.6.1.jar 2020-08-16 16:48:26 UTC (rev 6375)
Property changes on: core/trunk/lib/batik-all-1.6.1.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2020-08-09 17:59:45 UTC (rev 6374)
+++ core/trunk/pom.xml 2020-08-16 16:48:26 UTC (rev 6375)
@@ -922,27 +922,27 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.xmlgraphics</groupId>
+ <groupId>batik</groupId>
<artifactId>batik-awt-util</artifactId>
- <version>1.13</version>
+ <version>1.6-1</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.xmlgraphics</groupId>
+ <groupId>batik</groupId>
<artifactId>batik-dom</artifactId>
- <version>1.13</version>
+ <version>1.6-1</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.xmlgraphics</groupId>
+ <groupId>batik</groupId>
<artifactId>batik-svggen</artifactId>
- <version>1.13</version>
+ <version>1.6-1</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.xmlgraphics</groupId>
+ <groupId>batik</groupId>
<artifactId>batik-squiggle</artifactId>
- <version>1.13</version>
+ <version>1.6-1</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified:
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java
===================================================================
---
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java
2020-08-09 17:59:45 UTC (rev 6374)
+++
core/trunk/src/org/openjump/sextante/gui/additionalResults/AdditionalResultsIO.java
2020-08-16 16:48:26 UTC (rev 6375)
@@ -27,7 +27,7 @@
import javax.swing.tree.TreePath;
import javax.xml.namespace.QName;
-import org.apache.batik.anim.dom.SVGDOMImplementation;
+import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.svggen.SVGGraphics2D;
import org.apache.log4j.Logger;
import org.math.plot.PlotPanel;
@@ -37,7 +37,7 @@
import org.openjump.core.ui.util.LayerableUtil;
import org.openjump.sextante.core.ObjectAndDescription;
import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
+import org.w3c.dom.svg.SVGDocument;
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.feature.FeatureCollection;
@@ -401,7 +401,7 @@
// Get a SVGDOMImplementation and create an XML document
DOMImplementation domImpl =
SVGDOMImplementation.getDOMImplementation();
String svgNS = "http://www.w3.org/2000/svg";;
- Document svgDocument = domImpl.createDocument(svgNS, "svg",
null);
+ SVGDocument svgDocument = (SVGDocument)
domImpl.createDocument(svgNS, "svg", null);
// Create an instance of the SVG Generator
SVGGraphics2D svgGenerator = new SVGGraphics2D(svgDocument);
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
