Description: Fix build due to incompatible types --- --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/IOStructGen.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/IOStructGen.java @@ -132,7 +132,7 @@ public class IOStructGen { */ private void parseRoot(CommonTree root) throws ParseException { - List children = root.getChildren(); + List children = (List)root.getChildren(); CommonTree traceNode = null; boolean hasStreams = false; @@ -197,7 +197,7 @@ public class IOStructGen { if (!fHasBeenParsed) { throw new ParseException("You need to run generate first"); //$NON-NLS-1$ } - List children = root.getChildren(); + List children = (List)root.getChildren(); List events = new ArrayList<>(); Collection callsites = new ArrayList<>(); for (CommonTree child : children) { @@ -235,7 +235,7 @@ public class IOStructGen { private void parseTrace(CommonTree traceNode) throws ParseException { CTFTrace trace = fTrace; - List children = traceNode.getChildren(); + List children = (List)traceNode.getChildren(); if (children == null) { throw new ParseException("Trace block is empty"); //$NON-NLS-1$ } @@ -276,7 +276,7 @@ public class IOStructGen { private void parseRootDeclaration(CommonTree declaration) throws ParseException { - List children = declaration.getChildren(); + List children = (List)declaration.getChildren(); for (CommonTree child : children) { switch (child.getType()) { --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/ByteOrderParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/ByteOrderParser.java @@ -15,6 +15,7 @@ import static org.eclipse.tracecompass.i import static org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.TsdlUtils.isUnaryString; import java.nio.ByteOrder; +import java.util.List; import org.antlr.runtime.tree.CommonTree; import org.eclipse.tracecompass.ctf.core.trace.CTFTrace; @@ -99,7 +100,7 @@ public final class ByteOrderParser imple CommonTree firstChild = (CommonTree) byteOrderTree.getChild(0); if (isUnaryString(firstChild)) { - String strval = concatenateUnaryStrings(byteOrderTree.getChildren()); + String strval = concatenateUnaryStrings((List)byteOrderTree.getChildren()); if (strval.equals(MetadataStrings.LE)) { return ByteOrder.LITTLE_ENDIAN; --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/ClockParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/ClockParser.java @@ -120,7 +120,7 @@ public final class ClockParser implement @Override public CTFClock parse(CommonTree clock, ICommonTreeParserParameter unused) throws ParseException { - List children = clock.getChildren(); + List children = (List)clock.getChildren(); CTFClock ctfClock = new CTFClock(); for (CommonTree child : children) { final String key = child.getChild(0).getChild(0).getChild(0).getText(); --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/PointerListStringParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/PointerListStringParser.java @@ -43,7 +43,7 @@ public final class PointerListStringPars @Override public StringBuilder parse(CommonTree pointers, ICommonTreeParserParameter param) { StringBuilder sb = new StringBuilder(); - List pointerList = pointers.getChildren(); + List pointerList = (List)pointers.getChildren(); if (pointers.getChildCount() == 0) { return sb; } --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypeAliasAliasParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypeAliasAliasParser.java @@ -60,7 +60,7 @@ public final class TypeAliasAliasParser @Override public String parse(CommonTree typeSpecifier, ICommonTreeParserParameter param) throws ParseException { - List children = typeSpecifier.getChildren(); + List children = (List)typeSpecifier.getChildren(); CommonTree typeSpecifierList = null; CommonTree typeDeclaratorList = null; @@ -93,7 +93,7 @@ public final class TypeAliasAliasParser typeDeclarator = (CommonTree) typeDeclaratorList.getChild(0); - List typeDeclaratorChildren = typeDeclarator.getChildren(); + List typeDeclaratorChildren = (List)typeDeclarator.getChildren(); for (CommonTree child : typeDeclaratorChildren) { switch (child.getType()) { --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypeAliasParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypeAliasParser.java @@ -77,7 +77,7 @@ public final class TypeAliasParser exten } DeclarationScope scope = ((Param) param).fDeclarationScope; - List children = typealias.getChildren(); + List children = (List)typealias.getChildren(); CommonTree target = null; CommonTree alias = null; --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypeAliasTargetParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypeAliasTargetParser.java @@ -90,7 +90,7 @@ public final class TypeAliasTargetParser } DeclarationScope scope = ((Param) param).fDeclarationScope; - List children = target.getChildren(); + List children = (List)target.getChildren(); CommonTree typeSpecifierList = null; CommonTree typeDeclaratorList = null; --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypeDeclaratorParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypeDeclaratorParser.java @@ -114,7 +114,7 @@ public final class TypeDeclaratorParser /* Separate the tokens by type */ if (typeDeclarator != null) { - children = typeDeclarator.getChildren(); + children = (List)typeDeclarator.getChildren(); for (CommonTree child : children) { switch (child.getType()) { @@ -154,7 +154,7 @@ public final class TypeDeclaratorParser * By looking at the first expression, we can determine whether * it is an array or a sequence. */ - List lengthChildren = length.getChildren(); + List lengthChildren = (List)length.getChildren(); CommonTree first = lengthChildren.get(0); if (isUnaryInteger(first)) { --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypeSpecifierListStringParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypeSpecifierListStringParser.java @@ -47,7 +47,7 @@ public final class TypeSpecifierListStri @Override public StringBuilder parse(CommonTree typeSpecifierList, ICommonTreeParserParameter param) throws ParseException { StringBuilder sb = new StringBuilder(); - List children = typeSpecifierList.getChildren(); + List children = (List)typeSpecifierList.getChildren(); boolean firstItem = true; --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypedefParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/TypedefParser.java @@ -91,7 +91,7 @@ public final class TypedefParser extends if (typeSpecifierListNode == null) { throw new ParseException("Cannot have a typedef without specifiers"); //$NON-NLS-1$ } - List typeDeclaratorList = typeDeclaratorListNode.getChildren(); + List typeDeclaratorList = (List)typeDeclaratorListNode.getChildren(); Map declarations = new HashMap<>(); --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/UnaryIntegerParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/UnaryIntegerParser.java @@ -47,7 +47,7 @@ public final class UnaryIntegerParser im */ @Override public Long parse(CommonTree unaryInteger, ICommonTreeParserParameter notUsed) throws ParseException { - List children = unaryInteger.getChildren(); + List children = (List)unaryInteger.getChildren(); CommonTree value = children.get(0); String strval = value.getText(); --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/callsite/CallSiteParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/callsite/CallSiteParser.java @@ -68,7 +68,7 @@ public final class CallSiteParser implem long lineNumber =-1; long ip = -1; - List children = tree.getChildren(); + List children = (List)tree.getChildren(); for (CommonTree child : children) { String left = child.getChild(0).getChild(0).getChild(0).getText(); if (left.equals(NAME)) { --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/enumeration/EnumBodyParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/enumeration/EnumBodyParser.java @@ -65,7 +65,7 @@ public final class EnumBodyParser implem } Param parameter = (Param) param; EnumDeclaration enumDeclaration = parameter.fEnumDeclaration; - List enumerators = tree.getChildren(); + List enumerators = (List)tree.getChildren(); /* * Start at -1, so that if the first enumrator has no explicit value, it * will choose 0 --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/enumeration/EnumParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/enumeration/EnumParser.java @@ -148,7 +148,7 @@ public final class EnumParser extends Ab Param parameter = (Param) param; DeclarationScope scope = parameter.fCurrentScope; - List children = theEnum.getChildren(); + List children = (List)theEnum.getChildren(); /* The return value */ EnumDeclaration enumDeclaration = null; --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/enumeration/EnumeratorParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/enumeration/EnumeratorParser.java @@ -88,7 +88,7 @@ public final class EnumeratorParser impl } EnumDeclaration enumDeclaration = ((Param) param).fEnumDeclaration; - List children = enumerator.getChildren(); + List children = (List)enumerator.getChildren(); long low = 0, high = 0; boolean valueSpecified = false; --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/environment/EnvironmentParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/environment/EnvironmentParser.java @@ -38,7 +38,7 @@ public final class EnvironmentParser imp public Map parse(CommonTree environment, ICommonTreeParserParameter param) { ImmutableMap.Builder builder = new ImmutableMap.Builder<>(); - List children = environment.getChildren(); + List children = (List)environment.getChildren(); for (CommonTree child : children) { String left; String right; --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/event/EventDeclarationParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/event/EventDeclarationParser.java @@ -93,7 +93,7 @@ public final class EventDeclarationParse CommonTree leftNode = (CommonTree) eventDecl.getChild(0); CommonTree rightNode = (CommonTree) eventDecl.getChild(1); - List leftStrings = leftNode.getChildren(); + List leftStrings = (List)leftNode.getChildren(); if (!isAnyUnaryString(leftStrings.get(0))) { throw new ParseException("Left side of CTF assignment must be a string"); //$NON-NLS-1$ --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/event/EventNameParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/event/EventNameParser.java @@ -14,6 +14,7 @@ package org.eclipse.tracecompass.interna import static org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.TsdlUtils.concatenateUnaryStrings; import static org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.TsdlUtils.isAnyUnaryString; +import java.util.List; import org.antlr.runtime.tree.CommonTree; import org.eclipse.tracecompass.internal.ctf.core.event.metadata.ICommonTreeParser; import org.eclipse.tracecompass.internal.ctf.core.event.metadata.ParseException; @@ -38,7 +39,7 @@ public final class EventNameParser imple CommonTree firstChild = (CommonTree) tree.getChild(0); if (isAnyUnaryString(firstChild)) { - return concatenateUnaryStrings(tree.getChildren()); + return concatenateUnaryStrings((List)tree.getChildren()); } throw new ParseException("invalid value for event name"); //$NON-NLS-1$ } --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/event/EventParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/event/EventParser.java @@ -101,7 +101,7 @@ public final class EventParser extends A } Param parameter = (Param) param; CTFTrace trace = ((Param) param).fTrace; - List children = eventNode.getChildren(); + List children = (List)eventNode.getChildren(); if (children == null) { throw new ParseException("Empty event block"); //$NON-NLS-1$ } --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/floatingpoint/FloatDeclarationParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/floatingpoint/FloatDeclarationParser.java @@ -114,7 +114,7 @@ public final class FloatDeclarationParse throw new IllegalArgumentException("Param must be a " + Param.class.getCanonicalName()); //$NON-NLS-1$ } CTFTrace trace = ((Param) param).fTrace; - List children = floatingPoint.getChildren(); + List children = (List)floatingPoint.getChildren(); /* * If the integer has no attributes, then it is missing the size @@ -142,7 +142,7 @@ public final class FloatDeclarationParse CommonTree leftNode = (CommonTree) child.getChild(0); CommonTree rightNode = (CommonTree) child.getChild(1); - List leftStrings = leftNode.getChildren(); + List leftStrings = (List)leftNode.getChildren(); if (!isAnyUnaryString(leftStrings.get(0))) { throw new ParseException(IDENTIFIER_MUST_BE_A_STRING); --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/integer/BaseParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/integer/BaseParser.java @@ -15,6 +15,7 @@ import static org.eclipse.tracecompass.i import static org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.TsdlUtils.isUnaryInteger; import static org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.TsdlUtils.isUnaryString; +import java.util.List; import org.antlr.runtime.tree.CommonTree; import org.eclipse.tracecompass.internal.ctf.core.event.metadata.ICommonTreeParser; import org.eclipse.tracecompass.internal.ctf.core.event.metadata.MetadataStrings; @@ -58,7 +59,7 @@ public final class BaseParser implements } throw new ParseException(INVALID_VALUE_FOR_BASE); } else if (isUnaryString(firstChild)) { - switch (concatenateUnaryStrings(tree.getChildren())) { + switch (concatenateUnaryStrings((List)tree.getChildren())) { case MetadataStrings.DECIMAL: case MetadataStrings.DEC: case MetadataStrings.DEC_CTE: --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/integer/IntegerDeclarationParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/integer/IntegerDeclarationParser.java @@ -121,7 +121,7 @@ public final class IntegerDeclarationPar throw new IllegalArgumentException("Param must be a " + Param.class.getCanonicalName()); //$NON-NLS-1$ } CTFTrace trace = ((Param) parameter).fTrace; - List children = integer.getChildren(); + List children = (List)integer.getChildren(); /* * If the integer has no attributes, then it is missing the size @@ -154,7 +154,7 @@ public final class IntegerDeclarationPar CommonTree leftNode = (CommonTree) child.getChild(0); CommonTree rightNode = (CommonTree) child.getChild(1); - List leftStrings = leftNode.getChildren(); + List leftStrings = (List)leftNode.getChildren(); if (!isAnyUnaryString(leftStrings.get(0))) { throw new ParseException("Left side of ctf expression must be a string"); //$NON-NLS-1$ --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/integer/SignedParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/integer/SignedParser.java @@ -15,6 +15,7 @@ import static org.eclipse.tracecompass.i import static org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.TsdlUtils.isUnaryInteger; import static org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.TsdlUtils.isUnaryString; +import java.util.List; import org.antlr.runtime.tree.CommonTree; import org.eclipse.tracecompass.internal.ctf.core.event.metadata.ICommonTreeParser; import org.eclipse.tracecompass.internal.ctf.core.event.metadata.MetadataStrings; @@ -57,7 +58,7 @@ public final class SignedParser implemen CommonTree firstChild = (CommonTree) tree.getChild(0); if (isUnaryString(firstChild)) { - String strval = concatenateUnaryStrings(tree.getChildren()); + String strval = concatenateUnaryStrings((List)tree.getChildren()); if (strval.equals(MetadataStrings.TRUE) || strval.equals(MetadataStrings.TRUE2)) { --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/stream/StreamDeclarationParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/stream/StreamDeclarationParser.java @@ -144,7 +144,7 @@ public final class StreamDeclarationPars CommonTree leftNode = (CommonTree) streamDecl.getChild(0); CommonTree rightNode = (CommonTree) streamDecl.getChild(1); - List leftStrings = leftNode.getChildren(); + List leftStrings = (List)leftNode.getChildren(); if (!isAnyUnaryString(leftStrings.get(0))) { throw new ParseException(IDENTIFIER_MUST_BE_A_STRING); --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/stream/StreamParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/stream/StreamParser.java @@ -92,7 +92,7 @@ public final class StreamParser extends CTFTrace trace = ((Param) param).fTrace; CTFStream stream = new CTFStream(trace); - List children = streamNode.getChildren(); + List children = (List)streamNode.getChildren(); if (children == null) { throw new ParseException("Empty stream block"); //$NON-NLS-1$ } --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/string/EncodingParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/string/EncodingParser.java @@ -14,6 +14,7 @@ package org.eclipse.tracecompass.interna import static org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.TsdlUtils.concatenateUnaryStrings; import static org.eclipse.tracecompass.internal.ctf.core.event.metadata.tsdl.TsdlUtils.isUnaryString; +import java.util.List; import org.antlr.runtime.tree.CommonTree; import org.eclipse.tracecompass.ctf.core.event.types.Encoding; import org.eclipse.tracecompass.internal.ctf.core.event.metadata.ICommonTreeParser; @@ -48,7 +49,7 @@ public final class EncodingParser implem CommonTree firstChild = (CommonTree) tree.getChild(0); if (isUnaryString(firstChild)) { - String strval = concatenateUnaryStrings(tree.getChildren()); + String strval = concatenateUnaryStrings((List)tree.getChildren()); if (strval.equals(MetadataStrings.UTF8)) { return Encoding.UTF8; --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/string/StringDeclarationParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/string/StringDeclarationParser.java @@ -74,7 +74,7 @@ public final class StringDeclarationPars */ @Override public StringDeclaration parse(CommonTree string, ICommonTreeParserParameter unused) throws ParseException { - List children = string.getChildren(); + List children = (List)string.getChildren(); StringDeclaration stringDeclaration = null; if (children == null) { @@ -92,7 +92,7 @@ public final class StringDeclarationPars CommonTree leftNode = (CommonTree) child.getChild(0); CommonTree rightNode = (CommonTree) child.getChild(1); - List leftStrings = leftNode.getChildren(); + List leftStrings = (List)leftNode.getChildren(); if (!isAnyUnaryString(leftStrings.get(0))) { throw new ParseException("Left side of ctf expression must be a string"); //$NON-NLS-1$ --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/struct/StructBodyParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/struct/StructBodyParser.java @@ -127,7 +127,7 @@ public final class StructBodyParser exte String structName = ((Param) param).fName; final DeclarationScope scope = new DeclarationScope(((Param) param).fDeclarationScope, structName == null ? MetadataStrings.STRUCT : structName); StructDeclaration structDeclaration = ((Param) param).fStructDeclaration; - List structDeclarations = structBody.getChildren(); + List structDeclarations = (List)structBody.getChildren(); if (structDeclarations == null) { structDeclarations = Collections.emptyList(); } --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/struct/StructDeclarationParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/struct/StructDeclarationParser.java @@ -100,7 +100,7 @@ public final class StructDeclarationPars } /* Get the type declarator list */ - List typeDeclaratorList = typeDeclaratorListNode.getChildren(); + List typeDeclaratorList = (List)typeDeclaratorListNode.getChildren(); /* * For each type declarator, parse the declaration and add a field to --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/struct/StructParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/struct/StructParser.java @@ -144,7 +144,7 @@ public final class StructParser extends final DeclarationScope scope = ((Param) param).fDeclarationScope; CommonTree identifier = ((Param) param).fIdentifier; - List children = struct.getChildren(); + List children = (List)struct.getChildren(); /* The return value */ StructDeclaration structDeclaration = null; --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/trace/TraceDeclarationParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/trace/TraceDeclarationParser.java @@ -130,7 +130,7 @@ public final class TraceDeclarationParse CommonTree leftNode = (CommonTree) traceDecl.getChild(0); CommonTree rightNode = (CommonTree) traceDecl.getChild(1); - List leftStrings = leftNode.getChildren(); + List leftStrings = (List)leftNode.getChildren(); if (!isAnyUnaryString(leftStrings.get(0))) { throw new ParseException("Left side of CTF assignment must be a string"); //$NON-NLS-1$ --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/variant/VariantBodyParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/variant/VariantBodyParser.java @@ -99,7 +99,7 @@ public final class VariantBodyParser ext String variantName = ((Param) param).fName; VariantDeclaration variantDeclaration = ((Param) param).fVariantDeclaration; - List variantDeclarations = variantBody.getChildren(); + List variantDeclarations = (List)variantBody.getChildren(); final DeclarationScope scope = new DeclarationScope(((Param) param).fDeclarationScope, variantName == null ? MetadataStrings.VARIANT : variantName); CTFTrace trace = ((Param) param).fTrace; --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/variant/VariantDeclarationParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/variant/VariantDeclarationParser.java @@ -98,7 +98,7 @@ public final class VariantDeclarationPar throw new ParseException("Cannot have empty variant"); //$NON-NLS-1$ } /* Get the type declarator list */ - List typeDeclaratorList = typeDeclaratorListNode.getChildren(); + List typeDeclaratorList = (List)typeDeclaratorListNode.getChildren(); /* * For each type declarator, parse the declaration and add a field to --- tracecompass-5.3.0.orig/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/variant/VariantParser.java +++ tracecompass-5.3.0/ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/variant/VariantParser.java @@ -238,7 +238,7 @@ public final class VariantParser extends } final DeclarationScope scope = ((Param) param).fDeclarationScope; - List children = variant.getChildren(); + List children = (List)variant.getChildren(); VariantDeclaration variantDeclaration = null; boolean hasName = false; --- tracecompass-5.3.0.orig/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/filter/parser/FilterCu.java +++ tracecompass-5.3.0/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/provisional/tmf/core/model/filter/parser/FilterCu.java @@ -102,7 +102,7 @@ public class FilterCu implements IFilter if (!tree.isNil()) { children.add(tree); } else { - children.addAll(tree.getChildren()); + children.addAll((List)tree.getChildren()); } for (CommonTree child : children) {