Revert "Bug 533804 - [Diagram] Update batik dependencies for 1.9.1"

- This reverts the migration to Batik 1.9.1 as the problems encountered warrant to postpone it

This reverts commit aea9db22620bbc8b466b48ea7dd958bd004c91e4.

Change-Id: I15546c71d6a1868773a78459e604fe0babefbf6b
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

2 files changed, 24 insertions, 26 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index bb870bd7256..3e6b15ba001 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -1,9 +1,4 @@
 Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;singleton:=true
-Bundle-Version: 3.100.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.emf.appearance;bundle-version="[2.0.0,3.0.0)",
@@ -11,12 +6,11 @@ Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
  org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.8.0,2.0.0)",
  org.w3c.dom.svg;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.apache.batik.anim;bundle-version="[1.9.1,2.0.0)",
- org.apache.batik.dom;bundle-version="[1.9.1,2.0.0)",
- org.apache.batik.dom.svg;bundle-version="[1.9.1,2.0.0)",
- org.apache.batik.xml;bundle-version="[1.9.1,2.0.0)",
- org.apache.batik.util;bundle-version="[1.9.1,2.0.0)",
- org.apache.batik.svggen;bundle-version="[1.9.1,2.0.0)",
+ org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.xml;bundle-version="[1.6.0,1.7.0)",
  org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  com.ibm.icu,
  org.eclipse.papyrus.infra.services.decoration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
@@ -39,11 +33,6 @@ Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.papyrus.infra.types;bundle-version="4.0.0",
  org.eclipse.emf.common,
  org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.common,
  org.eclipse.papyrus.infra.gmfdiag.common.adapter,
  org.eclipse.papyrus.infra.gmfdiag.common.advice,
@@ -88,6 +77,18 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.common,
  org.eclipse.papyrus.infra.gmfdiag.common.utils,
  org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions;x-internal:=true,
  org.eclipse.papyrus.infra.gmfdiag.internal.common.model;x-internal:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 3.100.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.common;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="21.0.0",
  com.google.common.collect;version="21.0.0",
  com.google.common.util.concurrent;version="21.0.0",
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java
index 4a4af7a6634..555f65cfdd5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
+import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
 import org.apache.batik.dom.util.DOMUtilities;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.draw2d.PositionConstants;
@@ -165,12 +165,12 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements
 	 */
 	protected synchronized SVGDocument getSVGDocument(EObject view, String location) {
 		if (relativePaths == null) {
-			relativePaths = new WeakHashMap<>();
+			relativePaths = new WeakHashMap<Resource, Map<String, String>>();
 		}
-		if (location.contains("/" + POSITION_KEY) || location.contains("." + POSITION_KEY)) { //$NON-NLS-1$//$NON-NLS-2$
+		if (location.contains("/" + POSITION_KEY) || location.contains("." + POSITION_KEY)) {  //$NON-NLS-1$//$NON-NLS-2$
 			// load a specific variant of a symbol (with a different orientation) if the file name
 			// contains a specific "magic" key. The motivation is that symbols on the border of a parent
-			// (e.g. a port symbol) could always point into the parent shape depending on its position
+			// (e.g. a port	symbol) could always point into the parent shape depending on its position
 			try {
 				IMultiDiagramEditor editor = ServiceUtilsForEObject.getInstance().getService(IMultiDiagramEditor.class, view);
 
@@ -201,9 +201,7 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements
 
 	/**
 	 * Get a position key (enumeration) from the bit-vector representation of the position
-	 * 
-	 * @param side
-	 *            the binary encoded position
+	 * @param side the binary encoded position
 	 * @return the position key
 	 */
 	protected PositionEnum getPositionKey(int side) {
@@ -218,7 +216,6 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements
 			return PositionEnum.SOUTH;
 		}
 	}
-
 	/**
 	 * Loads a SVG document from the given location.
 	 * This method uses a cache so that any given document is only loaded once.
@@ -229,7 +226,7 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements
 	 */
 	protected synchronized SVGDocument getSVGDocument(String location) {
 		if (cache == null) {
-			cache = new HashMap<>();
+			cache = new HashMap<String, SVGDocument>();
 		}
 		if (cache.containsKey(location)) {
 			return cache.get(location);
@@ -288,7 +285,7 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements
 
 		Map<String, String> resMap = relativePaths.get(model.eResource());
 		if (resMap == null) {
-			resMap = new HashMap<>();
+			resMap = new HashMap<String, String>();
 			relativePaths.put(model.eResource(), resMap);
 		}
 		String canonical = resMap.get(uri);