From b538b19ccdb9f4ea21ada8ef40f0821b6820a597 Mon Sep 17 00:00:00 2001
From: Sebastian Bazley <sebb@apache.org>
Date: Tue, 20 Mar 2007 20:33:01 +0000
Subject: [PATCH] Bug 41903 - ViewResultsFullVisualizer : status column looks
 bad when you do copy and paste

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@520560 13f79535-47bb-0310-9956-ffa450edef68
---
 .../jmeter/visualizers/TableVisualizer.java   |  6 ++++--
 .../jmeter/resources/messages.properties      |  2 ++
 .../org/apache/jmeter/util/JMeterUtils.java   | 20 +++++++++++++++++++
 xdocs/changes.xml                             |  1 +
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/components/org/apache/jmeter/visualizers/TableVisualizer.java b/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
index e3b2044520..135a20d943 100644
--- a/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
+++ b/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
@@ -63,10 +63,12 @@ public class TableVisualizer extends AbstractVisualizer implements Clearable {
 	private static final Logger log = LoggingManager.getLoggerForClass();
 	
 	private static final ImageIcon imageSuccess = JMeterUtils.getImage(
-	        JMeterUtils.getPropDefault("viewResultsTree.success", "icon_success_sml.gif"));
+            JMeterUtils.getPropDefault("viewResultsTree.success", "icon_success_sml.gif"),
+            JMeterUtils.getResString("table_visualizer_success"));
 
 	private static final ImageIcon imageFailure = JMeterUtils.getImage(
-			JMeterUtils.getPropDefault("viewResultsTree.failure", "icon_warning_sml.gif"));
+            JMeterUtils.getPropDefault("viewResultsTree.failure", "icon_warning_sml.gif"),
+            JMeterUtils.getResString("table_visualizer_warning"));
 
 	private final String[] COLUMNS = new String[] {
             JMeterUtils.getResString("table_visualizer_sample_num"), // $NON-NLS-1$
diff --git a/src/core/org/apache/jmeter/resources/messages.properties b/src/core/org/apache/jmeter/resources/messages.properties
index d89725b38f..ed8547ede3 100644
--- a/src/core/org/apache/jmeter/resources/messages.properties
+++ b/src/core/org/apache/jmeter/resources/messages.properties
@@ -694,7 +694,9 @@ table_visualizer_sample_num=Sample #
 table_visualizer_sample_time=Sample Time(ms)
 table_visualizer_start_time=Start Time
 table_visualizer_status=Status
+table_visualizer_success=Success
 table_visualizer_thread_name=Thread Name
+table_visualizer_warning=Warning
 tcp_config_title=TCP Sampler Config
 tcp_nodelay=Set NoDelay
 tcp_port=Port Number\:
diff --git a/src/core/org/apache/jmeter/util/JMeterUtils.java b/src/core/org/apache/jmeter/util/JMeterUtils.java
index df8c059c9c..cd377f21db 100644
--- a/src/core/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/org/apache/jmeter/util/JMeterUtils.java
@@ -438,6 +438,26 @@ public class JMeterUtils implements UnitTestManager {
 			return null;
 		}
 	}
+    
+    /**
+     * This looks for the requested image in the classpath under
+     * org.apache.jmeter.images. <name>, and also sets the description
+     * of the image, which is useful if the icon is going to be placed 
+     * on the clipboard.
+     * 
+     * @param name
+     *            the name of the image
+     * @param description
+     *            the description of the image
+     * @return The Image value
+     */
+    public static ImageIcon getImage(String name, String description) {
+        ImageIcon icon = getImage(name);
+        if(icon != null) {
+            icon.setDescription(description);
+        }
+        return icon;
+    }
 
 	public static String getResourceFileAsText(String name) {
 		BufferedReader fileReader = null;
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 63a9db2503..eddd9987ba 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -190,6 +190,7 @@ Removed deprecated method JMeterUtils.split() - use JOrphanUtils version instead
 <li>Bug 40371 - response assertion "pattern to test" scrollbar problem</li>
 <li>Bug 40589 - Unescape XML entities in embedded URLs</li>
 <li>Bug 41902 - NPE in HTTPSampler when responseCode = -1</li>
+<li>Bug 41903 - ViewResultsFullVisualizer : status column looks bad when you do copy and paste</li>
 </ul>
 
 <h3>Version 2.2</h3>