jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1718736 - in /jmeter/trunk/src/core/org/apache/jmeter/report: config/ core/
Date Tue, 08 Dec 2015 22:56:44 GMT
Author: sebb
Date: Tue Dec  8 22:56:44 2015
New Revision: 1718736

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

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationException.java
    jmeter/trunk/src/core/org/apache/jmeter/report/config/ConfigurationUtils.java
    jmeter/trunk/src/core/org/apache/jmeter/report/config/ConvertException.java
    jmeter/trunk/src/core/org/apache/jmeter/report/config/Converters.java
    jmeter/trunk/src/core/org/apache/jmeter/report/config/ExporterConfiguration.java
    jmeter/trunk/src/core/org/apache/jmeter/report/config/GraphConfiguration.java
    jmeter/trunk/src/core/org/apache/jmeter/report/config/InstanceConfiguration.java
    jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java
    jmeter/trunk/src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java

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=1718736&r1=1718735&r2=1718736&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 Tue
Dec  8 22:56:44 2015
@@ -32,7 +32,7 @@ public class ConfigurationException exte
      * Instantiates a new configuration exception.
      */
     public ConfigurationException() {
-	super();
+        super();
     }
 
     /**
@@ -42,7 +42,7 @@ public class ConfigurationException exte
      *            the message
      */
     public ConfigurationException(String message) {
-	super(message);
+        super(message);
     }
 
     /**
@@ -54,7 +54,7 @@ public class ConfigurationException exte
      *            the cause
      */
     public ConfigurationException(String message, Throwable cause) {
-	super(message, cause);
+        super(message, cause);
     }
 
 }

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=1718736&r1=1718735&r2=1718736&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 Tue Dec
 8 22:56:44 2015
@@ -49,28 +49,28 @@ public class ConfigurationUtils {
      *             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");
+        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()));
+    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;
+        try {
+        result = converter.convert(value);
+        } catch (ConvertException ex) {
+        throw new ConfigurationException(String.format(
+                NOT_SUPPORTED_CONVERTION_FMT, value, clazz.getName()),
+                ex);
+        }
+    }
+    return result;
     }
 }

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=1718736&r1=1718735&r2=1718736&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 Tue Dec  8
22:56:44 2015
@@ -38,8 +38,7 @@ public class ConvertException extends Ex
      *            the type
      */
     public ConvertException(String value, String type) {
-	super(String.format(MESSAGE_FORMAT, value, type));
-
+        super(String.format(MESSAGE_FORMAT, value, type));
     }
 
     /**
@@ -53,7 +52,7 @@ public class ConvertException extends Ex
      *            the cause
      */
     public ConvertException(String value, String type, Throwable cause) {
-	super(String.format(MESSAGE_FORMAT, value, type), cause);
+        super(String.format(MESSAGE_FORMAT, value, type), cause);
     }
 
 }

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=1718736&r1=1718735&r2=1718736&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 Tue Dec  8 22:56:44
2015
@@ -31,51 +31,51 @@ public final class Converters {
 
     static {
 
-	StringConverter<Double> doubleConverter = new StringConverter<Double>() {
+        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);
-	    }
-	});
+            @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);
+            }
+        });
     }
 
     /**
@@ -89,7 +89,7 @@ public final class Converters {
      */
     @SuppressWarnings("unchecked")
     public static <TDest> StringConverter<TDest> getConverter(Class<TDest>
clazz) {
-	return (StringConverter<TDest>) converters.get(clazz);
+        return (StringConverter<TDest>) converters.get(clazz);
     }
 
 }

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=1718736&r1=1718735&r2=1718736&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 Tue Dec
 8 22:56:44 2015
@@ -39,7 +39,7 @@ public class ExporterConfiguration exten
      * @return the extra configurations for graphs
      */
     public Map<String, SubConfiguration> getGraphExtraConfigurations(){
-	return graphExtraConfigurations;
+        return graphExtraConfigurations;
     }
 
     /**

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=1718736&r1=1718735&r2=1718736&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 Tue Dec
 8 22:56:44 2015
@@ -33,7 +33,7 @@ public class GraphConfiguration extends
      * @return true if controller samples have to be filtered; false otherwise.
      */
     public final boolean excludesControllers() {
-	return excludeControllers;
+        return excludeControllers;
     }
 
     /**
@@ -43,7 +43,7 @@ public class GraphConfiguration extends
      *            the switch value to set
      */
     public final void setExcludeControllers(boolean excludeControllers) {
-	this.excludeControllers = excludeControllers;
+        this.excludeControllers = excludeControllers;
     }
 
     /**
@@ -52,7 +52,7 @@ public class GraphConfiguration extends
      * @return the title of the graph
      */
     public final String getTitle() {
-	return title;
+        return title;
     }
 
     /**
@@ -62,7 +62,7 @@ public class GraphConfiguration extends
      *            the title of the graph to set
      */
     public final void setTitle(String title) {
-	this.title = title;
+        this.title = title;
     }
 
 }

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=1718736&r1=1718735&r2=1718736&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 Tue Dec
 8 22:56:44 2015
@@ -33,7 +33,7 @@ public class InstanceConfiguration exten
      * @return the class name of the item
      */
     public final String getClassName() {
-	return className;
+        return className;
     }
 
     /**
@@ -43,7 +43,7 @@ public class InstanceConfiguration exten
      *            the new class name
      */
     public final void setClassName(String className) {
-	this.className = className;
+        this.className = className;
     }
 
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java?rev=1718736&r1=1718735&r2=1718736&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/SubConfiguration.java Tue Dec  8
22:56:44 2015
@@ -35,7 +35,7 @@ public class SubConfiguration {
      * @return the properties of the item
      */
     public final Map<String, String> getProperties() {
-	return properties;
+        return properties;
     }
 
     /**
@@ -54,15 +54,15 @@ public class SubConfiguration {
      *             if cannot convert property
      */
     public final <TProperty> TProperty getProperty(String key,
-	    TProperty defaultValue, Class<TProperty> clazz)
-	    throws ConfigurationException {
-	String value = properties.get(key);
-	TProperty result;
-	if (value == null) {
-	    result = defaultValue;
-	} else {
-	    result = ConfigurationUtils.convert(value, clazz);
-	}
-	return result;
+            TProperty defaultValue, Class<TProperty> clazz)
+                    throws ConfigurationException {
+        String value = properties.get(key);
+        TProperty result;
+        if (value == null) {
+            result = defaultValue;
+        } else {
+            result = ConfigurationUtils.convert(value, clazz);
+        }
+        return result;
     }
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java?rev=1718736&r1=1718735&r2=1718736&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java Tue Dec
 8 22:56:44 2015
@@ -62,15 +62,14 @@ abstract public class AbstractSampleWrit
      *            sample writer
      */
     public void setWriter(Writer writer) {
-	if (writer == null)
-	    throw new ArgumentNullException("writer");
+        if (writer == null)
+            throw new ArgumentNullException("writer");
 
-	if (this.writer != null) {
-	    // flush and close previous writer
-	    safeClose(this.writer);
-	}
-	this.writer = new PrintWriter(new BufferedWriter(writer, BUF_SIZE),
-	        false);
+        if (this.writer != null) {
+            // flush and close previous writer
+            safeClose(this.writer);
+        }
+        this.writer = new PrintWriter(new BufferedWriter(writer, BUF_SIZE), false);
     }
 
     /**
@@ -81,14 +80,14 @@ abstract public class AbstractSampleWrit
      *            The output stream on which sample should be written
      */
     public void setOutputStream(OutputStream out) {
-	if (out == null)
-	    throw new ArgumentNullException("out");
+        if (out == null)
+            throw new ArgumentNullException("out");
 
-	try {
-	    setWriter(new OutputStreamWriter(out, CHARSET));
-	} catch (UnsupportedEncodingException e) {
-	    // ignore iso8859-1 always supported
-	}
+        try {
+            setWriter(new OutputStreamWriter(out, CHARSET));
+        } catch (UnsupportedEncodingException e) {
+            // ignore iso8859-1 always supported
+        }
     }
 
     /**
@@ -99,13 +98,13 @@ abstract public class AbstractSampleWrit
      *            sample writter
      */
     public void setOutputFile(File output) {
-	FileOutputStream fos = null;
-	try {
-	    fos = new FileOutputStream(output);
-	} catch (Exception e) {
-	    throw new SampleException(e.getMessage(), e);
-	}
-	setOutputStream(fos);
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(output);
+        } catch (Exception e) {
+            throw new SampleException(e.getMessage(), e);
+        }
+        setOutputStream(fos);
     }
 
     /**
@@ -115,29 +114,29 @@ abstract public class AbstractSampleWrit
      */
     @Override
     public void close() {
-	safeClose(this.writer);
-	this.writer = null;
+        safeClose(this.writer);
+        this.writer = null;
     }
 
     private void safeClose(Writer w) {
-	try {
-	    w.flush();
-	} catch (Exception e) {
-	    // ignore
-	}
-	try {
-	    w.close();
-	} catch (Exception e) {
-	    // ignore
-	}
+        try {
+            w.flush();
+        } catch (Exception e) {
+            // ignore
+        }
+        try {
+            w.close();
+        } catch (Exception e) {
+            // ignore
+        }
     }
 
     public void flush() {
-	try {
-	    writer.flush();
-	} catch (Exception e) {
-	    // ignore
-	}
+        try {
+            writer.flush();
+        } catch (Exception e) {
+            // ignore
+        }
     }
 
 }



Mime
View raw message