Author: hboutemy
Date: Mon Jul 8 21:15:18 2013
New Revision: 1500957
URL: http://svn.apache.org/r1500957
Log:
code formatting
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java?rev=1500957&r1=1500956&r2=1500957&view=diff
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
Mon Jul 8 21:15:18 2013
@@ -427,9 +427,9 @@ public class ProcessRemoteResourcesMojo
getLog().info( "Skipping remote-resource generation in this
project because it's not the Execution Root" );
return;
}
- if (resolveScopes == null)
+ if ( resolveScopes == null )
{
- if (excludeScope == null || "".equals(excludeScope))
+ if ( excludeScope == null || "".equals( excludeScope ) )
{
resolveScopes = new String[] { this.includeScope };
}
@@ -439,9 +439,9 @@ public class ProcessRemoteResourcesMojo
}
}
velocity = new VelocityEngine();
- velocity.setProperty(VelocityEngine.RUNTIME_LOG_LOGSYSTEM, this);
- velocity.setProperty("resource.loader", "classpath");
- velocity.setProperty("classpath.resource.loader.class",
ClasspathResourceLoader.class.getName());
+ velocity.setProperty( VelocityEngine.RUNTIME_LOG_LOGSYSTEM, this );
+ velocity.setProperty( "resource.loader", "classpath" );
+ velocity.setProperty( "classpath.resource.loader.class",
ClasspathResourceLoader.class.getName() );
velocity.init();
if ( supplementalModels == null )
@@ -660,7 +660,7 @@ public class ProcessRemoteResourcesMojo
if ( supplementModels.containsKey( supplementKey ) )
{
- Model mergedModel = mergeModels( p.getModel(), (Model)
supplementModels.get( supplementKey ) );
+ Model mergedModel = mergeModels( p.getModel(),
supplementModels.get( supplementKey ) );
MavenProject mergedProject = new MavenProject( mergedModel
);
projects.add( mergedProject );
mergedProject.setArtifact( artifact );
@@ -1086,7 +1086,7 @@ public class ProcessRemoteResourcesMojo
for ( Enumeration<URL> e = classLoader.getResources(
BundleRemoteResourcesMojo.RESOURCES_MANIFEST );
e.hasMoreElements(); )
{
- URL url = (URL) e.nextElement();
+ URL url = e.nextElement();
try
{
@@ -1096,7 +1096,7 @@ public class ProcessRemoteResourcesMojo
RemoteResourcesBundle bundle = bundleReader.read( reader );
- for ( String bundleResource : (List<String>)
bundle.getRemoteResources() )
+ for ( String bundleResource : bundle.getRemoteResources() )
{
String projectResource = bundleResource;
@@ -1187,7 +1187,6 @@ public class ProcessRemoteResourcesMojo
{
writer = new PrintWriter( new
OutputStreamWriter( new FileOutputStream( f, true ),
bundle.getSourceEncoding() ) );
-
}
try
@@ -1402,11 +1401,12 @@ public class ProcessRemoteResourcesMojo
}
/* LogChute methods */
- public void init(RuntimeServices rs) throws Exception
+ public void init( RuntimeServices rs )
+ throws Exception
{
}
- public void log(int level, String message)
+ public void log( int level, String message )
{
switch ( level )
{
@@ -1429,7 +1429,7 @@ public class ProcessRemoteResourcesMojo
}
}
- public void log(int level, String message, Throwable t)
+ public void log( int level, String message, Throwable t )
{
switch ( level )
{
@@ -1452,7 +1452,7 @@ public class ProcessRemoteResourcesMojo
}
}
- public boolean isLevelEnabled(int level)
+ public boolean isLevelEnabled( int level )
{
return false;
}
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java?rev=1500957&r1=1500956&r2=1500957&view=diff
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java
Mon Jul 8 21:15:18 2013
@@ -37,7 +37,7 @@ public class RemoteResourcesClassLoader
{
super.addURL( url );
}
-
+
// don't check the parents for the resources. Just check the jars
// that we have provided. Thus, we don't pull junk from the
// system classpath jars and stuff instead of the jars
@@ -51,5 +51,5 @@ public class RemoteResourcesClassLoader
}
return url;
}
-
+
}
