Some warning cleanup

eclipse-mylyn · Jun 30, 2024 · 8afd29e · 8afd29e
1 parent cff4d7d
commit 8afd29e
Show file tree

Hide file tree

Showing 20 changed files with 38 additions and 25 deletions.
diff --git a/.../java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocDocumentBuilderTest.java b/.../java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocDocumentBuilderTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     Jeremie Bresson - copied from MarkdownDocumentBuilderTest and adapted to AsciiDoc
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.internal.wikitext.asciidoc.tests;
@@ -28,7 +29,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class AsciiDocDocumentBuilderTest {
 
 	private DocumentBuilder builder;

diff --git a/.../java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageSupportTest.java b/.../java/org/eclipse/mylyn/internal/wikitext/asciidoc/tests/AsciiDocLanguageSupportTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     Jeremie Bresson - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.internal.wikitext.asciidoc.tests;
@@ -28,7 +29,7 @@
 /**
  * Unit Tests for {@link LanguageSupport}
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class AsciiDocLanguageSupportTest extends AsciiDocLanguageTestBase {
 
 	@Test

diff --git a/...mmonmark.tests/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineTest.java b/...mmonmark.tests/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/LineTest.java
@@ -24,7 +24,7 @@
 import org.eclipse.mylyn.wikitext.parser.Locator;
 import org.junit.Test;
 
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class LineTest {
 
 	@Test(expected = NullPointerException.class)

diff --git a/...tests/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/SimpleLocatorTest.java b/...tests/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/SimpleLocatorTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     David Green - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.wikitext.commonmark.internal;
@@ -19,7 +20,7 @@
 import org.eclipse.mylyn.wikitext.parser.Locator;
 import org.junit.Test;
 
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class SimpleLocatorTest {
 
 	@Test

diff --git a/...ests/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineTest.java b/...ests/src/test/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     David Green - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.wikitext.commonmark.internal.inlines;
@@ -25,7 +26,7 @@
 import org.eclipse.mylyn.wikitext.parser.Locator;
 import org.junit.Test;
 
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class InlineTest {
 
 	@Test

diff --git a/...rk/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineParser.java b/...rk/src/main/java/org/eclipse/mylyn/wikitext/commonmark/internal/inlines/InlineParser.java
@@ -101,7 +101,7 @@ public void characters(String text) {
 			@Override
 			public void entityReference(String entity) {
 				stringBuilder
-				.append(Objects.requireNonNullElse(EntityReferences.instance().equivalentString(entity), ""));
+						.append(Objects.requireNonNullElse(EntityReferences.instance().equivalentString(entity), "")); //$NON-NLS-1$
 			}
 		};
 		for (Inline inline : contents) {

diff --git a/...a/org/eclipse/mylyn/wikitext/confluence/internal/tests/ConfluenceDocumentBuilderTest.java b/...a/org/eclipse/mylyn/wikitext/confluence/internal/tests/ConfluenceDocumentBuilderTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     David Green - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.wikitext.confluence.internal.tests;
@@ -31,7 +32,7 @@
  * @author David Green
  * @see ConfluenceDocumentBuilder
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class ConfluenceDocumentBuilderTest {
 
 	private final StringWriter out = new StringWriter();

diff --git a/...lyn/internal/wikitext/creole/tests/documentbuilder/AbstractCreoleDocumentBuilderTest.java b/...lyn/internal/wikitext/creole/tests/documentbuilder/AbstractCreoleDocumentBuilderTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     Kevin de Vlaming - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.internal.wikitext.creole.tests.documentbuilder;
@@ -25,7 +26,6 @@
 /**
  * @author Kevin de Vlaming
  */
-@SuppressWarnings("restriction")
 public abstract class AbstractCreoleDocumentBuilderTest {
 
 	protected DocumentBuilder builder;

diff --git a/.../mylyn/internal/wikitext/creole/tests/documentbuilder/CreoleDocumentBuilderBlockTest.java b/.../mylyn/internal/wikitext/creole/tests/documentbuilder/CreoleDocumentBuilderBlockTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     Kevin de Vlaming - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.internal.wikitext.creole.tests.documentbuilder;
@@ -25,7 +26,7 @@
  * @see http://www.wikicreole.org/wiki/Elements
  * @author Kevin de Vlaming
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class CreoleDocumentBuilderBlockTest extends AbstractCreoleDocumentBuilderTest {
 	@Test
 	public void testParagraph() {

diff --git a/...yn/internal/wikitext/creole/tests/documentbuilder/CreoleDocumentBuilderLinkImageTest.java b/...yn/internal/wikitext/creole/tests/documentbuilder/CreoleDocumentBuilderLinkImageTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     Kevin de Vlaming - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.internal.wikitext.creole.tests.documentbuilder;
@@ -25,7 +26,7 @@
  * @see http://www.wikicreole.org/wiki/Elements
  * @author Kevin de Vlaming
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class CreoleDocumentBuilderLinkImageTest extends AbstractCreoleDocumentBuilderTest {
 	@Test
 	public void testLink() {

diff --git a/...e/mylyn/internal/wikitext/creole/tests/documentbuilder/CreoleDocumentBuilderListTest.java b/...e/mylyn/internal/wikitext/creole/tests/documentbuilder/CreoleDocumentBuilderListTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     Kevin de Vlaming - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.internal.wikitext.creole.tests.documentbuilder;
@@ -25,7 +26,7 @@
  * @see http://www.wikicreole.org/wiki/Elements
  * @author Kevin de Vlaming
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class CreoleDocumentBuilderListTest extends AbstractCreoleDocumentBuilderTest {
 	@Test
 	public void testListBulleted() {

diff --git a/...e/mylyn/internal/wikitext/creole/tests/documentbuilder/CreoleDocumentBuilderSpanTest.java b/...e/mylyn/internal/wikitext/creole/tests/documentbuilder/CreoleDocumentBuilderSpanTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     Kevin de Vlaming - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.internal.wikitext.creole.tests.documentbuilder;
@@ -22,7 +23,7 @@
  * @see http://www.wikicreole.org/wiki/Elements
  * @author Kevin de Vlaming
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class CreoleDocumentBuilderSpanTest extends AbstractCreoleDocumentBuilderTest {
 	@Test
 	public void testItalic() {

diff --git a/.../mylyn/internal/wikitext/creole/tests/documentbuilder/CreoleDocumentBuilderTableTest.java b/.../mylyn/internal/wikitext/creole/tests/documentbuilder/CreoleDocumentBuilderTableTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     Kevin de Vlaming - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.internal.wikitext.creole.tests.documentbuilder;
@@ -26,7 +27,7 @@
  * @see http://www.wikicreole.org/wiki/Elements
  * @author Kevin de Vlaming
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class CreoleDocumentBuilderTableTest extends AbstractCreoleDocumentBuilderTest {
 	@Test
 	public void testTableWithEmptyCells() {

diff --git a/...lipse/mylyn/internal/wikitext/creole/tests/documentbuilder/CreoleDocumentBuilderTest.java b/...lipse/mylyn/internal/wikitext/creole/tests/documentbuilder/CreoleDocumentBuilderTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     Kevin de Vlaming - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.internal.wikitext.creole.tests.documentbuilder;
@@ -22,7 +23,7 @@
  * @see http://www.wikicreole.org/wiki/Elements
  * @author Kevin de Vlaming
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class CreoleDocumentBuilderTest extends AbstractCreoleDocumentBuilderTest {
 	@Test
 	public void testLineBreak() {

diff --git a/...tml.tests/src/test/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategiesTest.java b/...tml.tests/src/test/java/org/eclipse/mylyn/wikitext/html/internal/BlockStrategiesTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     David Green - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.wikitext.html.internal;
@@ -27,7 +28,6 @@
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.BlockType;
 import org.junit.Test;
 
-@SuppressWarnings("restriction")
 public class BlockStrategiesTest {
 
 	@Test(expected = NullPointerException.class)

diff --git a/...html.tests/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategiesTest.java b/...html.tests/src/test/java/org/eclipse/mylyn/wikitext/html/internal/SpanStrategiesTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     David Green - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.wikitext.html.internal;
@@ -26,7 +27,7 @@
 import org.eclipse.mylyn.wikitext.parser.DocumentBuilder.SpanType;
 import org.junit.Test;
 
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class SpanStrategiesTest {
 
 	@Test(expected = NullPointerException.class)

diff --git a/.../java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownDocumentBuilderTest.java b/.../java/org/eclipse/mylyn/internal/wikitext/markdown/tests/MarkdownDocumentBuilderTest.java
@@ -11,6 +11,7 @@
  *     Leo Dos Santos - initial API and implementation
  *     Pierre-Yves B. <pyvesdev@gmail.com> - Bug 509033 - markdown misses support for ~~strike~~
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.internal.wikitext.markdown.tests;
@@ -33,7 +34,7 @@
  * @see http://daringfireball.net/projects/markdown/syntax
  * @author Leo Dos Santos
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class MarkdownDocumentBuilderTest {
 
 	private DocumentBuilder builder;

diff --git a/....wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/tests/AttributesTest.java b/....wikitext.tests/src/test/java/org/eclipse/mylyn/wikitext/parser/tests/AttributesTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     David Green - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 
 package org.eclipse.mylyn.wikitext.parser.tests;
@@ -20,7 +21,7 @@
 import org.eclipse.mylyn.wikitext.parser.Attributes;
 import org.junit.Test;
 
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class AttributesTest {
 
 	@Test

diff --git a/...le.tests/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/tests/TextileTest.java b/...le.tests/src/test/java/org/eclipse/mylyn/wikitext/textile/internal/tests/TextileTest.java
@@ -10,6 +10,7 @@
  * Contributors:
  *     David Green - initial API and implementation
  *     ArSysOp - ongoing support
+ *     See git history
  *******************************************************************************/
 package org.eclipse.mylyn.wikitext.textile.internal.tests;
 
@@ -27,7 +28,7 @@
 /**
  * @author David Green
  */
-@SuppressWarnings({ "nls", "restriction" })
+@SuppressWarnings("nls")
 public class TextileTest {
 	@Test
 	public void testExplicitHeaderStartsNewBlock() {

diff --git a/...xt.tasks.ui/src/org/eclipse/mylyn/wikitext/tasks/ui/editor/MarkupTaskEditorExtension.java b/...xt.tasks.ui/src/org/eclipse/mylyn/wikitext/tasks/ui/editor/MarkupTaskEditorExtension.java
@@ -11,6 +11,7 @@
  *     David Green - initial API and implementation
  *     Frank Becker - improvements for bug 304910
  *     Tasktop Technologies - improvements
+ *     See git history
  *******************************************************************************/
 package org.eclipse.mylyn.wikitext.tasks.ui.editor;
 
@@ -74,7 +75,7 @@
  * @since 1.0
  */
 public class MarkupTaskEditorExtension<MarkupLanguageType extends MarkupLanguage> extends AbstractTaskEditorExtension
-		implements IAdaptable {
+implements IAdaptable {
 
 	private static final String MARKUP_SOURCE_CONTEXT_ID = "org.eclipse.mylyn.wikitext.tasks.ui.markupSourceContext"; //$NON-NLS-1$
 
@@ -147,8 +148,8 @@ public SourceViewer createViewer(TaskRepository taskRepository, Composite parent
 
 		if (JFaceResources.getFontRegistry().hasValueFor(WikiTextTasksUiPlugin.FONT_REGISTRY_KEY_DEFAULT_FONT)) {
 			markupViewer.getTextWidget()
-					.setFont(
-							JFaceResources.getFontRegistry().get(WikiTextTasksUiPlugin.FONT_REGISTRY_KEY_DEFAULT_FONT));
+			.setFont(
+					JFaceResources.getFontRegistry().get(WikiTextTasksUiPlugin.FONT_REGISTRY_KEY_DEFAULT_FONT));
 		}
 		if (JFaceResources.getFontRegistry().hasValueFor(WikiTextTasksUiPlugin.FONT_REGISTRY_KEY_MONOSPACE_FONT)) {
 			markupViewer.setDefaultMonospaceFont(
@@ -218,7 +219,6 @@ public SourceViewer createEditor(TaskRepository taskRepository, Composite parent
 		return createEditor(taskRepository, parent, style, null);
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public SourceViewer createEditor(TaskRepository taskRepository, Composite parent, int style, IAdaptable context) {
 		final MarkupLanguageType markupLanguageCopy = createRepositoryMarkupLanguage(taskRepository);
@@ -348,7 +348,6 @@ protected boolean isIncluded(Annotation annotation) {
 			};
 		}
 
-		@SuppressWarnings("unchecked")
 		@Override
 		protected Map<String, IAdaptable> getHyperlinkDetectorTargets(ISourceViewer sourceViewer) {
 			Map<String, IAdaptable> hyperlinkDetectorTargets = super.getHyperlinkDetectorTargets(sourceViewer);
@@ -400,7 +399,6 @@ public TaskMarkupViewerConfiguration(MarkupViewer viewer, TaskRepository taskRep
 			markupHyperlinksFirst = false;
 		}
 
-		@SuppressWarnings("unchecked")
 		@Override
 		protected Map<String, IAdaptable> getHyperlinkDetectorTargets(ISourceViewer sourceViewer) {
 			Map<String, IAdaptable> hyperlinkDetectorTargets = super.getHyperlinkDetectorTargets(sourceViewer);