refact: minor cleanup

eclipse-tm4e · Dec 18, 2024 · f2853fd · f2853fd
1 parent 049e761
commit f2853fd
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 51 deletions.
diff --git a/org.eclipse.tm4e.core.tests/about.html b/org.eclipse.tm4e.core.tests/about.html
@@ -1,9 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+<meta charset="ISO-8859-1">
 <title>About</title>
 </head>
-<body lang="EN-US">
+<body>
 	<h2>About This Content</h2>
 
 	<p>November 30, 2017</p>

diff --git a/org.eclipse.tm4e.core/about.html b/org.eclipse.tm4e.core/about.html
@@ -1,8 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html lang="en-US">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta charset="ISO-8859-1">
 <title>About</title>
 </head>
 <body lang="EN-US">

diff --git a/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/css/CSSColors.java b/org.eclipse.tm4e.core/src/main/java/org/eclipse/tm4e/core/internal/theme/css/CSSColors.java
@@ -18,7 +18,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tm4e.core.theme.RGB;
 
-public class CSSColors {
+public final class CSSColors {
 	private static final Map<String, RGB> NAMED_COLORS = new HashMap<>();
 	static {
 		NAMED_COLORS.put("aliceblue", new RGB(240, 248, 255));
@@ -176,4 +176,7 @@ public class CSSColors {
 	public static @Nullable RGB getByName(final String name) {
 		return NAMED_COLORS.get(name);
 	}
+
+	private CSSColors() {
+	}
 }
diff --git a/...ipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/internal/oniguruma/OnigRegExpTest.java b/...ipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/internal/oniguruma/OnigRegExpTest.java
@@ -43,7 +43,7 @@ private void assertOnigRegExpSearch(final String pattern, final String input, fi
 	}
 
 	@Test
-	void testOnigRegExp() throws Exception {
+	void testOnigRegExp() {
 		assertOnigRegExpSearch(
 				"\\G(MAKEFILES|VPATH|SHELL|MAKESHELL|MAKE|MAKELEVEL|MAKEFLAGS|MAKECMDGOALS|CURDIR|SUFFIXES|\\.LIBPATTERNS)(?=\\s*\\))",
 				"ifeq (version,$(firstword $(MAKECMDGOALS))\n",

diff --git a/org.eclipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/internal/parser/TMParserTest.java b/org.eclipse.tm4e.core/src/test/java/org/eclipse/tm4e/core/internal/parser/TMParserTest.java
@@ -57,7 +57,7 @@ private void validateCaptures(final RawGrammar grammar) {
 	}
 
 	@Test
-	void testParseCapturesJSON() throws Exception {
+	void testParseCapturesJSON() {
 		// test capture defined as JSON map
 		validateCaptures(TMParserJSON.INSTANCE.parse(new StringReader("""
 			{"patterns": [{
@@ -136,7 +136,7 @@ void testParseCapturesPList() throws Exception {
 	}
 
 	@Test
-	void testParseCapturesYAML() throws Exception {
+	void testParseCapturesYAML() {
 		// test capture defined as YAML map
 		validateCaptures(TMParserYAML.INSTANCE.parse(new StringReader("""
 			---

diff --git a/org.eclipse.tm4e.language_pack/about.html b/org.eclipse.tm4e.language_pack/about.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en-US">
 <head>
 <meta charset="UTF-8">
 <title>About</title>
@@ -16,7 +16,6 @@
 }
 </style>
 </head>
-</head>
 <body>
 
 <h2>About This Content</h2>

diff --git a/org.eclipse.tm4e.languageconfiguration/about.html b/org.eclipse.tm4e.languageconfiguration/about.html
@@ -1,9 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+<meta charset="ISO-8859-1">
 <title>About</title>
 </head>
-<body lang="EN-US">
+<body>
 	<h2>About This Content</h2>
 
 	<p>November 30, 2017</p>

diff --git a/...se/tm4e/languageconfiguration/internal/wizards/SelectLanguageConfigurationWizardPage.java b/...se/tm4e/languageconfiguration/internal/wizards/SelectLanguageConfigurationWizardPage.java
@@ -263,7 +263,7 @@ private Text createText(final Composite parent, final String s) {
 		infoWidget.refresh(null);
 
 		final String path = fileText.getText();
-		if (path.length() == 0) {
+		if (path.isEmpty()) {
 			return new Status(IStatus.ERROR, LanguageConfigurationPlugin.PLUGIN_ID,
 					SelectLanguageConfigurationWizardPage_fileError_noSelection);
 		}

diff --git a/...tion/src/test/java/org/eclipse/tm4e/languageconfiguration/internal/model/ParsingTest.java b/...tion/src/test/java/org/eclipse/tm4e/languageconfiguration/internal/model/ParsingTest.java
@@ -36,7 +36,7 @@ class ParsingTest {
 	}
 
 	@Test
-	void testOniguramaFallback() throws Exception {
+	void testOniguramaFallback() {
 		final var languageConfiguration = LanguageConfiguration.load(new StringReader("""
 			{
 			  "onEnterRules": [{
@@ -117,7 +117,7 @@ public FileVisitResult visitFile(final Path file, final @Nullable BasicFileAttri
 	}
 
 	@Test
-	void testParseColorizedBracketsPair() throws Exception {
+	void testParseColorizedBracketsPair() {
 		final var languageConfiguration = LanguageConfiguration.load(new StringReader("""
 			{
 				"colorizedBracketPairs": [
@@ -135,7 +135,7 @@ void testParseColorizedBracketsPair() throws Exception {
 	}
 
 	@Test
-	void testIndentationRules() throws Exception {
+	void testIndentationRules() {
 		final var languageConfiguration = LanguageConfiguration.load(new StringReader("""
 			{
 				"indentationRules": {

diff --git a/org.eclipse.tm4e.markdown/about.html b/org.eclipse.tm4e.markdown/about.html
@@ -1,11 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html lang="en-US">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta charset="ISO-8859-1">
 <title>About</title>
 </head>
-<body lang="EN-US">
+<body>
 	<h2>About This Content</h2>
 
 	<p>

diff --git a/org.eclipse.tm4e.registry/about.html b/org.eclipse.tm4e.registry/about.html
@@ -1,9 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+<meta charset="ISO-8859-1">
 <title>About</title>
 </head>
-<body lang="EN-US">
+<body>
 	<h2>About This Content</h2>
 
 	<p>November 30, 2017</p>

diff --git a/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/internal/TMScope.java b/org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/internal/TMScope.java
@@ -54,8 +54,7 @@ public boolean equals(final @Nullable Object obj) {
 		if (this == obj)
 			return true;
 		return obj instanceof TMScope other
-				? qualifiedName.equals(other.qualifiedName)
-				: false;
+				&& qualifiedName.equals(other.qualifiedName);
 	}
 
 	@Override

diff --git a/org.eclipse.tm4e.samples/about.html b/org.eclipse.tm4e.samples/about.html
@@ -1,11 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html lang="en-US">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta charset="ISO-8859-1">
 <title>About</title>
 </head>
-<body lang="EN-US">
+<body>
 	<h2>About This Content</h2>
 
 	<p>

diff --git a/org.eclipse.tm4e.ui.tests/about.html b/org.eclipse.tm4e.ui.tests/about.html
@@ -1,11 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html lang="en-US">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta charset="ISO-8859-1">
 <title>About</title>
 </head>
-<body lang="EN-US">
+<body>
 	<h2>About This Content</h2>
 
 	<p>

diff --git a/org.eclipse.tm4e.ui.tests/src/main/java/org/eclipse/tm4e/ui/tests/TMinGenericEditorTest.java b/org.eclipse.tm4e.ui.tests/src/main/java/org/eclipse/tm4e/ui/tests/TMinGenericEditorTest.java
@@ -14,15 +14,13 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.FileOutputStream;
-import java.io.IOException;
 
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.tm4e.ui.internal.utils.UI;
 import org.eclipse.tm4e.ui.tests.support.TestUtils;
 import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.ide.IDE;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -48,7 +46,7 @@ public void tearDown() throws Exception {
 	}
 
 	@Test
-	void testTMHighlightInGenericEditor() throws IOException, PartInitException {
+	void testTMHighlightInGenericEditor() throws Exception {
 		final var f = TestUtils.createTempFile(".ts");
 		try (var fileOutputStream = new FileOutputStream(f)) {
 			fileOutputStream.write("let a = '';\nlet b = 10;\nlet c = true;".getBytes());
@@ -60,7 +58,7 @@ void testTMHighlightInGenericEditor() throws IOException, PartInitException {
 	}
 
 	@Test
-	void testTMHighlightInGenericEditorEdit() throws IOException, PartInitException {
+	void testTMHighlightInGenericEditorEdit() throws Exception {
 		final var f = TestUtils.createTempFile(".ts");
 		try (var fileOutputStream = new FileOutputStream(f)) {
 			fileOutputStream.write("let a = '';".getBytes());

diff --git a/org.eclipse.tm4e.ui/about.html b/org.eclipse.tm4e.ui/about.html
@@ -1,9 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+<meta charset="ISO-8859-1">
 <title>About</title>
 </head>
-<body lang="EN-US">
+<body>
 	<h2>About This Content</h2>
 
 	<p>November 30, 2017</p>