Replace Batik with an internal hand-written CSS parser and drop SAC

bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF

@@ -8,7 +8,6 @@ Bundle-Version: 0.14.800.qualifier
 Export-Package: org.eclipse.e4.ui.css.core;x-internal:=true,
  org.eclipse.e4.ui.css.core.css2;x-friends:="org.eclipse.e4.ui.css.swt.theme,org.eclipse.e4.ui.css.swt,org.eclipse.e4.ui.css.jface",
  org.eclipse.e4.ui.css.core.dom;x-friends:="org.eclipse.e4.ui.css.swt,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.forms",
- org.eclipse.e4.ui.css.core.dom.parsers;x-internal:=true,
  org.eclipse.e4.ui.css.core.dom.properties;
   x-friends:="org.eclipse.e4.ui.css.swt,
    org.eclipse.ui.workbench,
@@ -28,20 +27,16 @@ Export-Package: org.eclipse.e4.ui.css.core;x-internal:=true,
    org.eclipse.ui.forms",
  org.eclipse.e4.ui.css.core.exceptions;x-friends:="org.eclipse.e4.ui.css.swt",
  org.eclipse.e4.ui.css.core.impl.dom;x-internal:=true,
- org.eclipse.e4.ui.css.core.impl.dom.parsers;x-internal:=true,
  org.eclipse.e4.ui.css.core.impl.dom.properties;x-friends:="org.eclipse.e4.ui.css.swt",
  org.eclipse.e4.ui.css.core.impl.engine;x-friends:="org.eclipse.e4.ui.css.swt,org.eclipse.e4.ui.workbench.swt",
  org.eclipse.e4.ui.css.core.impl.engine.selector;x-friends:="org.eclipse.e4.ui.tests.css.core",
- org.eclipse.e4.ui.css.core.impl.sac;x-internal:=true,
+ org.eclipse.e4.ui.css.core.impl.parser;x-friends:="org.eclipse.e4.ui.tests.css.core",
  org.eclipse.e4.ui.css.core.resources;x-friends:="org.eclipse.e4.ui.css.swt,org.eclipse.e4.ui.workbench.renderers.swt",
- org.eclipse.e4.ui.css.core.sac;x-internal:=true,
  org.eclipse.e4.ui.css.core.util.impl.resources;x-friends:="org.eclipse.e4.ui.css.swt.theme,org.eclipse.e4.ui.workbench.swt",
  org.eclipse.e4.ui.css.core.util.resources;x-friends:="org.eclipse.e4.ui.css.swt,org.eclipse.e4.ui.css.swt.theme,org.eclipse.e4.ui.workbench.swt",
  org.eclipse.e4.ui.css.core.utils;x-friends:="org.eclipse.e4.ui.css.swt"
-Import-Package: org.w3c.css.sac;version="1.3.0",
- org.w3c.css.sac.helpers;version="1.3.0"
-Require-Bundle: org.apache.batik.css;bundle-version="[1.9.1,2.0.0)",
- org.eclipse.equinox.common;bundle-version="[3.5.0,4.0.0)",
+Import-Package: org.w3c.css.sac;version="1.3.0"
+Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.e4.ui.css.core

bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/engine/CSSEngine.java

@@ -23,7 +23,6 @@
 import org.eclipse.e4.ui.css.core.impl.engine.selector.Selectors;
 import org.eclipse.e4.ui.css.core.resources.IResourcesRegistry;
 import org.eclipse.e4.ui.css.core.util.resources.IResourcesLocatorManager;
-import org.w3c.css.sac.InputSource;
 import org.w3c.dom.Element;
 import org.w3c.dom.css.CSSStyleDeclaration;
 import org.w3c.dom.css.CSSStyleSheet;
@@ -51,9 +50,10 @@ public interface CSSEngine {
 	StyleSheet parseStyleSheet(InputStream stream) throws IOException;
 
 	/**
-	 * Parse style sheet from InputSource source.
+	 * Parse style sheet from InputStream stream, using {@code uri} as the base
+	 * location for resolving relative {@code @import} rules.
 	 */
-	StyleSheet parseStyleSheet(InputSource source) throws IOException;
+	StyleSheet parseStyleSheet(InputStream stream, String uri) throws IOException;
 
 	/*--------------- Parse style declaration -----------------*/
 
@@ -72,11 +72,6 @@ public interface CSSEngine {
 	 */
 	CSSStyleDeclaration parseStyleDeclaration(InputStream stream) throws IOException;
 
-	/**
-	 * Parse style declaration from InputSource source.
-	 */
-	CSSStyleDeclaration parseStyleDeclaration(InputSource source) throws IOException;
-
 	/*--------------- Parse CSS Property Value-----------------*/
 
 	/**
@@ -94,23 +89,13 @@ public interface CSSEngine {
 	 */
 	CSSValue parsePropertyValue(Reader reader) throws IOException;
 
-	/**
-	 * Parse CSSValue from InputSource source.
-	 */
-	CSSValue parsePropertyValue(InputSource source) throws IOException;
-
 	/*--------------- Apply styles -----------------*/
 
 	/**
 	 * Parse Selectors from String value.
 	 */
 	Selectors.SelectorList parseSelectors(String text);
 
-	/**
-	 * Parse Selectors from InputSource value.
-	 */
-	Selectors.SelectorList parseSelectors(InputSource source) throws IOException;
-
 	/**
 	 * Parse Selectors from InputStream.
 	 */
@@ -162,11 +147,6 @@ public interface CSSEngine {
 	 */
 	CSSStyleDeclaration parseAndApplyStyleDeclaration(Object node, InputStream stream) throws IOException;
 
-	/**
-	 * Parse and apply style declaration from InputSource source.
-	 */
-	CSSStyleDeclaration parseAndApplyStyleDeclaration(Object node, InputSource sourcee) throws IOException;
-
 	/**
 	 * Parse and apply style declaration from String style.
 	 */

bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/AbstractCSSNode.java

@@ -15,8 +15,6 @@
 
 package org.eclipse.e4.ui.css.core.impl.dom;
 
-import org.eclipse.e4.ui.css.core.dom.parsers.CSSParser;
-
 /**
  * Abstract CSS Node.
  */
@@ -26,9 +24,4 @@ public AbstractCSSNode() {
 		super();
 	}
 
-	public CSSParser getCSSParser() {
-		//TODO not sure why this always returns null
-		return null;
-	}
-
 }

bundles/org.eclipse.e4.ui.css.core/src/org/eclipse/e4/ui/css/core/impl/dom/MediaListImpl.java

@@ -17,20 +17,15 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.w3c.css.sac.SACMediaList;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.stylesheets.MediaList;
 
 public class MediaListImpl implements MediaList {
 
 	private final List<String> mediaList;
 
-	public MediaListImpl(SACMediaList media) {
+	public MediaListImpl() {
 		mediaList = new ArrayList<>();
-		for (int i = 0; i < media.getLength(); i++) {
-			mediaList.add(media.item(i));
-		}
-
 	}
 
 	@Override