Skip to content

Commit ce9ffcd

Browse files
HannesWellHannesWell
committed
[FIXUP] Reference jsvg as dependency instead of embedding its jar
and a few more clean-ups and adjustments
1 parent 23e1257 commit ce9ffcd

File tree

9 files changed

+49
-21
lines changed

9 files changed

+49
-21
lines changed

‎bundles/org.eclipse.swt.svg.tests/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="JUnit Tests">
66
<attributes>

‎bundles/org.eclipse.swt.svg.tests/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
eclipse.preferences.version=1
2-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
3-
org.eclipse.jdt.core.compiler.compliance=21
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
3+
org.eclipse.jdt.core.compiler.compliance=17
44
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
55
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
77
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
88
org.eclipse.jdt.core.compiler.release=enabled
9-
org.eclipse.jdt.core.compiler.source=21
9+
org.eclipse.jdt.core.compiler.source=17

‎bundles/org.eclipse.swt.svg.tests/JUnit Tests/org/eclipse/swt/svg/tests/junit/Test_org_eclipse_swt_internal_SVGRasterizer.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
*
88
* SPDX-License-Identifier: EPL-2.0
99
*
10-
* Contributors: Michael Bangas (Vector Informatik GmbH) - initial API and implementation
10+
* Contributors:
11+
* Michael Bangas (Vector Informatik GmbH) - initial API and implementation
1112
*******************************************************************************/
1213
package org.eclipse.swt.svg.tests.junit;
1314

@@ -16,6 +17,7 @@
1617

1718
import java.io.File;
1819
import java.nio.file.Path;
20+
1921
import org.eclipse.swt.SWT;
2022
import org.eclipse.swt.SWTException;
2123
import org.eclipse.swt.graphics.Image;

‎bundles/org.eclipse.swt.svg.tests/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
3-
Bundle-Name: Tests
3+
Bundle-Name: SWT SVG Support Tests
44
Bundle-SymbolicName: org.eclipse.swt.svg.tests
55
Bundle-Version: 1.0.0.qualifier
66
Require-Bundle: org.eclipse.swt,
@@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.swt,
1010
org.eclipse.core.runtime
1111
Automatic-Module-Name: org.eclipse.swt.svg.tests
1212
Bundle-ClassPath: .
13-
Bundle-RequiredExecutionEnvironment: JavaSE-21
13+
Bundle-RequiredExecutionEnvironment: JavaSE-17

‎bundles/org.eclipse.swt.svg/.classpath‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
6-
<classpathentry kind="lib" path="libs/jsvg-1.6.1.jar"/>
76
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.win32.win32.x86_64"/>
87
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.win32.win32.aarch64"/>
98
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.gtk.linux.x86_64"/>

‎bundles/org.eclipse.swt.svg/META-INF/MANIFEST.MF‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
3-
Bundle-Name: SvgPlugin
3+
Bundle-Name: SWT SVG Rendering Support
44
Bundle-SymbolicName: org.eclipse.swt.svg
55
Bundle-Version: 1.0.0.qualifier
66
Automatic-Module-Name: org.eclipse.swt.svgPlugin
77
Bundle-RequiredExecutionEnvironment: JavaSE-17
88
Fragment-Host: org.eclipse.swt
9+
Import-Package: com.github.weisj.jsvg;version="[1.7.0,2.0.0)",
10+
com.github.weisj.jsvg.geometry.size;version="[1.7.0,2.0.0)",
11+
com.github.weisj.jsvg.parser;version="[1.7.0,2.0.0)"
912
Export-Package: org.eclipse.swt.svg
10-
Bundle-ClassPath: ., libs/jsvg-1.6.1.jar

‎bundles/org.eclipse.swt.svg/build.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
source.. = src/
22
output.. = bin/
33
bin.includes = META-INF/,\
4-
.,\
5-
libs/jsvg-1.6.1.jar
4+
.

‎bundles/org.eclipse.swt.svg/libs/jsvg-1.6.1.jar‎

-575 KB
Binary file not shown.

‎bundles/org.eclipse.swt.svg/src/org/eclipse/swt/svg/JSVGRasterizer.java‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,51 @@
77
*
88
* SPDX-License-Identifier: EPL-2.0
99
*
10-
* Contributors: Michael Bangas (Vector Informatik GmbH) - initial API and implementation
10+
* Contributors:
11+
* Michael Bangas (Vector Informatik GmbH) - initial API and implementation
1112
*******************************************************************************/
1213
package org.eclipse.swt.svg;
1314

14-
import static java.awt.RenderingHints.*;
15+
import static java.awt.RenderingHints.KEY_ALPHA_INTERPOLATION;
16+
import static java.awt.RenderingHints.KEY_ANTIALIASING;
17+
import static java.awt.RenderingHints.KEY_COLOR_RENDERING;
18+
import static java.awt.RenderingHints.KEY_DITHERING;
19+
import static java.awt.RenderingHints.KEY_FRACTIONALMETRICS;
20+
import static java.awt.RenderingHints.KEY_INTERPOLATION;
21+
import static java.awt.RenderingHints.KEY_RENDERING;
22+
import static java.awt.RenderingHints.KEY_STROKE_CONTROL;
23+
import static java.awt.RenderingHints.KEY_TEXT_ANTIALIASING;
24+
import static java.awt.RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY;
25+
import static java.awt.RenderingHints.VALUE_ANTIALIAS_ON;
26+
import static java.awt.RenderingHints.VALUE_COLOR_RENDER_QUALITY;
27+
import static java.awt.RenderingHints.VALUE_DITHER_DISABLE;
28+
import static java.awt.RenderingHints.VALUE_FRACTIONALMETRICS_ON;
29+
import static java.awt.RenderingHints.VALUE_INTERPOLATION_BICUBIC;
30+
import static java.awt.RenderingHints.VALUE_RENDER_QUALITY;
31+
import static java.awt.RenderingHints.VALUE_STROKE_PURE;
32+
import static java.awt.RenderingHints.VALUE_TEXT_ANTIALIAS_ON;
1533

16-
import java.awt.*;
17-
import java.awt.image.*;
18-
import java.io.*;
19-
import java.util.*;
34+
import java.awt.Graphics2D;
35+
import java.awt.RenderingHints.Key;
36+
import java.awt.image.BufferedImage;
37+
import java.awt.image.ComponentColorModel;
38+
import java.awt.image.DirectColorModel;
39+
import java.awt.image.IndexColorModel;
40+
import java.awt.image.WritableRaster;
41+
import java.io.IOException;
42+
import java.io.InputStream;
43+
import java.util.Map;
2044

2145
import org.eclipse.swt.SWT;
2246
import org.eclipse.swt.graphics.ImageData;
2347
import org.eclipse.swt.graphics.PaletteData;
2448
import org.eclipse.swt.graphics.RGB;
2549
import org.eclipse.swt.internal.SVGRasterizer;
26-
import com.github.weisj.jsvg.*;
27-
import com.github.weisj.jsvg.geometry.size.*;
28-
import com.github.weisj.jsvg.parser.*;
50+
51+
import com.github.weisj.jsvg.SVGDocument;
52+
import com.github.weisj.jsvg.geometry.size.FloatSize;
53+
import com.github.weisj.jsvg.parser.LoaderContext;
54+
import com.github.weisj.jsvg.parser.SVGLoader;
2955

3056
/**
3157
* A rasterizer implementation for converting SVG data into rasterized images.

0 commit comments

Comments
 (0)