[TMF] Bug: 436513 Custom Parser manager: renaming create a new parser and a parser...

Change-Id: I5750bc051737233dc5aa1b1960df55dbe9f26457
Signed-off-by: Jonathan Rajotte Julien <jonathan.rajotte-julien@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/27884
Tested-by: Hudson CI
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
(cherry picked from commit d8757ff23eb659cc981f97ea319a1e1ca0b15960)
Reviewed-on: https://git.eclipse.org/r/28077

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserWizard.java
index 355e9cf4a563d956346e29a5aac3effa3f82e5e4..aa96b2282839d9d0c8052741709530cb3cc92e7f 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserWizard.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomTxtParserWizard.java
@@ -30,6 +30,7 @@ public class CustomTxtParserWizard extends Wizard implements INewWizard {
     CustomTxtParserOutputWizardPage outputPage;
     private ISelection selection;
     CustomTxtTraceDefinition definition;
+    String initialDefinitionName;
 
     /**
      * Default constructor
@@ -47,13 +48,14 @@ public class CustomTxtParserWizard extends Wizard implements INewWizard {
     public CustomTxtParserWizard(CustomTxtTraceDefinition definition) {
         super();
         this.definition = definition;
+        this.initialDefinitionName = definition.definitionName;
     }
 
     @Override
     public boolean performFinish() {
         CustomTxtTraceDefinition def = outputPage.getDefinition();
-        if (definition != null && !definition.definitionName.equals(def.definitionName)) {
-            CustomTxtTraceDefinition.delete(definition.definitionName);
+        if (definition != null && !initialDefinitionName.equals(def.definitionName)) {
+            CustomTxtTraceDefinition.delete(initialDefinitionName);
         }
         def.save();
         return true;

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserWizard.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserWizard.java
index 4e4c277791d16c7c994a063c268da7cb74f1896e..5d4bcb4552e533777be61cc51789718653842fe4 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserWizard.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/wizards/CustomXmlParserWizard.java
@@ -30,6 +30,7 @@ public class CustomXmlParserWizard extends Wizard implements INewWizard {
     CustomXmlParserOutputWizardPage outputPage;
     private ISelection selection;
     CustomXmlTraceDefinition definition;
+    String initialDefinitionName;
 
     /**
      * Default constructor
@@ -47,13 +48,14 @@ public class CustomXmlParserWizard extends Wizard implements INewWizard {
     public CustomXmlParserWizard(CustomXmlTraceDefinition definition) {
         super();
         this.definition = definition;
+        this.initialDefinitionName = definition.definitionName;
     }
 
     @Override
     public boolean performFinish() {
         CustomXmlTraceDefinition def = outputPage.getDefinition();
-        if (definition != null && !definition.definitionName.equals(def.definitionName)) {
-            CustomXmlTraceDefinition.delete(definition.definitionName);
+        if (definition != null && !initialDefinitionName.equals(def.definitionName)) {
+            CustomXmlTraceDefinition.delete(initialDefinitionName);
         }
         def.save();
         return true;