[WebMacro-cvs] wiki/src/org/tcdi/opensource/wiki/builder DefaultPageBuilder.java,1.5,1.6 WikiPageBuilder.java,1.3,1.4

[<dr...@us...>]

Update of /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/builder
In directory sc8-pr-cvs1:/tmp/cvs-serv18187/src/org/tcdi/opensource/wiki/builder

Modified Files:
	DefaultPageBuilder.java WikiPageBuilder.java 
Log Message:
- make build.xml understand javacc so it can regen the parser
- added parser,builder,renderer support for bulleted lists. 
- removed some debug output in SavePageAction.java


Index: DefaultPageBuilder.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/builder/DefaultPageBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DefaultPageBuilder.java	18 Oct 2001 19:10:42 -0000	1.5
--- DefaultPageBuilder.java	27 Nov 2002 07:06:32 -0000	1.6
***************
*** 51,55 ****
  public class DefaultPageBuilder implements WikiPageBuilder {
      protected WikiTermMatcher _matcher;
!     protected boolean _bold, _underline, _italic, _color, _header, _space;
      protected String _currentHeader = null;
      protected StringBuffer _text = new StringBuffer ();
--- 51,55 ----
  public class DefaultPageBuilder implements WikiPageBuilder {
      protected WikiTermMatcher _matcher;
!     protected boolean _bold, _underline, _italic, _color, _header, _space, _list;
      protected String _currentHeader = null;
      protected StringBuffer _text = new StringBuffer ();
***************
*** 91,95 ****
          _currentData.setType (WikiDataTypes.LT);
      }
!     
      public void underline() {
          newData ();
--- 91,105 ----
          _currentData.setType (WikiDataTypes.LT);
      }
! 
!     public void li() {
! 		if (!_list) {
! 			newData();
! 			_currentData.setType(WikiDataTypes.START_LIST);
! 			_list = true;
! 		}
! 		newData();
! 		_currentData.setType(WikiDataTypes.LI);
!     }
! 
      public void underline() {
          newData ();
***************
*** 159,162 ****
--- 169,178 ----
      public void paragraph() {
          finishFormatting ();
+         if (_list) {
+             newData();
+             _currentData.setType(WikiDataTypes.END_LIST);
+             _list = false;
+ 
+         }
          newData ();
          _currentData.setType (WikiDataTypes.PARAGRAPH_BREAK);
***************
*** 227,233 ****
      
      public void indent(int many) {
!         newData();
!         _currentData.setType (WikiDataTypes.INDENT);
!         _currentData.setData (""+many);
      }
      
--- 243,251 ----
      
      public void indent(int many) {
!         if (!_list) {
!             newData();
!             _currentData.setType (WikiDataTypes.INDENT);
!             _currentData.setData (""+many);
!         }
      }
      

Index: WikiPageBuilder.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/builder/WikiPageBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WikiPageBuilder.java	18 Oct 2001 07:02:30 -0000	1.3
--- WikiPageBuilder.java	27 Nov 2002 07:06:32 -0000	1.4
***************
*** 106,110 ****
      /** add the greater-than (>) symbol */
      public void gt ();
!     
      /** add a URL */
      public void url (String url);
--- 106,113 ----
      /** add the greater-than (>) symbol */
      public void gt ();
! 
!     /** a bulleted list item */
!     public void li ();
! 
      /** add a URL */
      public void url (String url);