Bug 533804 - [Diagram] Update batik dependencies for 1.9.1

- Update tests and dependencies to the new architecture and version
- Update the targetplatforms to set the required dependency to 1.9.1 from the latest M6 Orbit repository

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

4 files changed, 42 insertions, 32 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
index b62b9dafd52..e4074ce0489 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.uml.export;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.13.50,4.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.anim;bundle-version="[1.9.1, 2.0.0)",
  com.google.gson;bundle-version="2.7.0",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.7.0,2.0.0)",
@@ -28,3 +28,4 @@ Export-Package: org.eclipse.papyrus.uml.export,
  org.eclipse.papyrus.uml.export.ui,
  org.eclipse.papyrus.uml.export.util
 Bundle-Localization: plugin
+Automatic-Module-Name: org.eclipse.papyrus.uml.export
diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.export/pom.xml
index 4d9899b18d7..7b6f6566322 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.export/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.export/pom.xml
@@ -8,6 +8,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.export</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/extension/contribution/CommentAnnotateSVG.java b/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/extension/contribution/CommentAnnotateSVG.java
index 925e3d104a6..3d0f7f9b9c6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/extension/contribution/CommentAnnotateSVG.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/extension/contribution/CommentAnnotateSVG.java
@@ -11,7 +11,7 @@
  *****************************************************************************/
 package org.eclipse.papyrus.uml.export.extension.contribution;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.export.GraphicsSVG;
@@ -46,7 +46,7 @@ public class CommentAnnotateSVG implements AnnotateSVG {
 		EObject eObject = view.getElement();
 		if (eObject instanceof NamedElement) {
 			NamedElement namedElement = (NamedElement) eObject;
-			EList<Comment> ownedComments = namedElement.getOwnedComments(); 
+			EList<Comment> ownedComments = namedElement.getOwnedComments();
 			if (!ownedComments.isEmpty()) {
 				rectangle.setAttributeNS(null, ATTRIBUTE_TITLE, ownedComments.get(0).getBody());
 				Element title = svgG.getDocument().createElementNS(SVGDOMImplementation.SVG_NAMESPACE_URI, ATTRIBUTE_TITLE);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/svgextension/PapyrusDiagramSVGGenerator.java b/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/svgextension/PapyrusDiagramSVGGenerator.java
index a2b1064023b..53f55e4a4e9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/svgextension/PapyrusDiagramSVGGenerator.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/svgextension/PapyrusDiagramSVGGenerator.java
@@ -26,7 +26,7 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.geometry.Rectangle;
@@ -57,15 +57,17 @@ import org.w3c.dom.Element;
 public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
 
 	/** The annotations. */
-	private  List<AnnotateSVG> annotations = new ArrayList<>();	
-	
+	private List<AnnotateSVG> annotations = new ArrayList<>();
+
 	/**
 	 * Instantiates a new papyrus diagram SVG generator.
 	 *
-	 * @param diagramEditPart the diagram edit part
-	 * @param annotations the annotations
+	 * @param diagramEditPart
+	 *            the diagram edit part
+	 * @param annotations
+	 *            the annotations
 	 */
-	public PapyrusDiagramSVGGenerator(DiagramEditPart diagramEditPart, List<AnnotateSVG> annotations ) {
+	public PapyrusDiagramSVGGenerator(DiagramEditPart diagramEditPart, List<AnnotateSVG> annotations) {
 		super(diagramEditPart);
 		this.annotations = annotations;
 	}
@@ -116,11 +118,11 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
 			Activator.log(IStatus.INFO, "Start transformation from Graphics to image descriptor");
 
 			GraphicsSVG svgG = (GraphicsSVG) g;
-			svgRoot = svgG.getRoot();	
-			
+			svgRoot = svgG.getRoot();
+
 			//////// Papyrus Specific code //////////
 			List<PartPositionInfo> allPartPositionInfo = this.getDiagramPartInfo();
-			
+
 			Collections.reverse(allPartPositionInfo);// Required to have property after class
 			for (PartPositionInfo partPositionInfo : allPartPositionInfo) {
 				Element rectangle = svgG.getDocument().createElementNS(SVGDOMImplementation.SVG_NAMESPACE_URI, "rect");
@@ -128,27 +130,27 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
 					NamedElement nameElement = (NamedElement) partPositionInfo.getSemanticElement();
 					rectangle.setAttributeNS(null, "id", nameElement.getName());// useful for svg debug
 				}
-				
+
 				rectangle.setAttributeNS(null, "x", String.valueOf(partPositionInfo.getPartX()));
 				rectangle.setAttributeNS(null, "y", String.valueOf(partPositionInfo.getPartY()));
 				rectangle.setAttributeNS(null, "width", String.valueOf(partPositionInfo.getPartWidth()));
 				rectangle.setAttributeNS(null, "height", String.valueOf(partPositionInfo.getPartHeight()));
-				rectangle.setAttributeNS(null, "fill-opacity", "0"); //transparent
+				rectangle.setAttributeNS(null, "fill-opacity", "0"); // transparent
 				rectangle.setAttributeNS(null, "stroke-opacity", "0"); // no border
-				View view =  partPositionInfo.getView();
+				View view = partPositionInfo.getView();
 				if (view instanceof Shape) { // filter on shape only to avoid duplication
 
 					boolean hasAnnotation = applyAll(view, svgG, rectangle);
 					if (hasAnnotation) {
-						svgRoot.appendChild(rectangle);	
-					}					
+						svgRoot.appendChild(rectangle);
+					}
 				}
 
 			}
-			
+
 			/////////////////////////
-			
-			
+
+
 			ByteArrayOutputStream os = new ByteArrayOutputStream(5000); // 5K
 																		// buffer
 			stream(os);
@@ -157,22 +159,25 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
 			setRenderedImage(RenderedImageFactory.getInstance(os.toByteArray()));
 
 			return RenderedImageDescriptor
-				.createFromRenderedImage(getRenderedImage());
+					.createFromRenderedImage(getRenderedImage());
 		} catch (IOException ex) {
 			Log.error(DiagramUIRenderPlugin.getInstance(), IStatus.ERROR, ex
-				.getMessage(), ex);
+					.getMessage(), ex);
 		}
 
 		return null;
 	}
 
-	
+
 	/**
 	 * Apply all.
 	 *
-	 * @param view the view
-	 * @param svgG the svg G
-	 * @param rectangle the rectangle
+	 * @param view
+	 *            the view
+	 * @param svgG
+	 *            the svg G
+	 * @param rectangle
+	 *            the rectangle
 	 * @return true, if successful
 	 */
 	public boolean applyAll(View view, GraphicsSVG svgG, Element rectangle) {
@@ -181,14 +186,15 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
 			res = res || annotateSVG.addAnnotation(view, svgG, rectangle);
 		}
 		return true;
-	}	
-	
+	}
+
 	/**
 	 * Writes the SVG Model out to a file.
 	 * 
 	 * @param outputStream
 	 *            output stream to store the SVG Model
 	 */
+	@Override
 	public void stream(OutputStream outputStream) {
 		try {
 			// Define the view box
@@ -224,11 +230,12 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
 	 * @see org.eclipse.gmf.runtime.diagram.ui.internal.clipboard.DiagramGenerator#
 	 * createAWTImageForParts(java.util.List)
 	 */
+	@Override
 	public Image createAWTImageForParts(List editparts, org.eclipse.swt.graphics.Rectangle sourceRect) {
 		createSWTImageDescriptorForParts(editparts, sourceRect);
 		if (getRenderedImage() != null) {
 			try {
-				BufferedImage bufImg = (BufferedImage) getRenderedImage().getAdapter(BufferedImage.class);
+				BufferedImage bufImg = getRenderedImage().getAdapter(BufferedImage.class);
 				if (bufImg == null)
 					bufImg = ImageConverter.convert(getRenderedImage().getSWTImage());
 				return bufImg;
@@ -257,6 +264,7 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
 	 * @return Returns the rendered image created by previous call to
 	 *         createSWTImageDescriptorForParts
 	 */
+	@Override
 	public RenderedImage getRenderedImage() {
 		return renderedImage;
 	}
@@ -264,7 +272,8 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
 	/**
 	 * Sets the rendered image.
 	 *
-	 * @param renderedImage the new rendered image
+	 * @param renderedImage
+	 *            the new rendered image
 	 */
 	private void setRenderedImage(RenderedImage renderedImage) {
 		this.renderedImage = renderedImage;