merge with pst-bachelor branch

src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionFilter.java

@@ -39,8 +39,7 @@ public final class TraceReconstructionFilter extends AbstractFilter implements I
 			traceBuffer.insertEvent(abstractOperationEvent);
 
 			if (traceBuffer.isFinished()) {
-				final Trace trace = traceBuffer.toTrace(true);
-				deliver(trace);
+				deliver(traceBuffer.toTrace(true));
 				traceId2trace.remove(traceId);
 			}
 		} else if (record instanceof Trace) {

src/explorviz/live_trace_processing/main/FilterConfiguration.java

@@ -5,8 +5,6 @@ import java.util.concurrent.TimeUnit;
 import explorviz.live_trace_processing.configuration.Configuration;
 import explorviz.live_trace_processing.configuration.ConfigurationFactory;
 import explorviz.live_trace_processing.filter.ITraceSink;
-import explorviz.live_trace_processing.filter.counting.IRecordCounting;
-import explorviz.live_trace_processing.filter.counting.RecordCountingFilter;
 import explorviz.live_trace_processing.filter.reconstruction.ITraceReconstruction;
 import explorviz.live_trace_processing.filter.reconstruction.TraceReconstructionFilter;
 import explorviz.live_trace_processing.filter.reduction.ITraceReduction;
@@ -16,10 +14,11 @@ import explorviz.live_trace_processing.reader.TCPReader;
 public class FilterConfiguration {
 	public static void configureAndStartFilters(final Configuration configuration,
 			final ITraceSink sink) {
-		final IRecordCounting recordCounting = new RecordCountingFilter(sink);
+		// final IRecordCounting recordCounting = new
+		// RecordCountingFilter(sink);
 
 		final ITraceReduction traceReduction = new TracePatternSummarizationFilter(
-				TimeUnit.MILLISECONDS.toNanos(990), recordCounting);
+				TimeUnit.MILLISECONDS.toNanos(990), sink);
 
 		final ITraceReconstruction traceReconstruction = new TraceReconstructionFilter(
 				TimeUnit.SECONDS.toNanos(4), traceReduction);