From c570e4631a700fe3c7ae8f241edf769023cd374c Mon Sep 17 00:00:00 2001 From: Petar Tahchiev Date: Tue, 17 Feb 2015 11:27:58 +0200 Subject: [PATCH] Adding support for multiple file extensions --- .../parser/module/AbstractParserModule.java | 36 ++++++++++++------- .../doxia/parser/module/ParserModule.java | 2 +- pom.xml | 1 + 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/AbstractParserModule.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/AbstractParserModule.java index 6797b40c4..e3f201eb1 100644 --- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/AbstractParserModule.java +++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/AbstractParserModule.java @@ -27,13 +27,19 @@ public abstract class AbstractParserModule implements ParserModule { - /** The source directory. */ + /** + * The source directory. + */ private final String sourceDirectory; - /** The default file extension. */ - private final String extension; + /** + * The default file extension. + */ + private final String[] extension; - /** The default file extension. */ + /** + * The default file extension. + */ private final String parserId; /** @@ -55,18 +61,18 @@ public AbstractParserModule( String parserId ) /** * Constructor with same value for parser id and source directory. */ - public AbstractParserModule( String parserId, String extension ) + public AbstractParserModule( String parserId, String... extension ) { this( parserId, extension, parserId ); } /** * @param sourceDirectory not null - * @param extension not null - * @param parserId not null + * @param extension not null + * @param parserId not null * @since 1.1.1 */ - protected AbstractParserModule( String sourceDirectory, String extension, String parserId ) + protected AbstractParserModule( String sourceDirectory, String[] extension, String parserId ) { super(); this.sourceDirectory = sourceDirectory; @@ -74,19 +80,25 @@ protected AbstractParserModule( String sourceDirectory, String extension, String this.parserId = parserId; } - /** {@inheritDoc} */ + /** + * {@inheritDoc} + */ public String getSourceDirectory() { return sourceDirectory; } - /** {@inheritDoc} */ - public String getExtension() + /** + * {@inheritDoc} + */ + public String[] getExtension() { return extension; } - /** {@inheritDoc} */ + /** + * {@inheritDoc} + */ public String getParserId() { return parserId; diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModule.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModule.java index 53e2b35b4..d16f7bd93 100644 --- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModule.java +++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModule.java @@ -39,7 +39,7 @@ public interface ParserModule * * @return The default file extension. */ - String getExtension(); + String[] getExtension(); /** * Returns the parser id for a given module. diff --git a/pom.xml b/pom.xml index 9f622d275..61f475a78 100644 --- a/pom.xml +++ b/pom.xml @@ -395,6 +395,7 @@ under the License. src/test/site/**/*.confluence src/test/resources/**/*.twiki src/test/resources/**/*.md + *.state