mstover1 2002/08/29 10:02:18
Modified: src/components/org/apache/jmeter/visualizers
ViewResultsFullVisualizer.java
src/core/org/apache/jmeter/gui/util JMeterMenuBar.java
MenuFactory.java
src/core/org/apache/jmeter/resources messages.properties
messages_de.properties messages_ja.properties
messages_no.properties
Added: src/core/org/apache/jmeter/gui/action Help.java
Log:
Adding run-time help
Revision Changes Path
1.5 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Index: ViewResultsFullVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ViewResultsFullVisualizer.java 28 Aug 2002 16:48:33 -0000 1.4
+++ ViewResultsFullVisualizer.java 29 Aug 2002 17:02:17 -0000 1.5
@@ -366,7 +366,7 @@
sel,expanded,leaf,row,hasFocus);
if(!((SampleResult)((DefaultMutableTreeNode)value).getUserObject()).isSuccessful())
{
- this.setForeground(Color.RED);
+ this.setForeground(Color.red);
}
return this;
}
1.1 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Help.java
Index: Help.java
===================================================================
package org.apache.jmeter.gui.action;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.HashSet;
import java.util.Set;
import javax.swing.JDialog;
import javax.swing.JOptionPane;
import javax.swing.JScrollPane;
import javax.swing.JTextPane;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.util.ComponentUtil;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.util.LoggingManager;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
/**
* @author Administrator
*
* To change this generated comment edit the template variable "typecomment":
* Window>Preferences>Java>Templates.
*/
public class Help implements Command
{
private static Logger log =
Hierarchy.getDefaultHierarchy().getLoggerFor(LoggingManager.GUI);
private static Set commands = new HashSet();
public final static String HELP = "help";
private static String helpPage =
"file://"
+ JMeterUtils.getJMeterHome()
+ "/docs/usermanual/component_reference.html";
private static JDialog helpWindow;
private static JTextPane helpDoc;
private static JScrollPane scroller;
static {
commands.add(HELP);
helpDoc = new JTextPane();
scroller = new JScrollPane(helpDoc);
helpDoc.setEditable(false);
try
{
helpDoc.setPage(helpPage);
}
catch (IOException err)
{
log.error("Couldn't load " + helpPage, err);
JOptionPane.showMessageDialog(
GuiPackage.getInstance().getMainFrame(),
JMeterUtils.getResString("error_loading_help"),
"Error",
JOptionPane.ERROR_MESSAGE);
}
}
/**
* @see org.apache.jmeter.gui.action.Command#doAction(ActionEvent)
*/
public void doAction(ActionEvent e)
{
if (helpWindow == null)
{
helpWindow =
new JDialog(
GuiPackage.getInstance().getMainFrame(),
JMeterUtils.getResString("help"),
false);
helpWindow.getContentPane().setLayout(new GridLayout(1, 1));
ComponentUtil.centerComponentInWindow(helpWindow, 60);
}
helpDoc.scrollToReference(GuiPackage
.getInstance()
.getTreeListener()
.getCurrentNode()
.getStaticLabel().replace(' ','_'));
helpWindow.getContentPane().removeAll();
helpWindow.getContentPane().add(scroller);
helpWindow.show();
}
/**
* @see org.apache.jmeter.gui.action.Command#getActionNames()
*/
public Set getActionNames()
{
return commands;
}
}
1.4 +6 -1
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
Index: JMeterMenuBar.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMeterMenuBar.java 25 Aug 2002 19:42:20 -0000 1.3
+++ JMeterMenuBar.java 29 Aug 2002 17:02:17 -0000 1.4
@@ -272,9 +272,14 @@
// HELP MENU
helpMenu = new JMenu(JMeterUtils.getResString("help"));
helpMenu.setMnemonic('H');
+ JMenuItem contextHelp = new
JMenuItem(JMeterUtils.getResString("help"),'H');
+ contextHelp.setActionCommand("help");
+
contextHelp.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_H,KeyEvent.CTRL_MASK));
+ contextHelp.addActionListener(ActionRouter.getInstance());
help_about = new JMenuItem(JMeterUtils.getResString("about"), 'A');
help_about.setActionCommand("about");
help_about.addActionListener(ActionRouter.getInstance());
+ helpMenu.add(contextHelp);
helpMenu.add(help_about);
}
private void makeOptionsMenu()
1.6 +3 -1
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java
Index: MenuFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MenuFactory.java 25 Aug 2002 19:42:20 -0000 1.5
+++ MenuFactory.java 29 Aug 2002 17:02:17 -0000 1.6
@@ -225,6 +225,8 @@
}
menu.add(enabled);
menu.add(disabled);
+ addSeparator(menu);
+ menu.add(makeMenuItem(JMeterUtils.getResString("help"),"Help","help"));
}
/****************************************
1.11 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- messages.properties 28 Aug 2002 21:29:27 -0000 1.10
+++ messages.properties 29 Aug 2002 17:02:17 -0000 1.11
@@ -298,4 +298,5 @@
counter_config_title=Counter
var_name=Reference Name
counter_per_user=Track counter independently for each user
-max=Maximum
\ No newline at end of file
+max=Maximum
+error_loading_help=Error loading help page
\ No newline at end of file
1.13 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties
Index: messages_de.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_de.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- messages_de.properties 28 Aug 2002 21:29:27 -0000 1.12
+++ messages_de.properties 29 Aug 2002 17:02:17 -0000 1.13
@@ -298,4 +298,5 @@
counter_config_title=Counter
var_name=Reference Name
counter_per_user=Track counter independently for each user
-max=Maximum
\ No newline at end of file
+max=Maximum
+error_loading_help=Error loading help page
\ No newline at end of file
1.11 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- messages_ja.properties 28 Aug 2002 21:29:27 -0000 1.10
+++ messages_ja.properties 29 Aug 2002 17:02:17 -0000 1.11
@@ -293,4 +293,5 @@
counter_config_title=Counter
var_name=Reference Name
counter_per_user=Track counter independently for each user
-max=Maximum
\ No newline at end of file
+max=Maximum
+error_loading_help=Error loading help page
\ No newline at end of file
1.11 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties
Index: messages_no.properties
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_no.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- messages_no.properties 28 Aug 2002 21:29:27 -0000 1.10
+++ messages_no.properties 29 Aug 2002 17:02:17 -0000 1.11
@@ -285,4 +285,5 @@
counter_config_title=Counter
var_name=Reference Name
counter_per_user=Track counter independently for each user
-max=Maximum
\ No newline at end of file
+max=Maximum
+error_loading_help=Error loading help page
\ No newline at end of file
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
