Use root node determined by Parser.parse(IDocument) in UpdateUnitVersions and TargetDefinitionCodeMiningProvider

Fixes: #2135

Author: trancexpress

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<ICodeMining> 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));

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;
 			}

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<XMLElement> 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<XMLElement> createXMLTagItterator(String document) {