jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1440149 - in /jmeter/trunk/src/reports/org/apache/jmeter: gui/util/ report/gui/ report/gui/action/ report/gui/tree/
Date Tue, 29 Jan 2013 21:28:55 GMT
Author: sebb
Date: Tue Jan 29 21:28:55 2013
New Revision: 1440149

URL: http://svn.apache.org/viewvc?rev=1440149&view=rev
Log:
Use standard naming convention for message propery keys - don't rely on JMeterUtils conversion

Modified:
    jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java
    jmeter/trunk/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java
    jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java
    jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java
    jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportExitCommand.java
    jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportStart.java
    jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeListener.java

Modified: jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java?rev=1440149&r1=1440148&r2=1440149&view=diff
==============================================================================
--- jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java (original)
+++ jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportMenuBar.java Tue Jan 29 21:28:55
2013
@@ -245,7 +245,7 @@ public class ReportMenuBar extends JMenu
         optionsMenu.add(functionHelper);
         optionsMenu.add(lafMenu);
         if (SSLManager.isSSLSupported()) {
-            sslManager = new JMenuItem(JMeterUtils.getResString("sslManager")); // $NON-NLS-1$
+            sslManager = new JMenuItem(JMeterUtils.getResString("sslmanager")); // $NON-NLS-1$
             sslManager.addActionListener(ReportActionRouter.getInstance());
             sslManager.setActionCommand("sslManager"); // $NON-NLS-1$
             sslManager.setMnemonic('S');

Modified: jmeter/trunk/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java?rev=1440149&r1=1440148&r2=1440149&view=diff
==============================================================================
--- jmeter/trunk/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java (original)
+++ jmeter/trunk/src/reports/org/apache/jmeter/report/gui/AbstractReportGui.java Tue Jan 29
21:28:55 2013
@@ -71,7 +71,7 @@ public abstract class AbstractReportGui 
     @Override
     public JPopupMenu createPopupMenu() {
         JPopupMenu pop = new JPopupMenu();
-        JMenu addMenu = new JMenu(JMeterUtils.getResString("Add")); // $NON-NLS-1$
+        JMenu addMenu = new JMenu(JMeterUtils.getResString("add")); // $NON-NLS-1$
         addMenu.add(ReportMenuFactory.makeMenu(ReportMenuFactory.CONFIG_ELEMENTS, "Add"));
// $NON-NLS-1$
         addMenu.add(ReportMenuFactory.makeMenu(ReportMenuFactory.PRE_PROCESSORS, "Add"));
// $NON-NLS-1$
         addMenu.add(ReportMenuFactory.makeMenu(ReportMenuFactory.POST_PROCESSORS, "Add"));
// $NON-NLS-1$

Modified: jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java?rev=1440149&r1=1440148&r2=1440149&view=diff
==============================================================================
--- jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java (original)
+++ jmeter/trunk/src/reports/org/apache/jmeter/report/gui/ReportPageGui.java Tue Jan 29 21:28:55
2013
@@ -93,7 +93,7 @@ public class ReportPageGui extends Abstr
     @Override
     public JPopupMenu createPopupMenu() {
         JPopupMenu pop = new JPopupMenu();
-        JMenu addMenu = new JMenu(JMeterUtils.getResString("Add")); // $NON-NLS-1$
+        JMenu addMenu = new JMenu(JMeterUtils.getResString("add")); // $NON-NLS-1$
         addMenu.add(ReportMenuFactory.makeMenuItem(new TableGui().getStaticLabel(),
                 TableGui.class.getName(),
                 "Add"));

Modified: jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java?rev=1440149&r1=1440148&r2=1440149&view=diff
==============================================================================
--- jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java (original)
+++ jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportClose.java Tue Jan
29 21:28:55 2013
@@ -73,7 +73,7 @@ public class ReportClose implements Comm
             if (JOptionPane.showConfirmDialog(ReportGuiPackage.getInstance()
                     .getMainFrame(), JMeterUtils
                     .getResString("cancel_new_to_save"), JMeterUtils // $NON-NLS-1$
-                    .getResString("Save?"), JOptionPane.YES_NO_OPTION, // $NON-NLS-1$
+                    .getResString("save?"), JOptionPane.YES_NO_OPTION, // $NON-NLS-1$
                     JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
                 ReportActionRouter.getInstance().doActionNow(
                         new ActionEvent(e.getSource(), e.getID(), ActionNames.SAVE));

Modified: jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportExitCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportExitCommand.java?rev=1440149&r1=1440148&r2=1440149&view=diff
==============================================================================
--- jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportExitCommand.java (original)
+++ jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportExitCommand.java Tue
Jan 29 21:28:55 2013
@@ -70,7 +70,7 @@ public class ReportExitCommand implement
             int chosenOption = JOptionPane.showConfirmDialog(ReportGuiPackage
                     .getInstance().getMainFrame(), 
                     JMeterUtils.getResString("cancel_exit_to_save"),  // $NON-NLS-1$ 
-                    JMeterUtils.getResString("Save?"),  // $NON-NLS-1$ 
+                    JMeterUtils.getResString("save?"),  // $NON-NLS-1$ 
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.QUESTION_MESSAGE);
             if (chosenOption == JOptionPane.NO_OPTION) {

Modified: jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportStart.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportStart.java?rev=1440149&r1=1440148&r2=1440149&view=diff
==============================================================================
--- jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportStart.java (original)
+++ jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportStart.java Tue Jan
29 21:28:55 2013
@@ -96,7 +96,7 @@ public class ReportStart extends Abstrac
             engine.runTest();
         } catch (JMeterEngineException e) {
             JOptionPane.showMessageDialog(gui.getMainFrame(), e.getMessage(), JMeterUtils
-                    .getResString("Error Occurred"), JOptionPane.ERROR_MESSAGE);  // $NON-NLS-1$
+                    .getResString("error_occurred"), JOptionPane.ERROR_MESSAGE);  // $NON-NLS-1$
         }
         log.debug("test plan after cloning and running test is running version: "
                 + ((TestPlan) testTree.getArray()[0]).isRunningVersion());

Modified: jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeListener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeListener.java?rev=1440149&r1=1440148&r2=1440149&view=diff
==============================================================================
--- jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeListener.java (original)
+++ jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeListener.java Tue
Jan 29 21:28:55 2013
@@ -172,20 +172,20 @@ public class ReportTreeListener implemen
         if (dragging && isValidDragAction(draggedNodes, getCurrentNode())) {
             dragging = false;
             JPopupMenu dragNdrop = new JPopupMenu();
-            JMenuItem item = new JMenuItem(JMeterUtils.getResString("Insert Before")); //
$NON-NLS-1$
+            JMenuItem item = new JMenuItem(JMeterUtils.getResString("insert_before")); //
$NON-NLS-1$
             item.addActionListener(actionHandler);
             item.setActionCommand(ReportDragNDrop.INSERT_BEFORE);
             dragNdrop.add(item);
-            item = new JMenuItem(JMeterUtils.getResString("Insert After")); // $NON-NLS-1$
+            item = new JMenuItem(JMeterUtils.getResString("insert_after")); // $NON-NLS-1$
             item.addActionListener(actionHandler);
             item.setActionCommand(ReportDragNDrop.INSERT_AFTER);
             dragNdrop.add(item);
-            item = new JMenuItem(JMeterUtils.getResString("Add as Child")); // $NON-NLS-1$
+            item = new JMenuItem(JMeterUtils.getResString("add_as_child")); // $NON-NLS-1$
             item.addActionListener(actionHandler);
             item.setActionCommand(ReportDragNDrop.ADD);
             dragNdrop.add(item);
             dragNdrop.addSeparator();
-            item = new JMenuItem(JMeterUtils.getResString("Cancel")); // $NON-NLS-1$
+            item = new JMenuItem(JMeterUtils.getResString("cancel")); // $NON-NLS-1$
             dragNdrop.add(item);
             displayPopUp(e, dragNdrop);
         } else {



Mime
View raw message