Author: fschumacher
Date: Thu Dec 10 19:10:06 2015
New Revision: 1719185
URL: http://svn.apache.org/viewvc?rev=1719185&view=rev
Log:
set eol-style to native and remove linefeeds
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationException.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationUtils.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/config/ConvertException.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/config/Converters.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/config/ExporterConfiguration.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/config/GraphConfiguration.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/config/InstanceConfiguration.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/config/StringConverter.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/ArgumentNullException.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/ControllerSamplePredicate.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvFile.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleWriter.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/DataContext.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/JsonUtil.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/Sample.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleBuilder.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleComparator.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleException.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetaDataParser.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetadata.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/SamplePredicate.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleWriter.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/core/TimeHelper.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/AbstractDataExporter.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/DataExporter.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ExportException.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/GenerationException.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/JsonizerVisitor.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/TemplateVisitor.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractAggregatorFactory.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleConsumer.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleProcessor.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSampleSource.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AbstractSummaryConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AggregateConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/Aggregator.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/AggregatorFactory.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ApdexSummaryConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ApdexSummaryData.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ApdexThresholdsInfo.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ChannelContext.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/FieldSampleComparator.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/FilterConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/Job.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ListResultData.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/MapResultData.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/MaxAggregator.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/MeanAggregator.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/MeanAggregatorFactory.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/MedianAggregatorFactory.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/MinAggregator.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/NormalizerSampleConsumer.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/PercentileAggregator.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/PercentileAggregatorFactory.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/RequestsSummaryConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ResultData.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ResultDataVisitor.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleConsumer.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleContext.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleIndexer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProcessor.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleProducer.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleSource.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SampleWriterConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java (props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryData.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SumAggregator.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/SumAggregatorFactory.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/TaggerConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ThresholdSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/TimeRateAggregator.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/TimeRateAggregatorFactory.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ValueResultData.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractOverTimeGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/AbstractVersusRequestsGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/CountValueSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/ElapsedTimeValueSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/GraphKeysSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/GraphSeriesSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/GraphValueSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/GroupData.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/GroupInfo.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/IndexedNameSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/LatencyValueSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/SeriesData.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/StatusSeriesSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/TimeStampKeysSelector.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ActiveThreadsGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/BytesThroughputGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/CodesPerSecondGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/HitsPerSecondGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyOverTimeGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/LatencyVSRequestGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeDistributionGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeOverTimeGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePerSampleGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseTimeVSRequestGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TimeVSThreadGraphConsumer.java (contents, props changed)
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TransactionsPerSecondGraphConsumer.java (contents, props changed)
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationException.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationException.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationException.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationException.java Thu Dec 10 19:10:06 2015
@@ -1,60 +1,60 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.config;
-
-/**
- * The class ConfigurationException provides an exception when configuration
- * properties loading fails.
- *
- * @since 2.14
- */
-public class ConfigurationException extends Exception {
-
- /** The Constant serialVersionUID. */
- private static final long serialVersionUID = -8686808406435011845L;
-
- /**
- * Instantiates a new configuration exception.
- */
- public ConfigurationException() {
- super();
- }
-
- /**
- * Instantiates a new configuration exception.
- *
- * @param message
- * the message
- */
- public ConfigurationException(String message) {
- super(message);
- }
-
- /**
- * Instantiates a new configuration exception.
- *
- * @param message
- * the message
- * @param cause
- * the cause
- */
- public ConfigurationException(String message, Throwable cause) {
- super(message, cause);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.config;
+
+/**
+ * The class ConfigurationException provides an exception when configuration
+ * properties loading fails.
+ *
+ * @since 2.14
+ */
+public class ConfigurationException extends Exception {
+
+ /** The Constant serialVersionUID. */
+ private static final long serialVersionUID = -8686808406435011845L;
+
+ /**
+ * Instantiates a new configuration exception.
+ */
+ public ConfigurationException() {
+ super();
+ }
+
+ /**
+ * Instantiates a new configuration exception.
+ *
+ * @param message
+ * the message
+ */
+ public ConfigurationException(String message) {
+ super(message);
+ }
+
+ /**
+ * Instantiates a new configuration exception.
+ *
+ * @param message
+ * the message
+ * @param cause
+ * the cause
+ */
+ public ConfigurationException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+}
Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationUtils.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationUtils.java Thu Dec 10 19:10:06 2015
@@ -1,78 +1,78 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.config;
-
-import org.apache.jmeter.report.core.ArgumentNullException;
-
-/**
- * The class ConfigurationUtils provides helper method for configuration
- * handling.
- *
- * @since 2.14
- */
-public class ConfigurationUtils {
-
- private static final String NOT_SUPPORTED_CONVERTION_FMT = "Convert \"%s\" to \"%s\" is not supported";
-
- /**
- * Instantiates a new configuration utils.
- */
- private ConfigurationUtils() {
- }
-
- /**
- * Convert the specified string value to the property type.
- *
- * @param <TProperty>
- * the type of the property
- * @param value
- * the string value
- * @param clazz
- * the class of the property
- * @return the converted string
- * @throws ConfigurationException
- * when unable to convert the string
- */
- public static <TProperty> TProperty convert(String value,
- Class<TProperty> clazz) throws ConfigurationException {
- if (clazz == null) {
- throw new ArgumentNullException("clazz");
- }
-
- TProperty result;
- if (clazz.isAssignableFrom(String.class)) {
- result = (TProperty) value;
- } else {
- StringConverter<TProperty> converter = Converters
- .getConverter(clazz);
- if (converter == null) {
- throw new ConfigurationException(String.format(
- NOT_SUPPORTED_CONVERTION_FMT, value, clazz.getName()));
- }
-
- try {
- result = converter.convert(value);
- } catch (ConvertException ex) {
- throw new ConfigurationException(String.format(
- NOT_SUPPORTED_CONVERTION_FMT, value, clazz.getName()),
- ex);
- }
- }
- return result;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.config;
+
+import org.apache.jmeter.report.core.ArgumentNullException;
+
+/**
+ * The class ConfigurationUtils provides helper method for configuration
+ * handling.
+ *
+ * @since 2.14
+ */
+public class ConfigurationUtils {
+
+ private static final String NOT_SUPPORTED_CONVERTION_FMT = "Convert \"%s\" to \"%s\" is not supported";
+
+ /**
+ * Instantiates a new configuration utils.
+ */
+ private ConfigurationUtils() {
+ }
+
+ /**
+ * Convert the specified string value to the property type.
+ *
+ * @param <TProperty>
+ * the type of the property
+ * @param value
+ * the string value
+ * @param clazz
+ * the class of the property
+ * @return the converted string
+ * @throws ConfigurationException
+ * when unable to convert the string
+ */
+ public static <TProperty> TProperty convert(String value,
+ Class<TProperty> clazz) throws ConfigurationException {
+ if (clazz == null) {
+ throw new ArgumentNullException("clazz");
+ }
+
+ TProperty result;
+ if (clazz.isAssignableFrom(String.class)) {
+ result = (TProperty) value;
+ } else {
+ StringConverter<TProperty> converter = Converters
+ .getConverter(clazz);
+ if (converter == null) {
+ throw new ConfigurationException(String.format(
+ NOT_SUPPORTED_CONVERTION_FMT, value, clazz.getName()));
+ }
+
+ try {
+ result = converter.convert(value);
+ } catch (ConvertException ex) {
+ throw new ConfigurationException(String.format(
+ NOT_SUPPORTED_CONVERTION_FMT, value, clazz.getName()),
+ ex);
+ }
+ }
+ return result;
+ }
+}
Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/ConvertException.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/ConvertException.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/ConvertException.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/ConvertException.java Thu Dec 10 19:10:06 2015
@@ -1,58 +1,58 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.config;
-
-/**
- * The class ConvertException provides an exception when
- * ConvertStringMethod.execute fails.
- *
- * @since 2.14
- */
-public class ConvertException extends Exception {
-
- /** The Constant serialVersionUID. */
- private static final long serialVersionUID = -8837968211227052980L;
- private static final String MESSAGE_FORMAT = "Unable to convert \"%s\" to \"%s\"";
-
- /**
- * Instantiates a new convert exception.
- *
- * @param value
- * the value
- * @param type
- * the type
- */
- public ConvertException(String value, String type) {
- super(String.format(MESSAGE_FORMAT, value, type));
- }
-
- /**
- * Instantiates a new convert exception.
- *
- * @param value
- * the value
- * @param type
- * the type
- * @param cause
- * the cause
- */
- public ConvertException(String value, String type, Throwable cause) {
- super(String.format(MESSAGE_FORMAT, value, type), cause);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.config;
+
+/**
+ * The class ConvertException provides an exception when
+ * ConvertStringMethod.execute fails.
+ *
+ * @since 2.14
+ */
+public class ConvertException extends Exception {
+
+ /** The Constant serialVersionUID. */
+ private static final long serialVersionUID = -8837968211227052980L;
+ private static final String MESSAGE_FORMAT = "Unable to convert \"%s\" to \"%s\"";
+
+ /**
+ * Instantiates a new convert exception.
+ *
+ * @param value
+ * the value
+ * @param type
+ * the type
+ */
+ public ConvertException(String value, String type) {
+ super(String.format(MESSAGE_FORMAT, value, type));
+ }
+
+ /**
+ * Instantiates a new convert exception.
+ *
+ * @param value
+ * the value
+ * @param type
+ * the type
+ * @param cause
+ * the cause
+ */
+ public ConvertException(String value, String type, Throwable cause) {
+ super(String.format(MESSAGE_FORMAT, value, type), cause);
+ }
+
+}
Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/config/ConvertException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/Converters.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/Converters.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/Converters.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/Converters.java Thu Dec 10 19:10:06 2015
@@ -1,95 +1,95 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.config;
-
-import java.io.File;
-import java.util.HashMap;
-
-/**
- * The class Converters provides converters of string.
- *
- * @since 2.14
- */
-public final class Converters {
-
- private static HashMap<Class<?>, StringConverter<?>> converters = new HashMap<>();
-
- static {
-
- StringConverter<Double> doubleConverter = new StringConverter<Double>() {
-
- @Override
- public Double convert(String value) throws ConvertException {
- try {
- return Double.valueOf(value);
- } catch (NumberFormatException ex) {
- throw new ConvertException(value, Double.class.getName());
- }
- }
- };
- converters.put(Double.class, doubleConverter);
- converters.put(double.class, doubleConverter);
-
- StringConverter<Long> longConverter = new StringConverter<Long>() {
-
- @Override
- public Long convert(String value) throws ConvertException {
- try {
- return Long.valueOf(value);
- } catch (NumberFormatException ex) {
- throw new ConvertException(value, Long.class.getName());
- }
- }
- };
- converters.put(Long.class, longConverter);
- converters.put(long.class, longConverter);
-
- StringConverter<Boolean> booleanConverter = new StringConverter<Boolean>() {
-
- @Override
- public Boolean convert(String value) throws ConvertException {
- return Boolean.valueOf(value);
- }
- };
- converters.put(Boolean.class, booleanConverter);
- converters.put(boolean.class, booleanConverter);
-
- converters.put(File.class, new StringConverter<File>() {
-
- @Override
- public File convert(String value) throws ConvertException {
- return new File(value);
- }
- });
- }
-
- /**
- * Gets the converter for the specified class.
- *
- * @param <TDest>
- * the target type
- * @param clazz
- * the target class
- * @return the converter
- */
- @SuppressWarnings("unchecked")
- public static <TDest> StringConverter<TDest> getConverter(Class<TDest> clazz) {
- return (StringConverter<TDest>) converters.get(clazz);
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.config;
+
+import java.io.File;
+import java.util.HashMap;
+
+/**
+ * The class Converters provides converters of string.
+ *
+ * @since 2.14
+ */
+public final class Converters {
+
+ private static HashMap<Class<?>, StringConverter<?>> converters = new HashMap<>();
+
+ static {
+
+ StringConverter<Double> doubleConverter = new StringConverter<Double>() {
+
+ @Override
+ public Double convert(String value) throws ConvertException {
+ try {
+ return Double.valueOf(value);
+ } catch (NumberFormatException ex) {
+ throw new ConvertException(value, Double.class.getName());
+ }
+ }
+ };
+ converters.put(Double.class, doubleConverter);
+ converters.put(double.class, doubleConverter);
+
+ StringConverter<Long> longConverter = new StringConverter<Long>() {
+
+ @Override
+ public Long convert(String value) throws ConvertException {
+ try {
+ return Long.valueOf(value);
+ } catch (NumberFormatException ex) {
+ throw new ConvertException(value, Long.class.getName());
+ }
+ }
+ };
+ converters.put(Long.class, longConverter);
+ converters.put(long.class, longConverter);
+
+ StringConverter<Boolean> booleanConverter = new StringConverter<Boolean>() {
+
+ @Override
+ public Boolean convert(String value) throws ConvertException {
+ return Boolean.valueOf(value);
+ }
+ };
+ converters.put(Boolean.class, booleanConverter);
+ converters.put(boolean.class, booleanConverter);
+
+ converters.put(File.class, new StringConverter<File>() {
+
+ @Override
+ public File convert(String value) throws ConvertException {
+ return new File(value);
+ }
+ });
+ }
+
+ /**
+ * Gets the converter for the specified class.
+ *
+ * @param <TDest>
+ * the target type
+ * @param clazz
+ * the target class
+ * @return the converter
+ */
+ @SuppressWarnings("unchecked")
+ public static <TDest> StringConverter<TDest> getConverter(Class<TDest> clazz) {
+ return (StringConverter<TDest>) converters.get(clazz);
+ }
+
+}
Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/config/Converters.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/ExporterConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/ExporterConfiguration.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/ExporterConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/ExporterConfiguration.java Thu Dec 10 19:10:06 2015
@@ -1,98 +1,98 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.config;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * The class ExporterConfiguration describes the configuration of an exporter.
- *
- * @since 2.14
- */
-public class ExporterConfiguration extends InstanceConfiguration {
-
- private final HashMap<String, SubConfiguration> graphExtraConfigurations = new HashMap<>();
-
- private boolean filtersOnlySampleSeries;
- private String seriesFilter;
- private boolean showControllerSeriesOnly;
-
- /**
- * Gets the extra configurations for graphs.
- *
- * @return the extra configurations for graphs
- */
- public Map<String, SubConfiguration> getGraphExtraConfigurations(){
- return graphExtraConfigurations;
- }
-
- /**
- * Indicates whether series filter apply only on sample series
- *
- * @return true if series filter apply only on sample series; false otherwise
- */
- public final boolean filtersOnlySampleSeries() {
- return filtersOnlySampleSeries;
- }
-
- /**
- * Sets the series filters apply only on sample series.
- *
- * @param filtersOnlySampleSeries true if series filter apply only on sample series; false otherwise
- */
- public final void filtersOnlySampleSeries(boolean filtersOnlySampleSeries) {
- this.filtersOnlySampleSeries = filtersOnlySampleSeries;
- }
-
- /**
- * Gets the series filter.
- *
- * @return the series filter
- */
- public final String getSeriesFilter() {
- return seriesFilter;
- }
-
- /**
- * Sets the series filter.
- *
- * @param seriesFilter the series filter to set
- */
- public final void setSeriesFilter(String seriesFilter) {
- this.seriesFilter = seriesFilter;
- }
-
- /**
- * Indicates whether only controller series are shown.
- *
- * @return true if only controller series are shown; false otherwise
- */
- public final boolean showControllerSeriesOnly() {
- return showControllerSeriesOnly;
- }
-
- /**
- * Sets the flag defining whether only controllers series are shown
- *
- * @param showControllerSeriesOnly indicates whether only controllers series are shown
- */
- public final void showControllerSeriesOnly(boolean showControllerSeriesOnly) {
- this.showControllerSeriesOnly = showControllerSeriesOnly;
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.config;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * The class ExporterConfiguration describes the configuration of an exporter.
+ *
+ * @since 2.14
+ */
+public class ExporterConfiguration extends InstanceConfiguration {
+
+ private final HashMap<String, SubConfiguration> graphExtraConfigurations = new HashMap<>();
+
+ private boolean filtersOnlySampleSeries;
+ private String seriesFilter;
+ private boolean showControllerSeriesOnly;
+
+ /**
+ * Gets the extra configurations for graphs.
+ *
+ * @return the extra configurations for graphs
+ */
+ public Map<String, SubConfiguration> getGraphExtraConfigurations(){
+ return graphExtraConfigurations;
+ }
+
+ /**
+ * Indicates whether series filter apply only on sample series
+ *
+ * @return true if series filter apply only on sample series; false otherwise
+ */
+ public final boolean filtersOnlySampleSeries() {
+ return filtersOnlySampleSeries;
+ }
+
+ /**
+ * Sets the series filters apply only on sample series.
+ *
+ * @param filtersOnlySampleSeries true if series filter apply only on sample series; false otherwise
+ */
+ public final void filtersOnlySampleSeries(boolean filtersOnlySampleSeries) {
+ this.filtersOnlySampleSeries = filtersOnlySampleSeries;
+ }
+
+ /**
+ * Gets the series filter.
+ *
+ * @return the series filter
+ */
+ public final String getSeriesFilter() {
+ return seriesFilter;
+ }
+
+ /**
+ * Sets the series filter.
+ *
+ * @param seriesFilter the series filter to set
+ */
+ public final void setSeriesFilter(String seriesFilter) {
+ this.seriesFilter = seriesFilter;
+ }
+
+ /**
+ * Indicates whether only controller series are shown.
+ *
+ * @return true if only controller series are shown; false otherwise
+ */
+ public final boolean showControllerSeriesOnly() {
+ return showControllerSeriesOnly;
+ }
+
+ /**
+ * Sets the flag defining whether only controllers series are shown
+ *
+ * @param showControllerSeriesOnly indicates whether only controllers series are shown
+ */
+ public final void showControllerSeriesOnly(boolean showControllerSeriesOnly) {
+ this.showControllerSeriesOnly = showControllerSeriesOnly;
+ }
+}
Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/config/ExporterConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/GraphConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/GraphConfiguration.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/GraphConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/GraphConfiguration.java Thu Dec 10 19:10:06 2015
@@ -1,68 +1,68 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.config;
-
-/**
- * The class GraphConfiguration describes a configuration of a graph.
- *
- * @since 2.14
- */
-public class GraphConfiguration extends InstanceConfiguration {
-
- private boolean excludeControllers;
- private String title;
-
- /**
- * Checks if controller samples have to be filtered.
- *
- * @return true if controller samples have to be filtered; false otherwise.
- */
- public final boolean excludesControllers() {
- return excludeControllers;
- }
-
- /**
- * Sets a switch used to check if controller samples have to be filtered.
- *
- * @param excludeControllers
- * the switch value to set
- */
- public final void setExcludeControllers(boolean excludeControllers) {
- this.excludeControllers = excludeControllers;
- }
-
- /**
- * Gets the title of the graph.
- *
- * @return the title of the graph
- */
- public final String getTitle() {
- return title;
- }
-
- /**
- * Sets the title of the graph.
- *
- * @param title
- * the title of the graph to set
- */
- public final void setTitle(String title) {
- this.title = title;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.config;
+
+/**
+ * The class GraphConfiguration describes a configuration of a graph.
+ *
+ * @since 2.14
+ */
+public class GraphConfiguration extends InstanceConfiguration {
+
+ private boolean excludeControllers;
+ private String title;
+
+ /**
+ * Checks if controller samples have to be filtered.
+ *
+ * @return true if controller samples have to be filtered; false otherwise.
+ */
+ public final boolean excludesControllers() {
+ return excludeControllers;
+ }
+
+ /**
+ * Sets a switch used to check if controller samples have to be filtered.
+ *
+ * @param excludeControllers
+ * the switch value to set
+ */
+ public final void setExcludeControllers(boolean excludeControllers) {
+ this.excludeControllers = excludeControllers;
+ }
+
+ /**
+ * Gets the title of the graph.
+ *
+ * @return the title of the graph
+ */
+ public final String getTitle() {
+ return title;
+ }
+
+ /**
+ * Sets the title of the graph.
+ *
+ * @param title
+ * the title of the graph to set
+ */
+ public final void setTitle(String title) {
+ this.title = title;
+ }
+
+}
Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/config/GraphConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/InstanceConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/InstanceConfiguration.java?rev=1719185&r1=1719184&r2=1719185&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/InstanceConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/InstanceConfiguration.java Thu Dec 10 19:10:06 2015
@@ -1,49 +1,49 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.apache.jmeter.report.config;
-
-/**
- * The class InstanceConfiguration describe the configuration of an item that
- * can be instantiated by its class name.
- *
- * @since 2.14
- */
-public class InstanceConfiguration extends SubConfiguration {
-
- private String className;
-
- /**
- * Gets the class name of the item.
- *
- * @return the class name of the item
- */
- public final String getClassName() {
- return className;
- }
-
- /**
- * Sets the class name of the item.
- *
- * @param className
- * the new class name
- */
- public final void setClassName(String className) {
- this.className = className;
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.jmeter.report.config;
+
+/**
+ * The class InstanceConfiguration describe the configuration of an item that
+ * can be instantiated by its class name.
+ *
+ * @since 2.14
+ */
+public class InstanceConfiguration extends SubConfiguration {
+
+ private String className;
+
+ /**
+ * Gets the class name of the item.
+ *
+ * @return the class name of the item
+ */
+ public final String getClassName() {
+ return className;
+ }
+
+ /**
+ * Sets the class name of the item.
+ *
+ * @param className
+ * the new class name
+ */
+ public final void setClassName(String className) {
+ this.className = className;
+ }
+
+}
Propchange: jmeter/trunk/src/core/org/apache/jmeter/report/config/InstanceConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
|