You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/12/28 20:27:37 UTC
svn commit: r1776324 - in
/jmeter/trunk/src/components/org/apache/jmeter/visualizers:
StatGraphVisualizer.java StatVisualizer.java
Author: pmouawad
Date: Wed Dec 28 20:27:37 2016
New Revision: 1776324
URL: http://svn.apache.org/viewvc?rev=1776324&view=rev
Log:
sonar: fix security errors
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?rev=1776324&r1=1776323&r2=1776324&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java Wed Dec 28 20:27:37 2016
@@ -123,7 +123,8 @@ public class StatGraphVisualizer extends
"aggregate_report_sent_bytes_per_sec" //$NON-NLS-1$
};
- static final Object[][] COLUMNS_MSG_PARAMETERS = { null,
+ static final Object[][] getColumnsMsgParameters() {
+ Object[][] result = { null,
null,
null,
null,
@@ -136,6 +137,8 @@ public class StatGraphVisualizer extends
null,
null,
null};
+ return result;
+ }
private final String[] GRAPH_COLUMNS = {"average",//$NON-NLS-1$
"aggregate_report_median", //$NON-NLS-1$
@@ -326,8 +329,8 @@ public class StatGraphVisualizer extends
}
// Column formats
- static final Format[] FORMATS =
- new Format[]{
+ static final Format[] getFormatters() {
+ return new Format[]{
null, // Label
null, // count
null, // Mean
@@ -342,10 +345,11 @@ public class StatGraphVisualizer extends
new DecimalFormat("#0.00"), // Throughput //$NON-NLS-1$
new DecimalFormat("#0.00") // pageSize //$NON-NLS-1$
};
+ }
// Column renderers
- static final TableCellRenderer[] RENDERERS =
- new TableCellRenderer[]{
+ static final TableCellRenderer[] getRenderers() {
+ return new TableCellRenderer[]{
null, // Label
null, // count
null, // Mean
@@ -360,6 +364,7 @@ public class StatGraphVisualizer extends
new NumberRenderer("#0.00"), // Received bytes per sec //$NON-NLS-1$
new NumberRenderer("#0.00"), // Sent bytes per sec //$NON-NLS-1$
};
+ }
public static boolean testFunctors(){
StatGraphVisualizer instance = new StatGraphVisualizer();
@@ -430,9 +435,9 @@ public class StatGraphVisualizer extends
myJTable = new JTable(model);
JMeterUtils.applyHiDPI(myJTable);
// Fix centering of titles
- myJTable.getTableHeader().setDefaultRenderer(new HeaderAsPropertyRenderer(COLUMNS_MSG_PARAMETERS));
+ myJTable.getTableHeader().setDefaultRenderer(new HeaderAsPropertyRenderer(getColumnsMsgParameters()));
myJTable.setPreferredScrollableViewportSize(new Dimension(500, 70));
- RendererUtils.applyRenderers(myJTable, RENDERERS);
+ RendererUtils.applyRenderers(myJTable, getRenderers());
myScrollPane = new JScrollPane(myJTable);
settingsPane = new VerticalPanel();
@@ -657,7 +662,7 @@ public class StatGraphVisualizer extends
FileWriter writer = null;
try {
writer = new FileWriter(chooser.getSelectedFile()); // TODO Charset ?
- CSVSaveService.saveCSVStats(getAllTableData(model, FORMATS),writer,saveHeaders.isSelected() ? getLabels(COLUMNS) : null);
+ CSVSaveService.saveCSVStats(getAllTableData(model, getFormatters()),writer,saveHeaders.isSelected() ? getLabels(COLUMNS) : null);
} catch (IOException e) {
JMeterUtils.reportErrorToUser(e.getMessage(), "Error saving data");
} finally {
@@ -735,7 +740,7 @@ public class StatGraphVisualizer extends
static String[] getLabels(String[] keys) {
String[] labels = new String[keys.length];
for (int i = 0; i < labels.length; i++) {
- labels[i]=MessageFormat.format(JMeterUtils.getResString(keys[i]), COLUMNS_MSG_PARAMETERS[i]);
+ labels[i]=MessageFormat.format(JMeterUtils.getResString(keys[i]), getColumnsMsgParameters()[i]);
}
return labels;
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?rev=1776324&r1=1776323&r2=1776324&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java Wed Dec 28 20:27:37 2016
@@ -173,9 +173,9 @@ public class StatVisualizer extends Abst
// new SortFilterModel(myStatTableModel);
myJTable = new JTable(model);
JMeterUtils.applyHiDPI(myJTable);
- myJTable.getTableHeader().setDefaultRenderer(new HeaderAsPropertyRenderer(StatGraphVisualizer.COLUMNS_MSG_PARAMETERS));
+ myJTable.getTableHeader().setDefaultRenderer(new HeaderAsPropertyRenderer(StatGraphVisualizer.getColumnsMsgParameters()));
myJTable.setPreferredScrollableViewportSize(new Dimension(500, 70));
- RendererUtils.applyRenderers(myJTable, StatGraphVisualizer.RENDERERS);
+ RendererUtils.applyRenderers(myJTable, StatGraphVisualizer.getRenderers());
myScrollPane = new JScrollPane(myJTable);
this.add(mainPanel, BorderLayout.NORTH);
this.add(myScrollPane, BorderLayout.CENTER);
@@ -209,7 +209,7 @@ public class StatVisualizer extends Abst
return;
}
try (FileWriter writer = new FileWriter(chooser.getSelectedFile());){ // TODO Charset ?
- CSVSaveService.saveCSVStats(StatGraphVisualizer.getAllTableData(model, StatGraphVisualizer.FORMATS),
+ CSVSaveService.saveCSVStats(StatGraphVisualizer.getAllTableData(model, StatGraphVisualizer.getFormatters()),
writer,
saveHeaders.isSelected() ? StatGraphVisualizer.getLabels(StatGraphVisualizer.getColumns()) : null);
} catch (IOException e) {