From cbac1ac1f1846ef34c6bf751ab65bcec8d225aef Mon Sep 17 00:00:00 2001 From: Jean-Christian Kouame Date: Wed, 20 Jan 2016 13:50:17 -0500 Subject: [PATCH] tmf : Improve toString() in TmfXmlStateValue and TmfXmlCondition Change-Id: I25dc5961d71c84a6c3af82d6669a45fedcaa1504 Signed-off-by: Jean-Christian Kouame Reviewed-on: https://git.eclipse.org/r/64804 Reviewed-by: Hudson CI Reviewed-by: Genevieve Bastien Tested-by: Genevieve Bastien Reviewed-by: Matthew Khouzam --- .../xml/core/model/TmfXmlCondition.java | 14 ++++++++++- .../xml/core/model/TmfXmlStateValue.java | 13 +++++++++- .../readwrite/TmfXmlReadWriteStateValue.java | 24 +++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlCondition.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlCondition.java index e9705e743e..29ea73f9f5 100644 --- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlCondition.java +++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlCondition.java @@ -113,6 +113,8 @@ public class TmfXmlCondition { fConditionOperator = getConditionOperator(rootNode); getStateValuesForXmlCondition(modelFactory, NonNullUtils.checkNotNull(childElements)); } else { + // No need to test if the childElements size is actually 2. The + // XSD validation do this check already. fConditionOperator = ConditionOperator.EQ; fStateValues.add(modelFactory.createStateValue(NonNullUtils.checkNotNull(childElements.get(0)), fContainer, new ArrayList())); fStateValues.add(modelFactory.createStateValue(NonNullUtils.checkNotNull(childElements.get(1)), fContainer, new ArrayList())); @@ -285,7 +287,17 @@ public class TmfXmlCondition { @Override public String toString() { - return "TmfXmlCondition: " + fOperator + " on " + fConditions; //$NON-NLS-1$ //$NON-NLS-2$ + StringBuilder output = new StringBuilder("TmfXmlCondition: "); //$NON-NLS-1$ + if (fOperator != LogicalOperator.NONE) { + output.append(fOperator).append(" on ").append(fConditions); //$NON-NLS-1$ + } else { + output.append(fConditionOperator).append(" {").append(fStateValues.get(0)); //$NON-NLS-1$ + if (fStateValues.size() == 2) { + output.append(", ").append(fStateValues.get(1)); //$NON-NLS-1$ + } + output.append("}"); //$NON-NLS-1$ + } + return output.toString(); } /** diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlStateValue.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlStateValue.java index d55dc0307b..4c20d8cd87 100644 --- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlStateValue.java +++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlStateValue.java @@ -404,7 +404,14 @@ public abstract class TmfXmlStateValue implements ITmfXmlStateValue { @Override public String toString() { - return "TmfXmlStateValue: " + fStateValue; //$NON-NLS-1$ + StringBuilder builder = new StringBuilder("TmfXmlStateValue: "); //$NON-NLS-1$ + if (fEventField != null) { + builder.append("Field=").append(fEventField).append("; "); //$NON-NLS-1$ //$NON-NLS-2$ + } else if (!fPath.isEmpty()) { + builder.append("Path=").append(fPath).append("; "); //$NON-NLS-1$ //$NON-NLS-2$ + } + builder.append(fStateValue); + return builder.toString(); } /** @@ -501,6 +508,10 @@ public abstract class TmfXmlStateValue implements ITmfXmlStateValue { return TmfStateValue.nullValue(); } + @Override + public String toString() { + return "NULL"; //$NON-NLS-1$ + } } } diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/readwrite/TmfXmlReadWriteStateValue.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/readwrite/TmfXmlReadWriteStateValue.java index 42f4075589..c9da497472 100644 --- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/readwrite/TmfXmlReadWriteStateValue.java +++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/readwrite/TmfXmlReadWriteStateValue.java @@ -257,6 +257,11 @@ public class TmfXmlReadWriteStateValue extends TmfXmlStateValue { } } + @Override + public String toString() { + return "Value=" + fValue; //$NON-NLS-1$ + } + } /* The state value uses the value of an event field */ @@ -291,6 +296,11 @@ public class TmfXmlReadWriteStateValue extends TmfXmlStateValue { Activator.logWarning(String.format("TmfXmlStateValue: The event field increment %s is not a number type but a %s", fFieldName, incrementValue.getType())); //$NON-NLS-1$ } } + + @Override + public String toString() { + return "Event Field=" + fFieldName; //$NON-NLS-1$ + } } /* The state value is the event name */ @@ -305,6 +315,11 @@ public class TmfXmlReadWriteStateValue extends TmfXmlStateValue { return TmfStateValue.newValueString(event.getName()); } + @Override + public String toString() { + return "Event name"; //$NON-NLS-1$ + } + } /* The state value deletes an attribute */ @@ -325,6 +340,10 @@ public class TmfXmlReadWriteStateValue extends TmfXmlStateValue { builder.removeAttribute(timestamp, quark); } + @Override + public String toString() { + return "Delete"; //$NON-NLS-1$ + } } /* The state value uses the result of a query */ @@ -381,6 +400,11 @@ public class TmfXmlReadWriteStateValue extends TmfXmlStateValue { Activator.logWarning("TmfXmlStateValue: The query result increment is not a number type"); //$NON-NLS-1$ } } + + @Override + public String toString() { + return "Query=" + fQueryValue; //$NON-NLS-1$ + } } } -- 2.34.1