You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2015/12/30 03:07:45 UTC
svn commit: r1722257 - in
/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src:
main/java/org/apache/maven/doxia/siterenderer/
test/java/org/apache/maven/doxia/siterenderer/
Author: hboutemy
Date: Wed Dec 30 02:07:45 2015
New Revision: 1722257
URL: http://svn.apache.org/viewvc?rev=1722257&view=rev
Log:
[DOXIASITETOOLS-138] removed skinFile parameter from createContextForTemplate
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1722257&r1=1722256&r2=1722257&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java Wed Dec 30 02:07:45 2015
@@ -652,13 +652,28 @@ public class DefaultSiteRenderer
}
}
+ private SiteRenderingContext createSiteRenderingContext( Map<String, ?> attributes, DecorationModel decoration,
+ String defaultWindowTitle, Locale locale )
+ {
+ SiteRenderingContext context = new SiteRenderingContext();
+
+ context.setTemplateProperties( attributes );
+ context.setLocale( locale );
+ context.setDecoration( decoration );
+ context.setDefaultWindowTitle( defaultWindowTitle );
+
+ return context;
+ }
+
/** {@inheritDoc} */
public SiteRenderingContext createContextForSkin( File skinFile, Map<String, ?> attributes,
DecorationModel decoration, String defaultWindowTitle,
Locale locale )
throws IOException
{
- SiteRenderingContext context = new SiteRenderingContext();
+ SiteRenderingContext context = createSiteRenderingContext( attributes, decoration, defaultWindowTitle, locale );
+
+ context.setSkinJarFile( skinFile );
ZipFile zipFile = getZipFile( skinFile );
@@ -681,69 +696,23 @@ public class DefaultSiteRenderer
closeZipFile( zipFile );
}
- context.setTemplateProperties( attributes );
- context.setLocale( locale );
- context.setDecoration( decoration );
- context.setDefaultWindowTitle( defaultWindowTitle );
- context.setSkinJarFile( skinFile );
-
return context;
}
- private static ZipFile getZipFile( File file )
- throws IOException
- {
- if ( file == null )
- {
- throw new IOException( "Error opening ZipFile: null" );
- }
-
- try
- {
- // TODO: plexus-archiver, if it could do the excludes
- return new ZipFile( file );
- }
- catch ( ZipException ex )
- {
- IOException ioe = new IOException( "Error opening ZipFile: " + file.getAbsolutePath() );
- ioe.initCause( ex );
- throw ioe;
- }
- }
-
/** {@inheritDoc} */
- public SiteRenderingContext createContextForTemplate( File templateFile, File skinFile, Map<String, ?> attributes,
+ public SiteRenderingContext createContextForTemplate( File templateFile, Map<String, ?> attributes,
DecorationModel decoration, String defaultWindowTitle,
Locale locale )
throws MalformedURLException
{
- SiteRenderingContext context = new SiteRenderingContext();
+ SiteRenderingContext context = createSiteRenderingContext( attributes, decoration, defaultWindowTitle, locale );
context.setTemplateName( templateFile.getName() );
context.setTemplateClassLoader( new URLClassLoader( new URL[]{templateFile.getParentFile().toURI().toURL()} ) );
- context.setTemplateProperties( attributes );
- context.setLocale( locale );
- context.setDecoration( decoration );
- context.setDefaultWindowTitle( defaultWindowTitle );
- context.setSkinJarFile( skinFile );
-
return context;
}
- private static void closeZipFile( ZipFile zipFile )
- {
- // TODO: move to plexus utils
- try
- {
- zipFile.close();
- }
- catch ( IOException e )
- {
- // ignore
- }
- }
-
/** {@inheritDoc} */
public void copyResources( SiteRenderingContext siteRenderingContext, File resourcesDirectory,
File outputDirectory )
@@ -987,4 +956,38 @@ public class DefaultSiteRenderer
return str.regionMatches( true, str.length() - searchStr.length(), searchStr, 0, searchStr.length() );
}
+
+ private static ZipFile getZipFile( File file )
+ throws IOException
+ {
+ if ( file == null )
+ {
+ throw new IOException( "Error opening ZipFile: null" );
+ }
+
+ try
+ {
+ // TODO: plexus-archiver, if it could do the excludes
+ return new ZipFile( file );
+ }
+ catch ( ZipException ex )
+ {
+ IOException ioe = new IOException( "Error opening ZipFile: " + file.getAbsolutePath() );
+ ioe.initCause( ex );
+ throw ioe;
+ }
+ }
+
+ private static void closeZipFile( ZipFile zipFile )
+ {
+ // TODO: move to plexus utils
+ try
+ {
+ zipFile.close();
+ }
+ catch ( IOException e )
+ {
+ // ignore
+ }
+ }
}
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java?rev=1722257&r1=1722256&r2=1722257&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java Wed Dec 30 02:07:45 2015
@@ -89,15 +89,15 @@ public interface Renderer
* Create a Site Rendering Context for a site using a local template.
*
* @param templateFile
- * @param skinFile
* @param attributes
* @param decoration
* @param defaultWindowTitle
* @param locale
* @return a SiteRenderingContext.
* @throws MalformedURLException if it bombs.
+ * @since 1.7, had an additional skinFile parameter before
*/
- SiteRenderingContext createContextForTemplate( File templateFile, File skinFile, Map<String, ?> attributes,
+ SiteRenderingContext createContextForTemplate( File templateFile, Map<String, ?> attributes,
DecorationModel decoration, String defaultWindowTitle,
Locale locale )
throws MalformedURLException;
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java?rev=1722257&r1=1722256&r2=1722257&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java Wed Dec 30 02:07:45 2015
@@ -226,7 +226,7 @@ public class DefaultSiteRendererTest
Map<String, ?> attributes = Collections.emptyMap();
SiteRenderingContext siteRenderingContext =
- renderer.createContextForTemplate( templateFile, null, attributes, new DecorationModel(),
+ renderer.createContextForTemplate( templateFile, attributes, new DecorationModel(),
"defaultWindowTitle", Locale.ENGLISH );
RenderingContext context = new RenderingContext( new File( "" ), "document.html" );
SiteRendererSink sink = new SiteRendererSink( context );