Reformat code

Author: slachiewicz

pom.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectxmlns="http://maven.apache.org/POM/4.0.0"xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
 
@@ -16,8 +17,8 @@
  <scm>
  <connection>scm:git:https://github.com/codehaus-plexus/plexus-interpolation.git</connection>
  <developerConnection>scm:git:https://github.com/codehaus-plexus/plexus-interpolation.git</developerConnection>
- <url>http://github.com/codehaus-plexus/plexus-interpolation/tree/${project.scm.tag}/</url>
  <tag>master</tag>
+ <url>http://github.com/codehaus-plexus/plexus-interpolation/tree/${project.scm.tag}/</url>
  </scm>
 
  <issueManagement>
@@ -60,15 +61,17 @@
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-scm-publish-plugin</artifactId>
  <configuration>
- <content>${project.reporting.outputDirectory}</content><!-- mono-module doesn't require site:stage -->
+ <content>${project.reporting.outputDirectory}</content>
+<!-- mono-module doesn't require site:stage -->
  </configuration>
  <executions>
  <execution>
  <id>scm-publish</id>
- <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin -->
+<!-- deploy site with maven-scm-publish-plugin -->
  <goals>
  <goal>publish-scm</goal>
  </goals>
+ <phase>site-deploy</phase>
  </execution>
  </executions>
  </plugin>

src/main/java/org/codehaus/plexus/interpolation/AbstractDelegatingValueSource.java

@@ -18,40 +18,31 @@
 
 importjava.util.List;
 
-publicabstractclassAbstractDelegatingValueSource
-implementsValueSource
-{
-
+publicabstractclassAbstractDelegatingValueSourceimplementsValueSource{
+
 privatefinalValueSourcedelegate;
 
-protectedAbstractDelegatingValueSource( ValueSourcedelegate )
-{
-if ( delegate == null )
-{
-thrownewNullPointerException( "Delegate ValueSource cannot be null." );
+protectedAbstractDelegatingValueSource(ValueSourcedelegate){
+if (delegate == null){
+thrownewNullPointerException("Delegate ValueSource cannot be null.");
  }
-
+
 this.delegate = delegate;
  }
-
-protectedValueSourcegetDelegate()
-{
+
+protectedValueSourcegetDelegate(){
 returndelegate;
  }
 
-publicObjectgetValue( Stringexpression )
-{
-returngetDelegate().getValue( expression );
+publicObjectgetValue(Stringexpression){
+returngetDelegate().getValue(expression);
  }
-
-publicvoidclearFeedback()
-{
+
+publicvoidclearFeedback(){
 delegate.clearFeedback();
  }
 
-publicListgetFeedback()
-{
+publicListgetFeedback(){
 returndelegate.getFeedback();
  }
-
 }

src/main/java/org/codehaus/plexus/interpolation/AbstractFunctionValueSourceWrapper.java

@@ -28,9 +28,7 @@
  * value of the second expression, which is resolved from the wrapped value
  * source.</p>
  */
-publicabstractclassAbstractFunctionValueSourceWrapper
-implementsValueSource
-{
+publicabstractclassAbstractFunctionValueSourceWrapperimplementsValueSource{
 
 privatefinalValueSourcevalueSource;
 
@@ -40,8 +38,7 @@ public abstract class AbstractFunctionValueSourceWrapper
  *
  * @param valueSource The value source to wrap
  */
-protectedAbstractFunctionValueSourceWrapper( ValueSourcevalueSource )
-{
+protectedAbstractFunctionValueSourceWrapper(ValueSourcevalueSource){
 this.valueSource = valueSource;
  }
 
@@ -56,26 +53,23 @@ protected AbstractFunctionValueSourceWrapper( ValueSource valueSource )
  * for the current expression.</li>
  * </ol>
  */
-publicObjectgetValue( Stringexpression )
-{
-Objectvalue = valueSource.getValue( expression );
+publicObjectgetValue(Stringexpression){
+Objectvalue = valueSource.getValue(expression);
 
 Stringexpr = expression;
 
-if ( valueSourceinstanceofQueryEnabledValueSource )
-{
+if (valueSourceinstanceofQueryEnabledValueSource){
 expr = ((QueryEnabledValueSource) valueSource).getLastExpression();
  }
 
-returnexecuteFunction(expr, value);
+returnexecuteFunction(expr, value);
  }
 
 /**
  * Retrieve the embedded value source.
  * @return{@link ValueSource}
  */
-protectedValueSourcegetValueSource()
-{
+protectedValueSourcegetValueSource(){
 returnvalueSource;
  }
 
@@ -87,6 +81,5 @@ protected ValueSource getValueSource()
  * @param value The value for the current expression, resolved by the embedded{@link ValueSource}
  * @return The result of modifying the current expression's value using the function named by the last expression.
  */
-protectedabstractObjectexecuteFunction( Stringexpression, Objectvalue );
-
+protectedabstractObjectexecuteFunction(Stringexpression, Objectvalue);
 }

src/main/java/org/codehaus/plexus/interpolation/AbstractValueSource.java

@@ -19,45 +19,34 @@
 importjava.util.ArrayList;
 importjava.util.List;
 
-publicabstractclassAbstractValueSource
-implementsValueSource
-{
-
+publicabstractclassAbstractValueSourceimplementsValueSource{
+
 privatefinalListfeedback;
-
-protectedAbstractValueSource( booleanusesFeedback )
-{
-if ( usesFeedback )
-{
+
+protectedAbstractValueSource(booleanusesFeedback){
+if (usesFeedback){
 feedback = newArrayList();
- }
-else
-{
+ } else{
 feedback = null;
  }
  }
 
-publicvoidclearFeedback()
-{
-if ( feedback != null )
-{
+publicvoidclearFeedback(){
+if (feedback != null){
 feedback.clear();
  }
  }
 
-publicListgetFeedback()
-{
+publicListgetFeedback(){
 returnfeedback;
  }
 
-protectedvoidaddFeedback( Stringmessage )
-{
-feedback.add( message );
+protectedvoidaddFeedback(Stringmessage){
+feedback.add(message);
  }
-
-protectedvoidaddFeedback( Stringmessage, Throwablecause )
-{
-feedback.add( message );
-feedback.add( cause );
+
+protectedvoidaddFeedback(Stringmessage, Throwablecause){
+feedback.add(message);
+feedback.add(cause);
  }
 }

src/main/java/org/codehaus/plexus/interpolation/BasicInterpolator.java

@@ -20,8 +20,7 @@
  *
  * TODO: Really really needs a way to communicate errors.
  */
-publicinterfaceBasicInterpolator
-{
+publicinterfaceBasicInterpolator{
 /**
  * See{@link org.codehaus.plexus.interpolation.Interpolator#interpolate(String, String, org.codehaus.plexus.interpolation.RecursionInterceptor)}.
  * <p>
@@ -34,8 +33,7 @@ public interface BasicInterpolator
  * @return the interpolated string.
  * @throws InterpolationException in case of an error.
  */
-Stringinterpolate( Stringinput )
-throwsInterpolationException;
+Stringinterpolate(Stringinput) throwsInterpolationException;
 
 /**
  * See{@link org.codehaus.plexus.interpolation.Interpolator#interpolate(String, String, org.codehaus.plexus.interpolation.RecursionInterceptor)}.
@@ -52,6 +50,5 @@ String interpolate( String input )
  * @return the interpolated string.
  * @throws InterpolationException in case of an error.
  */
-Stringinterpolate( Stringinput, RecursionInterceptorrecursionInterceptor )
-throwsInterpolationException;
+Stringinterpolate(Stringinput, RecursionInterceptorrecursionInterceptor) throwsInterpolationException;
 }

src/main/java/org/codehaus/plexus/interpolation/EnvarBasedValueSource.java

@@ -16,20 +16,18 @@
  * limitations under the License.
  */
 
-importorg.codehaus.plexus.interpolation.os.OperatingSystemUtils;
-
 importjava.io.IOException;
 importjava.util.Properties;
 
+importorg.codehaus.plexus.interpolation.os.OperatingSystemUtils;
+
 /**
  *{@link ValueSource} which resolves expressions against the environment variables
  * available from the underlying operating system (and possibly, the shell environment
  * that created the present Java process). If the expression starts with 'env.',
  * this prefix is trimmed before resolving the rest as an environment variable name.
  */
-publicclassEnvarBasedValueSource
-extendsAbstractValueSource
-{
+publicclassEnvarBasedValueSourceextendsAbstractValueSource{
 
 privatestaticPropertiesenvarsCaseSensitive;
 privatestaticPropertiesenvarsCaseInsensitive;
@@ -43,9 +41,8 @@ public class EnvarBasedValueSource
  *
  * @throws IOException in case of an error.
  */
-publicEnvarBasedValueSource() throwsIOException
-{
-this( true );
+publicEnvarBasedValueSource() throwsIOException{
+this(true);
  }
 
 /**
@@ -55,29 +52,21 @@ public EnvarBasedValueSource() throws IOException
  * case-sensitive manner for lookups
  * @throws IOException in case of an error.
  */
-publicEnvarBasedValueSource( booleancaseSensitive ) throwsIOException
-{
-super( false );
+publicEnvarBasedValueSource(booleancaseSensitive) throwsIOException{
+super(false);
 this.caseSensitive = caseSensitive;
-this.envars = getEnvars(caseSensitive);
+this.envars = getEnvars(caseSensitive);
  }
 
-privatestaticsynchronizedPropertiesgetEnvars( booleancaseSensitive )
-throwsIOException
-{
-if ( caseSensitive )
-{
-if ( envarsCaseSensitive == null )
-{
-envarsCaseSensitive = OperatingSystemUtils.getSystemEnvVars( caseSensitive );
+privatestaticsynchronizedPropertiesgetEnvars(booleancaseSensitive) throwsIOException{
+if (caseSensitive){
+if (envarsCaseSensitive == null){
+envarsCaseSensitive = OperatingSystemUtils.getSystemEnvVars(caseSensitive);
  }
 returnenvarsCaseSensitive;
- }
-else
-{
-if ( envarsCaseInsensitive == null )
-{
-envarsCaseInsensitive = OperatingSystemUtils.getSystemEnvVars( caseSensitive );
+ } else{
+if (envarsCaseInsensitive == null){
+envarsCaseInsensitive = OperatingSystemUtils.getSystemEnvVars(caseSensitive);
  }
 returnenvarsCaseInsensitive;
  }
@@ -92,30 +81,25 @@ private static synchronized Properties getEnvars( boolean caseSensitive )
  * @param expression envar expression, like 'HOME' or 'env.HOME'
  * @return the environment variable value for the given expression
  */
-publicObjectgetValue( Stringexpression )
-{
+publicObjectgetValue(Stringexpression){
 Stringexpr = expression;
 
-if ( expr.startsWith( "env." ) )
-{
-expr = expr.substring( "env.".length() );
+if (expr.startsWith("env.")){
+expr = expr.substring("env.".length());
  }
 
-if ( !caseSensitive )
-{
+if (!caseSensitive){
 expr = expr.toUpperCase();
  }
 
-returnenvars.getProperty(expr);
+returnenvars.getProperty(expr);
  }
-
+
 /**
  * reset static variables acting as a cache for testing purposes only
  */
-staticvoidresetStatics()
-{
+staticvoidresetStatics(){
 envarsCaseSensitive = null;
 envarsCaseInsensitive = null;
  }
-
 }

src/main/java/org/codehaus/plexus/interpolation/FeedbackEnabledValueSource.java

@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 /**
  * Represents a{@link ValueSource} which provides information back to the caller
  * about what may have gone wrong while resolving the value for an expression.
@@ -25,7 +24,4 @@
  *
  * @deprecated Rolled into{@link ValueSource} now.
  */
-publicinterfaceFeedbackEnabledValueSource
-extendsValueSource
-{
-}
+publicinterfaceFeedbackEnabledValueSourceextendsValueSource{}