You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/01/29 18:18:45 UTC
svn commit: r1440004 - in /jmeter/trunk/src:
components/org/apache/jmeter/assertions/
components/org/apache/jmeter/timers/gui/
components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/engine/
core/org/apache/jmeter/functions/gui/ core/org/apach...
Author: sebb
Date: Tue Jan 29 17:18:44 2013
New Revision: 1440004
URL: http://svn.apache.org/viewvc?rev=1440004&view=rev
Log:
Add missing NON-NLS markers for message property key name strings
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
jmeter/trunk/src/components/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java
jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphProperties.java
jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java?rev=1440004&r1=1440003&r2=1440004&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java Tue Jan 29 17:18:44 2013
@@ -80,11 +80,11 @@ public class CompareAssertion extends Ab
result.setFailure(true);
buf.setLength(0);
appendResultDetails(buf, prevResult);
- buf.append(JMeterUtils.getResString("comparison_response_time")).append(prevTime);
+ buf.append(JMeterUtils.getResString("comparison_response_time")).append(prevTime); //$NON-NLS-1$
result.addToBaseResult(buf.toString());
buf.setLength(0);
appendResultDetails(buf, sResult);
- buf.append(JMeterUtils.getResString("comparison_response_time")).append(currentTime);
+ buf.append(JMeterUtils.getResString("comparison_response_time")).append(currentTime); //$NON-NLS-1$
result.addToSecondaryResult(buf.toString());
result.setFailureMessage(
JMeterUtils.getResString("comparison_differ_time")+ //$NON-NLS-1$
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java?rev=1440004&r1=1440003&r2=1440004&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java Tue Jan 29 17:18:44 2013
@@ -55,7 +55,7 @@ public class SMIMEAssertionTestElement e
AssertionResult assertionResult = new AssertionResult(getName());
assertionResult.setError(true);
assertionResult.setResultForFailure(JMeterUtils
- .getResString("bouncy_castle_unavailable_message"));
+ .getResString("bouncy_castle_unavailable_message")); //$NON-NLS-1$
return assertionResult;
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java?rev=1440004&r1=1440003&r2=1440004&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java Tue Jan 29 17:18:44 2013
@@ -62,7 +62,7 @@ public class GaussianRandomTimerGui exte
*/
@Override
protected String getTimerDelayLabelKey() {
- return JMeterUtils.getResString("gaussian_timer_delay");
+ return JMeterUtils.getResString("gaussian_timer_delay"); //$NON-NLS-1$
}
/**
@@ -70,7 +70,7 @@ public class GaussianRandomTimerGui exte
*/
@Override
protected String getTimerRangeLabelKey() {
- return JMeterUtils.getResString("gaussian_timer_range");
+ return JMeterUtils.getResString("gaussian_timer_range"); //$NON-NLS-1$
}
/**
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java?rev=1440004&r1=1440003&r2=1440004&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/gui/PoissonRandomTimerGui.java Tue Jan 29 17:18:44 2013
@@ -49,12 +49,12 @@ public class PoissonRandomTimerGui exten
@Override
protected String getTimerDelayLabelKey() {
- return JMeterUtils.getResString("poisson_timer_delay");
+ return JMeterUtils.getResString("poisson_timer_delay"); //$NON-NLS-1$
}
@Override
protected String getTimerRangeLabelKey() {
- return JMeterUtils.getResString("poisson_timer_range");
+ return JMeterUtils.getResString("poisson_timer_range"); //$NON-NLS-1$
}
@Override
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java?rev=1440004&r1=1440003&r2=1440004&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java Tue Jan 29 17:18:44 2013
@@ -63,7 +63,7 @@ public class UniformRandomTimerGui exten
*/
@Override
protected String getTimerDelayLabelKey() {
- return JMeterUtils.getResString("uniform_timer_delay");
+ return JMeterUtils.getResString("uniform_timer_delay"); //$NON-NLS-1$
}
/**
@@ -71,7 +71,7 @@ public class UniformRandomTimerGui exten
*/
@Override
protected String getTimerRangeLabelKey() {
- return JMeterUtils.getResString("uniform_timer_range");
+ return JMeterUtils.getResString("uniform_timer_range"); //$NON-NLS-1$
}
/**
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java?rev=1440004&r1=1440003&r2=1440004&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java Tue Jan 29 17:18:44 2013
@@ -731,7 +731,7 @@ public class RespTimeGraphVisualizer ext
legendPanel.add(GuiUtils.createLabelCombo(JMeterUtils.getResString("aggregate_graph_legend_placement"), //$NON-NLS-1$
legendPlacementList));
- legendPlacementList.setSelectedItem(JMeterUtils.getResString("aggregate_graph_legend.placement.bottom")); // default: bottom
+ legendPlacementList.setSelectedItem(JMeterUtils.getResString("aggregate_graph_legend.placement.bottom")); //$NON-NLS-1$ default: bottom
legendPanel.add(GuiUtils.createLabelCombo(JMeterUtils.getResString("aggregate_graph_font"), //$NON-NLS-1$
fontNameList));
fontNameList.setSelectedIndex(0); // default: sans serif
@@ -740,7 +740,7 @@ public class RespTimeGraphVisualizer ext
fontSizeList.setSelectedItem(StatGraphProperties.fontSize[2]); // default: 10
legendPanel.add(GuiUtils.createLabelCombo(JMeterUtils.getResString("aggregate_graph_style"), //$NON-NLS-1$
fontStyleList));
- fontStyleList.setSelectedItem(JMeterUtils.getResString("fontstyle.normal")); // default: normal
+ fontStyleList.setSelectedItem(JMeterUtils.getResString("fontstyle.normal")); //$NON-NLS-1$ default: normal
return legendPanel;
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphProperties.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphProperties.java?rev=1440004&r1=1440003&r2=1440004&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphProperties.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphProperties.java Tue Jan 29 17:18:44 2013
@@ -37,38 +37,38 @@ public class StatGraphProperties {
public static Map<String, String> getFontNameMap() {
Map<String, String> fontNameMap = new HashMap<String, String>(2);
- fontNameMap.put(JMeterUtils.getResString("font.sansserif"), "SansSerif");
- fontNameMap.put(JMeterUtils.getResString("font.serif"), "Serif");
+ fontNameMap.put(JMeterUtils.getResString("font.sansserif"), "SansSerif"); //$NON-NLS-1$ //$NON-NLS-1$
+ fontNameMap.put(JMeterUtils.getResString("font.serif"), "Serif"); //$NON-NLS-1$
return fontNameMap;
}
@SuppressWarnings("boxing")
public static Map<String, Integer> getFontStyleMap() {
Map<String, Integer> fontStyleMap = new HashMap<String, Integer>(3);
- fontStyleMap.put(JMeterUtils.getResString("fontstyle.normal"), Font.PLAIN);
- fontStyleMap.put(JMeterUtils.getResString("fontstyle.bold"), Font.BOLD);
- fontStyleMap.put(JMeterUtils.getResString("fontstyle.italic"), Font.ITALIC);
+ fontStyleMap.put(JMeterUtils.getResString("fontstyle.normal"), Font.PLAIN); //$NON-NLS-1$
+ fontStyleMap.put(JMeterUtils.getResString("fontstyle.bold"), Font.BOLD); //$NON-NLS-1$
+ fontStyleMap.put(JMeterUtils.getResString("fontstyle.italic"), Font.ITALIC); //$NON-NLS-1$
return fontStyleMap;
}
@SuppressWarnings("boxing")
public static Map<String, Integer> getPlacementNameMap() {
Map<String, Integer> placementNameMap = new HashMap<String, Integer>(4);
- placementNameMap.put(JMeterUtils.getResString("aggregate_graph_legend.placement.bottom"), LegendAreaProperties.BOTTOM);
- placementNameMap.put(JMeterUtils.getResString("aggregate_graph_legend.placement.right"), LegendAreaProperties.RIGHT);
- placementNameMap.put(JMeterUtils.getResString("aggregate_graph_legend.placement.left"), LegendAreaProperties.LEFT);
- placementNameMap.put(JMeterUtils.getResString("aggregate_graph_legend.placement.top"), LegendAreaProperties.TOP);
+ placementNameMap.put(JMeterUtils.getResString("aggregate_graph_legend.placement.bottom"), LegendAreaProperties.BOTTOM); //$NON-NLS-1$
+ placementNameMap.put(JMeterUtils.getResString("aggregate_graph_legend.placement.right"), LegendAreaProperties.RIGHT); //$NON-NLS-1$
+ placementNameMap.put(JMeterUtils.getResString("aggregate_graph_legend.placement.left"), LegendAreaProperties.LEFT); //$NON-NLS-1$
+ placementNameMap.put(JMeterUtils.getResString("aggregate_graph_legend.placement.top"), LegendAreaProperties.TOP); //$NON-NLS-1$
return placementNameMap;
}
public static Map<String, Shape> getPointShapeMap() {
// We want to retain insertion order, so LinkedHashMap is necessary
Map<String, Shape> pointShapeMap = new LinkedHashMap<String, Shape>(5);
- pointShapeMap.put(JMeterUtils.getResString("graph_pointshape_circle"), PointChartProperties.SHAPE_CIRCLE);
- pointShapeMap.put(JMeterUtils.getResString("graph_pointshape_diamond"), PointChartProperties.SHAPE_DIAMOND);
- pointShapeMap.put(JMeterUtils.getResString("graph_pointshape_square"), PointChartProperties.SHAPE_SQUARE);
- pointShapeMap.put(JMeterUtils.getResString("graph_pointshape_triangle"), PointChartProperties.SHAPE_TRIANGLE);
- pointShapeMap.put(JMeterUtils.getResString("graph_pointshape_none"), null);
+ pointShapeMap.put(JMeterUtils.getResString("graph_pointshape_circle"), PointChartProperties.SHAPE_CIRCLE); //$NON-NLS-1$
+ pointShapeMap.put(JMeterUtils.getResString("graph_pointshape_diamond"), PointChartProperties.SHAPE_DIAMOND); //$NON-NLS-1$
+ pointShapeMap.put(JMeterUtils.getResString("graph_pointshape_square"), PointChartProperties.SHAPE_SQUARE); //$NON-NLS-1$
+ pointShapeMap.put(JMeterUtils.getResString("graph_pointshape_triangle"), PointChartProperties.SHAPE_TRIANGLE); //$NON-NLS-1$
+ pointShapeMap.put(JMeterUtils.getResString("graph_pointshape_none"), null); //$NON-NLS-1$
return pointShapeMap;
}
}
\ No newline at end of file
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=1440004&r1=1440003&r2=1440004&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java Tue Jan 29 17:18:44 2013
@@ -274,7 +274,7 @@ public class StandardJMeterEngine implem
if (!stopped) { // we totally failed to stop the test
if (JMeter.isNonGUI()) {
// TODO should we call test listeners? That might hang too ...
- log.fatalError(JMeterUtils.getResString("stopping_test_failed"));
+ log.fatalError(JMeterUtils.getResString("stopping_test_failed")); //$NON-NLS-1$
if (SYSTEM_EXIT_ON_STOP_FAIL) { // default is true
log.fatalError("Exitting");
System.out.println("Fatal error, could not stop test, exitting");
@@ -284,8 +284,8 @@ public class StandardJMeterEngine implem
}
} else {
JMeterUtils.reportErrorToUser(
- JMeterUtils.getResString("stopping_test_failed"),
- JMeterUtils.getResString("stopping_test_title"));
+ JMeterUtils.getResString("stopping_test_failed"), //$NON-NLS-1$
+ JMeterUtils.getResString("stopping_test_title")); //$NON-NLS-1$
}
} // else will be done by threadFinished()
} else {
Modified: jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java?rev=1440004&r1=1440003&r2=1440004&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java Tue Jan 29 17:18:44 2013
@@ -185,7 +185,7 @@ public class FunctionHelper extends JDia
@Override
public void localeChanged(LocaleChangeEvent event) {
- setTitle(JMeterUtils.getResString("function_helper_title"));
+ setTitle(JMeterUtils.getResString("function_helper_title")); //$NON-NLS-1$
this.getContentPane().removeAll(); // so we can add them again in init
init();
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java?rev=1440004&r1=1440003&r2=1440004&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java Tue Jan 29 17:18:44 2013
@@ -66,7 +66,9 @@ public class Copy extends AbstractAction
try {
return (JMeterTreeNode[]) clipboard.getData(JMeterTreeNodeTransferable.JMETER_TREE_NODE_ARRAY_DATA_FLAVOR);
} catch (Exception ex) {
- JOptionPane.showMessageDialog(GuiPackage.getInstance().getMainFrame(), JMeterUtils.getResString("clipboard_node_read_error")+":\n" + ex.getLocalizedMessage(), JMeterUtils.getResString("error_title"), JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(GuiPackage.getInstance().getMainFrame(),
+ JMeterUtils.getResString("clipboard_node_read_error")+":\n" + ex.getLocalizedMessage(), //$NON-NLS-1$ //$NON-NLS-2$
+ JMeterUtils.getResString("error_title"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$
}
}
return null;
@@ -86,7 +88,9 @@ public class Copy extends AbstractAction
transferable.setTransferData(nodes);
clipboard.setContents(transferable, null);
} catch (Exception ex) {
- JOptionPane.showMessageDialog(GuiPackage.getInstance().getMainFrame(), JMeterUtils.getResString("clipboard_node_read_error")+":\n" + ex.getLocalizedMessage(), JMeterUtils.getResString("error_title"), JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(GuiPackage.getInstance().getMainFrame(),
+ JMeterUtils.getResString("clipboard_node_read_error")+":\n" + ex.getLocalizedMessage(), //$NON-NLS-1$ //$NON-NLS-2$
+ JMeterUtils.getResString("error_title"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$
}
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java?rev=1440004&r1=1440003&r2=1440004&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java Tue Jan 29 17:18:44 2013
@@ -37,19 +37,19 @@ public class FilePanel extends FilePanel
}
public FilePanel(String title, String filetype) {
- super(JMeterUtils.getResString("file_visualizer_filename"), filetype);
+ super(JMeterUtils.getResString("file_visualizer_filename"), filetype); // $NON-NLS-1$
this.title = title;
init();
}
public FilePanel(ChangeListener l, String title) {
- super(JMeterUtils.getResString("file_visualizer_filename"), l);
+ super(JMeterUtils.getResString("file_visualizer_filename"), l); // $NON-NLS-1$
this.title = title;
init();
}
public FilePanel(String resString, String[] exts) {
- super(JMeterUtils.getResString("file_visualizer_filename"), exts);
+ super(JMeterUtils.getResString("file_visualizer_filename"), exts); // $NON-NLS-1$
title = resString;
init();
}