From d946f5d3bc6a3ba2b1b961aebcbbb1c9962af3d1 Mon Sep 17 00:00:00 2001 From: Simeon Andreev Date: Tue, 18 Nov 2025 13:29:30 +0200 Subject: [PATCH 1/2] Use root node determined by Parser.parse(IDocument) in UpdateUnitVersions and TargetDefinitionCodeMiningProvider Fixes: #2135 --- .../codemining/TargetDefinitionCodeMiningProvider.java | 3 +-- .../target/extension/command/UpdateUnitVersions.java | 5 ++--- .../genericeditor/target/extension/model/xml/Parser.java | 9 ++++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/codemining/TargetDefinitionCodeMiningProvider.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/codemining/TargetDefinitionCodeMiningProvider.java index 6c8061a62e0..54b591e1a46 100644 --- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/codemining/TargetDefinitionCodeMiningProvider.java +++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/codemining/TargetDefinitionCodeMiningProvider.java @@ -49,8 +49,7 @@ void fillCodeMinings(IDocument document, List minings) throws BadLo int line = 0; try { Parser parser = Parser.getDefault(); - parser.parse(document); - Node target = parser.getRootNode(); + Node target = parser.parse(document); if (target != null) { line = document.getLineOfOffset(target.getOffsetStart()); minings.add(new TargetDefinitionActivationCodeMining(line, document, this, null)); diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/command/UpdateUnitVersions.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/command/UpdateUnitVersions.java index d100b14a307..7a15a2720e9 100644 --- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/command/UpdateUnitVersions.java +++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/command/UpdateUnitVersions.java @@ -52,13 +52,12 @@ public Object execute(ExecutionEvent event) throws ExecutionException { return null; } + Node rootNode = null; Parser parser = Parser.getDefault(); try { - parser.parse(document); + rootNode = parser.parse(document); } catch (XMLStreamException e) { - return null; } - Node rootNode = parser.getRootNode(); if (rootNode == null) { return null; } diff --git a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/Parser.java b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/Parser.java index ee3984b08a4..6e297110531 100644 --- a/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/Parser.java +++ b/ui/org.eclipse.pde.genericeditor.extension/src/org/eclipse/pde/internal/genericeditor/target/extension/model/xml/Parser.java @@ -50,8 +50,9 @@ private void initializeParser() { inputFactory = XMLInputFactory.newInstance(); } - public void parse(IDocument document) throws XMLStreamException { + public Node parse(IDocument document) throws XMLStreamException { target = null; + Node parsedTarget = null; Node currentParent = null; Node currentNode = null; Iterator tagReaderIterator = createXMLTagItterator(document.get()); @@ -81,8 +82,9 @@ public void parse(IDocument document) throws XMLStreamException { containerLocation.addRepositoryLocation(locationValue); } } else if (ITargetConstants.TARGET_TAG.equalsIgnoreCase(name)) { - target = new Node(); - currentNode = target; + parsedTarget = new Node(); + target = parsedTarget; + currentNode = parsedTarget; } else { currentNode = new Node(); } @@ -107,6 +109,7 @@ public void parse(IDocument document) throws XMLStreamException { while (eventReader.hasNext()) { eventReader.nextEvent(); } + return parsedTarget; } private Iterator createXMLTagItterator(String document) { From 17301f02e8aa0f1787648b0a56e755610fd573ca Mon Sep 17 00:00:00 2001 From: Eclipse PDE Bot Date: Tue, 18 Nov 2025 15:16:42 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.38 stream --- ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF index cb86c60b2d7..443137c0e86 100644 --- a/ui/org.eclipse.pde.genericeditor.extension/META-INF/MANIFEST.MF +++ b/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,