Author: pmouawad
Date: Sat Dec 31 15:51:17 2016
New Revision: 1776781
URL: http://svn.apache.org/viewvc?rev=1776781&view=rev
Log:
Sonar : fix squid:S00115 "Rename this constant name to match the regular
expression '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'"
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TreeNodeRenderer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java?rev=1776781&r1=1776780&r2=1776781&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
Sat Dec 31 15:51:17 2016
@@ -40,7 +40,7 @@ public class IncludeController extends G
private static final String INCLUDE_PATH =
"IncludeController.includepath"; //$NON-NLS-1$
- private static final String prefix =
+ private static final String PREFIX =
JMeterUtils.getPropDefault(
"includecontroller.prefix", //$NON-NLS-1$
""); //$NON-NLS-1$
@@ -121,7 +121,7 @@ public class IncludeController extends G
final String includePath = getIncludePath();
HashTree tree = null;
if (includePath != null && includePath.length() > 0) {
- String fileName=prefix+includePath;
+ String fileName=PREFIX+includePath;
try {
File file = new File(fileName.trim());
final String absolutePath = file.getAbsolutePath();
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java?rev=1776781&r1=1776780&r2=1776781&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
Sat Dec 31 15:51:17 2016
@@ -60,18 +60,18 @@ public class TableVisualizer extends Abs
private static final long serialVersionUID = 240L;
- private static final String iconSize =
JMeterUtils.getPropDefault(JMeter.TREE_ICON_SIZE,
JMeter.DEFAULT_TREE_ICON_SIZE);
+ private static final String ICON_SIZE =
JMeterUtils.getPropDefault(JMeter.TREE_ICON_SIZE,
JMeter.DEFAULT_TREE_ICON_SIZE);
// Note: the resource string won't respond to locale-changes,
// however this does not matter as it is only used when pasting to the
clipboard
private static final ImageIcon imageSuccess = JMeterUtils.getImage(
JMeterUtils.getPropDefault("viewResultsTree.success",
//$NON-NLS-1$
- "vrt/" + iconSize +
"/security-high-2.png"), //$NON-NLS-1$ $NON-NLS-2$
+ "vrt/" + ICON_SIZE +
"/security-high-2.png"), //$NON-NLS-1$ $NON-NLS-2$
JMeterUtils.getResString("table_visualizer_success"));
//$NON-NLS-1$
private static final ImageIcon imageFailure = JMeterUtils.getImage(
JMeterUtils.getPropDefault("viewResultsTree.failure",
//$NON-NLS-1$
- "vrt/" + iconSize +
"/security-low-2.png"), //$NON-NLS-1$ $NON-NLS-2$
+ "vrt/" + ICON_SIZE +
"/security-low-2.png"), //$NON-NLS-1$ $NON-NLS-2$
JMeterUtils.getResString("table_visualizer_warning"));
//$NON-NLS-1$
private static final String[] COLUMNS = new String[] {
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TreeNodeRenderer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TreeNodeRenderer.java?rev=1776781&r1=1776780&r2=1776781&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TreeNodeRenderer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TreeNodeRenderer.java
Sat Dec 31 15:51:17 2016
@@ -37,16 +37,16 @@ public class TreeNodeRenderer extends De
private static final long serialVersionUID = 240L;
- private static final String iconSize =
JMeterUtils.getPropDefault(JMeter.TREE_ICON_SIZE,
JMeter.DEFAULT_TREE_ICON_SIZE);
+ private static final String ICON_SIZE =
JMeterUtils.getPropDefault(JMeter.TREE_ICON_SIZE,
JMeter.DEFAULT_TREE_ICON_SIZE);
// Same ViewResultsTree
private static final ImageIcon imageSuccess = JMeterUtils.getImage(
JMeterUtils.getPropDefault("viewResultsTree.success",
//$NON-NLS-1$
- "vrt/" + iconSize + "/security-high-2.png"));
//$NON-NLS-1$ $NON-NLS-2$
+ "vrt/" + ICON_SIZE + "/security-high-2.png"));
//$NON-NLS-1$ $NON-NLS-2$
private static final ImageIcon imageFailure = JMeterUtils.getImage(
JMeterUtils.getPropDefault("viewResultsTree.failure",
//$NON-NLS-1$
- "vrt/" + iconSize + "/security-low-2.png")); //$NON-NLS-1$
$NON-NLS-2$
+ "vrt/" + ICON_SIZE + "/security-low-2.png"));
//$NON-NLS-1$ $NON-NLS-2$
public TreeNodeRenderer() {
super();
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java?rev=1776781&r1=1776780&r2=1776781&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Sat Dec 31 15:51:17 2016
@@ -105,15 +105,15 @@ implements ActionListener, TreeSelection
protected static final String COMBO_CHANGE_COMMAND = "change_combo"; //
$NON-NLS-1$
- private static final String iconSize =
JMeterUtils.getPropDefault(JMeter.TREE_ICON_SIZE,
JMeter.DEFAULT_TREE_ICON_SIZE);
+ private static final String ICON_SIZE =
JMeterUtils.getPropDefault(JMeter.TREE_ICON_SIZE,
JMeter.DEFAULT_TREE_ICON_SIZE);
private static final ImageIcon imageSuccess = JMeterUtils.getImage(
JMeterUtils.getPropDefault("viewResultsTree.success",
//$NON-NLS-1$
- "vrt/" + iconSize + "/security-high-2.png"));
//$NON-NLS-1$ $NON-NLS-2$
+ "vrt/" + ICON_SIZE + "/security-high-2.png"));
//$NON-NLS-1$ $NON-NLS-2$
private static final ImageIcon imageFailure = JMeterUtils.getImage(
JMeterUtils.getPropDefault("viewResultsTree.failure",
//$NON-NLS-1$
- "vrt/" + iconSize + "/security-low-2.png")); //$NON-NLS-1$
$NON-NLS-2$
+ "vrt/" + ICON_SIZE + "/security-low-2.png"));
//$NON-NLS-1$ $NON-NLS-2$
// Maximum size that we will display
// Default limited to 10 megabytes
