ctf/tmf: allow multiple traces to be open with name clashing events

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.core / src / org / eclipse / linuxtools / tmf / core / ctfadaptor / CtfTmfEventField.java

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEventField.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEventField.java
index 5f4a21978662e4dbba34dd9df5123a6864f13fa6..6e77376bdd5085ce2112c123c189d9a4792025d1 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEventField.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEventField.java
@@ -106,7 +106,7 @@ public abstract class CtfTmfEventField extends TmfEventField {
         } else if (fieldDef instanceof ArrayDefinition) {
             ArrayDefinition arrayDef = (ArrayDefinition) fieldDef;
 
-            if (arrayDef.isString()) {
+            if (arrayDef.getDeclaration().isString()) {
                 /* This is an array of UTF-8 bytes, a.k.a. a String! */
                 field = new CTFStringField(fieldName, fieldDef.toString());
 
@@ -200,8 +200,8 @@ public abstract class CtfTmfEventField extends TmfEventField {
  */
 final class CTFIntegerField extends CtfTmfEventField {
 
-    private final int base;
-    private final boolean signed;
+    private final int fBase;
+    private final boolean fSigned;
 
     /**
      * A CTF "IntegerDefinition" can be an integer of any byte size, so in the
@@ -216,8 +216,8 @@ final class CTFIntegerField extends CtfTmfEventField {
      */
     CTFIntegerField(String name, long longValue, int base, boolean signed) {
         super(name, longValue, null);
-        this.signed = signed;
-        this.base = base;
+        fSigned = signed;
+        fBase = base;
     }
 
     @Override
@@ -227,7 +227,7 @@ final class CTFIntegerField extends CtfTmfEventField {
 
     @Override
     public String getFormattedValue() {
-        return IntegerDefinition.formatNumber(getValue(), base, signed);
+        return IntegerDefinition.formatNumber(getValue(), fBase, fSigned);
     }
 
 }
@@ -264,9 +264,9 @@ final class CTFStringField extends CtfTmfEventField {
  */
 final class CTFIntegerArrayField extends CtfTmfEventField {
 
-    private final int base;
-    private final boolean signed;
-    private String formattedValue = null;
+    private final int fBase;
+    private final boolean fSigned;
+    private String fFormattedValue = null;
 
     /**
      * Constructor for CTFIntegerArrayField.
@@ -281,8 +281,8 @@ final class CTFIntegerArrayField extends CtfTmfEventField {
      */
     CTFIntegerArrayField(String name, long[] longValues, int base, boolean signed) {
         super(name, longValues, null);
-        this.base = base;
-        this.signed = signed;
+        fBase = base;
+        fSigned = signed;
     }
 
     @Override
@@ -292,14 +292,14 @@ final class CTFIntegerArrayField extends CtfTmfEventField {
 
     @Override
     public synchronized String getFormattedValue() {
-        if (formattedValue == null) {
+        if (fFormattedValue == null) {
             List<String> strings = new ArrayList<>();
             for (long value : getValue()) {
-                strings.add(IntegerDefinition.formatNumber(value, base, signed));
+                strings.add(IntegerDefinition.formatNumber(value, fBase, fSigned));
             }
-            formattedValue = strings.toString();
+            fFormattedValue = strings.toString();
         }
-        return formattedValue;
+        return fFormattedValue;
     }
 
 }
@@ -311,7 +311,7 @@ final class CTFIntegerArrayField extends CtfTmfEventField {
  */
 final class CTFArrayField extends CtfTmfEventField {
 
-    private String formattedValue = null;
+    private String fFormattedValue = null;
 
     /**
      * Constructor for CTFArrayField.
@@ -332,14 +332,14 @@ final class CTFArrayField extends CtfTmfEventField {
 
     @Override
     public synchronized String getFormattedValue() {
-        if (formattedValue == null) {
+        if (fFormattedValue == null) {
             List<String> strings = new ArrayList<>();
             for (CtfTmfEventField element : getValue()) {
                 strings.add(element.getFormattedValue());
             }
-            formattedValue = strings.toString();
+            fFormattedValue = strings.toString();
         }
-        return formattedValue;
+        return fFormattedValue;
     }
 }