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
CustomTxtParserOutputWizardPage outputPage;
private ISelection selection;
CustomTxtTraceDefinition definition;
CustomTxtParserOutputWizardPage outputPage;
private ISelection selection;
CustomTxtTraceDefinition definition;
+ String initialDefinitionName;
/**
* Default constructor
/**
* Default constructor
public CustomTxtParserWizard(CustomTxtTraceDefinition definition) {
super();
this.definition = definition;
public CustomTxtParserWizard(CustomTxtTraceDefinition definition) {
super();
this.definition = definition;
+ this.initialDefinitionName = definition.definitionName;
}
@Override
public boolean performFinish() {
CustomTxtTraceDefinition def = outputPage.getDefinition();
}
@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;
}
def.save();
return true;
CustomXmlParserOutputWizardPage outputPage;
private ISelection selection;
CustomXmlTraceDefinition definition;
CustomXmlParserOutputWizardPage outputPage;
private ISelection selection;
CustomXmlTraceDefinition definition;
+ String initialDefinitionName;
/**
* Default constructor
/**
* Default constructor
public CustomXmlParserWizard(CustomXmlTraceDefinition definition) {
super();
this.definition = definition;
public CustomXmlParserWizard(CustomXmlTraceDefinition definition) {
super();
this.definition = definition;
+ this.initialDefinitionName = definition.definitionName;
}
@Override
public boolean performFinish() {
CustomXmlTraceDefinition def = outputPage.getDefinition();
}
@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;
}
def.save();
return true;