Use own Parser in UpdateUnitVersions

ui/org.eclipse.pde.genericeditor.extension.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Generic Target Platform Editor
 Bundle-SymbolicName: org.eclipse.pde.genericeditor.extension.tests
-Bundle-Version: 1.3.100.qualifier
+Bundle-Version: 1.3.200.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",

ui/org.eclipse.pde.genericeditor.extension.tests/pom.xml

@@ -18,7 +18,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.genericeditor.extension.tests</artifactId>
-  <version>1.3.100-SNAPSHOT</version>
+  <version>1.3.200-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>

ui/org.eclipse.pde.genericeditor.extension.tests/src/org/eclipse/pde/genericeditor/extension/tests/AbstractTargetEditorTest.java

@@ -41,6 +41,8 @@
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.pde.internal.genericeditor.target.extension.autocomplete.TargetDefinitionContentAssist;
 import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
 import org.junit.After;
@@ -87,6 +89,14 @@ protected String getLocationForSite(String name) {
 
 	@After
 	public void tearDown() throws Exception {
+		// Close any editors we opened
+		IWorkbenchWindow[] workbenchPages = PlatformUI.getWorkbench().getWorkbenchWindows();
+		for (IWorkbenchWindow workbenchPage : workbenchPages) {
+			IWorkbenchPage page = workbenchPage.getActivePage();
+			if (page != null) {
+				page.closeAllEditors(false);
+			}
+		}
 		if (tempFile != null) {
 			tempFile.delete();
 		}

ui/org.eclipse.pde.genericeditor.extension.tests/src/org/eclipse/pde/genericeditor/extension/tests/TestUtils.java

@@ -0,0 +1,15 @@
+package org.eclipse.pde.genericeditor.extension.tests;
+
+import org.eclipse.swt.widgets.Display;
+
+public class TestUtils {
+
+	public static void processUIEvents() {
+		Display display = Display.getCurrent();
+		if (display != null && !display.isDisposed()) {
+			while (display.readAndDispatch()) {
+				// Keep pumping events until the queue is empty
+			}
+		}
+	}
+}

ui/org.eclipse.pde.genericeditor.extension.tests/src/org/eclipse/pde/genericeditor/extension/tests/UpdateUnitVersionsCommandTests.java

@@ -82,6 +82,7 @@ private void confirmVersionUpdates(Map<String, String> expected) throws Exceptio
 		@SuppressWarnings("unchecked")
 		String updatedText = ((CompletableFuture<String>) response).get();
 		assertNotNull(updatedText);
+		TestUtils.processUIEvents();
 
 		Map<String, String> actual = getVersionsForIdsFromTargetFile(updatedText);
 

ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.pde.genericeditor.extension;singleton:=true
-Bundle-Version: 1.3.200.qualifier
+Bundle-Version: 1.3.300.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface.text,

ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/command/UpdateUnitVersions.java

@@ -41,6 +41,8 @@
 
 public class UpdateUnitVersions extends AbstractHandler {
 
+	private static Parser parser;
+
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		IDocument document = getDocument();
@@ -52,7 +54,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 				return null;
 			}
 
-			Parser parser = Parser.getDefault();
+			Parser parser = parser();
 			try {
 				parser.parse(document);
 			} catch (XMLStreamException e) {
@@ -144,4 +146,11 @@ private IDocument getDocument() {
 		IEditorInput input = editor.getEditorInput();
 		return provider.getDocument(input);
 	}
+
+	private static synchronized Parser parser() {
+		if (parser == null) {
+			parser = new Parser();
+		}
+		return parser;
+	}
 }