Fix for bug 380959: Trace indexing not always triggered.

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 08f8d69458f41095e23cae3fead96dfa09934d06..c6e731fe1fb5adc7b65135204cd259a61f990e02 100644 (file)
--- 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<CustomTxtEvent> implements ITmfEven
     public CustomTxtTrace(final CustomTxtTraceDefinition definition) {\r
         fDefinition = definition;\r
         fEventType = new CustomTxtEventType(fDefinition);\r
+        setCacheSize(DEFAULT_CACHE_SIZE);\r
     }\r
 \r
-    public CustomTxtTrace(final IResource resource, final CustomTxtTraceDefinition definition, final String path, final int pageSize) throws TmfTraceException {\r
-        super(resource, CustomTxtEvent.class, path, (pageSize > 0) ? pageSize : DEFAULT_CACHE_SIZE);\r
-        fDefinition = definition;\r
-        fEventType = new CustomTxtEventType(fDefinition);\r
-        indexTrace(false);\r
+    public CustomTxtTrace(final IResource resource, final CustomTxtTraceDefinition definition, final String path, final int cacheSize) throws TmfTraceException {\r
+        this(definition);\r
+        setCacheSize((cacheSize > 0) ? cacheSize : DEFAULT_CACHE_SIZE);\r
+        initTrace(resource, path, CustomTxtEvent.class);\r
     }\r
 \r
     @Override\r

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 939cb42363223579fb057831ffc368b43b577697..e9ffee766505ee2c8d344c3777ea21c3b6b0e586 100644 (file)
--- 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<CustomXmlEvent> implements ITmfEven
         fDefinition = definition;\r
         fEventType = new CustomXmlEventType(fDefinition);\r
         fRecordInputElement = getRecordInputElement(fDefinition.rootInputElement);\r
+        setCacheSize(DEFAULT_CACHE_SIZE);\r
     }\r
 \r
     public CustomXmlTrace(final IResource resource, final CustomXmlTraceDefinition definition, final String path, final int pageSize) throws TmfTraceException {\r
-        super(null, CustomXmlEvent.class, path, (pageSize > 0) ? pageSize : DEFAULT_CACHE_SIZE);\r
-        fDefinition = definition;\r
-        fEventType = new CustomXmlEventType(fDefinition);\r
-        fRecordInputElement = getRecordInputElement(fDefinition.rootInputElement);\r
-        indexTrace(false);\r
+        this(definition);\r
+        setCacheSize((pageSize > 0) ? pageSize : DEFAULT_CACHE_SIZE);\r
+        initTrace(resource, path, CustomXmlEvent.class);\r
     }\r
 \r
     @Override\r