jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1742328 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/action/Help.java xdocs/changes.xml
Date Wed, 04 May 2016 20:03:03 GMT
Author: fschumacher
Date: Wed May  4 20:03:03 2016
New Revision: 1742328

URL: http://svn.apache.org/viewvc?rev=1742328&view=rev
Log:
Display error about missing help page inside the help pane

Bugzilla Id: 59425

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java?rev=1742328&r1=1742327&r2=1742328&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java Wed May  4 20:03:03 2016
@@ -99,7 +99,17 @@ public class Help implements Command {
             helpDoc.setPage(url.toString()); // N.B. this only reloads if necessary (ignores
the reference)
         } catch (IOException ioe) {
             log.error(ioe.toString());
-            JMeterUtils.reportErrorToUser("Problem loading a help page - see log for details");
+            helpDoc.setText("<html><head><title>Problem loading help page</title>"
+                    + "<style><!--"
+                    + ".note { background-color: #ffeeee; border: 1px solid brown; }"
+                    + "div { padding: 10; margin: 10; }"
+                    + "--></style></head>"
+                    + "<body><div class='note'>"
+                    + "<h1>Problem loading help page</h1>"
+                    + "<div>Can't load url: &quot;<em>"
+                    + url.toString() + "</em>&quot;</div>"
+                    + "<div>See log for more info</div>"
+                    + "</body>");
         }
     }
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1742328&r1=1742327&r2=1742328&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Wed May  4 20:03:03 2016
@@ -467,6 +467,7 @@ Deprecated Libraries dropped or replaced
 <li><bug>59153</bug>Stop test if CSVDataSet is accessing non-existing file.
Contributed by Antonio Gomes Rodrigues (ra0077 at gmail.com)</li>
 <li><bug>59320</bug>Better tooltip in GUI with GenericTestBeanCustomizer
(CSV Data Set Config, JDBC Connection Configuration, Keystore Configuration...) . Based on
a patch by Antonio Gomes Rodrigues (ra0077 at gmail.com)</li>
 <li><bug>59171</bug>Sample Result SaveConfig Dialog is generated in random
order</li>
+<li><bug>59425</bug>Display error about missing help page inside the help
pane</li>
 </ul>
 <ch_section>Non-functional changes</ch_section>
 <ul>



Mime
View raw message