Author: pmouawad
Date: Thu Dec 29 22:18:23 2016
New Revision: 1776499
URL: http://svn.apache.org/viewvc?rev=1776499&view=rev
Log:
sonar: reorder to fix sonar code smells
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.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=1776499&r1=1776498&r2=1776499&view=diff
==============================================================================
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
Thu Dec 29 22:18:23 2016
@@ -121,23 +121,6 @@ public class StatGraphVisualizer extends
"aggregate_report_bandwidth", //$NON-NLS-1$
"aggregate_report_sent_bytes_per_sec" //$NON-NLS-1$
};
-
- static final Object[][] getColumnsMsgParameters() {
- Object[][] result = { null,
- null,
- null,
- null,
- new Object[]{PCT1_LABEL},
- new Object[]{PCT2_LABEL},
- new Object[]{PCT3_LABEL},
- null,
- null,
- null,
- null,
- null,
- null};
- return result;
- }
private static final String[] GRAPH_COLUMNS = {"average",//$NON-NLS-1$
"aggregate_report_median", //$NON-NLS-1$
@@ -284,6 +267,23 @@ public class StatGraphVisualizer extends
init();
}
+ static final Object[][] getColumnsMsgParameters() {
+ Object[][] result = { null,
+ null,
+ null,
+ null,
+ new Object[]{PCT1_LABEL},
+ new Object[]{PCT2_LABEL},
+ new Object[]{PCT3_LABEL},
+ null,
+ null,
+ null,
+ null,
+ null,
+ null};
+ return result;
+ }
+
/**
* @return array of String containing column names
*/
@@ -360,6 +360,47 @@ public class StatGraphVisualizer extends
new NumberRenderer("#0.00"), // Sent bytes per sec
//$NON-NLS-1$
};
}
+
+ /**
+ *
+ * @param keys I18N keys
+ * @return labels
+ */
+ 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]),
getColumnsMsgParameters()[i]);
+ }
+ return labels;
+ }
+
+ /**
+ * We use this method to get the data, since we are using
+ * ObjectTableModel, so the calling getDataVector doesn't
+ * work as expected.
+ * @param model {@link ObjectTableModel}
+ * @param formats Array of {@link Format} array can contain null
formatters in this case value is added as is
+ * @return the data from the model
+ */
+ public static List<List<Object>> getAllTableData(ObjectTableModel model,
Format[] formats) {
+ List<List<Object>> data = new ArrayList<>();
+ if (model.getRowCount() > 0) {
+ for (int rw=0; rw < model.getRowCount(); rw++) {
+ int cols = model.getColumnCount();
+ List<Object> column = new ArrayList<>();
+ data.add(column);
+ for (int idx=0; idx < cols; idx++) {
+ Object val = model.getValueAt(rw,idx);
+ if(formats[idx] != null) {
+ column.add(formats[idx].format(val));
+ } else {
+ column.add(val);
+ }
+ }
+ }
+ }
+ return data;
+ }
public static boolean testFunctors(){
StatGraphVisualizer instance = new StatGraphVisualizer();
@@ -599,34 +640,6 @@ public class StatGraphVisualizer extends
}
return i;
}
-
- /**
- * We use this method to get the data, since we are using
- * ObjectTableModel, so the calling getDataVector doesn't
- * work as expected.
- * @param model {@link ObjectTableModel}
- * @param formats Array of {@link Format} array can contain null
formatters in this case value is added as is
- * @return the data from the model
- */
- public static List<List<Object>> getAllTableData(ObjectTableModel model,
Format[] formats) {
- List<List<Object>> data = new ArrayList<>();
- if (model.getRowCount() > 0) {
- for (int rw=0; rw < model.getRowCount(); rw++) {
- int cols = model.getColumnCount();
- List<Object> column = new ArrayList<>();
- data.add(column);
- for (int idx=0; idx < cols; idx++) {
- Object val = model.getValueAt(rw,idx);
- if(formats[idx] != null) {
- column.add(formats[idx].format(val));
- } else {
- column.add(val);
- }
- }
- }
- }
- return data;
- }
@Override
public void actionPerformed(ActionEvent event) {
@@ -719,19 +732,6 @@ public class StatGraphVisualizer extends
}
}
- /**
- *
- * @param keys I18N keys
- * @return labels
- */
- 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]),
getColumnsMsgParameters()[i]);
- }
- return labels;
- }
-
private void actionMakeGraph() {
if (model.getRowCount() > 1) {
makeGraph();
