tmf: Rename tag name label in custom XML parser wizard

Change-Id: I51215a25d07a8eb00b3bd5cac834964f1114e653
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/76256
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Hudson CI

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/Messages.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/Messages.java
index 7bae0aa043badab3987532ba564c0871bfcfcd88..0244c82c2c642d52c9aad8e50ab5d46e02955a1e 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/Messages.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/Messages.java
@@ -272,12 +272,11 @@ public class Messages extends NLS {
     public static String CustomXmlParserInputWizardPage_removeAttribute;
     public static String CustomXmlParserInputWizardPage_removeElement;
     public static String CustomXmlParserInputWizardPage_set;
-    public static String CustomXmlParserInputWizardPage_tagName;
     public static String CustomXmlParserInputWizardPage_timestampFormat;
     public static String CustomXmlParserInputWizardPage_timestampFormatHelp;
-    public static String CustomXmlParserInputWizardPage_windowTitle;
     public static String CustomXmlParserInputWizardPage_titleEdit;
     public static String CustomXmlParserInputWizardPage_titleNew;
+    public static String CustomXmlParserInputWizardPage_windowTitle;
     public static String CustomXmlParserOutputWizardPage_description;
     public static String CustomXmlParserOutputWizardPage_moveAfter;
     public static String CustomXmlParserOutputWizardPage_moveBefore;

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/messages.properties b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/messages.properties
index 1b784a930b8a11496e0492c5b250657d909ea8a6..96ccf2059d5abda49c0e36f15f127229f1176611 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/messages.properties
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/messages.properties
@@ -272,12 +272,11 @@ CustomXmlParserInputWizardPage_previewInput=Preview input
 CustomXmlParserInputWizardPage_removeAttribute=Remove attribute
 CustomXmlParserInputWizardPage_removeElement=Remove element
 CustomXmlParserInputWizardPage_set=Set
-CustomXmlParserInputWizardPage_tagName=tag name:
 CustomXmlParserInputWizardPage_timestampFormat=Time Stamp format:
 CustomXmlParserInputWizardPage_timestampFormatHelp=Time Stamp Format Help
-CustomXmlParserInputWizardPage_windowTitle=Custom XML Parser
 CustomXmlParserInputWizardPage_titleEdit=Edit Custom XML Parser
 CustomXmlParserInputWizardPage_titleNew=New Custom XML Parser
+CustomXmlParserInputWizardPage_windowTitle=Custom XML Parser
 CustomXmlParserOutputWizardPage_description=Customize the output of the parser
 CustomXmlParserOutputWizardPage_moveAfter=Move After
 CustomXmlParserOutputWizardPage_moveBefore=Move Before

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/parsers/wizards/CustomXmlParserInputWizardPage.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/parsers/wizards/CustomXmlParserInputWizardPage.java
index d430d865f8364fdb07c588f31797af5820700db8..de8aac3c732a638512fde11934f7c1bdd4e49d83 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/parsers/wizards/CustomXmlParserInputWizardPage.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/parsers/wizards/CustomXmlParserInputWizardPage.java
@@ -978,7 +978,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
                             actionCombo.setVisible(true);
                             break;
                         case 4: // Other
-                            tagLabel.setText(Messages.CustomXmlParserInputWizardPage_tagName);
+                            tagLabel.setText(Messages.CustomXmlParserInputWizardPage_name);
                             tagLabel.setVisible(true);
                             if (tagText.getText().trim().length() == 0) {
                                 tagText.setText(elementNameText.getText().trim());
@@ -1030,7 +1030,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
                     tagText.setVisible(false);
                 } else {
                     tagCombo.select(4);
-                    tagLabel.setText(Messages.CustomXmlParserInputWizardPage_tagName);
+                    tagLabel.setText(Messages.CustomXmlParserInputWizardPage_name);
                     tagText.setText(inputElement.getInputName());
                     tagText.addModifyListener(updateListener);
                 }
@@ -1076,8 +1076,8 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
 
         private void updatePreview() {
             Element element = getPreviewElement(inputElement);
-            if (inputElement.getParentElement() != null) { // no preview text for
-                                                      // document element
+            // no preview text for document element
+            if (inputElement.getParentElement() != null) {
                 previewText.setText(Messages.CustomXmlParserInputWizardPage_noMatchingElement);
                 if (element != null) {
                     previewText.setText(CustomXmlTrace.parseElement(element, new StringBuffer()).toString());
@@ -1086,8 +1086,8 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
                             logEntryFound = true;
                             logEntriesCount++;
                         } else {
-                            logEntryButton.setSelection(false); // remove nested
-                                                                // log entry
+                            // remove nested log entry
+                            logEntryButton.setSelection(false);
                         }
                     }
                     if (tagCombo.getText().equals(CustomTraceDefinition.TAG_TIMESTAMP) && logEntriesCount <= 1) {
@@ -1365,7 +1365,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
                         tagText.setVisible(false);
                         break;
                     case 3: // Other
-                        tagLabel.setText(Messages.CustomXmlParserInputWizardPage_tagName);
+                        tagLabel.setText(Messages.CustomXmlParserInputWizardPage_name);
                         tagLabel.setVisible(true);
                         if (tagText.getText().trim().length() == 0) {
                             tagText.setText(attributeNameText.getText().trim());
@@ -1412,7 +1412,7 @@ public class CustomXmlParserInputWizardPage extends WizardPage {
                 tagText.setVisible(false);
             } else {
                 tagCombo.select(3);
-                tagLabel.setText(Messages.CustomXmlParserInputWizardPage_tagName);
+                tagLabel.setText(Messages.CustomXmlParserInputWizardPage_name);
                 tagText.setText(inputAttribute.getInputName());
                 tagText.addModifyListener(updateListener);
             }