Recover STARHACK, avoid deprecation warnings

Author: carlosame

ci/io/github/css4j/ci/SampleSitesIT.java

@@ -22,6 +22,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
@@ -214,6 +215,11 @@ public class SampleSitesIT {
 		}
 
 		// NSAC flags
+		s = config.getProperty("parser.starhack");
+		if ("true".equalsIgnoreCase(s)) {
+			parserFlags.add(Parser.Flag.STARHACK);
+			log.info("IE star hack allowed.");
+		}
 		s = config.getProperty("parser.ievalues");
 		if ("true".equalsIgnoreCase(s)) {
 			parserFlags.add(Parser.Flag.IEVALUES);
@@ -249,7 +255,7 @@ public class SampleSitesIT {
 
 	SiteErrorReporter reporter;
 
-	public SampleSitesIT(String uri) throws IOException {
+	public SampleSitesIT(String uri) throws URISyntaxException, IOException {
 		super();
 		agent = new MyDOMUserAgent();
 
@@ -260,7 +266,7 @@ public SampleSitesIT(String uri) throws IOException {
 		dom4jAgent = new MyDOM4JUserAgent();
 
 		log.info("Testing URL: " + uri);
-		URL url = new URL(uri);
+		URL url = new java.net.URI(uri).toURL();
 
 		if (errorReporterType == 0) {
 			reporter = new LogSiteErrorReporter();

ci/io/github/css4j/ci/TreeSiteErrorReporter.java

@@ -18,7 +18,6 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.channels.FileChannel;
 import java.nio.charset.StandardCharsets;
@@ -324,10 +323,10 @@ private void selectTargetSheet(StyleSheet sheet, int sheetIndex, boolean warn) {
 	private String getLinkedSheetInternalPath(StyleSheet sheet, String uri) {
 		String path;
 		try {
-			URL url = new URL(uri);
-			path = SampleSitesIT.encodeString(url.toExternalForm());
+			java.net.URI url = new java.net.URI(uri);
+			path = SampleSitesIT.encodeString(url.toString());
 			path = url.getHost() + '/' + path;
-		} catch (MalformedURLException e) {
+		} catch (Exception e) {
 			path = "-";
 		}
 		return path;

ci/io/github/css4j/ci/ValueComparator.java

@@ -11,9 +11,7 @@
 
 package io.github.css4j.ci;
 
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
+import java.net.URI;
 import java.util.Iterator;
 
 import org.w3c.dom.DOMException;
@@ -295,17 +293,13 @@ && similarAlphaValue(color.getAlpha(), otherColor.getAlpha())) {
 	private boolean isSameURI(CSSTypedValue pri, CSSTypedValue primini) {
 		String uri = pri.getStringValue();
 		String urimini = primini.getStringValue();
-		URL baseurl;
+		URI baseuri;
 		try {
-			baseurl = new URL(style.getParentRule().getParentStyleSheet().getHref());
-		} catch (MalformedURLException e) {
-			return uri.equals(urimini);
-		}
-		try {
-			URL url = new URL(baseurl, uri);
-			URL urlmini = new URL(baseurl, urimini);
-			return url.toURI().normalize().equals(urlmini.toURI().normalize());
-		} catch (MalformedURLException | URISyntaxException e) {
+			baseuri = new URI(style.getParentRule().getParentStyleSheet().getHref());
+			URI u = baseuri.resolve(uri);
+			URI umini = baseuri.resolve(urimini);
+			return u.normalize().equals(umini.normalize());
+		} catch (Exception e) {
 		}
 		return uri.equals(urimini);
 	}