You are viewing a plain text version of this content. The canonical link for it is here.
Posted to doxia-commits@maven.apache.org by vs...@apache.org on 2009/08/24 14:04:46 UTC
svn commit: r807168 - in
/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook:
DocBookParser.java DocBookSink.java
Author: vsiveton
Date: Mon Aug 24 12:04:46 2009
New Revision: 807168
URL: http://svn.apache.org/viewvc?rev=807168&view=rev
Log:
DOXIA-364: Guarantee the state of sinks and parsers impl
o impl init() method from r807164
o use final fields
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.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/DocBookParser.java?rev=807168&r1=807167&r2=807168&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java Mon Aug 24 12:04:46 2009
@@ -171,13 +171,15 @@
/** {@inheritDoc} */
protected void init()
{
- parent.clear();
- trademark = 0;
- level = 0;
- isBold = false;
- inHead = false;
- ignore = false;
- simpleTag = false;
+ super.init();
+
+ this.parent.clear();
+ this.trademark = 0;
+ this.level = 0;
+ this.isBold = false;
+ this.inHead = false;
+ this.ignore = false;
+ this.simpleTag = false;
}
// ----------------------------------------------------------------------
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.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/DocBookSink.java?rev=807168&r1=807167&r2=807168&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java Mon Aug 24 12:04:46 2009
@@ -506,9 +506,17 @@
/**
* Reset all variables.
+ *
+ * @deprecated since 1.1.2, use {@link #init()} instead of.
*/
protected void resetState()
{
+ init();
+ }
+
+ /** {@inheritDoc} */
+ protected void init()
+ {
hasTitle = false;
authorDateFlag = false;
verbatimFlag = false;
@@ -532,7 +540,7 @@
*/
public void head()
{
- resetState();
+ init();
MutableAttributeSet att = writeXmlHeader( "article" );
@@ -672,7 +680,7 @@
{
writeEndTag( SimplifiedDocbookMarkup.ARTICLE_TAG );
out.flush();
- resetState();
+ init();
}
/**