You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/03/02 02:42:41 UTC
svn commit: r382233 - in
/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter:
gui/util/ReportMenuBar.java report/gui/action/ReportClose.java
Author: sebb
Date: Wed Mar 1 17:42:39 2006
New Revision: 382233
URL: http://svn.apache.org/viewcvs?rev=382233&view=rev
Log:
Action names are now all in ActionNames class
Modified:
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java
jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java
Modified: jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java?rev=382233&r1=382232&r2=382233&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java Wed Mar 1 17:42:39 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2005 The Apache Software Foundation.
*
@@ -34,7 +33,7 @@
import javax.swing.UIManager;
import org.apache.jmeter.report.gui.action.ReportActionRouter;
-import org.apache.jmeter.gui.action.ChangeLanguage;
+import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.util.LocaleChangeEvent;
import org.apache.jmeter.util.LocaleChangeListener;
@@ -289,49 +288,49 @@
// add english
JMenuItem english = new JMenuItem(JMeterUtils.getResString("en"), 'E');
english.addActionListener(ReportActionRouter.getInstance());
- english.setActionCommand(ChangeLanguage.CHANGE_LANGUAGE);
+ english.setActionCommand(ActionNames.CHANGE_LANGUAGE);
english.setName(Locale.ENGLISH.getLanguage());
languageMenu.add(english);
// add Japanese
JMenuItem japanese = new JMenuItem(JMeterUtils.getResString("jp"), 'J');
japanese.addActionListener(ReportActionRouter.getInstance());
- japanese.setActionCommand(ChangeLanguage.CHANGE_LANGUAGE);
+ japanese.setActionCommand(ActionNames.CHANGE_LANGUAGE);
japanese.setName(Locale.JAPANESE.getLanguage());
languageMenu.add(japanese);
// add Norwegian
JMenuItem norway = new JMenuItem(JMeterUtils.getResString("no"), 'N');
norway.addActionListener(ReportActionRouter.getInstance());
- norway.setActionCommand(ChangeLanguage.CHANGE_LANGUAGE);
+ norway.setActionCommand(ActionNames.CHANGE_LANGUAGE);
norway.setName("no"); // No default for Norwegian
languageMenu.add(norway);
// add German
JMenuItem german = new JMenuItem(JMeterUtils.getResString("de"), 'G');
german.addActionListener(ReportActionRouter.getInstance());
- german.setActionCommand(ChangeLanguage.CHANGE_LANGUAGE);
+ german.setActionCommand(ActionNames.CHANGE_LANGUAGE);
german.setName(Locale.GERMAN.getLanguage());
languageMenu.add(german);
// add French
JMenuItem french = new JMenuItem(JMeterUtils.getResString("fr"), 'F');
french.addActionListener(ReportActionRouter.getInstance());
- french.setActionCommand(ChangeLanguage.CHANGE_LANGUAGE);
+ french.setActionCommand(ActionNames.CHANGE_LANGUAGE);
french.setName(Locale.FRENCH.getLanguage());
languageMenu.add(french);
// add chinese (simple)
JMenuItem chineseSimple = new JMenuItem(JMeterUtils.getResString("zh_cn"));
chineseSimple.addActionListener(ReportActionRouter.getInstance());
- chineseSimple.setActionCommand(ChangeLanguage.CHANGE_LANGUAGE);
+ chineseSimple.setActionCommand(ActionNames.CHANGE_LANGUAGE);
chineseSimple.setName(Locale.SIMPLIFIED_CHINESE.toString());
languageMenu.add(chineseSimple);
// add chinese (traditional)
JMenuItem chineseTrad = new JMenuItem(JMeterUtils.getResString("zh_TW"));
chineseTrad.addActionListener(ReportActionRouter.getInstance());
- chineseTrad.setActionCommand(ChangeLanguage.CHANGE_LANGUAGE);
+ chineseTrad.setActionCommand(ActionNames.CHANGE_LANGUAGE);
chineseTrad.setName(Locale.TRADITIONAL_CHINESE.toString());
languageMenu.add(chineseTrad);
// add spanish
JMenuItem spanish = new JMenuItem(JMeterUtils.getResString("es"));
spanish.addActionListener(ReportActionRouter.getInstance());
- spanish.setActionCommand(ChangeLanguage.CHANGE_LANGUAGE);
+ spanish.setActionCommand(ActionNames.CHANGE_LANGUAGE);
spanish.setName("es");
languageMenu.add(spanish);
return languageMenu;
@@ -369,10 +368,10 @@
run_clear = new JMenuItem(JMeterUtils.getResString("clear"), 'C');
run_clear.addActionListener(ReportActionRouter.getInstance());
- run_clear.setActionCommand(org.apache.jmeter.gui.action.Clear.CLEAR);
+ run_clear.setActionCommand(ActionNames.CLEAR);
run_clearAll = new JMenuItem(JMeterUtils.getResString("clear_all"), 'a');
run_clearAll.addActionListener(ReportActionRouter.getInstance());
- run_clearAll.setActionCommand(org.apache.jmeter.gui.action.Clear.CLEAR_ALL);
+ run_clearAll.setActionCommand(ActionNames.CLEAR_ALL);
run_clearAll.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_MASK));
runMenu.add(run_start);
if (remote_start != null) {
Modified: jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java?rev=382233&r1=382232&r2=382233&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java Wed Mar 1 17:42:39 2006
@@ -1,4 +1,3 @@
-//$Header$
/*
* Copyright 2005 The Apache Software Foundation.
*
@@ -25,10 +24,8 @@
import javax.swing.JOptionPane;
import org.apache.jmeter.gui.ReportGuiPackage;
-import org.apache.jmeter.report.gui.action.ReportActionRouter;
-import org.apache.jmeter.gui.action.CheckDirty;
+import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.action.Command;
-import org.apache.jmeter.gui.action.Save;
import org.apache.jmeter.util.JMeterUtils;
/**
@@ -78,7 +75,7 @@
.getResString("Save?"), JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
ReportActionRouter.getInstance().doActionNow(
- new ActionEvent(e.getSource(), e.getID(), Save.SAVE));
+ new ActionEvent(e.getSource(), e.getID(), ActionNames.SAVE));
}
}
guiPackage.getTreeModel().clearTestPlan();
@@ -88,6 +85,6 @@
ReportGuiPackage.getInstance().setReportPlanFile(null);
ReportActionRouter.getInstance().actionPerformed(
- new ActionEvent(e.getSource(), e.getID(), CheckDirty.ADD_ALL));
+ new ActionEvent(e.getSource(), e.getID(), ActionNames.ADD_ALL));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org