sebb 2003/10/06 06:59:41
Modified: src/core/org/apache/jmeter/gui/action Help.java
Log:
If cannot find Help page, put error message in it instead.
(Also, don't log stack trace)
Revision Changes Path
1.15 +9 -3 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Help.java 15 Sep 2003 23:13:16 -0000 1.14
+++ Help.java 6 Oct 2003 13:59:41 -0000 1.15
@@ -46,7 +46,10 @@
}
catch (IOException err)
{
- log.error("Couldn't load " + helpPage, err);
+ String msg = "Couldn't load help file " + err.toString();
+ log.error(msg);
+ helpDoc.setText(msg);
+ currentPage="";// Avoid NPE in resetPage()
}
}
@@ -60,7 +63,7 @@
helpWindow =
new JDialog(
new Frame(),// independent frame to allow it to be
overlaid by the main frame
- JMeterUtils.getResString("help"),
+ JMeterUtils.getResString("help"),//$NON-NLS-1$
false);
helpWindow.getContentPane().setLayout(new GridLayout(1, 1));
ComponentUtil.centerComponentInWindow(helpWindow, 60);
@@ -98,7 +101,10 @@
}
catch (IOException err)
{
- log.error("Couldn't load page: " + source, err);
+ String msg = "Couldn't load page " + source + " " +
err.toString();
+ log.error(msg);
+ helpDoc.setText(msg);
+ currentPage="";
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
