tmf: bug 494698 Add per-event fields to custom parsers

[deliverable/tracecompass.git] / tmf / org.eclipse.tracecompass.tmf.core / src / org / eclipse / tracecompass / tmf / core / parsers / custom / CustomTraceDefinition.java

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomTraceDefinition.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomTraceDefinition.java
index 71469277707843f2d784f379bf42dc0ebd7ad09e..00f23f998749fdfca55a0612ee86e969db9e89c8 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomTraceDefinition.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/parsers/custom/CustomTraceDefinition.java
@@ -60,6 +60,20 @@ public abstract class CustomTraceDefinition {
         EVENT_TYPE(TmfBaseAspects.getEventTypeAspect().getName()),
         /** Message */
         MESSAGE(Messages.CustomTraceDefinition_messageTag),
+        /** Extra field name
+         * @since 2.2*/
+        EXTRA_FIELD_NAME(Messages.CustomTraceDefinition_extraFieldNameTag),
+        /** Extra field value
+         * @since 2.2*/
+        EXTRA_FIELD_VALUE(Messages.CustomTraceDefinition_extraFieldValueTag),
+        /**
+         * Extra fields
+         * <p>
+         * Used as output tag corresponding to the {@link #EXTRA_FIELD_NAME} and
+         * {@link #EXTRA_FIELD_VALUE} input tags.
+         * @since 2.2
+         */
+        EXTRA_FIELDS(Messages.CustomExtraFieldsAspect_extraFieldsAspectName),
         /** Other */
         OTHER(Messages.CustomTraceDefinition_otherTag);
 
@@ -107,6 +121,14 @@ public abstract class CustomTraceDefinition {
         }
     }
 
+    /**
+     * Separator to use with the
+     * {@link CustomTraceDefinition#ACTION_APPEND_WITH_SEPARATOR}
+     *
+     * @since 2.2
+     */
+    public static final @NonNull String SEPARATOR = " | ";  //$NON-NLS-1$
+
     /** Timestamp tag
      * @deprecated Use {@link Tag#TIMESTAMP} instead. */
     @Deprecated