svn commit: r1670504 - in /maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/module: AbstractParserModule.java ParserModule.java

[hb...@apache.org]

Author: hboutemy
Date: Tue Mar 31 22:35:54 2015
New Revision: 1670504

URL: http://svn.apache.org/r1670504
Log:
[DOXIA-527] allow multiple extensions for given markup
Submitted by: Petar Tahchiev, applied with little modifications

Modified:
    maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/AbstractParserModule.java
    maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModule.java

Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/AbstractParserModule.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/AbstractParserModule.java?rev=1670504&r1=1670503&r2=1670504&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/AbstractParserModule.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/AbstractParserModule.java Tue Mar 31 22:35:54 2015
@@ -30,8 +30,8 @@ public abstract class AbstractParserModu
     /** The source directory. */
     private final String sourceDirectory;
 
-    /** The default file extension. */
-    private final String extension;
+    /** The supported file extensions. */
+    private final String[] extensions;
 
     /** The default file extension. */
     private final String parserId;
@@ -41,7 +41,7 @@ public abstract class AbstractParserModu
      */
     public AbstractParserModule()
     {
-        this( null, null, null );
+        this( null, (String[]) null, null );
     }
 
     /**
@@ -55,9 +55,9 @@ public abstract class AbstractParserModu
     /**
      * Constructor with same value for parser id and source directory.
      */
-    public AbstractParserModule( String parserId, String extension )
+    public AbstractParserModule( String parserId, String... extensions )
     {
-        this( parserId, extension, parserId );
+        this( parserId, extensions, parserId );
     }
 
     /**
@@ -70,7 +70,21 @@ public abstract class AbstractParserModu
     {
         super();
         this.sourceDirectory = sourceDirectory;
-        this.extension = extension;
+        this.extensions = new String[] { extension };
+        this.parserId = parserId;
+    }
+
+    /**
+     * @param sourceDirectory not null
+     * @param extensions not null
+     * @param parserId not null
+     * @since 1.7
+     */
+    protected AbstractParserModule( String sourceDirectory, String[] extensions, String parserId )
+    {
+        super();
+        this.sourceDirectory = sourceDirectory;
+        this.extensions = extensions;
         this.parserId = parserId;
     }
 
@@ -81,9 +95,9 @@ public abstract class AbstractParserModu
     }
 
     /** {@inheritDoc} */
-    public String getExtension()
+    public String[] getExtensions()
     {
-        return extension;
+        return extensions;
     }
 
     /** {@inheritDoc} */

Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModule.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModule.java?rev=1670504&r1=1670503&r2=1670504&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModule.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/module/ParserModule.java Tue Mar 31 22:35:54 2015
@@ -35,11 +35,12 @@ public interface ParserModule
     String getSourceDirectory();
 
     /**
-     * Returns the default file extension for a given module.
+     * Returns the supported file extensions for a given module.
      *
-     * @return The default file extension.
+     * @return The supported file extensions.
+     * @since 1.7 (was String getExtension() before)
      */
-    String getExtension();
+    String[] getExtensions();
 
     /**
      * Returns the parser id for a given module.