mstover1 2002/08/31 08:00:47
Modified: docs/usermanual component_reference.html
src/core/org/apache/jmeter/functions/gui FunctionHelper.java
src/core/org/apache/jmeter/gui/action Help.java
xdocs/usermanual component_reference.xml
Log:
Extending the help system to cover functions
Revision Changes Path
1.25 +6 -6 jakarta-jmeter/docs/usermanual/component_reference.html
Index: component_reference.html
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/usermanual/component_reference.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- component_reference.html 29 Aug 2002 18:16:38 -0000 1.24
+++ component_reference.html 31 Aug 2002 15:00:47 -0000 1.25
@@ -134,9 +134,9 @@
</ul>
<li><a href="#functions">13.9 Functions</a></li>
<ul>
- <li><a href="#Regex_Function">Regex
Function</a></li>
- <li><a href="#Counter_Function">Counter
Function</a></li>
- <li><a href="#Thread_Number_Function">Thread
Number Function</a></li>
+ <li><a
href="#__regexFunction">__regexFunction</a></li>
+ <li><a href="#__counter">__counter</a></li>
+ <li><a href="#__threadNum">__threadNum</a></li>
</ul>
</ul>
<table border="0" cellspacing="0" cellpadding="2" width="100%">
@@ -2882,7 +2882,7 @@
<table
border="0" cellspacing="0" cellpadding="2">
<tr><td>
<font face="arial,helvetica,sanserif">
- <a name="Regex_Function"><h3>13.9.1 Regex Function</h3></a>
+ <a name="__regexFunction"><h3>13.9.1 __regexFunction</h3></a>
</font>
</td></tr>
<tr><td>
@@ -2980,7 +2980,7 @@
<table
border="0" cellspacing="0" cellpadding="2">
<tr><td>
<font face="arial,helvetica,sanserif">
- <a name="Counter_Function"><h3>13.9.2 Counter
Function</h3></a>
+ <a name="__counter"><h3>13.9.2 __counter</h3></a>
</font>
</td></tr>
<tr><td>
@@ -3013,7 +3013,7 @@
<table
border="0" cellspacing="0" cellpadding="2">
<tr><td>
<font face="arial,helvetica,sanserif">
- <a name="Thread_Number_Function"><h3>13.9.3 Thread Number
Function</h3></a>
+ <a name="__threadNum"><h3>13.9.3 __threadNum</h3></a>
</font>
</td></tr>
<tr><td>
1.2 +15 -0
jakarta-jmeter/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
Index: FunctionHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionHelper.java 11 Aug 2002 19:24:43 -0000 1.1
+++ FunctionHelper.java 31 Aug 2002 15:00:47 -0000 1.2
@@ -17,10 +17,12 @@
import javax.swing.JPanel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.gui.ArgumentsPanel;
import org.apache.jmeter.functions.Function;
+import org.apache.jmeter.gui.action.ActionRouter;
import org.apache.jmeter.gui.util.ComponentUtil;
import org.apache.jmeter.gui.util.JLabeledChoice;
import org.apache.jmeter.gui.util.JLabeledTextField;
@@ -56,6 +58,9 @@
this.getContentPane().setLayout(new BorderLayout(10,10));
JPanel comboPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
comboPanel.add(functionList);
+ JButton helpButton = new JButton(JMeterUtils.getResString("help"));
+ helpButton.addActionListener(new HelpListener());
+ comboPanel.add(helpButton);
this.getContentPane().add(comboPanel,BorderLayout.NORTH);
this.getContentPane().add(parameterPanel,BorderLayout.CENTER);
JPanel resultsPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
@@ -146,6 +151,16 @@
}
functionCall.append("}");
cutPasteFunction.setText(functionCall.toString());
+ }
+
+ private class HelpListener implements ActionListener
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ String[] source = new
String[]{JMeterUtils.getJMeterHome()+"/docs/usermanual/component_index.html",functionList.getText()};
+ ActionEvent helpEvent = new
ActionEvent(source,e.getID(),"help");
+ ActionRouter.getInstance().actionPerformed(helpEvent);
+ }
}
1.3 +28 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Help.java 29 Aug 2002 18:17:38 -0000 1.2
+++ Help.java 31 Aug 2002 15:00:47 -0000 1.3
@@ -34,6 +34,7 @@
private static JDialog helpWindow;
private static JTextPane helpDoc;
private static JScrollPane scroller;
+ private static String currentPage;
static {
commands.add(HELP);
helpDoc = new JTextPane();
@@ -42,6 +43,7 @@
try
{
helpDoc.setPage(helpPage);
+ currentPage = helpPage;
}
catch (IOException err)
{
@@ -68,14 +70,39 @@
helpWindow.getContentPane().setLayout(new GridLayout(1, 1));
ComponentUtil.centerComponentInWindow(helpWindow, 60);
}
- helpDoc.scrollToReference(GuiPackage
+ if(e.getSource() instanceof String[])
+ {
+ String[] source = (String[])e.getSource();
+ resetPage(source[0]);
+ helpDoc.scrollToReference(source[1]);
+ }
+ else
+ {
+ resetPage(helpPage);
+ helpDoc.scrollToReference(GuiPackage
.getInstance()
.getTreeListener()
.getCurrentNode()
.getStaticLabel().replace(' ','_'));
+ }
helpWindow.getContentPane().removeAll();
helpWindow.getContentPane().add(scroller);
helpWindow.show();
+ }
+ private void resetPage(String source)
+ {
+ if(!currentPage.equals(source))
+ {
+ try
+ {
+ helpDoc.setPage(source);
+ currentPage = source;
+ }
+ catch (IOException err)
+ {
+ log.error("Couldn't load page: "+source,err);
+ }
+ }
}
/**
* @see org.apache.jmeter.gui.action.Command#getActionNames()
1.25 +3 -3 jakarta-jmeter/xdocs/usermanual/component_reference.xml
Index: component_reference.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/component_reference.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- component_reference.xml 29 Aug 2002 18:16:45 -0000 1.24
+++ component_reference.xml 31 Aug 2002 15:00:47 -0000 1.25
@@ -962,7 +962,7 @@
<p>Please read the <a href="functions.html">general description</a> of how
functions work. Here is given only the details of
specific functions.</p>
-<component index="13.9.1" name="Regex Function">
+<component index="13.9.1" name="__regexFunction">
<description><p>The Regex Function is used to parse the previous response using any
regular
expression (provided by user). The function returns the template string with
variable values filled
in.</p></description>
@@ -994,7 +994,7 @@
</properties>
</component>
-<component index="13.9.2" name="Counter Function">
+<component index="13.9.2" name="__counter">
<description><p>The counter generates a new number each time it is called, starting
with 1
and incrementing by +1 each time. The counter can be configured to keep each
simulated user's values
separate, or to use the same counter for all user. If each user's values is
incremented separately,
@@ -1007,7 +1007,7 @@
</properties>
</component>
-<component index="13.9.3" name="Thread Number Function">
+<component index="13.9.3" name="__threadNum">
<description><p>The thread number function simply returns the number of the thread
currently
being executed. These numbers are independent of ThreadGroup, meaning thread #1 in
one threadgroup
is indistinguishable from thread #1 in another threadgroup, from the point of view
of this function.</p>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
