Perform clean code of ua/org.eclipse.ua.tests

eclipse-platform-bot · HeikoKlare · commit 6551632e5103 · 2025-06-14T17:36:25.000+02:00
diff --git a/ua/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/util/CheatSheetModelSerializer.java b/ua/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/util/CheatSheetModelSerializer.java
@@ -147,22 +147,19 @@ public static String serialize(AbstractSubItem subItem, String indent) {
 			buf.append(indent + "<nullSubItem/>\n");
 		}
 		else {
-			if (subItem instanceof ConditionalSubItem) {
-				ConditionalSubItem c = (ConditionalSubItem)subItem;
+			if (subItem instanceof ConditionalSubItem c) {
 				buf.append(indent + "<conditionalSubItem\n");
 				buf.append(indent + "      condition=\"" + c.getCondition() + "\">\n");
 				buf.append(serialize(c.getSubItems(), indent + "   "));
 				buf.append(indent + "</conditionalSubItem>\n");
 			}
-			else if (subItem instanceof RepeatedSubItem) {
-				RepeatedSubItem r = (RepeatedSubItem)subItem;
+			else if (subItem instanceof RepeatedSubItem r) {
 				buf.append(indent + "<repeatedSubItem\n");
 				buf.append(indent + "      values=\"" + r.getValues() + "\">\n");
 				buf.append(serialize(r.getSubItems(), indent + "   "));
 				buf.append(indent + "</repeatedSubItem>\n");
 			}
-			else if (subItem instanceof SubItem) {
-				SubItem s = (SubItem)subItem;
+			else if (subItem instanceof SubItem s) {
 				buf.append(indent + "<subItem\n");
 				buf.append(indent + "      label=\"" + s.getLabel() + "\"\n");
 				buf.append(indent + "      when=\"" + s.getWhen() + "\"\n");
diff --git a/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ResourceTest.java b/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/other/ResourceTest.java
@@ -53,8 +53,7 @@ private void checkFields(Class<?> messages) throws IllegalAccessException {
 			int modifiers = field.getModifiers();
 			if (Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers)) {
 				Object value = field.get(null);
-				if (value instanceof String) {
-					String stringValue = (String)value;
+				if (value instanceof String stringValue) {
 					if (stringValue.startsWith("NLS missing message")) {
 						fail("Missing resource for " + field.getName());
 					}
diff --git a/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/IndexServletTest.java b/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/IndexServletTest.java
@@ -125,8 +125,7 @@ private Element[] findEntryInAllContributions(Node parent, String keyword) {
 		List<Node> results = new ArrayList<>();
 		for (int i = 0; i < contributions.getLength(); i++) {
 			Node next = contributions.item(i);
-			if (next instanceof Element)  {
-				Element nextElement = (Element)next;
+			if (next instanceof Element nextElement)  {
 				if ("indexContribution".equals(nextElement.getTagName())) {
 					findEntryInIndexContribution(nextElement, keyword, results);
 				}
@@ -140,8 +139,7 @@ private void findEntryInIndexContribution(Element parent, String keyword,
 		NodeList indexes = parent.getChildNodes();
 		for (int i = 0; i < indexes.getLength(); i++) {
 			Node next = indexes.item(i);
-			if (next instanceof Element) {
-				Element nextElement = (Element) next;
+			if (next instanceof Element nextElement) {
 				if ("index".equals(nextElement.getTagName())) {
 					findMatchingChildEntry(nextElement, keyword, results);
 				}
@@ -154,8 +152,7 @@ private void findMatchingChildEntry(Element parent, String keyword,
 		NodeList topLevelEntries = parent.getChildNodes();
 		for (int i = 0; i < topLevelEntries.getLength(); i++) {
 			Node next = topLevelEntries.item(i);
-			if (next instanceof Element) {
-				Element nextElement = (Element) next;
+			if (next instanceof Element nextElement) {
 				if ("entry".equals(nextElement.getTagName())
 						&& keyword.equals(nextElement
 								.getAttribute("keyword"))) {
diff --git a/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TocManagerTest.java b/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TocManagerTest.java
@@ -73,11 +73,13 @@ public void testLocalProviderPriority() throws Exception {
 		HelpPlugin.getTocManager().clearCache();
 		AbstractTocProvider [] tocProviders = HelpPlugin.getTocManager().getTocProviders();
 		for (AbstractTocProvider tocProvider : tocProviders) {
-			if(tocProvider instanceof TocFileProvider)
+			if(tocProvider instanceof TocFileProvider) {
 				localPriority = tocProvider.getPriority();
+			}
 
-			if(tocProvider instanceof RemoteTocProvider)
+			if(tocProvider instanceof RemoteTocProvider) {
 				remotePriority = tocProvider.getPriority();
+			}
 		}
 
 		assertTrue(localPriority<remotePriority);
@@ -93,11 +95,13 @@ public void testRemoteProviderPriority() throws Exception {
 
 		AbstractTocProvider [] tocProviders = HelpPlugin.getTocManager().getTocProviders();
 		for (AbstractTocProvider tocProvider : tocProviders) {
-			if(tocProvider instanceof TocFileProvider)
+			if(tocProvider instanceof TocFileProvider) {
 				localPriority = tocProvider.getPriority();
+			}
 
-			if(tocProvider instanceof RemoteTocProvider)
+			if(tocProvider instanceof RemoteTocProvider) {
 				remotePriority = tocProvider.getPriority();
+			}
 		}
 
 		assertTrue(remotePriority<localPriority);
@@ -108,10 +112,11 @@ public static boolean hasDuplicateContributions(TocContribution[] tocContributio
 		HashSet<String> contributionsFound = new HashSet<>();
 
 		for (TocContribution tocContribution : tocContributions) {
-			if(contributionsFound.contains(tocContribution.getId()))
+			if(contributionsFound.contains(tocContribution.getId())) {
 				return true;
-			else
+			} else {
 				contributionsFound.add(tocContribution.getId());
+			}
 		}
 
 		return false;
diff --git a/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TocServletTest.java b/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/TocServletTest.java
@@ -110,8 +110,7 @@ private Element[] findChildren(Node parent, String childKind, String attributeNa
 		List<Node> results = new ArrayList<>();
 		for (int i = 0; i < contributions.getLength(); i++) {
 			Node next = contributions.item(i);
-			if (next instanceof Element) {
-				Element nextElement = (Element)next;
+			if (next instanceof Element nextElement) {
 				if ( childKind.equals(nextElement.getTagName()) && attributeValue.equals(nextElement.getAttribute(attributeName))) {
 
 					results.add(next);
diff --git a/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/WrappedSearchProcessor.java b/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/search/WrappedSearchProcessor.java
@@ -32,34 +32,40 @@ private static boolean isNotSearchProcessorTest(String query) {
 
 	@Override
 	public SearchProcessorInfo preSearch(String query) {
-		if (isNotSearchProcessorTest(query))
+		if (isNotSearchProcessorTest(query)) {
 			return null;
+		}
 		synchronized (WrappedSearchProcessor.class) {
-			if (isNotSearchProcessorTest(query))
+			if (isNotSearchProcessorTest(query)) {
 				return null;
+			}
 			return wrapped.preSearch(query);
 		}
 	}
 
 	@Override
 	public ISearchResult[] postSearch(String query, ISearchResult[] results) {
-		if (wrapped == null)
+		if (wrapped == null) {
 			return null;
+		}
 		synchronized (WrappedSearchProcessor.class) {
-			if (wrapped == null)
+			if (wrapped == null) {
 				return null;
+			}
 			return wrapped.postSearch(query, results);
 		}
 	}
 
 	@Override
 	public ISearchResult[] postSearch(String query, String originalQuery, ISearchResult[] results, String locale,
 			IHelpResource[] scopes) {
-		if (isNotSearchProcessorTest(originalQuery))
+		if (isNotSearchProcessorTest(originalQuery)) {
 			return null;
+		}
 		synchronized (WrappedSearchProcessor.class) {
-			if (isNotSearchProcessorTest(originalQuery))
+			if (isNotSearchProcessorTest(originalQuery)) {
 				return null;
+			}
 			return wrapped.postSearch(query, originalQuery, results, locale, scopes);
 		}
 	}
diff --git a/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ExtensionServiceTest.java b/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/ExtensionServiceTest.java
@@ -127,8 +127,7 @@ private Element[] findChildren(Node parent, String childKind,
 		List<Node> results = new ArrayList<>();
 		for (int i = 0; i < contributions.getLength(); i++) {
 			Node next = contributions.item(i);
-			if (next instanceof Element) {
-				Element nextElement = (Element)next;
+			if (next instanceof Element nextElement) {
 				if ( childKind.equals(nextElement.getTagName()) && attributeValue.equals(nextElement.getAttribute(attributeName))) {
 
 					results.add(next);
diff --git a/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/SchemaValidator.java b/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/SchemaValidator.java
@@ -31,10 +31,11 @@ public static String testXMLSchema(String uri, String schemaFile) {
 		try {
 			SchemaFactory factory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema"); //$NON-NLS-1$
 			Schema schema = null;
-			if (schemaFile.startsWith("http") || schemaFile.startsWith("ftp"))
+			if (schemaFile.startsWith("http") || schemaFile.startsWith("ftp")) {
 				schema = factory.newSchema(new URL(schemaFile));
-			else
+			} else {
 				schema = factory.newSchema(new File(schemaFile));
+			}
 
 			Validator validator = schema.newValidator();
 			Source source = new StreamSource(uri);
diff --git a/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/TocFragmentServiceTest.java b/ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/TocFragmentServiceTest.java
@@ -154,8 +154,7 @@ private Element[] findChildren(Node parent, String childKind,
 		List<Node> results = new ArrayList<>();
 		for (int i = 0; i < nodes.getLength(); i++) {
 			Node next = nodes.item(i);
-			if (next instanceof Element) {
-				Element nextElement = (Element)next;
+			if (next instanceof Element nextElement) {
 				if ( childKind.equals(nextElement.getTagName())
 						&& attributeValue.equals(nextElement.getAttribute(attributeName))) {
 
@@ -175,8 +174,7 @@ private Element[] findHref(Node parent, String childKind,
 		List<Node> results = new ArrayList<>();
 		for (int i = 0; i < nodes.getLength(); i++) {
 			Node next = nodes.item(i);
-			if (next instanceof Element) {
-				Element nextElement = (Element)next;
+			if (next instanceof Element nextElement) {
 				if ( childKind.equals(nextElement.getTagName()) ) {
 					String href = nextElement.getAttribute("href");
 					if (href != null) {
diff --git a/ua/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/anchors/ExtensionReorderingTest.java b/ua/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/anchors/ExtensionReorderingTest.java
@@ -162,8 +162,9 @@ protected IConfigurationElement[] getConfigurationsFromAttribute(
 			String currentAttributeValue = configElement
 				.getAttribute(attributeName);
 			if (currentAttributeValue != null
-					&& currentAttributeValue.equals(attributeValue))
+					&& currentAttributeValue.equals(attributeValue)) {
 				elements.add(configElement);
+			}
 		}
 
 		// now return array.
diff --git a/ua/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializer.java b/ua/org.eclipse.ua.tests/intro/org/eclipse/ua/tests/intro/util/IntroModelSerializer.java
@@ -76,8 +76,9 @@ private void printModelRootInfo(IntroModelRoot model, StringBuilder text) {
 		text.append("\nHome page id = " //$NON-NLS-1$
 				+ model.getPresentation().getHomePageId());
 		IntroHead headContent = model.getPresentation().getHead();
-		if (headContent != null)
+		if (headContent != null) {
 			text.append("\nPresentation Shared Head = " + headContent.getSrc()); //$NON-NLS-1$
+		}
 		text.append("\nNumber of pages (not including Root Page) = " //$NON-NLS-1$
 				+ model.getPages().length);
 		text.append("\nNumber of shared groups = " //$NON-NLS-1$
@@ -106,13 +107,15 @@ private void printHomePage(AbstractIntroPage rootPage, StringBuilder text) {
 	private void printPageStyles(AbstractIntroPage page, StringBuilder text) {
 		text.append("\n\tpage styles are = "); //$NON-NLS-1$
 		String[] styles = page.getStyles();
-		for (String style : styles)
+		for (String style : styles) {
 			text.append(filterURL(style + "\n\t\t\t")); //$NON-NLS-1$
+		}
 		text.append("\n\tpage alt-styles are = "); //$NON-NLS-1$
 
 		final Map<String, Bundle> altStylesHashtable = page.getAltStyles();
-		if (altStylesHashtable == null)
+		if (altStylesHashtable == null) {
 			return;
+		}
 
 		Set<String> set = altStylesHashtable.keySet();
 		String[] sorted = new String[set.size()];
@@ -221,10 +224,12 @@ private void printHtml(StringBuilder text, IntroHTML html, String indent) {
 		text.append(indent + "src = " + html.getSrc()); //$NON-NLS-1$
 		text.append(indent + "isInlined = " + html.isInlined()); //$NON-NLS-1$
 		text.append(indent + "style-id = " + html.getStyleId()); //$NON-NLS-1$
-		if (html.getIntroImage() != null)
+		if (html.getIntroImage() != null) {
 			printImage(text, html.getIntroImage(), indent + "\t\t"); //$NON-NLS-1$
-		if (html.getIntroText() != null)
+		}
+		if (html.getIntroText() != null) {
 			printText(text, html.getIntroText(), indent + "\t\t"); //$NON-NLS-1$
+		}
 
 	}
 
@@ -259,8 +264,9 @@ private void printContentProvidor(StringBuilder text,
 		indent = indent + "\t\t"; //$NON-NLS-1$
 		text.append(indent + "class = " + provider.getClassName()); //$NON-NLS-1$
 		text.append(indent + "pluginId = " + provider.getPluginId()); //$NON-NLS-1$
-		if (provider.getIntroText() != null)
+		if (provider.getIntroText() != null) {
 			printText(text, provider.getIntroText(), indent + "\t\t"); //$NON-NLS-1$
+		}
 
 	}
 
