jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1718756 - in /jmeter/trunk/src/core/org/apache/jmeter/report/processor: ./ graph/
Date Wed, 09 Dec 2015 02:11:05 GMT
Author: sebb
Date: Wed Dec  9 02:11:05 2015
New Revision: 1718756

URL: http://svn.apache.org/viewvc?rev=1718756&view=rev
Log:
Tab police / fix indentation

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleWriterConsumer.java
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/SumAggregator.java
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/SumAggregatorFactory.java
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/TimeRateAggregator.java
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/ValueResultData.java
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java
    jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleWriterConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleWriterConsumer.java?rev=1718756&r1=1718755&r2=1718756&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleWriterConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleWriterConsumer.java Wed
Dec  9 02:11:05 2015
@@ -33,8 +33,7 @@ import org.slf4j.LoggerFactory;
  */
 public class SampleWriterConsumer extends AbstractSampleConsumer {
 
-    private static final Logger log = LoggerFactory
-	    .getLogger(SampleWriterConsumer.class);
+    private static final Logger log = LoggerFactory.getLogger(SampleWriterConsumer.class);
 
     private File outputFile;
 
@@ -45,80 +44,79 @@ public class SampleWriterConsumer extend
     private int channelsCount;
 
     public void setOutputFile(String outputFile) {
-	setOutputFile(new File(outputFile));
+        setOutputFile(new File(outputFile));
     }
 
     public void setOutputFile(File outputFile) {
-	if (outputFile == null) {
+        if (outputFile == null) {
         throw new ArgumentNullException("outputFile");
-    }
+        }
 
-	this.outputFile = outputFile;
+        this.outputFile = outputFile;
     }
 
     public File getOutputFile() {
-	return outputFile;
+        return outputFile;
     }
 
     public File getOutputFile(int channel) {
-	String ext = null;
-	String fName = getOutputFile().getName();
-	int idx = fName.lastIndexOf('.');
-	if (idx >= 0 && idx < fName.length() - 1) {
-	    String backedName = fName;
-	    fName = fName.substring(0, idx);
-	    ext = backedName.substring(idx + 1);
-	} else {
-	    ext = "";
-	}
-	if (channel > 0) {
-	    fName += "-" + channel + "." + ext;
-	} else {
-	    fName += "." + ext;
-	}
-	return new File(getOutputFile().getParentFile(), fName);
+        String ext = null;
+        String fName = getOutputFile().getName();
+        int idx = fName.lastIndexOf('.');
+        if (idx >= 0 && idx < fName.length() - 1) {
+            String backedName = fName;
+            fName = fName.substring(0, idx);
+            ext = backedName.substring(idx + 1);
+        } else {
+            ext = "";
+        }
+        if (channel > 0) {
+            fName += "-" + channel + "." + ext;
+        } else {
+            fName += "." + ext;
+        }
+        return new File(getOutputFile().getParentFile(), fName);
     }
 
     /**
      * Enables the CSV header on the output file (defaults to false)
      */
     public void setWriteHeader(boolean writeHeader) {
-	this.shouldWriteHeader = writeHeader;
+        this.shouldWriteHeader = writeHeader;
     }
 
     @Override
     public void startConsuming() {
-	if (outputFile == null) {
-	    File wd = getWorkingDirectory();
-	    wd.mkdir();
-	    if (log.isInfoEnabled()) {
-		log.info("startConsuming(): No output file set, writing to work directory :"
-		        + wd.getAbsolutePath());
-	    }
-	    outputFile = new File(wd, "samples.csv");
-	}
-	outputFile.getParentFile().mkdirs();
-	channelsCount = getConsumedChannelCount();
-	csvWriters = new CsvSampleWriter[channelsCount];
-	for (int i = 0; i < channelsCount; i++) {
-	    csvWriters[i] = new CsvSampleWriter(getOutputFile(i),
-		    getConsumedMetadata(i));
-	    if (shouldWriteHeader) {
-		csvWriters[i].writeHeader();
-	    }
-	}
+        if (outputFile == null) {
+            File wd = getWorkingDirectory();
+            wd.mkdir();
+            if (log.isInfoEnabled()) {
+                log.info("startConsuming(): No output file set, writing to work directory
:"
+                    + wd.getAbsolutePath());
+            }
+            outputFile = new File(wd, "samples.csv");
+        }
+        outputFile.getParentFile().mkdirs();
+        channelsCount = getConsumedChannelCount();
+        csvWriters = new CsvSampleWriter[channelsCount];
+        for (int i = 0; i < channelsCount; i++) {
+            csvWriters[i] = new CsvSampleWriter(getOutputFile(i),getConsumedMetadata(i));
+            if (shouldWriteHeader) {
+                csvWriters[i].writeHeader();
+            }
+        }
     }
 
     @Override
     public void consume(Sample s, int channel) {
-	csvWriters[channel].write(s);
+        csvWriters[channel].write(s);
     }
 
     @Override
     public void stopConsuming() {
-	for (int i = 0; i < channelsCount; i++) {
-	    csvWriters[i].close();
-	}
-	getWorkingDirectory().delete();
+        for (int i = 0; i < channelsCount; i++) {
+            csvWriters[i].close();
+        }
+        getWorkingDirectory().delete();
     }
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java?rev=1718756&r1=1718755&r2=1718756&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
Wed Dec  9 02:11:05 2015
@@ -33,38 +33,38 @@ public class StatisticsSummaryConsumer e
         AbstractSummaryConsumer<StatisticsSummaryData> {
 
     private static final int percentileIndex1 = JMeterUtils.getPropDefault(
-	    "aggregate_rpt_pct1", 90);
+        "aggregate_rpt_pct1", 90);
     private static final int percentileIndex2 = JMeterUtils.getPropDefault(
-	    "aggregate_rpt_pct2", 95);
+        "aggregate_rpt_pct2", 95);
     private static final int percentileIndex3 = JMeterUtils.getPropDefault(
-	    "aggregate_rpt_pct3", 99);
+        "aggregate_rpt_pct3", 99);
 
     /**
      * Instantiates a new statistics summary consumer.
      */
     public StatisticsSummaryConsumer() {
-	super(true);
+        super(true);
     }
 
     void aggregateSample(Sample sample, StatisticsSummaryData data) {
-	data.IncTotal();
-	data.IncBytes(sample.getSentBytes());
+        data.IncTotal();
+        data.IncBytes(sample.getSentBytes());
 
-	if (sample.getSuccess() == false) {
-	    data.IncErrors();
-	}
+        if (sample.getSuccess() == false) {
+                data.IncErrors();
+                }
 
-	long elapsedTime = sample.getElapsedTime();
-	data.getPercentile1().addValue(elapsedTime);
-	data.getPercentile2().addValue(elapsedTime);
-	data.getPercentile3().addValue(elapsedTime);
+        long elapsedTime = sample.getElapsedTime();
+        data.getPercentile1().addValue(elapsedTime);
+        data.getPercentile2().addValue(elapsedTime);
+        data.getPercentile3().addValue(elapsedTime);
 
-	data.setMin(elapsedTime);
-	data.setMax(elapsedTime);
+        data.setMin(elapsedTime);
+        data.setMax(elapsedTime);
 
-	data.setFirstTime(sample.getStartTime());
+        data.setFirstTime(sample.getStartTime());
 
-	data.setEndTime(sample.getEndTime());
+        data.setEndTime(sample.getEndTime());
     }
 
     /*
@@ -77,23 +77,23 @@ public class StatisticsSummaryConsumer e
      */
     @Override
     protected void updateData(SummaryInfo info, Sample sample) {
-	SummaryInfo overallInfo = getOverallInfo();
-	StatisticsSummaryData overallData = overallInfo.getData();
-	if (overallData == null) {
-	    overallData = new StatisticsSummaryData(percentileIndex1,
-		    percentileIndex2, percentileIndex3);
-	    overallInfo.setData(overallData);
-	}
-
-	StatisticsSummaryData data = info.getData();
-	if (data == null) {
-	    data = new StatisticsSummaryData(percentileIndex1,
-		    percentileIndex2, percentileIndex3);
-	    info.setData(data);
-	}
+        SummaryInfo overallInfo = getOverallInfo();
+        StatisticsSummaryData overallData = overallInfo.getData();
+        if (overallData == null) {
+            overallData = new StatisticsSummaryData(percentileIndex1,
+                            percentileIndex2, percentileIndex3);
+            overallInfo.setData(overallData);
+            }
+
+        StatisticsSummaryData data = info.getData();
+        if (data == null) {
+            data = new StatisticsSummaryData(percentileIndex1,
+                        percentileIndex2, percentileIndex3);
+            info.setData(data);
+        }
 
-	aggregateSample(sample, data);
-	aggregateSample(sample, overallData);
+        aggregateSample(sample, data);
+        aggregateSample(sample, overallData);
     }
 
     /*
@@ -105,23 +105,23 @@ public class StatisticsSummaryConsumer e
      */
     @Override
     protected ListResultData createDataResult(String key,
-	    StatisticsSummaryData data) {
-	ListResultData result = new ListResultData();
-	result.addResult(new ValueResultData(key != null ? key : JMeterUtils
-	        .getResString("reportgenerator_summary_total")));
-	long total = data.getTotal();
-	long errors = data.getErrors();
-	result.addResult(new ValueResultData(total));
-	result.addResult(new ValueResultData(errors));
-	result.addResult(new ValueResultData((double) errors * 100 / total));
-	result.addResult(new ValueResultData(data.getPercentile1().getResult()));
-	result.addResult(new ValueResultData(data.getPercentile2().getResult()));
-	result.addResult(new ValueResultData(data.getPercentile3().getResult()));
-	result.addResult(new ValueResultData(data.getThroughput()));
-	result.addResult(new ValueResultData(data.getKBytesPerSecond()));
-	result.addResult(new ValueResultData(data.getMin()));
-	result.addResult(new ValueResultData(data.getMax()));
-	return result;
+            StatisticsSummaryData data) {
+        ListResultData result = new ListResultData();
+        result.addResult(new ValueResultData(
+                key != null ? key : JMeterUtils.getResString("reportgenerator_summary_total")));
+        long total = data.getTotal();
+        long errors = data.getErrors();
+        result.addResult(new ValueResultData(total));
+        result.addResult(new ValueResultData(errors));
+        result.addResult(new ValueResultData((double) errors * 100 / total));
+        result.addResult(new ValueResultData(data.getPercentile1().getResult()));
+        result.addResult(new ValueResultData(data.getPercentile2().getResult()));
+        result.addResult(new ValueResultData(data.getPercentile3().getResult()));
+        result.addResult(new ValueResultData(data.getThroughput()));
+        result.addResult(new ValueResultData(data.getKBytesPerSecond()));
+        result.addResult(new ValueResultData(data.getMin()));
+        result.addResult(new ValueResultData(data.getMax()));
+        return result;
     }
 
     /*
@@ -133,7 +133,7 @@ public class StatisticsSummaryConsumer e
      */
     @Override
     protected String getKeyFromSample(Sample sample) {
-	return sample.getName();
+        return sample.getName();
     }
 
     /*
@@ -145,40 +145,32 @@ public class StatisticsSummaryConsumer e
      */
     @Override
     protected ListResultData createResultTitles() {
-	ListResultData titles = new ListResultData();
-	titles.addResult(new ValueResultData(JMeterUtils
-	        .getResString("reportgenerator_summary_statistics_label")));
-	titles.addResult(new ValueResultData(JMeterUtils
-	        .getResString("reportgenerator_summary_statistics_count")));
-	titles.addResult(new ValueResultData(JMeterUtils
-	        .getResString("reportgenerator_summary_statistics_error_count")));
-	titles.addResult(new ValueResultData(
-	        JMeterUtils
-	                .getResString("reportgenerator_summary_statistics_error_percent")));
-	titles.addResult(new ValueResultData(
-	        String.format(
-	                JMeterUtils
-	                        .getResString("reportgenerator_summary_statistics_percentile_fmt"),
-	                percentileIndex1)));
-	titles.addResult(new ValueResultData(
-	        String.format(
-	                JMeterUtils
-	                        .getResString("reportgenerator_summary_statistics_percentile_fmt"),
-	                percentileIndex2)));
-	titles.addResult(new ValueResultData(
-	        String.format(
-	                JMeterUtils
-	                        .getResString("reportgenerator_summary_statistics_percentile_fmt"),
-	                percentileIndex3)));
-	titles.addResult(new ValueResultData(JMeterUtils
-	        .getResString("reportgenerator_summary_statistics_throughput")));
-	titles.addResult(new ValueResultData(JMeterUtils
-	        .getResString("reportgenerator_summary_statistics_kbytes")));
-	titles.addResult(new ValueResultData(JMeterUtils
-	        .getResString("reportgenerator_summary_statistics_min")));
-	titles.addResult(new ValueResultData(JMeterUtils
-	        .getResString("reportgenerator_summary_statistics_max")));
-	return titles;
+        ListResultData titles = new ListResultData();
+        titles.addResult(new ValueResultData(JMeterUtils
+            .getResString("reportgenerator_summary_statistics_label")));
+        titles.addResult(new ValueResultData(JMeterUtils
+            .getResString("reportgenerator_summary_statistics_count")));
+        titles.addResult(new ValueResultData(JMeterUtils
+            .getResString("reportgenerator_summary_statistics_error_count")));
+        titles.addResult(new ValueResultData(
+            JMeterUtils.getResString("reportgenerator_summary_statistics_error_percent")));
+        titles.addResult(new ValueResultData(
+            String.format(
+                JMeterUtils.getResString("reportgenerator_summary_statistics_percentile_fmt"),
+                    percentileIndex1)));
+        titles.addResult(new ValueResultData(
+            String.format(
+                JMeterUtils.getResString("reportgenerator_summary_statistics_percentile_fmt"),
+                    percentileIndex2)));
+        titles.addResult(new ValueResultData(
+            String.format(
+                JMeterUtils.getResString("reportgenerator_summary_statistics_percentile_fmt"),
+                    percentileIndex3)));
+        titles.addResult(new ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_throughput")));
+        titles.addResult(new ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_kbytes")));
+        titles.addResult(new ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_min")));
+        titles.addResult(new ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_max")));
+        return titles;
     }
 
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/SumAggregator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/SumAggregator.java?rev=1718756&r1=1718755&r2=1718756&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/SumAggregator.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/SumAggregator.java Wed Dec  9
02:11:05 2015
@@ -34,7 +34,7 @@ public class SumAggregator implements Ag
      */
     @Override
     public long getCount() {
-	return count;
+        return count;
     }
 
     /*
@@ -44,7 +44,7 @@ public class SumAggregator implements Ag
      */
     @Override
     public double getResult() {
-	return sum;
+        return sum;
     }
 
     /*
@@ -54,8 +54,8 @@ public class SumAggregator implements Ag
      */
     @Override
     public void addValue(double value) {
-	count++;
-	sum += value;
+        count++;
+        sum += value;
     }
 
     /*
@@ -65,8 +65,8 @@ public class SumAggregator implements Ag
      */
     @Override
     public void reset() {
-	count = 0;
-	sum = 0;
+        count = 0;
+        sum = 0;
     }
 
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/SumAggregatorFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/SumAggregatorFactory.java?rev=1718756&r1=1718755&r2=1718756&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/SumAggregatorFactory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/SumAggregatorFactory.java Wed
Dec  9 02:11:05 2015
@@ -33,7 +33,7 @@ public class SumAggregatorFactory extend
      */
     @Override
     protected Aggregator createAggregator() {
-	return new SumAggregator();
+        return new SumAggregator();
     }
 
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/TimeRateAggregator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/TimeRateAggregator.java?rev=1718756&r1=1718755&r2=1718756&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/TimeRateAggregator.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/TimeRateAggregator.java Wed Dec
 9 02:11:05 2015
@@ -32,7 +32,7 @@ public class TimeRateAggregator implemen
      * @return the granularity
      */
     public final long getGranularity() {
-	return granularity;
+        return granularity;
     }
 
     /**
@@ -40,7 +40,7 @@ public class TimeRateAggregator implemen
      *            the granularity to set
      */
     public final void setGranularity(long granularity) {
-	this.granularity = granularity;
+        this.granularity = granularity;
     }
 
     /*
@@ -50,7 +50,7 @@ public class TimeRateAggregator implemen
      */
     @Override
     public long getCount() {
-	return count;
+        return count;
     }
 
     /*
@@ -60,7 +60,7 @@ public class TimeRateAggregator implemen
      */
     @Override
     public double getResult() {
-	return value * 1000 / granularity;
+        return value * 1000 / granularity;
     }
 
     /*
@@ -70,8 +70,8 @@ public class TimeRateAggregator implemen
      */
     @Override
     public void addValue(final double value) {
-	this.count++;
-	this.value += value;
+        this.count++;
+        this.value += value;
     }
 
     /*
@@ -81,8 +81,8 @@ public class TimeRateAggregator implemen
      */
     @Override
     public void reset() {
-	count = 0;
-	value = 0;
+        count = 0;
+        value = 0;
     }
 
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java?rev=1718756&r1=1718755&r2=1718756&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java
Wed Dec  9 02:11:05 2015
@@ -32,7 +32,7 @@ public class TimeRateAggregatorFactory e
      * @return the granularity
      */
     public final long getGranularity() {
-	return granularity;
+        return granularity;
     }
 
     /**
@@ -42,7 +42,7 @@ public class TimeRateAggregatorFactory e
      *            the granularity to set
      */
     public final void setGranularity(long granularity) {
-	this.granularity = granularity;
+        this.granularity = granularity;
     }
 
     /*
@@ -54,9 +54,9 @@ public class TimeRateAggregatorFactory e
      */
     @Override
     protected Aggregator createAggregator() {
-	TimeRateAggregator aggregator = new TimeRateAggregator();
-	aggregator.setGranularity(granularity);
-	return aggregator;
+        TimeRateAggregator aggregator = new TimeRateAggregator();
+        aggregator.setGranularity(granularity);
+        return aggregator;
     }
 
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/ValueResultData.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/ValueResultData.java?rev=1718756&r1=1718755&r2=1718756&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/ValueResultData.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/ValueResultData.java Wed Dec
 9 02:11:05 2015
@@ -34,7 +34,7 @@ public class ValueResultData implements
      * @return the value of the result
      */
     public final Object getValue() {
-	return value;
+        return value;
     }
 
     /**
@@ -44,7 +44,7 @@ public class ValueResultData implements
      *            the new value of the result
      */
     public final void setValue(Object value) {
-	this.value = value;
+        this.value = value;
     }
 
     /**
@@ -60,7 +60,7 @@ public class ValueResultData implements
      *            the value of the result
      */
     public ValueResultData(Object value) {
-	setValue(value);
+        setValue(value);
     }
 
     /*
@@ -72,10 +72,10 @@ public class ValueResultData implements
      */
     @Override
     public <TVisit> TVisit accept(ResultDataVisitor<TVisit> visitor) {
-	if (visitor == null) {
-        throw new ArgumentNullException("visitor");
-    }
-	return visitor.visitValueResult(this);
+        if (visitor == null) {
+            throw new ArgumentNullException("visitor");
+        }
+        return visitor.visitValueResult(this);
     }
 
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java?rev=1718756&r1=1718755&r2=1718756&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
Wed Dec  9 02:11:05 2015
@@ -36,7 +36,7 @@ public class StaticSeriesSelector extend
      * @return the name of the series
      */
     public final String getSeriesName() {
-	return seriesName;
+        return seriesName;
     }
 
     /**
@@ -46,7 +46,7 @@ public class StaticSeriesSelector extend
      *            the name of the series to set
      */
     public final void setSeriesName(String seriesName) {
-	this.seriesName = seriesName;
+        this.seriesName = seriesName;
     }
 
     /*
@@ -58,7 +58,7 @@ public class StaticSeriesSelector extend
      */
     @Override
     public Iterable<String> select(Sample sample) {
-	return Arrays.asList(seriesName);
+        return Arrays.asList(seriesName);
     }
 
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java?rev=1718756&r1=1718755&r2=1718756&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java
Wed Dec  9 02:11:05 2015
@@ -38,7 +38,7 @@ public class StatusSeriesSelector extend
      * @return the failureLabel
      */
     public final String getFailureLabel() {
-	return failureLabel;
+        return failureLabel;
     }
 
     /**
@@ -48,7 +48,7 @@ public class StatusSeriesSelector extend
      *            the failureLabel to set
      */
     public final void setFailureLabel(String failureLabel) {
-	this.failureLabel = failureLabel;
+        this.failureLabel = failureLabel;
     }
 
     /**
@@ -57,7 +57,7 @@ public class StatusSeriesSelector extend
      * @return the successLabel
      */
     public final String getSuccessLabel() {
-	return successLabel;
+        return successLabel;
     }
 
     /**
@@ -67,7 +67,7 @@ public class StatusSeriesSelector extend
      *            the successLabel to set
      */
     public final void setSuccessLabel(String successLabel) {
-	this.successLabel = successLabel;
+        this.successLabel = successLabel;
     }
 
     /*
@@ -79,8 +79,8 @@ public class StatusSeriesSelector extend
      */
     @Override
     public Iterable<String> select(Sample sample) {
-	String label = sample.getSuccess() ? successLabel : failureLabel;
-	return Arrays.asList(new String[] { label });
+        String label = sample.getSuccess() ? successLabel : failureLabel;
+        return Arrays.asList(new String[] { label });
     }
 
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java?rev=1718756&r1=1718755&r2=1718756&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java
Wed Dec  9 02:11:05 2015
@@ -36,7 +36,7 @@ public class TimeStampKeysSelector imple
      * @return the granularity
      */
     public long getGranularity() {
-	return granularity;
+        return granularity;
     }
 
     /**
@@ -46,7 +46,7 @@ public class TimeStampKeysSelector imple
      *            the granularity to set
      */
     public void setGranularity(long granularity) {
-	this.granularity = granularity;
+        this.granularity = granularity;
     }
 
     /**
@@ -56,7 +56,7 @@ public class TimeStampKeysSelector imple
      * @return true if the begin time is used; false otherwise.
      */
     public final boolean selectsBeginTime() {
-	return selectBeginTime;
+        return selectBeginTime;
     }
 
     /**
@@ -67,7 +67,7 @@ public class TimeStampKeysSelector imple
      *            the status to set
      */
     public final void setSelectBeginTime(boolean selectBeginTime) {
-	this.selectBeginTime = selectBeginTime;
+        this.selectBeginTime = selectBeginTime;
     }
 
     /*
@@ -79,9 +79,8 @@ public class TimeStampKeysSelector imple
      */
     @Override
     public Double select(Sample sample) {
-	long time = selectBeginTime ? sample.getStartTime() : sample
-	        .getEndTime();
-	return (double) (time - time % granularity);
+        long time = selectBeginTime ? sample.getStartTime() : sample.getEndTime();
+        return (double) (time - time % granularity);
     }
 
 }



Mime
View raw message