From aea9db22620bbc8b466b48ea7dd958bd004c91e4 Mon Sep 17 00:00:00 2001 From: Quentin Le Menez Date: Sun, 22 Apr 2018 11:47:54 +0200 Subject: Bug 533804 - [Diagram] Update batik dependencies for 1.9.1 - Update the targetplatforms to set the required dependency to 1.9.1 from the latest M6 Orbit repository - Rebase the platforms on the latest integration builds Change-Id: Ib57fb5c3b322fcd880ec4f7a7d1ba06b9bfea2a2 Signed-off-by: Quentin Le Menez --- .../common/service/shape/AbstractShapeProvider.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse') 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 555f65cfdd5..4a4af7a6634 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.dom.svg.SAXSVGDocumentFactory; +import org.apache.batik.anim.dom.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<>(); } - 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,7 +201,9 @@ 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) { @@ -216,6 +218,7 @@ 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. @@ -226,7 +229,7 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements */ protected synchronized SVGDocument getSVGDocument(String location) { if (cache == null) { - cache = new HashMap(); + cache = new HashMap<>(); } if (cache.containsKey(location)) { return cache.get(location); @@ -285,7 +288,7 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements Map resMap = relativePaths.get(model.eResource()); if (resMap == null) { - resMap = new HashMap(); + resMap = new HashMap<>(); relativePaths.put(model.eResource(), resMap); } String canonical = resMap.get(uri); -- cgit v1.2.3