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 2012/11/27 01:12:09 UTC
svn commit: r1413954 [2/2] - in
/jmeter/trunk/src/components/org/apache/jmeter: config/ control/
control/gui/ extractor/ extractor/gui/ modifiers/ modifiers/gui/ sampler/
sampler/gui/ timers/ timers/gui/ visualizers/
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java?rev=1413954&r1=1413953&r2=1413954&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/SimpleDataWriter.java Tue Nov 27 00:11:55 2012
@@ -41,6 +41,7 @@ public class SimpleDataWriter extends Ab
setName(getStaticLabel());
}
+ @Override
public String getLabelResource() {
return "simple_data_writer_title"; // $NON-NLS-1$
}
@@ -60,6 +61,7 @@ public class SimpleDataWriter extends Ab
* Does nothing, but required by interface.
*/
+ @Override
public void clearData() {
}
@@ -70,6 +72,7 @@ public class SimpleDataWriter extends Ab
* ignored
*/
+ @Override
public void add(SampleResult sample) {
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineModel.java?rev=1413954&r1=1413953&r2=1413954&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineModel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineModel.java Tue Nov 27 00:11:55 2012
@@ -97,6 +97,7 @@ public class SplineModel implements Clea
clearData();
}
+ @Override
public synchronized void clearData() {
// this.graph.clear();
samples.clear();
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java?rev=1413954&r1=1413953&r2=1413954&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineVisualizer.java Tue Nov 27 00:11:55 2012
@@ -92,22 +92,27 @@ public class SplineVisualizer extends Ab
setGUI();
}
+ @Override
public void add(final SampleResult res) {
JMeterUtils.runSafe(new Runnable() {
+ @Override
public void run() {
model.add(res);
}
});
}
+ @Override
public String getLabelResource() {
return "spline_visualizer_title"; //$NON-NLS-1$
}
+ @Override
public void updateGui(Sample s) {
updateGui();
}
+ @Override
public void clearData() {
model.clearData();
}
@@ -203,6 +208,7 @@ public class SplineVisualizer extends Ab
// add(infoPanel, BorderLayout.EAST);
}
+ @Override
public void updateGui() {
repaint();
synchronized (this) {
@@ -257,6 +263,7 @@ public class SplineVisualizer extends Ab
return this;
}
+ @Override
public Image getImage() {
Image result = graph.createImage(graph.getWidth(), graph.getHeight());
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=1413954&r1=1413953&r2=1413954&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java Tue Nov 27 00:11:55 2012
@@ -285,10 +285,12 @@ public class StatGraphVisualizer extends
return instance.model.checkFunctors(null,instance.getClass());
}
+ @Override
public String getLabelResource() {
return "aggregate_graph_title"; //$NON-NLS-1$
}
+ @Override
public void add(final SampleResult res) {
final String sampleLabel = res.getSampleLabel();
// Sampler selection
@@ -297,6 +299,7 @@ public class StatGraphVisualizer extends
}
if ((matcher == null) || (matcher.find())) {
JMeterUtils.runSafe(new Runnable() {
+ @Override
public void run() {
SamplingStatCalculator row = null;
synchronized (lock) {
@@ -318,6 +321,7 @@ public class StatGraphVisualizer extends
/**
* Clears this visualizer and its model, and forces a repaint of the table.
*/
+ @Override
public void clearData() {
synchronized (lock) {
model.clearData();
@@ -368,6 +372,7 @@ public class StatGraphVisualizer extends
// If clic on the Graph tab, make the graph (without apply interval or filter)
ChangeListener changeListener = new ChangeListener() {
+ @Override
public void stateChanged(ChangeEvent changeEvent) {
JTabbedPane srcTab = (JTabbedPane) changeEvent.getSource();
int index = srcTab.getSelectedIndex();
@@ -539,6 +544,7 @@ public class StatGraphVisualizer extends
return data;
}
+ @Override
public void actionPerformed(ActionEvent event) {
boolean forceReloadData = false;
final Object eventSource = event.getSource();
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=1413954&r1=1413953&r2=1413954&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java Tue Nov 27 00:11:55 2012
@@ -159,12 +159,15 @@ public class StatVisualizer extends Abst
return instance.model.checkFunctors(null,instance.getClass());
}
+ @Override
public String getLabelResource() {
return "aggregate_report"; //$NON-NLS-1$
}
+ @Override
public void add(final SampleResult res) {
JMeterUtils.runSafe(new Runnable() {
+ @Override
public void run() {
SamplingStatCalculator row = null;
final String sampleLabel = res.getSampleLabel(useGroupName.isSelected());
@@ -194,6 +197,7 @@ public class StatVisualizer extends Abst
/**
* Clears this visualizer and its model, and forces a repaint of the table.
*/
+ @Override
public void clearData() {
synchronized (lock) {
model.clearData();
@@ -249,6 +253,7 @@ public class StatVisualizer extends Abst
saveHeaders.setSelected(el.getPropertyAsBoolean(SAVE_HEADERS, true));
}
+ @Override
public void actionPerformed(ActionEvent ev) {
if (ev.getSource() == saveTable) {
JFileChooser chooser = FileDialoger.promptToSaveFile("aggregate.csv");//$NON-NLS-1$
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java?rev=1413954&r1=1413953&r2=1413954&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java Tue Nov 27 00:11:55 2012
@@ -155,13 +155,16 @@ public class SummaryReport extends Abstr
return instance.model.checkFunctors(null,instance.getClass());
}
+ @Override
public String getLabelResource() {
return "summary_report"; //$NON-NLS-1$
}
+ @Override
public void add(final SampleResult res) {
final String sampleLabel = res.getSampleLabel(useGroupName.isSelected());
JMeterUtils.runSafe(new Runnable() {
+ @Override
public void run() {
Calculator row = null;
synchronized (lock) {
@@ -190,6 +193,7 @@ public class SummaryReport extends Abstr
/**
* Clears this visualizer and its model, and forces a repaint of the table.
*/
+ @Override
public void clearData() {
//Synch is needed because a clear can occur while add occurs
synchronized (lock) {
@@ -244,6 +248,7 @@ public class SummaryReport extends Abstr
saveHeaders.setSelected(el.getPropertyAsBoolean(SAVE_HEADERS, true));
}
+ @Override
public void actionPerformed(ActionEvent ev) {
if (ev.getSource() == saveTable) {
JFileChooser chooser = FileDialoger.promptToSaveFile("summary.csv");//$NON-NLS-1$
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=1413954&r1=1413953&r2=1413954&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java Tue Nov 27 00:11:55 2012
@@ -146,6 +146,7 @@ public class TableVisualizer extends Abs
}
+ @Override
public String getLabelResource() {
return "view_results_in_table"; // $NON-NLS-1$
}
@@ -157,8 +158,10 @@ public class TableVisualizer extends Abs
deviationField.setText(Long.toString((long) calc.getStandardDeviation()));
}
+ @Override
public void add(final SampleResult res) {
JMeterUtils.runSafe(new Runnable() {
+ @Override
public void run() {
if (childSamples.isSelected()) {
SampleResult[] subResults = res.getSubResults();
@@ -192,6 +195,7 @@ public class TableVisualizer extends Abs
});
}
+ @Override
public synchronized void clearData() {
model.clearData();
calc.clear();
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=1413954&r1=1413953&r2=1413954&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java Tue Nov 27 00:11:55 2012
@@ -122,8 +122,10 @@ implements ActionListener, TreeSelection
}
/** {@inheritDoc} */
+ @Override
public void add(final SampleResult sample) {
JMeterUtils.runSafe(new Runnable() {
+ @Override
public void run() {
updateGui(sample);
}
@@ -189,6 +191,7 @@ implements ActionListener, TreeSelection
}
/** {@inheritDoc} */
+ @Override
public synchronized void clearData() {
while (root.getChildCount() > 0) {
// the child to be removed will always be 0 'cos as the nodes are
@@ -199,6 +202,7 @@ implements ActionListener, TreeSelection
}
/** {@inheritDoc} */
+ @Override
public String getLabelResource() {
return "view_results_tree_title"; // $NON-NLS-1$
}
@@ -225,6 +229,7 @@ implements ActionListener, TreeSelection
}
/** {@inheritDoc} */
+ @Override
public void valueChanged(TreeSelectionEvent e) {
lastSelectionEvent = e;
DefaultMutableTreeNode node = null;
@@ -321,6 +326,7 @@ implements ActionListener, TreeSelection
}
/** {@inheritDoc} */
+ @Override
public void actionPerformed(ActionEvent event) {
String command = event.getActionCommand();
if (COMBO_CHANGE_COMMAND.equals(command)) {
@@ -404,6 +410,7 @@ implements ActionListener, TreeSelection
/**
* Handler for Checkbox
*/
+ @Override
public void itemStateChanged(ItemEvent e) {
// NOOP state is held by component
}