Fix alignment issue. Now traces using more than one alignment can be

[deliverable/tracecompass.git] / org.eclipse.linuxtools.ctf.core / src / org / eclipse / linuxtools / ctf / core / event / types / VariantDeclaration.java

diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/VariantDeclaration.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/VariantDeclaration.java
index c0338cf35a0f44e768f73f47621e20243a14f838..6592edda9327d41b053e7104929d539b38610d53 100644 (file)
--- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/VariantDeclaration.java
+++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/VariantDeclaration.java
@@ -24,7 +24,7 @@ public class VariantDeclaration implements IDeclaration {
     // ------------------------------------------------------------------------
 
     private String tag = null;
-    private long alignment;
+    final private long alignment = 1;
     private final HashMap<String, IDeclaration> fields = new HashMap<String, IDeclaration>();
 
     // ------------------------------------------------------------------------
@@ -32,6 +32,7 @@ public class VariantDeclaration implements IDeclaration {
     // ------------------------------------------------------------------------
 
     public VariantDeclaration() {
+
     }
 
     // ------------------------------------------------------------------------
@@ -74,7 +75,6 @@ public class VariantDeclaration implements IDeclaration {
 
     public void addField(String fieldTag, IDeclaration declaration) {
         fields.put(fieldTag, declaration);
-        alignment = Math.max(alignment, declaration.getAlignment());
     }
 
     @Override