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 br...@apache.org on 2005/11/24 02:03:48 UTC
svn commit: r348605 [1/9] - in /maven/doxia/trunk: ./ doxia-core/
doxia-core/src/main/java/org/apache/
doxia-core/src/main/java/org/apache/maven/
doxia-core/src/main/java/org/apache/maven/doxia/
doxia-core/src/main/java/org/apache/maven/doxia/macro/ do...
Author: brett
Date: Wed Nov 23 17:02:44 2005
New Revision: 348605
URL: http://svn.apache.org/viewcvs?rev=348605&view=rev
Log:
rename packages, update licenses, add minimal site
PR: DOXIA-32, DOXIA-31, DOXIA-33
Added:
maven/doxia/trunk/doxia-core/src/main/java/org/apache/
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/
- copied from r348596, maven/doxia/trunk/doxia-core/src/main/java/org/codehaus/doxia/
maven/doxia/trunk/doxia-core/src/test/java/org/apache/
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/
- copied from r348596, maven/doxia/trunk/doxia-core/src/test/java/org/codehaus/doxia/
maven/doxia/trunk/doxia-sink-api/src/main/java/org/apache/
maven/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/
maven/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/
- copied from r348596, maven/doxia/trunk/doxia-sink-api/src/main/java/org/codehaus/doxia/
Removed:
maven/doxia/trunk/doxia-core/src/main/java/org/codehaus/doxia/
maven/doxia/trunk/doxia-core/src/test/java/org/codehaus/doxia/
maven/doxia/trunk/doxia-sink-api/src/main/java/org/codehaus/doxia/
Modified:
maven/doxia/trunk/doxia-core/pom.xml
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/Doxia.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroManager.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroNotFoundException.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/HtmlTools.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParseException.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptReaderSource.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptSource.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/fml/model/Faq.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/fml/model/Faqs.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/fml/model/Part.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/AlphaNumerals.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/Font.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/FontMetrics.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/Monospace.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBold.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceBoldItalic.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/MonospaceItalic.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/PBMReader.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/RomanNumerals.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/SansSerif.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBold.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifBoldItalic.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/SansSerifItalic.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/Serif.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/SerifBold.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/SerifBoldItalic.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/SerifItalic.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/rtf/WMFWriter.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/AbstractXhtmlSink.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/SinkDescriptorReader.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/StringsMap.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/model/Banner.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/model/DecorationModel.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/model/DecorationModelReader.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/model/Image.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/model/Item.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/model/Link.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/model/Menu.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/BannerRenderer.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/DecorationRenderer.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/LinksRenderer.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/NavigationRenderer.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/xhtml/decoration/render/RenderingContext.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/ParseException.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/Parser.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/DefaultParserManager.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/ParserManager.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/ParserNotFoundException.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/plugin/AbstractPlugin.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/plugin/Plugin.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/plugin/manager/DefaultPluginManager.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/plugin/manager/PluginManager.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/plugin/manager/PluginNotFoundException.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkAdapter.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/StructureSink.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/manager/DefaultSinkManager.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/manager/SinkManager.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/manager/SinkNotFoundException.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/AbstractSiteModule.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/SiteModule.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/manager/DefaultSiteModuleManager.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/manager/SiteModuleManager.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/module/manager/SiteModuleNotFoundException.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/renderer/DefaultSiteRenderer.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/site/renderer/SiteRenderer.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/FileUtil.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/LineBreaker.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/StringUtil.java
maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/WrappedException.java
maven/doxia/trunk/doxia-core/src/site/site.xml
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/AbstractSinkTestCase.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/DocBookSinkTest.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/DoxiaTest.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/FmlParserTest.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/LatexSinkTest.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/RtfSinkTest.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/SinkDescriptorReaderTest.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/SiteRenderingTest.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/WellformednessCheckingSink.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/XdocParserTest.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/XdocSinkTest.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/XhtmlSinkTest.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java
maven/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTestCase.java
maven/doxia/trunk/doxia-sink-api/pom.xml
maven/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
maven/doxia/trunk/doxia-site-renderer/pom.xml
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/plexus/siterenderer/DefaultSiteRenderer.java
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/plexus/siterenderer/RendererException.java
maven/doxia/trunk/doxia-site-renderer/src/main/java/org/codehaus/plexus/siterenderer/sink/SiteRendererSink.java
maven/doxia/trunk/doxia-site-renderer/src/test/java/org/codehaus/plexus/siterenderer/DefaultSiteRendererTest.java
maven/doxia/trunk/pom.xml
Modified: maven/doxia/trunk/doxia-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/pom.xml?rev=348605&r1=348604&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/pom.xml (original)
+++ maven/doxia/trunk/doxia-core/pom.xml Wed Nov 23 17:02:44 2005
@@ -1,7 +1,7 @@
<project>
<parent>
<artifactId>doxia</artifactId>
- <groupId>org.codehaus.doxia</groupId>
+ <groupId>org.apache.maven.doxia</groupId>
<version>1.0-alpha-6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -19,7 +19,7 @@
<version>1.0.4</version>
</dependency>
<dependency>
- <groupId>org.codehaus.doxia</groupId>
+ <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
<version>1.0-alpha-6-SNAPSHOT</version>
</dependency>
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java Wed Nov 23 17:02:44 2005
@@ -1,22 +1,36 @@
-package org.codehaus.doxia;
+package org.apache.maven.doxia;
-import org.codehaus.doxia.macro.manager.MacroManager;
-import org.codehaus.doxia.plugin.manager.PluginManager;
-import org.codehaus.doxia.parser.manager.ParserManager;
-import org.codehaus.doxia.parser.manager.ParserNotFoundException;
-import org.codehaus.doxia.parser.Parser;
-import org.codehaus.doxia.parser.ParseException;
-import org.codehaus.doxia.sink.manager.SinkNotFoundException;
-import org.codehaus.doxia.sink.Sink;
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.doxia.macro.manager.MacroManager;
+import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.parser.Parser;
+import org.apache.maven.doxia.parser.manager.ParserManager;
+import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
+import org.apache.maven.doxia.plugin.manager.PluginManager;
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.manager.SinkNotFoundException;
import java.io.Reader;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
- *
- * @plexus.component
- * role="org.codehaus.doxia.Doxia"
+ * @plexus.component role="org.apache.maven.doxia.Doxia"
*/
public class DefaultDoxia
implements Doxia
@@ -58,7 +72,8 @@
// which can probably be done away with.
// ----------------------------------------------------------------------
- public void parse( Reader source, String parserId, Sink sink ) throws ParserNotFoundException, ParseException
+ public void parse( Reader source, String parserId, Sink sink )
+ throws ParserNotFoundException, ParseException
{
Parser parser = parserManager.getParser( parserId );
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/Doxia.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/Doxia.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/Doxia.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/Doxia.java Wed Nov 23 17:02:44 2005
@@ -1,12 +1,28 @@
-package org.codehaus.doxia;
+package org.apache.maven.doxia;
-import org.codehaus.doxia.sink.manager.SinkNotFoundException;
-import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.parser.manager.ParserManager;
-import org.codehaus.doxia.parser.manager.ParserNotFoundException;
-import org.codehaus.doxia.parser.ParseException;
-import org.codehaus.doxia.macro.manager.MacroManager;
-import org.codehaus.doxia.plugin.manager.PluginManager;
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.doxia.macro.manager.MacroManager;
+import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.parser.manager.ParserManager;
+import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
+import org.apache.maven.doxia.plugin.manager.PluginManager;
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.manager.SinkNotFoundException;
import java.io.Reader;
@@ -21,7 +37,8 @@
void parse( Reader source, String parserId, String sinkId )
throws ParserNotFoundException, SinkNotFoundException, ParseException;
- void parse( Reader source, String parserId, Sink sink ) throws ParserNotFoundException, ParseException;
+ void parse( Reader source, String parserId, Sink sink )
+ throws ParserNotFoundException, ParseException;
// SinkManager getSinkManager();
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java Wed Nov 23 17:02:44 2005
@@ -1,7 +1,18 @@
-/*
- * Copyright (c) 2004 Your Corporation. All Rights Reserved.
+package org.apache.maven.doxia.macro;/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-package org.codehaus.doxia.macro;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java Wed Nov 23 17:02:44 2005
@@ -1,13 +1,28 @@
-package org.codehaus.doxia.macro;
+package org.apache.maven.doxia.macro;
-import org.codehaus.doxia.sink.Sink;
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.doxia.sink.Sink;
import java.util.Iterator;
/**
- * @plexus.component
- * role="org.codehaus.doxia.macro.Macro"
- * role-hint="echo"
+ * @plexus.component role="org.apache.maven.doxia.macro.Macro"
+ * role-hint="echo"
*/
public class EchoMacro
extends AbstractMacro
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/Macro.java Wed Nov 23 17:02:44 2005
@@ -1,9 +1,22 @@
+package org.apache.maven.doxia.macro;
+
/*
- * Copyright (c) 2004 Your Corporation. All Rights Reserved.
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-package org.codehaus.doxia.macro;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/MacroRequest.java Wed Nov 23 17:02:44 2005
@@ -1,7 +1,20 @@
+package org.apache.maven.doxia.macro;
+
/*
- * Copyright (c) 2004 Your Corporation. All Rights Reserved.
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-package org.codehaus.doxia.macro;
import java.util.Map;
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java Wed Nov 23 17:02:44 2005
@@ -1,22 +1,35 @@
-package org.codehaus.doxia.macro.manager;
+package org.apache.maven.doxia.macro.manager;
-import org.codehaus.doxia.macro.Macro;
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.doxia.macro.Macro;
import java.util.Map;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
- *
- * @plexus.component
- * role="org.codehaus.doxia.macro.manager.MacroManager"
+ * @plexus.component role="org.apache.maven.doxia.macro.manager.MacroManager"
*/
public class DefaultMacroManager
implements MacroManager
{
/**
- * @plexus.requirement
- * role="org.codehaus.doxia.macro.Macro"
+ * @plexus.requirement role="org.apache.maven.doxia.macro.Macro"
*/
private Map macros;
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroManager.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroManager.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroManager.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroManager.java Wed Nov 23 17:02:44 2005
@@ -1,6 +1,22 @@
-package org.codehaus.doxia.macro.manager;
+package org.apache.maven.doxia.macro.manager;
-import org.codehaus.doxia.macro.Macro;
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.doxia.macro.Macro;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroNotFoundException.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroNotFoundException.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroNotFoundException.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/MacroNotFoundException.java Wed Nov 23 17:02:44 2005
@@ -1,4 +1,18 @@
-package org.codehaus.doxia.macro.manager;
+package org.apache.maven.doxia.macro.manager;/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java Wed Nov 23 17:02:44 2005
@@ -1,8 +1,24 @@
-package org.codehaus.doxia.macro.snippet;
+package org.apache.maven.doxia.macro.snippet;
-import org.codehaus.doxia.macro.MacroRequest;
-import org.codehaus.doxia.macro.AbstractMacro;
-import org.codehaus.doxia.sink.Sink;
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.doxia.macro.AbstractMacro;
+import org.apache.maven.doxia.macro.MacroRequest;
+import org.apache.maven.doxia.sink.Sink;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -11,9 +27,8 @@
import java.util.Map;
/**
- * @plexus.component
- * role="org.codehaus.doxia.macro.Macro"
- * role-hint="snippet"
+ * @plexus.component role="org.apache.maven.doxia.macro.Macro"
+ * role-hint="snippet"
*/
public class SnippetMacro
extends AbstractMacro
@@ -61,7 +76,8 @@
sink.verbatim_();
}
- StringBuffer getSnippet( URL url, String id ) throws IOException
+ StringBuffer getSnippet( URL url, String id )
+ throws IOException
{
StringBuffer result;
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetReader.java Wed Nov 23 17:02:44 2005
@@ -1,4 +1,20 @@
-package org.codehaus.doxia.macro.snippet;
+package org.apache.maven.doxia.macro.snippet;
+
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
import java.io.BufferedReader;
import java.io.IOException;
@@ -19,7 +35,8 @@
this.source = source;
}
- public StringBuffer readSnippet( String snippetId ) throws IOException
+ public StringBuffer readSnippet( String snippetId )
+ throws IOException
{
List lines = readLines( snippetId );
int minIndent = minIndent( lines );
@@ -58,7 +75,8 @@
return indent;
}
- private List readLines( String snippetId ) throws IOException
+ private List readLines( String snippetId )
+ throws IOException
{
BufferedReader reader = new BufferedReader( new InputStreamReader( source.openStream() ) );
List lines = new ArrayList();
@@ -97,8 +115,8 @@
protected boolean isDemarcator( String snippetId, String what, String line )
{
String upper = line.toUpperCase();
- return upper.indexOf( what.toUpperCase() ) != -1 &&
- upper.indexOf( "SNIPPET" ) != -1 && line.indexOf( snippetId ) != -1;
+ return upper.indexOf( what.toUpperCase() ) != -1 && upper.indexOf( "SNIPPET" ) != -1 &&
+ line.indexOf( snippetId ) != -1;
}
protected boolean isEnd( String snippetId, String line )
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/HtmlTools.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/HtmlTools.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/HtmlTools.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/HtmlTools.java Wed Nov 23 17:02:44 2005
@@ -1,9 +1,22 @@
+package org.apache.maven.doxia.module;
+
/*
- * CopyrightPlugin (c) 2004 Your Corporation. All Rights Reserved.
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-package org.codehaus.doxia.module;
-import org.codehaus.doxia.sink.StructureSink;
+import org.apache.maven.doxia.sink.StructureSink;
import java.io.UnsupportedEncodingException;
@@ -82,9 +95,7 @@
encoded.append( c );
break;
default:
- if ( ( c >= 'a' && c <= 'z' ) ||
- ( c >= 'A' && c <= 'Z' ) ||
- ( c >= '0' && c <= '9' ) )
+ if ( ( c >= 'a' && c <= 'z' ) || ( c >= 'A' && c <= 'Z' ) || ( c >= '0' && c <= '9' ) )
{
encoded.append( c );
}
@@ -108,7 +119,9 @@
encoded.append( '%' );
if ( hex.length() == 1 )
+ {
encoded.append( '0' );
+ }
encoded.append( hex );
}
}
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParseException.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParseException.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParseException.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParseException.java Wed Nov 23 17:02:44 2005
@@ -1,14 +1,22 @@
+package org.apache.maven.doxia.module.apt;
+
/*
- * Copyright (c) 1999-2003 Pixware.
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Author: Hussein Shafie
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This file is part of the Pixware APT tools.
- * For conditions of distribution and use, see the accompanying legal.txt file.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-package org.codehaus.doxia.module.apt;
-import org.codehaus.doxia.parser.ParseException;
+import org.apache.maven.doxia.parser.ParseException;
public class AptParseException
extends ParseException
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java Wed Nov 23 17:02:44 2005
@@ -1,17 +1,25 @@
+package org.apache.maven.doxia.module.apt;
+
/*
- * Copyright (c) 1999-2004 Pixware.
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Author: Hussein Shafie
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This file is part of the Pixware APT tools.
- * For conditions of distribution and use, see the accompanying legal.txt file.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-package org.codehaus.doxia.module.apt;
-import org.codehaus.doxia.macro.MacroRequest;
-import org.codehaus.doxia.parser.AbstractParser;
-import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.sink.SinkAdapter;
+import org.apache.maven.doxia.macro.MacroRequest;
+import org.apache.maven.doxia.parser.AbstractParser;
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkAdapter;
import org.codehaus.plexus.util.StringUtils;
import java.io.Reader;
@@ -20,58 +28,55 @@
import java.util.StringTokenizer;
/**
- * @plexus.component
- * role="org.codehaus.doxia.parser.Parser"
- * role-hint="apt"
+ * @plexus.component role="org.apache.maven.doxia.parser.Parser"
+ * role-hint="apt"
*/
public class AptParser
extends AbstractParser
{
private static final int TITLE = 0;
+
private static final int SECTION1 = 1;
+
private static final int SECTION2 = 2;
+
private static final int SECTION3 = 3;
+
private static final int SECTION4 = 4;
+
private static final int SECTION5 = 5;
+
private static final int PARAGRAPH = 6;
+
private static final int VERBATIM = 7;
+
private static final int FIGURE = 8;
+
private static final int TABLE = 9;
+
private static final int LIST_ITEM = 10;
+
private static final int NUMBERED_LIST_ITEM = 11;
+
private static final int DEFINITION_LIST_ITEM = 12;
+
private static final int HORIZONTAL_RULE = 13;
+
private static final int PAGE_BREAK = 14;
+
private static final int LIST_BREAK = 15;
+
private static final int MACRO = 16;
- private static final String typeNames[] = {
- "TITLE",
- "SECTION1",
- "SECTION2",
- "SECTION3",
- "SECTION4",
- "SECTION5",
- "PARAGRAPH",
- "VERBATIM",
- "FIGURE",
- "TABLE",
- "LIST_ITEM",
- "NUMBERED_LIST_ITEM",
- "DEFINITION_LIST_ITEM",
- "HORIZONTAL_RULE",
- "PAGE_BREAK",
- "LIST_BREAK",
- "MACRO"
- };
-
- private static final char spaces[] = {
- ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
- ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
- ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
- ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
- ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '
- };
+ private static final String typeNames[] = {"TITLE", "SECTION1", "SECTION2", "SECTION3", "SECTION4", "SECTION5",
+ "PARAGRAPH", "VERBATIM", "FIGURE", "TABLE", "LIST_ITEM", "NUMBERED_LIST_ITEM", "DEFINITION_LIST_ITEM",
+ "HORIZONTAL_RULE", "PAGE_BREAK", "LIST_BREAK", "MACRO"};
+
+ private static final char spaces[] = {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
+ ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
+ ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
+ ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
+ ' ', ' ', ' ', ' '};
public static final int TAB_WIDTH = 8;
@@ -79,11 +84,17 @@
private AptSource source;
- /** @ignore */
+ /**
+ * @ignore
+ */
private Sink sink;
+
private String line;
+
private Block block;
+
private String blockFileName;
+
private int blockLineNumber;
// -----------------------------------------------------------------------
@@ -126,7 +137,8 @@
return blockLineNumber;
}
- private void traverseHead() throws AptParseException
+ private void traverseHead()
+ throws AptParseException
{
sink.head();
@@ -139,7 +151,8 @@
sink.head_();
}
- private void traverseBody() throws AptParseException
+ private void traverseBody()
+ throws AptParseException
{
sink.body();
@@ -156,7 +169,8 @@
sink.body_();
}
- private void traverseSection( int level ) throws AptParseException
+ private void traverseSection( int level )
+ throws AptParseException
{
if ( block == null )
{
@@ -222,9 +236,11 @@
}
}
- private void traverseSectionBlocks() throws AptParseException
+ private void traverseSectionBlocks()
+ throws AptParseException
{
- loop: while ( block != null )
+ loop:
+ while ( block != null )
{
switch ( block.getType() )
{
@@ -264,7 +280,8 @@
}
}
- private void traverseList() throws AptParseException
+ private void traverseList()
+ throws AptParseException
{
if ( block == null )
{
@@ -283,7 +300,8 @@
nextBlock();
- loop: while ( block != null )
+ loop:
+ while ( block != null )
{
int blockIndent = block.getIndent();
@@ -291,7 +309,9 @@
{
case PARAGRAPH:
if ( blockIndent < listIndent )
+ {
break loop;
+ }
/*FALLTHROUGH*/
case VERBATIM:
case FIGURE:
@@ -304,7 +324,9 @@
case LIST_ITEM:
if ( blockIndent < listIndent )
+ {
break loop;
+ }
if ( blockIndent > listIndent )
{
@@ -321,21 +343,27 @@
case NUMBERED_LIST_ITEM:
if ( blockIndent < listIndent )
+ {
break loop;
+ }
traverseNumberedList();
break;
case DEFINITION_LIST_ITEM:
if ( blockIndent < listIndent )
+ {
break loop;
+ }
traverseDefinitionList();
break;
case LIST_BREAK:
if ( blockIndent >= listIndent )
+ {
nextBlock();
+ }
/*FALLTHROUGH*/
default:
// A block which ends the list.
@@ -347,10 +375,13 @@
sink.list_();
}
- private void traverseNumberedList() throws AptParseException
+ private void traverseNumberedList()
+ throws AptParseException
{
if ( block == null )
+ {
return;
+ }
expectedBlock( NUMBERED_LIST_ITEM );
int listIndent = block.getIndent();
@@ -359,7 +390,8 @@
block.traverse();
nextBlock();
- loop: while ( block != null )
+ loop:
+ while ( block != null )
{
int blockIndent = block.getIndent();
@@ -367,7 +399,9 @@
{
case PARAGRAPH:
if ( blockIndent < listIndent )
+ {
break loop;
+ }
/*FALLTHROUGH*/
case VERBATIM:
case FIGURE:
@@ -380,14 +414,18 @@
case LIST_ITEM:
if ( blockIndent < listIndent )
+ {
break loop;
+ }
traverseList();
break;
case NUMBERED_LIST_ITEM:
if ( blockIndent < listIndent )
+ {
break loop;
+ }
if ( blockIndent > listIndent )
{
@@ -404,14 +442,18 @@
case DEFINITION_LIST_ITEM:
if ( blockIndent < listIndent )
+ {
break loop;
+ }
traverseDefinitionList();
break;
case LIST_BREAK:
if ( blockIndent >= listIndent )
+ {
nextBlock();
+ }
/*FALLTHROUGH*/
default:
// A block which ends the list.
@@ -423,10 +465,13 @@
sink.numberedList_();
}
- private void traverseDefinitionList() throws AptParseException
+ private void traverseDefinitionList()
+ throws AptParseException
{
if ( block == null )
+ {
return;
+ }
expectedBlock( DEFINITION_LIST_ITEM );
int listIndent = block.getIndent();
@@ -435,7 +480,8 @@
block.traverse();
nextBlock();
- loop: while ( block != null )
+ loop:
+ while ( block != null )
{
int blockIndent = block.getIndent();
@@ -443,7 +489,9 @@
{
case PARAGRAPH:
if ( blockIndent < listIndent )
+ {
break loop;
+ }
/*FALLTHROUGH*/
case VERBATIM:
case FIGURE:
@@ -456,21 +504,27 @@
case LIST_ITEM:
if ( blockIndent < listIndent )
+ {
break loop;
+ }
traverseList();
break;
case NUMBERED_LIST_ITEM:
if ( blockIndent < listIndent )
+ {
break loop;
+ }
traverseNumberedList();
break;
case DEFINITION_LIST_ITEM:
if ( blockIndent < listIndent )
+ {
break loop;
+ }
if ( blockIndent > listIndent )
{
@@ -488,7 +542,9 @@
case LIST_BREAK:
if ( blockIndent >= listIndent )
+ {
nextBlock();
+ }
/*FALLTHROUGH*/
default:
// A block which ends the list.
@@ -501,22 +557,26 @@
sink.definitionList_();
}
- private final void nextLine() throws AptParseException
+ private final void nextLine()
+ throws AptParseException
{
line = source.getNextLine();
}
- private void nextBlock() throws AptParseException
+ private void nextBlock()
+ throws AptParseException
{
nextBlock( /*first*/ false );
}
- private void nextBlock( boolean firstBlock ) throws AptParseException
+ private void nextBlock( boolean firstBlock )
+ throws AptParseException
{
// Skip open and comment lines.
int length, indent, i;
- skipLoop: for ( ; ; )
+ skipLoop:
+ for ( ; ; )
{
if ( line == null )
{
@@ -526,7 +586,8 @@
length = line.length();
indent = 0;
- lineLoop: for ( i = 0; i < length; ++i )
+ lineLoop:
+ for ( i = 0; i < length; ++i )
{
switch ( line.charAt( i ) )
{
@@ -553,7 +614,9 @@
}
if ( i == length )
+ {
nextLine();
+ }
}
blockFileName = source.getName();
@@ -564,8 +627,7 @@
case '*':
if ( indent == 0 )
{
- if ( charAt( line, length, i + 1 ) == '-' &&
- charAt( line, length, i + 2 ) == '-' )
+ if ( charAt( line, length, i + 1 ) == '-' && charAt( line, length, i + 2 ) == '-' )
{
block = new Table( indent, line );
}
@@ -645,8 +707,7 @@
}
break;
case '-':
- if ( charAt( line, length, i + 1 ) == '-' &&
- charAt( line, length, i + 2 ) == '-' )
+ if ( charAt( line, length, i + 1 ) == '-' && charAt( line, length, i + 2 ) == '-' )
{
if ( indent == 0 )
{
@@ -655,25 +716,29 @@
else
{
if ( firstBlock )
+ {
block = new Title( indent, line );
+ }
}
}
break;
case '+':
- if ( indent == 0 &&
- charAt( line, length, i + 1 ) == '-' &&
- charAt( line, length, i + 2 ) == '-' )
+ if ( indent == 0 && charAt( line, length, i + 1 ) == '-' && charAt( line, length, i + 2 ) == '-' )
+ {
block = new Verbatim( indent, line );
+ }
break;
case '=':
- if ( indent == 0 &&
- charAt( line, length, i + 1 ) == '=' &&
- charAt( line, length, i + 2 ) == '=' )
+ if ( indent == 0 && charAt( line, length, i + 1 ) == '=' && charAt( line, length, i + 2 ) == '=' )
+ {
block = new HorizontalRule( indent, line );
+ }
break;
case '\f':
if ( indent == 0 )
+ {
block = new PageBreak( indent, line );
+ }
break;
case '%':
if ( indent == 0 && charAt( line, length, i + 1 ) == '{' )
@@ -686,20 +751,26 @@
if ( block == null )
{
if ( indent == 0 )
+ {
block = new Section1( indent, line );
+ }
else
+ {
block = new Paragraph( indent, line );
+ }
}
}
- private void expectedBlock( int type ) throws AptParseException
+ private void expectedBlock( int type )
+ throws AptParseException
{
int blockType = block.getType();
if ( blockType != type )
{
- throw new AptParseException( "expected " + typeNames[type] + ", found " + typeNames[blockType] +
- " at line " + getSourceLineNumber(), source );
+ throw new AptParseException(
+ "expected " + typeNames[type] + ", found " + typeNames[blockType] + " at line " + getSourceLineNumber(),
+ source );
}
}
@@ -712,8 +783,7 @@
private static final boolean isHexChar( char c )
{
- return ( ( c >= '0' && c <= '9' ) || ( c >= 'a' && c <= 'f' ) ||
- ( c >= 'A' && c <= 'F' ) );
+ return ( ( c >= '0' && c <= '9' ) || ( c >= 'a' && c <= 'f' ) || ( c >= 'A' && c <= 'F' ) );
}
private static final char charAt( String string, int length, int i )
@@ -723,7 +793,8 @@
private static int skipSpace( String string, int length, int i )
{
- loop: for ( ; i < length; ++i )
+ loop:
+ for ( ; i < length; ++i )
{
switch ( string.charAt( i ) )
{
@@ -737,8 +808,8 @@
return i;
}
- private static void doTraverseText( String text, int begin, int end,
- Sink sink ) throws AptParseException
+ private static void doTraverseText( String text, int begin, int end, Sink sink )
+ throws AptParseException
{
boolean anchor = false;
boolean link = false;
@@ -766,9 +837,10 @@
case '\n':
++i;
// Skip white space which may follow a line break.
- while ( i + 1 < end &&
- Character.isWhitespace( text.charAt( i + 1 ) ) )
+ while ( i + 1 < end && Character.isWhitespace( text.charAt( i + 1 ) ) )
+ {
++i;
+ }
flushTraversed( buffer, sink );
sink.lineBreak();
break;
@@ -789,8 +861,7 @@
buffer.append( escaped );
break;
case 'x':
- if ( i + 3 < end &&
- isHexChar( text.charAt( i + 2 ) ) &&
+ if ( i + 3 < end && isHexChar( text.charAt( i + 2 ) ) &&
isHexChar( text.charAt( i + 3 ) ) )
{
int value = '?';
@@ -811,10 +882,8 @@
}
break;
case 'u':
- if ( i + 5 < end &&
- isHexChar( text.charAt( i + 2 ) ) &&
- isHexChar( text.charAt( i + 3 ) ) &&
- isHexChar( text.charAt( i + 4 ) ) &&
+ if ( i + 5 < end && isHexChar( text.charAt( i + 2 ) ) &&
+ isHexChar( text.charAt( i + 3 ) ) && isHexChar( text.charAt( i + 4 ) ) &&
isHexChar( text.charAt( i + 5 ) ) )
{
int value = '?';
@@ -842,7 +911,9 @@
{
++octalChars;
if ( isOctalChar( charAt( text, end, i + 3 ) ) )
+ {
++octalChars;
+ }
}
int value = '?';
try
@@ -888,7 +959,9 @@
}
if ( linkAnchor == null )
+ {
linkAnchor = getTraversedLink( text, i + 1, end );
+ }
sink.link( linkAnchor );
}
@@ -959,8 +1032,7 @@
break;
case '>':
- if ( monospaced && i + 2 < end &&
- text.charAt( i + 1 ) == '>' && text.charAt( i + 2 ) == '>' )
+ if ( monospaced && i + 2 < end && text.charAt( i + 1 ) == '>' && text.charAt( i + 2 ) == '>' )
{
i += 2;
monospaced = false;
@@ -992,9 +1064,10 @@
buffer.append( ' ' );
// Skip to the last char of a sequence of white spaces.
- while ( i + 1 < end &&
- Character.isWhitespace( text.charAt( i + 1 ) ) )
+ while ( i + 1 < end && Character.isWhitespace( text.charAt( i + 1 ) ) )
+ {
++i;
+ }
}
else
{
@@ -1004,15 +1077,25 @@
}
if ( monospaced )
+ {
throw new AptParseException( "missing '>>>'" );
+ }
if ( bold )
+ {
throw new AptParseException( "missing '>>'" );
+ }
if ( italic )
+ {
throw new AptParseException( "missing '>'" );
+ }
if ( link )
+ {
throw new AptParseException( "missing '}}'" );
+ }
if ( anchor )
+ {
throw new AptParseException( "missing '}'" );
+ }
flushTraversed( buffer, sink );
}
@@ -1026,12 +1109,12 @@
}
}
- private static int skipTraversedLinkAnchor( String text, int begin, int end,
- StringBuffer linkAnchor )
+ private static int skipTraversedLinkAnchor( String text, int begin, int end, StringBuffer linkAnchor )
throws AptParseException
{
int i;
- loop: for ( i = begin; i < end; ++i )
+ loop:
+ for ( i = begin; i < end; ++i )
{
char c = text.charAt( i );
switch ( c )
@@ -1054,7 +1137,9 @@
}
}
if ( i == end )
+ {
throw new AptParseException( "missing '}'" );
+ }
return i;
}
@@ -1070,13 +1155,17 @@
{
char c = text.charAt( i );
if ( c == '}' && previous == '}' && previous2 != '\\' )
+ {
break;
+ }
previous2 = previous;
previous = c;
}
if ( i == end )
+ {
throw new AptParseException( "missing '}}'" );
+ }
return doGetTraversedLink( text, begin, i - 1 );
}
@@ -1091,12 +1180,16 @@
{
char c = text.charAt( i );
if ( c == '}' && previous != '\\' )
+ {
break;
+ }
previous = c;
}
if ( i == end )
+ {
throw new AptParseException( "missing '}'" );
+ }
return doGetTraversedLink( text, begin, i );
}
@@ -1133,11 +1226,15 @@
private abstract class Block
{
protected int type;
+
protected int indent;
+
protected String text;
+
protected int textLength;
- public Block( int type, int indent ) throws AptParseException
+ public Block( int type, int indent )
+ throws AptParseException
{
this( type, indent, null );
}
@@ -1169,8 +1266,7 @@
i = skipSpace( l, length, i );
if ( i == length ||
- ( AptParser.charAt( l, length, i ) == '~' &&
- AptParser.charAt( l, length, i + 1 ) == '~' ) )
+ ( AptParser.charAt( l, length, i ) == '~' && AptParser.charAt( l, length, i + 1 ) == '~' ) )
{
// Stop after open or comment line and skip it.
// (A comment line is considered to be an open line.)
@@ -1199,14 +1295,17 @@
return indent;
}
- public abstract void traverse() throws AptParseException;
+ public abstract void traverse()
+ throws AptParseException;
- protected void traverseText( int begin ) throws AptParseException
+ protected void traverseText( int begin )
+ throws AptParseException
{
traverseText( begin, text.length() );
}
- protected void traverseText( int begin, int end ) throws AptParseException
+ protected void traverseText( int begin, int end )
+ throws AptParseException
{
AptParser.doTraverseText( text, begin, end, AptParser.this.sink );
}
@@ -1217,23 +1316,30 @@
for ( ; i < textLength; ++i )
{
if ( text.charAt( i ) != '*' )
+ {
break;
+ }
}
return skipSpaceFrom( i );
}
- protected int skipFromLeftToRightBracket( int i ) throws AptParseException
+ protected int skipFromLeftToRightBracket( int i )
+ throws AptParseException
{
char previous = '[';
for ( ++i; i < textLength; ++i )
{
char c = text.charAt( i );
if ( c == ']' && previous != '\\' )
+ {
break;
+ }
previous = c;
}
if ( i == textLength )
+ {
throw new AptParseException( "missing ']'" );
+ }
return i;
}
@@ -1244,27 +1350,33 @@
}
}
- private class ListBreak extends AptParser.Block
+ private class ListBreak
+ extends AptParser.Block
{
- public ListBreak( int indent, String firstLine ) throws AptParseException
+ public ListBreak( int indent, String firstLine )
+ throws AptParseException
{
super( AptParser.LIST_BREAK, indent );
}
- public void traverse() throws AptParseException
+ public void traverse()
+ throws AptParseException
{
throw new AptParseException( "internal error: traversing list break" );
}
}
- private class Title extends Block
+ private class Title
+ extends Block
{
- public Title( int indent, String firstLine ) throws AptParseException
+ public Title( int indent, String firstLine )
+ throws AptParseException
{
super( TITLE, indent, firstLine );
}
- public void traverse() throws AptParseException
+ public void traverse()
+ throws AptParseException
{
StringTokenizer lines = new StringTokenizer( text, "\n" );
int separator = -1;
@@ -1273,26 +1385,32 @@
boolean author = false;
boolean date = false;
- loop: while ( lines.hasMoreTokens() )
+ loop:
+ while ( lines.hasMoreTokens() )
{
String line = lines.nextToken().trim();
int lineLength = line.length();
- if ( AptParser.charAt( line, lineLength, 0 ) == '-' &&
- AptParser.charAt( line, lineLength, 1 ) == '-' &&
+ if ( AptParser.charAt( line, lineLength, 0 ) == '-' && AptParser.charAt( line, lineLength, 1 ) == '-' &&
AptParser.charAt( line, lineLength, 2 ) == '-' )
{
switch ( separator )
{
case 0:
if ( title )
+ {
AptParser.this.sink.title_();
+ }
else
+ {
throw new AptParseException( "missing title" );
+ }
break;
case 1:
if ( author )
+ {
AptParser.this.sink.author_();
+ }
break;
case 2:
// Note that an extra decorative line is allowed
@@ -1330,8 +1448,7 @@
AptParser.this.sink.lineBreak();
}
- AptParser.doTraverseText( line, 0, lineLength,
- AptParser.this.sink );
+ AptParser.doTraverseText( line, 0, lineLength, AptParser.this.sink );
}
}
@@ -1339,23 +1456,32 @@
{
case 0:
if ( title )
+ {
AptParser.this.sink.title_();
+ }
else
+ {
throw new AptParseException( "missing title" );
+ }
break;
case 1:
if ( author )
+ {
AptParser.this.sink.author_();
+ }
break;
case 2:
if ( date )
+ {
AptParser.this.sink.date_();
+ }
break;
}
}
}
- private class Section extends Block
+ private class Section
+ extends Block
{
public Section( int type, int indent, String firstLine )
throws AptParseException
@@ -1363,7 +1489,8 @@
super( type, indent, firstLine );
}
- public void traverse() throws AptParseException
+ public void traverse()
+ throws AptParseException
{
Title();
traverseText( skipLeadingBullets() );
@@ -1381,9 +1508,11 @@
}
}
- private class Section1 extends Section
+ private class Section1
+ extends Section
{
- public Section1( int indent, String firstLine ) throws AptParseException
+ public Section1( int indent, String firstLine )
+ throws AptParseException
{
super( SECTION1, indent, firstLine );
}
@@ -1399,9 +1528,11 @@
}
}
- private class Section2 extends Section
+ private class Section2
+ extends Section
{
- public Section2( int indent, String firstLine ) throws AptParseException
+ public Section2( int indent, String firstLine )
+ throws AptParseException
{
super( SECTION2, indent, firstLine );
}
@@ -1417,9 +1548,11 @@
}
}
- private class Section3 extends Section
+ private class Section3
+ extends Section
{
- public Section3( int indent, String firstLine ) throws AptParseException
+ public Section3( int indent, String firstLine )
+ throws AptParseException
{
super( SECTION3, indent, firstLine );
}
@@ -1435,9 +1568,11 @@
}
}
- private class Section4 extends Section
+ private class Section4
+ extends Section
{
- public Section4( int indent, String firstLine ) throws AptParseException
+ public Section4( int indent, String firstLine )
+ throws AptParseException
{
super( SECTION4, indent, firstLine );
}
@@ -1453,9 +1588,11 @@
}
}
- private class Section5 extends Section
+ private class Section5
+ extends Section
{
- public Section5( int indent, String firstLine ) throws AptParseException
+ public Section5( int indent, String firstLine )
+ throws AptParseException
{
super( SECTION5, indent, firstLine );
}
@@ -1471,14 +1608,17 @@
}
}
- private class Paragraph extends Block
+ private class Paragraph
+ extends Block
{
- public Paragraph( int indent, String firstLine ) throws AptParseException
+ public Paragraph( int indent, String firstLine )
+ throws AptParseException
{
super( PARAGRAPH, indent, firstLine );
}
- public void traverse() throws AptParseException
+ public void traverse()
+ throws AptParseException
{
AptParser.this.sink.paragraph();
traverseText( skipSpaceFrom( 0 ) );
@@ -1486,11 +1626,13 @@
}
}
- private class Verbatim extends Block
+ private class Verbatim
+ extends Block
{
private boolean boxed;
- public Verbatim( int indent, String firstLine ) throws AptParseException
+ public Verbatim( int indent, String firstLine )
+ throws AptParseException
{
super( VERBATIM, indent, null );
@@ -1505,8 +1647,7 @@
String l = AptParser.this.line;
int length = l.length();
- if ( AptParser.charAt( l, length, 0 ) == firstChar &&
- AptParser.charAt( l, length, 1 ) == '-' &&
+ if ( AptParser.charAt( l, length, 0 ) == firstChar && AptParser.charAt( l, length, 1 ) == '-' &&
AptParser.charAt( l, length, 2 ) == '-' )
{
AptParser.this.nextLine();
@@ -1557,7 +1698,8 @@
text = buffer.toString();
}
- public void traverse() throws AptParseException
+ public void traverse()
+ throws AptParseException
{
AptParser.this.sink.verbatim( boxed );
AptParser.this.sink.text( text );
@@ -1565,14 +1707,17 @@
}
}
- private class Figure extends Block
+ private class Figure
+ extends Block
{
- public Figure( int indent, String firstLine ) throws AptParseException
+ public Figure( int indent, String firstLine )
+ throws AptParseException
{
super( FIGURE, indent, firstLine );
}
- public void traverse() throws AptParseException
+ public void traverse()
+ throws AptParseException
{
AptParser.this.sink.figure();
@@ -1591,14 +1736,17 @@
}
}
- private class Table extends Block
+ private class Table
+ extends Block
{
- public Table( int indent, String firstLine ) throws AptParseException
+ public Table( int indent, String firstLine )
+ throws AptParseException
{
super( TABLE, indent, firstLine );
}
- public void traverse() throws AptParseException
+ public void traverse()
+ throws AptParseException
{
int captionIndex = -1;
int nextLineIndex = 0;
@@ -1643,12 +1791,16 @@
columns = justification.length;
cells = new StringBuffer[columns];
for ( i = 0; i < columns; ++i )
+ {
cells[i] = new StringBuffer();
+ }
}
else
{
if ( traverseRow( cells ) )
+ {
++rows;
+ }
}
}
else
@@ -1660,8 +1812,7 @@
AptParser.this.sink.tableRows( justification, grid );
}
- line = replaceAll( ( grid ? line.substring( 1 ) : line ),
- "\\|", "\\174" );
+ line = replaceAll( ( grid ? line.substring( 1 ) : line ), "\\|", "\\174" );
StringTokenizer cellLines = new StringTokenizer( line, "|" );
i = 0;
@@ -1677,25 +1828,30 @@
{
if ( cell.length() > 0 )
// Implicit lineBreak if multi-line cell.
+ {
cell.append( "\\\n" );
+ }
cell.append( cellLine );
}
++i;
if ( i == columns )
+ {
break;
+ }
}
}
}
if ( rows == 0 )
+ {
throw new AptParseException( "no table rows" );
+ }
AptParser.this.sink.tableRows_();
if ( captionIndex >= 0 )
{
AptParser.this.sink.tableCaption();
- AptParser.doTraverseText( text, captionIndex, textLength,
- AptParser.this.sink );
+ AptParser.doTraverseText( text, captionIndex, textLength, AptParser.this.sink );
AptParser.this.sink.tableCaption_();
}
@@ -1720,7 +1876,9 @@
}
if ( columns == 0 )
+ {
throw new AptParseException( "no columns specified" );
+ }
int[] justification = new int[columns];
columns = 0;
@@ -1766,8 +1924,7 @@
AptParser.this.sink.tableCell();
if ( cell.length() > 0 )
{
- AptParser.doTraverseText( cell.toString(), 0,
- cell.length(), AptParser.this.sink );
+ AptParser.doTraverseText( cell.toString(), 0, cell.length(), AptParser.this.sink );
cell.setLength( 0 );
}
AptParser.this.sink.tableCell_();
@@ -1779,14 +1936,17 @@
}
}
- private class ListItem extends Block
+ private class ListItem
+ extends Block
{
- public ListItem( int indent, String firstLine ) throws AptParseException
+ public ListItem( int indent, String firstLine )
+ throws AptParseException
{
super( LIST_ITEM, indent, firstLine );
}
- public void traverse() throws AptParseException
+ public void traverse()
+ throws AptParseException
{
AptParser.this.sink.paragraph();
traverseText( skipLeadingBullets() );
@@ -1794,7 +1954,8 @@
}
}
- private class NumberedListItem extends Block
+ private class NumberedListItem
+ extends Block
{
private int numbering;
@@ -1810,14 +1971,16 @@
return numbering;
}
- public void traverse() throws AptParseException
+ public void traverse()
+ throws AptParseException
{
AptParser.this.sink.paragraph();
traverseText( skipItemNumber() );
AptParser.this.sink.paragraph_();
}
- private int skipItemNumber() throws AptParseException
+ private int skipItemNumber()
+ throws AptParseException
{
int i = skipSpaceFrom( 0 );
@@ -1826,18 +1989,23 @@
{
char c = text.charAt( i );
if ( c == ']' && prevChar == ']' )
+ {
break;
+ }
prevChar = c;
}
if ( i == textLength )
+ {
throw new AptParseException( "missing ']]'" );
+ }
return skipSpaceFrom( i + 1 );
}
}
- private class DefinitionListItem extends Block
+ private class DefinitionListItem
+ extends Block
{
public DefinitionListItem( int indent, String firstLine )
throws AptParseException
@@ -1845,7 +2013,8 @@
super( DEFINITION_LIST_ITEM, indent, firstLine );
}
- public void traverse() throws AptParseException
+ public void traverse()
+ throws AptParseException
{
int i = skipSpaceFrom( 0 );
int j = skipFromLeftToRightBracket( i );
@@ -1856,7 +2025,9 @@
j = skipSpaceFrom( j + 1 );
if ( j == textLength )
+ {
throw new AptParseException( "no definition" );
+ }
AptParser.this.sink.definition();
AptParser.this.sink.paragraph();
@@ -1865,7 +2036,8 @@
}
}
- private class HorizontalRule extends Block
+ private class HorizontalRule
+ extends Block
{
public HorizontalRule( int indent, String firstLine )
throws AptParseException
@@ -1873,35 +2045,42 @@
super( HORIZONTAL_RULE, indent );
}
- public void traverse() throws AptParseException
+ public void traverse()
+ throws AptParseException
{
AptParser.this.sink.horizontalRule();
}
}
- private class PageBreak extends Block
+ private class PageBreak
+ extends Block
{
- public PageBreak( int indent, String firstLine ) throws AptParseException
+ public PageBreak( int indent, String firstLine )
+ throws AptParseException
{
super( PAGE_BREAK, indent );
}
- public void traverse() throws AptParseException
+ public void traverse()
+ throws AptParseException
{
AptParser.this.sink.pageBreak();
}
}
- private class MacroBlock extends Block
+ private class MacroBlock
+ extends Block
{
- public MacroBlock( int indent, String firstLine ) throws AptParseException
+ public MacroBlock( int indent, String firstLine )
+ throws AptParseException
{
super( MACRO, indent );
text = firstLine;
}
- public void traverse() throws AptParseException
+ public void traverse()
+ throws AptParseException
{
String s = text;
@@ -1928,8 +2107,7 @@
// -----------------------------------------------------------------------
- private static String replaceAll( String string,
- String oldSub, String newSub )
+ private static String replaceAll( String string, String oldSub, String newSub )
{
StringBuffer replaced = new StringBuffer();
int oldSubLength = oldSub.length();
@@ -1939,12 +2117,16 @@
while ( ( end = string.indexOf( oldSub, begin ) ) >= 0 )
{
if ( end > begin )
+ {
replaced.append( string.substring( begin, end ) );
+ }
replaced.append( newSub );
begin = end + oldSubLength;
}
if ( begin < string.length() )
+ {
replaced.append( string.substring( begin ) );
+ }
return replaced.toString();
}
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptReaderSource.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptReaderSource.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptReaderSource.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptReaderSource.java Wed Nov 23 17:02:44 2005
@@ -1,18 +1,27 @@
+package org.apache.maven.doxia.module.apt;
+
/*
- * Copyright (c) 1999,2000 Pixware.
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Author: Hussein Shafie
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * This file is part of the Pixware APT tools.
- * For conditions of distribution and use, see the accompanying legal.txt file.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-package org.codehaus.doxia.module.apt;
import java.io.IOException;
import java.io.LineNumberReader;
import java.io.Reader;
-public class AptReaderSource implements AptSource
+public class AptReaderSource
+ implements AptSource
{
private LineNumberReader reader;
@@ -25,10 +34,13 @@
lineNumber = -1;
}
- public String getNextLine() throws AptParseException
+ public String getNextLine()
+ throws AptParseException
{
if ( reader == null )
+ {
return null;
+ }
String line;
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java Wed Nov 23 17:02:44 2005
@@ -1,14 +1,28 @@
-package org.codehaus.doxia.module.apt;
+package org.apache.maven.doxia.module.apt;
-import org.codehaus.doxia.site.module.AbstractSiteModule;
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.doxia.site.module.AbstractSiteModule;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
- *
- * @plexus.component
- * role="org.codehaus.doxia.site.module.SiteModule"
- * role-hint="apt"
+ * @plexus.component role="org.apache.maven.doxia.site.module.SiteModule"
+ * role-hint="apt"
*/
public class AptSiteModule
extends AbstractSiteModule
Modified: maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptSource.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptSource.java?rev=348605&r1=348596&r2=348605&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptSource.java (original)
+++ maven/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/apt/AptSource.java Wed Nov 23 17:02:44 2005
@@ -1,12 +1,18 @@
-/*
- * Copyright (c) 1999,2000 Pixware.
+package org.apache.maven.doxia.module.apt;/*
+ * Copyright 2004-2005 The Apache Software Foundation.
*
- * Author: Hussein Shafie
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * This file is part of the Pixware APT tools.
- * For conditions of distribution and use, see the accompanying legal.txt file.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
-package org.codehaus.doxia.module.apt;
public interface AptSource
{