[WebMacro-cvs] wiki/src/org/tcdi/opensource/wiki/renderer HTMLPageRenderer.java,1.5,1.6 TextPageRenderer.java,1.4,1.5 WikiPageRenderer.java,1.4,1.5

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

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

Modified Files:
	HTMLPageRenderer.java TextPageRenderer.java 
	WikiPageRenderer.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: HTMLPageRenderer.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/renderer/HTMLPageRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HTMLPageRenderer.java	5 Jan 2002 19:51:09 -0000	1.5
--- HTMLPageRenderer.java	27 Nov 2002 07:06:32 -0000	1.6
***************
*** 255,260 ****
      protected String renderParagraphBreak() {
          return "<br><br>";
!     }    
!     
      /**
      * replace all occurrences of 'from' to 'to' in 'src'
--- 255,272 ----
      protected String renderParagraphBreak() {
          return "<br><br>";
!     }
! 
!     protected String renderStartList() {
!         return "<ul>";
!     }
! 
!     protected String renderListItem() {
!         return "<li>";
!     }
! 
!     protected String renderEndList() {
!         return "</ul>";
!     }
! 
      /**
      * replace all occurrences of 'from' to 'to' in 'src'
***************
*** 263,267 ****
      * @param from substring that needs to be replaced
      * @param to string to replace 'from' with
!     * @returns String with all occurrences of 'from' replaced with 'to' or 'src' if 'from' not found
      */
      private static final String replace (String src, String from, String to)
--- 275,279 ----
      * @param from substring that needs to be replaced
      * @param to string to replace 'from' with
!     * @return String with all occurrences of 'from' replaced with 'to' or 'src' if 'from' not found
      */
      private static final String replace (String src, String from, String to)

Index: TextPageRenderer.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/renderer/TextPageRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TextPageRenderer.java	7 Nov 2002 18:15:27 -0000	1.4
--- TextPageRenderer.java	27 Nov 2002 07:06:32 -0000	1.5
***************
*** 159,163 ****
          return "";        
      }
!     
      protected String renderLineBreak() {
          return System.getProperty ("line.separator");        
--- 159,175 ----
          return "";        
      }
! 
!     protected String renderStartList() {
!         return "\n";
!     }
! 
!     protected String renderListItem() {
!         return "*   ";
!     }
! 
!     protected String renderEndList() {
!         return "";
!     }
! 
      protected String renderLineBreak() {
          return System.getProperty ("line.separator");        

Index: WikiPageRenderer.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/renderer/WikiPageRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WikiPageRenderer.java	5 Jan 2002 20:35:45 -0000	1.4
--- WikiPageRenderer.java	27 Nov 2002 07:06:32 -0000	1.5
***************
*** 50,55 ****
   * Default implementes for rendering to Text and HTML are provided.
   *
!  * @see com.tcdi.opensource.wiki.renderer.TextPageRenderer
!  * @see com.tcdi.opensource.wiki.renderer.HTMLPageRenderer
   * @author  e_ridge
   */
--- 50,55 ----
   * Default implementes for rendering to Text and HTML are provided.
   *
!  * @see org.tcdi.opensource.wiki.renderer.TextPageRenderer
!  * @see org.tcdi.opensource.wiki.renderer.HTMLPageRenderer
   * @author  e_ridge
   */
***************
*** 157,161 ****
                      str = _urlRenderer.renderURL (data);
                      break;
!                     
                  // @deprecated "image" is now a URL type.
                  case WikiDataTypes.IMAGE:
--- 157,173 ----
                      str = _urlRenderer.renderURL (data);
                      break;
! 
!                 case WikiDataTypes.START_LIST:
!                     str = renderStartList();
!                     break;
! 
!                 case WikiDataTypes.LI:
!                     str = renderListItem();
!                     break;
! 
!                 case WikiDataTypes.END_LIST:
!                     str = renderEndList();
!                     break;
! 
                  // @deprecated "image" is now a URL type.
                  case WikiDataTypes.IMAGE:
***************
*** 227,232 ****
      protected abstract String renderGT ();
      protected abstract String renderUnknown (WikiData data);
!  
!     
      protected abstract String renderBoldStart ();
      protected abstract String renderBoldEnd ();
--- 239,247 ----
      protected abstract String renderGT ();
      protected abstract String renderUnknown (WikiData data);
! 
!     protected abstract String renderStartList();
!     protected abstract String renderListItem();
!     protected abstract String renderEndList();
! 
      protected abstract String renderBoldStart ();
      protected abstract String renderBoldEnd ();