diff options
author | Quentin Le Menez | 2018-04-21 21:11:59 +0000 |
---|---|---|
committer | Quentin Le Menez | 2018-04-21 21:13:17 +0000 |
commit | 583f3e40fbbd646a5e13b3db29bbba77fb9efb0a (patch) | |
tree | ae7e3bba49581abcd8358a0063c594ff8c8e4ee8 /plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse | |
parent | 0bdf62f7a9968d362c762f84a5a3e6da34f9f7a9 (diff) | |
download | org.eclipse.papyrus-583f3e40fbbd646a5e13b3db29bbba77fb9efb0a.tar.gz org.eclipse.papyrus-583f3e40fbbd646a5e13b3db29bbba77fb9efb0a.tar.xz org.eclipse.papyrus-583f3e40fbbd646a5e13b3db29bbba77fb9efb0a.zip |
Revert "Bug 533804 - [Diagram] Update batik dependencies for 1.9.1"
- a compilation error was introduced by this change, this needs to be reverted until resolved.
This reverts commit 0bdf62f7a9968d362c762f84a5a3e6da34f9f7a9.
Change-Id: Idfb6e8ebd7f04654e22bb017e61d3cd6ea36b65d
Diffstat (limited to 'plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse')
-rw-r--r-- | plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java | 17 |
1 files changed, 7 insertions, 10 deletions
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); |