diff options
| author | Pierre-Charles David | 2015-09-04 07:27:01 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2016-02-10 09:11:29 +0000 |
| commit | bb031978234dcdfb85512d67640b1e063870a9cb (patch) | |
| tree | 9d22140f48354500ae7004e1d9edcb0d80827487 | |
| parent | 3406ee32a1f643604bdcf998aee00a16f2690fda (diff) | |
| download | org.eclipse.sirius-bb031978234dcdfb85512d67640b1e063870a9cb.tar.gz org.eclipse.sirius-bb031978234dcdfb85512d67640b1e063870a9cb.tar.xz org.eclipse.sirius-bb031978234dcdfb85512d67640b1e063870a9cb.zip | |
[442268] Remove some dead code
Bug: 442268
Change-Id: Iea8b9387e142ae923af6ab0ed0cd2903a9e85c18
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
2 files changed, 0 insertions, 50 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGFigure.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGFigure.java index be255b9891..756d1434b3 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGFigure.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGFigure.java @@ -24,7 +24,6 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.apache.batik.bridge.BridgeContext; import org.apache.batik.dom.svg.SAXSVGDocumentFactory; import org.apache.batik.util.XMLResourceDescriptor; import org.eclipse.draw2d.Figure; @@ -33,17 +32,14 @@ import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.sirius.diagram.DiagramPlugin; import org.eclipse.sirius.diagram.ui.provider.Messages; import org.eclipse.sirius.diagram.ui.tools.internal.figure.svg.InferringNamespaceContext; -import org.eclipse.sirius.diagram.ui.tools.internal.figure.svg.SVGUtils; import org.eclipse.sirius.diagram.ui.tools.internal.figure.svg.SimpleImageTranscoder; import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Device; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.PaletteData; import org.eclipse.swt.widgets.Display; import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.w3c.dom.NodeList; //CHECKSTYLE:OFF @@ -173,26 +169,6 @@ public class SVGFigure extends Figure { return null; } - /** - * Reads color value from the document. - */ - protected Color getColor(Element element, String attributeName) { - if (getDocument() == null || getDocument() != element.getOwnerDocument()) { - return null; - } - Color color = null; - // Make sure that CSSEngine is available. - BridgeContext ctx = transcoder.initCSSEngine(); - try { - color = SVGUtils.toSWTColor(element, attributeName); - } finally { - if (ctx != null) { - ctx.dispose(); - } - } - return color; - } - @Override protected void paintFigure(Graphics graphics) { super.paintFigure(graphics); diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/svg/SimpleImageTranscoder.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/svg/SimpleImageTranscoder.java index 3f7c182738..9e20ddd66e 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/svg/SimpleImageTranscoder.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/figure/svg/SimpleImageTranscoder.java @@ -17,8 +17,6 @@ import java.awt.Shape; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; -import org.apache.batik.bridge.BridgeContext; -import org.apache.batik.dom.svg.SVGOMDocument; import org.apache.batik.gvt.renderer.ImageRenderer; import org.apache.batik.gvt.renderer.StaticRenderer; import org.apache.batik.transcoder.SVGAbstractTranscoder; @@ -99,30 +97,6 @@ public class SimpleImageTranscoder extends SVGAbstractTranscoder { contentChanged(); } - /** - * Call before querying for CSS properties. If document has CSS engine - * installed returns null. Client is responsible to dispose bridge context - * if it was returned by this method. - */ - public BridgeContext initCSSEngine() { - if (this.document == null) { - return null; - } - SVGOMDocument sd = (SVGOMDocument) this.document; - if (sd.getCSSEngine() != null) { - return null; - } - class BridgeContextEx extends BridgeContext { - - public BridgeContextEx() { - super(SimpleImageTranscoder.this.userAgent); - BridgeContextEx.this.setDocument(SimpleImageTranscoder.this.document); - BridgeContextEx.this.initializeDocument(SimpleImageTranscoder.this.document); - } - } - return new BridgeContextEx(); - } - public void contentChanged() { bufferedImage = null; } |
