From 42c1cfe1d5ff1f4a7fc28f3c3b8181c1b8b8b967 Mon Sep 17 00:00:00 2001
From: Sebastian Bazley <sebb@apache.org>
Date: Tue, 16 Jun 2015 15:11:07 +0000
Subject: [PATCH] Tree View Listener should show sample data type Bugzilla Id:
 58041

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1685854 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 0caa83ecb181cf9491b7e8dbd03ee29a7a1c36f5
---
 .../org/apache/jmeter/visualizers/SamplerResultTab.java          | 1 +
 src/core/org/apache/jmeter/resources/messages.properties         | 1 +
 src/core/org/apache/jmeter/resources/messages_fr.properties      | 1 +
 xdocs/changes.xml                                                | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java b/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
index 7b8be3f056..acc5ba437a 100644
--- a/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
+++ b/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
@@ -236,6 +236,7 @@ public abstract class SamplerResultTab implements ResultRenderer {
                 statsBuff.append(JMeterUtils.getResString("view_results_size_body_in_bytes")).append(sampleResult.getBodySize()).append(NL); //$NON-NLS-1$
                 statsBuff.append(JMeterUtils.getResString("view_results_sample_count")).append(sampleResult.getSampleCount()).append(NL); //$NON-NLS-1$
                 statsBuff.append(JMeterUtils.getResString("view_results_error_count")).append(sampleResult.getErrorCount()).append(NL); //$NON-NLS-1$
+                statsBuff.append(JMeterUtils.getResString("view_results_datatype")).append(sampleResult.getDataType()).append(NL); //$NON-NLS-1$
                 statsDoc.insertString(statsDoc.getLength(), statsBuff.toString(), null);
                 statsBuff.setLength(0); // reset for reuse
 
diff --git a/src/core/org/apache/jmeter/resources/messages.properties b/src/core/org/apache/jmeter/resources/messages.properties
index 01bbba238d..f0a39a2f96 100644
--- a/src/core/org/apache/jmeter/resources/messages.properties
+++ b/src/core/org/apache/jmeter/resources/messages.properties
@@ -1194,6 +1194,7 @@ view_results_assertion_failure=Assertion failure:
 view_results_assertion_failure_message=Assertion failure message: 
 view_results_autoscroll=Scroll automatically?
 view_results_childsamples=Child samples?
+view_results_datatype=Data type ("text"|"bin"|""): 
 view_results_desc=Shows the text results of sampling in tree form
 view_results_error_count=Error Count: 
 view_results_fields=fields:
diff --git a/src/core/org/apache/jmeter/resources/messages_fr.properties b/src/core/org/apache/jmeter/resources/messages_fr.properties
index 851611600e..7a81a07e26 100644
--- a/src/core/org/apache/jmeter/resources/messages_fr.properties
+++ b/src/core/org/apache/jmeter/resources/messages_fr.properties
@@ -1180,6 +1180,7 @@ view_results_assertion_failure_message=Message d'\u00E9chec d'assertion \:
 view_results_autoscroll=D\u00E9filement automatique ?
 view_results_childsamples=Echantillons enfants?
 view_results_connect_time=Temps \u00E9tablissement connexion \: 
+view_results_datatype=Type de donn\u00E9es ("text"|"bin"|""): 
 view_results_desc=Affiche les r\u00E9sultats d'un \u00E9chantillon dans un arbre de r\u00E9sultats
 view_results_error_count=Compteur erreur\: 
 view_results_fields=champs \:
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 7eba254c9a..3dd0c913d0 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -92,6 +92,7 @@ Summary
 
 <h3>Listeners</h3>
 <ul>
+<li><bug>58041</bug>Tree View Listener should show sample data type</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>