Author: vsiveton
Date: Sun Jun 7 14:14:16 2009
New Revision: 782392
URL: http://svn.apache.org/viewvc?rev=782392&view=rev
Log:
o improved instantiation of SiteModule classes
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSiteModule.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java?rev=782392&r1=782391&r2=782392&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/AbstractSiteModule.java
Sun Jun 7 14:14:16 2009
@@ -25,16 +25,32 @@
* @author <a href="mailto:ja...@maven.org";>Jason van Zyl</a>
* @version $Id$
* @since 1.0
- * @plexus.component
*/
public abstract class AbstractSiteModule
implements SiteModule
{
/** The source directory. */
- private String sourceDirectory;
+ private final String sourceDirectory;
/** The default file extension. */
- private String extension;
+ private final String extension;
+
+ /** The default file extension. */
+ private final String parserId;
+
+ /**
+ * @param sourceDirectory not null
+ * @param extension not null
+ * @param parserId not null
+ * @since 1.1.1
+ */
+ protected AbstractSiteModule( String sourceDirectory, String extension,
String parserId )
+ {
+ super();
+ this.sourceDirectory = sourceDirectory;
+ this.extension = extension;
+ this.parserId = parserId;
+ }
/** {...@inheritdoc} */
public String getSourceDirectory()
@@ -47,4 +63,10 @@
{
return extension;
}
+
+ /** {...@inheritdoc} */
+ public String getParserId()
+ {
+ return parserId;
+ }
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java?rev=782392&r1=782391&r2=782392&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
Sun Jun 7 14:14:16 2009
@@ -32,21 +32,11 @@
public class AptSiteModule
extends AbstractSiteModule
{
- /** {...@inheritdoc} */
- public String getSourceDirectory()
+ /**
+ * Default constructor.
+ */
+ public AptSiteModule()
{
- return "apt";
- }
-
- /** {...@inheritdoc} */
- public String getExtension()
- {
- return "apt";
- }
-
- /** {...@inheritdoc} */
- public String getParserId()
- {
- return "apt";
+ super( "apt", "apt", "apt" );
}
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java?rev=782392&r1=782391&r2=782392&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
Sun Jun 7 14:14:16 2009
@@ -32,21 +32,11 @@
public class ConfluenceSiteModule
extends AbstractSiteModule
{
- /** {...@inheritdoc} */
- public String getSourceDirectory()
+ /**
+ * Default constructor.
+ */
+ public ConfluenceSiteModule()
{
- return "confluence";
- }
-
- /** {...@inheritdoc} */
- public String getExtension()
- {
- return "confluence";
- }
-
- /** {...@inheritdoc} */
- public String getParserId()
- {
- return "confluence";
+ super( "confluence", "confluence", "confluence" );
}
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java?rev=782392&r1=782391&r2=782392&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
Sun Jun 7 14:14:16 2009
@@ -32,21 +32,11 @@
public class DocBookSiteModule
extends AbstractSiteModule
{
- /** {...@inheritdoc} */
- public String getSourceDirectory()
+ /**
+ * Default constructor.
+ */
+ public DocBookSiteModule()
{
- return "docbook";
- }
-
- /** {...@inheritdoc} */
- public String getExtension()
- {
- return "xml";
- }
-
- /** {...@inheritdoc} */
- public String getParserId()
- {
- return "doc-book";
+ super( "docbook", "xml", "docbook" );
}
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java?rev=782392&r1=782391&r2=782392&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
Sun Jun 7 14:14:16 2009
@@ -32,21 +32,11 @@
public class FmlSiteModule
extends AbstractSiteModule
{
- /** {...@inheritdoc} */
- public String getSourceDirectory()
+ /**
+ * Default constructor.
+ */
+ public FmlSiteModule()
{
- return "fml";
- }
-
- /** {...@inheritdoc} */
- public String getExtension()
- {
- return "fml";
- }
-
- /** {...@inheritdoc} */
- public String getParserId()
- {
- return "fml";
+ super( "fml", "fml", "fml" );
}
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java?rev=782392&r1=782391&r2=782392&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java
Sun Jun 7 14:14:16 2009
@@ -19,40 +19,24 @@
* under the License.
*/
-import org.apache.maven.doxia.module.site.SiteModule;
+import org.apache.maven.doxia.module.site.AbstractSiteModule;
/**
- * {...@link org.apache.maven.doxia.module.site.SiteModule} implementation for
- * the twiki file format.
+ * <p>TWikiSiteModule class.</p>
*
* @author Juan F. Codagnone
* @version $Id$
* @since 1.0
* @plexus.component role="org.apache.maven.doxia.module.site.SiteModule"
role-hint="twiki"
*/
-public final class TWikiSiteModule
- implements SiteModule
+public class TWikiSiteModule
+ extends AbstractSiteModule
{
-
- /** {...@inheritdoc} */
-
- public String getSourceDirectory()
- {
- return "twiki";
- }
-
- /** {...@inheritdoc} */
-
- public String getExtension()
+ /**
+ * Default constructor.
+ */
+ public TWikiSiteModule()
{
- return "twiki";
+ super( "twiki", "twiki", "twiki" );
}
-
- /** {...@inheritdoc} */
-
- public String getParserId()
- {
- return "twiki";
- }
-
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java?rev=782392&r1=782391&r2=782392&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
Sun Jun 7 14:14:16 2009
@@ -32,21 +32,11 @@
public class XdocSiteModule
extends AbstractSiteModule
{
- /** {...@inheritdoc} */
- public String getSourceDirectory()
+ /**
+ * Default constructor.
+ */
+ public XdocSiteModule()
{
- return "xdoc";
- }
-
- /** {...@inheritdoc} */
- public String getExtension()
- {
- return "xml";
- }
-
- /** {...@inheritdoc} */
- public String getParserId()
- {
- return "xdoc";
+ super( "xdoc", "xml", "xdoc" );
}
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSiteModule.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSiteModule.java?rev=782392&r1=782391&r2=782392&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSiteModule.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSiteModule.java
Sun Jun 7 14:14:16 2009
@@ -32,21 +32,11 @@
public class XhtmlSiteModule
extends AbstractSiteModule
{
- /** {...@inheritdoc} */
- public String getSourceDirectory()
+ /**
+ * Default constructor.
+ */
+ public XhtmlSiteModule()
{
- return "xhtml";
- }
-
- /** {...@inheritdoc} */
- public String getExtension()
- {
- return "xhtml";
- }
-
- /** {...@inheritdoc} */
- public String getParserId()
- {
- return "xhtml";
+ super( "xhtml", "xhtml", "xhtml" );
}
}
