From c843ebb5eb6e4fd7e54c65c06546c89aa31ed246 Mon Sep 17 00:00:00 2001 From: Patrick Tasse Date: Sat, 9 Jun 2012 23:43:02 -0400 Subject: [PATCH] Fix for bug 380959: Trace indexing not always triggered. --- .../internal/tmf/ui/parsers/custom/CustomTxtTrace.java | 10 +++++----- .../internal/tmf/ui/parsers/custom/CustomXmlTrace.java | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java index 08f8d69458..c6e731fe1f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTrace.java @@ -46,13 +46,13 @@ public class CustomTxtTrace extends TmfTrace implements ITmfEven public CustomTxtTrace(final CustomTxtTraceDefinition definition) { fDefinition = definition; fEventType = new CustomTxtEventType(fDefinition); + setCacheSize(DEFAULT_CACHE_SIZE); } - public CustomTxtTrace(final IResource resource, final CustomTxtTraceDefinition definition, final String path, final int pageSize) throws TmfTraceException { - super(resource, CustomTxtEvent.class, path, (pageSize > 0) ? pageSize : DEFAULT_CACHE_SIZE); - fDefinition = definition; - fEventType = new CustomTxtEventType(fDefinition); - indexTrace(false); + public CustomTxtTrace(final IResource resource, final CustomTxtTraceDefinition definition, final String path, final int cacheSize) throws TmfTraceException { + this(definition); + setCacheSize((cacheSize > 0) ? cacheSize : DEFAULT_CACHE_SIZE); + initTrace(resource, path, CustomTxtEvent.class); } @Override diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java index 939cb42363..e9ffee7665 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTrace.java @@ -58,14 +58,13 @@ public class CustomXmlTrace extends TmfTrace implements ITmfEven fDefinition = definition; fEventType = new CustomXmlEventType(fDefinition); fRecordInputElement = getRecordInputElement(fDefinition.rootInputElement); + setCacheSize(DEFAULT_CACHE_SIZE); } public CustomXmlTrace(final IResource resource, final CustomXmlTraceDefinition definition, final String path, final int pageSize) throws TmfTraceException { - super(null, CustomXmlEvent.class, path, (pageSize > 0) ? pageSize : DEFAULT_CACHE_SIZE); - fDefinition = definition; - fEventType = new CustomXmlEventType(fDefinition); - fRecordInputElement = getRecordInputElement(fDefinition.rootInputElement); - indexTrace(false); + this(definition); + setCacheSize((pageSize > 0) ? pageSize : DEFAULT_CACHE_SIZE); + initTrace(resource, path, CustomXmlEvent.class); } @Override -- 2.34.1