sebb 2003/10/08 18:01:46
Modified: src/core/org/apache/jmeter/gui/action Help.java
Log:
Tidy up error reporting
Revision Changes Path
1.18 +7 -11 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Help.java
Index: Help.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Help.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Help.java 8 Oct 2003 18:49:13 -0000 1.17
+++ Help.java 9 Oct 2003 01:01:46 -0000 1.18
@@ -16,6 +16,11 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
+/**
+ *
+ * @author unattributed
+ * @version $revision$ $date$
+ */
public class Help implements Command
{
transient private static Logger log = LoggingManager.getLoggerForClass();
@@ -54,7 +59,6 @@
{
String msg = "Couldn't load help file " + err.toString();
log.error(msg);
- helpDoc.setText(msg);
currentPage="";// Avoid NPE in resetPage()
}
}
@@ -100,13 +104,6 @@
{
if (!currentPage.equals(source))
{
- if (currentPage.length()==0){
- helpDoc = new HtmlPane();// setText seems to mangle the old one
- scroller.setViewportView(helpDoc);
- helpDoc.setEditable(false);
- //TODO: still does not recover completely, but is
usable
- // and unlikely to be needed now that HELP_PAGE is
shared string
- }
try
{
helpDoc.setPage(source);
@@ -114,9 +111,8 @@
}
catch (IOException err)
{
- String msg = "Couldn't load page " + source + " " +
err.toString();
- log.error(msg);
- helpDoc.setText(msg);
+ log.error(err.toString());
+ JMeterUtils.reportErrorToUser("Problem loading a help
page - see log for details");
currentPage="";
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
