Author: hboutemy
Date: Thu Mar 31 22:00:51 2011
New Revision: 1087455
URL: http://svn.apache.org/viewvc?rev=1087455&view=rev
Log:
updated code to generics from doxia-decoration-model
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1087455&r1=1087454&r2=1087455&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Thu Mar 31 22:00:51 2011
@@ -628,7 +628,7 @@ public abstract class AbstractDeployMojo
/**
* Extract the distributionManagment site of the top level parent of the
given MavenProject.
- * This climbs up the project hirarchy and returns the site of the last
project
+ * This climbs up the project hierarchy and returns the site of the last
project
* for which {@link #getSite(org.apache.maven.project.MavenProject)}
returns a site.
*
* @param project the MavenProject. Not null.
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=1087455&r1=1087454&r2=1087455&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Thu Mar 31 22:00:51 2011
@@ -122,7 +122,7 @@ public abstract class AbstractSiteRender
*
* @parameter expression="${attributes}"
*/
- private Map<Object, Object> attributes;
+ private Map<String, Object> attributes;
/**
* Site renderer.
@@ -195,7 +195,7 @@ public abstract class AbstractSiteRender
{
if ( attributes == null )
{
- attributes = new HashMap<Object, Object>();
+ attributes = new HashMap<String, Object>();
}
if ( attributes.get( "project" ) == null )
@@ -214,7 +214,10 @@ public abstract class AbstractSiteRender
}
// Put any of the properties in directly into the Velocity context
- attributes.putAll( project.getProperties() );
+ for ( Map.Entry<Object, Object> entry :
project.getProperties().entrySet() )
+ {
+ attributes.put( (String) entry.getKey(), entry.getValue() );
+ }
DecorationModel decorationModel;
try
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java?rev=1087455&r1=1087454&r2=1087455&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMap.java
Thu Mar 31 22:00:51 2011
@@ -22,7 +22,6 @@ package org.apache.maven.plugins.site;
import java.io.File;
import java.io.IOException;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -144,10 +143,8 @@ public class SiteMap
sink.text( i18n.getString( "site-plugin", locale,
"site.sitemap.description" ) );
sink.paragraph_();
- for ( Iterator<Menu> it = decoration.getMenus().iterator();
it.hasNext(); )
+ for ( Menu menu : decoration.getMenus() )
{
- Menu menu = it.next();
-
sink.section3();
sink.sectionTitle3();
sink.text( menu.getName() );
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=1087455&r1=1087454&r2=1087455&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Thu Mar 31 22:00:51 2011
@@ -105,7 +105,7 @@ public class SiteMojo
}
else
{
- filteredReports = Collections.EMPTY_LIST;
+ filteredReports = Collections.emptyList();
}
try
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java?rev=1087455&r1=1087454&r2=1087455&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
Thu Mar 31 22:00:51 2011
@@ -410,7 +410,7 @@ public final class PathUtils
/**
* Decodes the specified (portion of a) URL. <strong>Note:</strong> This
decoder assumes that ISO-8859-1 is used to
- * convert URL-encoded octets to characters.
+ * convert URL-encoded bytes to characters.
*
* @param url The URL to decode, may be <code>null</code>.
* @return The decoded URL or <code>null</code> if the input was
<code>null</code>.
Modified:
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java?rev=1087455&r1=1087454&r2=1087455&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteMojoTest.java
Thu Mar 31 22:00:51 2011
@@ -57,8 +57,9 @@ public class SiteMojoTest
assertTrue( siteDescriptorContent.indexOf( "${project.name}" ) != -1 );
SiteTool siteTool = (SiteTool) lookup( SiteTool.ROLE );
- siteDescriptorContent = siteTool.getInterpolatedSiteDescriptorContent(
new HashMap(), siteMojo.project,
-
siteDescriptorContent, "UTF-8", "UTF-8" );
+ siteDescriptorContent =
+ siteTool.getInterpolatedSiteDescriptorContent( new HashMap<String,
String>(), siteMojo.project,
+
siteDescriptorContent, "UTF-8", "UTF-8" );
assertNotNull( siteDescriptorContent );
assertTrue( siteDescriptorContent.indexOf( "${project.name}" ) == -1 );
}
