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

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

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

Modified Files:
	HTMLPageRenderer.java TextPageRenderer.java 
	WikiPageRenderer.java 
Log Message:
- fixed rendering issues with DiffPage
- add begin() and done() notifications to the page builder
- add parser/renderer supported for numbered lists
- fix rendering bug with: ~~
- fix bugs where one could create a page with all lower-case letters (also cleaned up filesystem of production webserver)
- add ability to Preview before Saving a page edit
- cleanup "thank you for registering" page a little bit
- don't show the "Diff to Previous" link if we're not actually viewing a valid page
- attempt to convince WMServlet to log my exception stack traces so I can hunt down the cause of a few NPE's I've seen in the error log on the production server

Index: HTMLPageRenderer.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/renderer/HTMLPageRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** HTMLPageRenderer.java	27 Nov 2002 07:06:32 -0000	1.6
--- HTMLPageRenderer.java	3 Jul 2003 05:20:08 -0000	1.7
***************
*** 133,137 ****
          sb.append ("<pre>")
            .append (replace (replace (text, "<", "&lt;"), ">", "&gt;"))
!           .append ("</pre>");
          
          return sb.toString ();
--- 133,137 ----
          sb.append ("<pre>")
            .append (replace (replace (text, "<", "&lt;"), ">", "&gt;"))
!           .append ("</pre>\n");
          
          return sb.toString ();
***************
*** 226,230 ****
      
      protected String renderHorizLine() {
!         return "<hr>";
      }
      
--- 226,230 ----
      
      protected String renderHorizLine() {
!         return "<hr>\n";
      }
      
***************
*** 250,270 ****
      
      protected String renderLineBreak() {
!         return "<br>";
      }
      
      protected String renderParagraphBreak() {
!         return "<br><br>";
      }
  
      protected String renderStartList() {
!         return "<ul>";
      }
  
      protected String renderListItem() {
          return "<li>";
-     }
- 
-     protected String renderEndList() {
-         return "</ul>";
      }
  
--- 250,278 ----
      
      protected String renderLineBreak() {
!         return "<br>\n";
      }
      
      protected String renderParagraphBreak() {
!         return "<br><br>\n";
      }
  
+     protected String renderStartNumberedList() {
+         return "<ol>\n";
+     }
+     
+     protected String renderEndNumberedList() {
+         return "</ol>\n";
+     }
+     
      protected String renderStartList() {
!         return "<ul>\n";
      }
  
+     protected String renderEndList() {
+         return "</ul>\n";
+     }
+     
      protected String renderListItem() {
          return "<li>";
      }
  

Index: TextPageRenderer.java
===================================================================
RCS file: /cvsroot/webmacro/wiki/src/org/tcdi/opensource/wiki/renderer/TextPageRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TextPageRenderer.java	27 Nov 2002 07:06:32 -0000	1.5
--- TextPageRenderer.java	3 Jul 2003 05:20:09 -0000	1.6
***************
*** 164,175 ****
      }
  
!     protected String renderListItem() {
!         return "*   ";
      }
  
!     protected String renderEndList() {
          return "";
      }
  
      protected String renderLineBreak() {
          return System.getProperty ("line.separator");        
--- 164,186 ----
      }
  
!     protected String renderEndList() {
!         return "";
      }
  
!     private int _number = 0;
!     protected String renderStartNumberedList() {
!         _number = 1;
!         return "\n";
!     }
! 
!     protected String renderEndNumberedList() {
!         _number = 0;
          return "";
      }
  
+     protected String renderListItem() {
+         return _number > 0 ? "" + (++_number) : "*   ";
+     }
+     
      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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** WikiPageRenderer.java	27 Nov 2002 07:06:32 -0000	1.5
--- WikiPageRenderer.java	3 Jul 2003 05:20:09 -0000	1.6
***************
*** 162,173 ****
                      break;
  
-                 case WikiDataTypes.LI:
-                     str = renderListItem();
-                     break;
- 
                  case WikiDataTypes.END_LIST:
                      str = renderEndList();
                      break;
  
                  // @deprecated "image" is now a URL type.
                  case WikiDataTypes.IMAGE:
--- 162,181 ----
                      break;
  
                  case WikiDataTypes.END_LIST:
                      str = renderEndList();
                      break;
+                     
+                 case WikiDataTypes.START_NUMBERED_LIST:
+                     str = renderStartNumberedList();
+                     break;
+ 
+                 case WikiDataTypes.END_NUMBERED_LIST:
+                     str = renderEndNumberedList();
+                     break;
  
+                 case WikiDataTypes.LI:
+                     str = renderListItem();
+                     break;
+                     
                  // @deprecated "image" is now a URL type.
                  case WikiDataTypes.IMAGE:
***************
*** 241,247 ****
  
      protected abstract String renderStartList();
-     protected abstract String renderListItem();
      protected abstract String renderEndList();
! 
      protected abstract String renderBoldStart ();
      protected abstract String renderBoldEnd ();
--- 249,257 ----
  
      protected abstract String renderStartList();
      protected abstract String renderEndList();
!     protected abstract String renderStartNumberedList();
!     protected abstract String renderEndNumberedList();
!     protected abstract String renderListItem();
!     
      protected abstract String renderBoldStart ();
      protected abstract String renderBoldEnd ();