Update Batik to 1.14.0
Bug: 578795
Change-Id: I2086aa8292377177efe68fd0a94b452f1947e6e2
diff --git a/features/org.eclipse.graphiti.export.feature/feature.xml b/features/org.eclipse.graphiti.export.feature/feature.xml
index 0cb20ca..189f5e3 100644
--- a/features/org.eclipse.graphiti.export.feature/feature.xml
+++ b/features/org.eclipse.graphiti.export.feature/feature.xml
@@ -50,56 +50,42 @@
id="org.apache.batik.svggen"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
- unpack="false"/>
-
- <plugin
- id="org.apache.batik.ext.awt"
- download-size="0"
- install-size="0"
- version="1.9.1.qualifier"
+ version="1.14.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.batik.util"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
+ version="1.14.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.batik.constants"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
+ version="1.14.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.batik.i18n"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
- unpack="false"/>
-
- <plugin
- id="org.apache.batik.util.gui"
- download-size="0"
- install-size="0"
- version="1.9.1.qualifier"
+ version="1.14.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.batik.dom"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
+ version="1.14.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.batik.css"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
+ version="1.14.0.qualifier"
unpack="false"/>
<plugin
@@ -127,7 +113,21 @@
id="org.apache.batik.xml"
download-size="0"
install-size="0"
- version="1.9.1.qualifier"
+ version="1.14.0.qualifier"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.ext"
+ download-size="0"
+ install-size="0"
+ version="1.14.0.qualifier"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.batik.codec"
+ download-size="0"
+ install-size="0"
+ version="1.14.0.qualifier"
unpack="false"/>
</feature>
diff --git a/plugins/org.eclipse.graphiti.export.batik/META-INF/MANIFEST.MF b/plugins/org.eclipse.graphiti.export.batik/META-INF/MANIFEST.MF
index a56e35b..4e9afe4 100644
--- a/plugins/org.eclipse.graphiti.export.batik/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.graphiti.export.batik/META-INF/MANIFEST.MF
@@ -6,10 +6,15 @@
Bundle-SymbolicName: org.eclipse.graphiti.export.batik;singleton:=true
Bundle-Version: 0.19.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.apache.batik.svggen;bundle-version="[1.9.1,2.0.0)",
- org.apache.batik.ext.awt;bundle-version="[1.9.1,2.0.0)",
- org.apache.batik.util;bundle-version="[1.9.1,2.0.0)",
- org.apache.batik.dom;bundle-version="[1.9.1,2.0.0)",
+Require-Bundle: org.apache.batik.svggen;bundle-version="[1.14.0,2.0.0)",
+ org.apache.batik.awt.util;bundle-version="[1.14.0,2.0.0)",
+ org.apache.batik.util;bundle-version="[1.14.0,2.0.0)",
+ org.apache.batik.dom;bundle-version="[1.14.0,2.0.0)",
+ org.apache.batik.ext;bundle-version="[1.14.0,2.0.0)",
+ org.apache.batik.codec;bundle-version="[1.14.0,2.0.0)",
org.eclipse.draw2d;bundle-version="[3.9.100,4.0.0)",
- org.eclipse.graphiti.ui;bundle-version="0.19.0"
+ org.eclipse.graphiti.ui;bundle-version="0.19.0",
+ org.eclipse.ui.workbench;bundle-version="[3.100.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.24.90,4.0.0)"
Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.graphiti.export.batik.internal.GraphitiBatikPlugin
diff --git a/plugins/org.eclipse.graphiti.export.batik/src/org/eclipse/graphiti/export/batik/internal/GraphitiBatikPlugin.java b/plugins/org.eclipse.graphiti.export.batik/src/org/eclipse/graphiti/export/batik/internal/GraphitiBatikPlugin.java
new file mode 100644
index 0000000..b4c5d0b
--- /dev/null
+++ b/plugins/org.eclipse.graphiti.export.batik/src/org/eclipse/graphiti/export/batik/internal/GraphitiBatikPlugin.java
@@ -0,0 +1,30 @@
+package org.eclipse.graphiti.export.batik.internal;
+
+import org.apache.batik.ext.awt.image.spi.ImageTagRegistry;
+import org.apache.batik.ext.awt.image.spi.ImageWriterRegistry;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+public class GraphitiBatikPlugin extends AbstractUIPlugin {
+
+ public GraphitiBatikPlugin() {
+ super();
+ registerBatikImageFormats();
+ }
+
+ private void registerBatikImageFormats() {
+ ImageWriterRegistry.getInstance()
+ .register(new org.apache.batik.ext.awt.image.codec.imageio.ImageIOPNGImageWriter());
+ ImageWriterRegistry.getInstance()
+ .register(new org.apache.batik.ext.awt.image.codec.imageio.ImageIOTIFFImageWriter());
+ ImageWriterRegistry.getInstance()
+ .register(new org.apache.batik.ext.awt.image.codec.imageio.ImageIOJPEGImageWriter());
+
+ ImageTagRegistry.getRegistry().register(new org.apache.batik.ext.awt.image.codec.png.PNGRegistryEntry());
+ ImageTagRegistry.getRegistry()
+ .register(new org.apache.batik.ext.awt.image.codec.imageio.ImageIOJPEGRegistryEntry());
+ ImageTagRegistry.getRegistry()
+ .register(new org.apache.batik.ext.awt.image.codec.imageio.ImageIOPNGRegistryEntry());
+ ImageTagRegistry.getRegistry()
+ .register(new org.apache.batik.ext.awt.image.codec.imageio.ImageIOTIFFRegistryEntry());
+ }
+}
