X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=tmf%2Forg.eclipse.tracecompass.tmf.ui%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Finternal%2Ftmf%2Fui%2Fparsers%2Fwizards%2FCustomXmlParserOutputWizardPage.java;h=1b1711bb65a21e858ac49731e6c589679ff16287;hb=efeeb73397f31c0c375555ca56b7225f68ebe4b0;hp=17766a7d683da4ec4288ed11934eed7bfa904bed;hpb=a36fa387f725817df2daa740af1ce6a0a58ab50c;p=deliverable%2Ftracecompass.git

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java
index 17766a7d68..1b1711bb65 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/parsers/wizards/CustomXmlParserOutputWizardPage.java
@@ -17,6 +17,7 @@ import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -140,6 +141,21 @@ public class CustomXmlParserOutputWizardPage extends WizardPage {
             this.definition = wizard.inputPage.getDefinition();
             final List<Entry<Tag, String>> inputs = wizard.inputPage.getInputs();
 
+            // substitute extra field name/value with extra fields tag
+            Iterator<Entry<Tag, String>> iterator = inputs.iterator();
+            boolean addExtraFields = false;
+            while (iterator.hasNext()) {
+                Entry<Tag, String> entry = iterator.next();
+                if (entry.getKey().equals(Tag.EXTRA_FIELD_NAME) ||
+                        entry.getKey().equals(Tag.EXTRA_FIELD_VALUE)) {
+                    iterator.remove();
+                    addExtraFields = true;
+                }
+            }
+            if (addExtraFields) {
+                inputs.add(new SimpleEntry<>(Tag.EXTRA_FIELDS, Tag.EXTRA_FIELDS.toString()));
+            }
+
             // dispose outputs that have been removed in the input page
             final Iterator<Output> iter = outputs.iterator();
             while (iter.hasNext()) {