[Jreepad-CVS] jreepad/src/jreepad/io XmlReader.java, 1.1, 1.2 TreepadReader.java, 1.1, 1.2 HtmlWriter.java, 1.1, 1.2 XmlWriter.java, 1.3, 1.4

[PeWu <pe...@us...>]

Update of /cvsroot/jreepad/jreepad/src/jreepad/io
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv26820/src/jreepad/io

Modified Files:
	XmlReader.java TreepadReader.java HtmlWriter.java 
	XmlWriter.java 
Log Message:
refactoring: refactored JreepadArticle from JreepadNode.
  JreepadNode is the tree node and contains an article.
  JreepadArticle is the article with no connection to the tree.


Index: XmlReader.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/XmlReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XmlReader.java	20 Jan 2007 13:01:19 -0000	1.1
--- XmlReader.java	26 Jan 2007 21:47:55 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  import java.io.InputStreamReader;
  
+ import jreepad.JreepadArticle;
  import jreepad.JreepadNode;
  
***************
*** 108,120 ****
  
          if (typeString.equals("text/csv"))
!             node.setArticleMode(JreepadNode.ARTICLEMODE_CSV);
          else if (typeString.equals("text/html"))
!             node.setArticleMode(JreepadNode.ARTICLEMODE_HTML);
          else if (typeString.equals("text/textile"))
!             node.setArticleMode(JreepadNode.ARTICLEMODE_TEXTILEHTML);
!         else if (typeString.equals("application/x-jreepad-softlink"))
!             node.setArticleMode(JreepadNode.ARTICLEMODE_SOFTLINK);
          else
!             node.setArticleMode(JreepadNode.ARTICLEMODE_ORDINARY);
  
          node.setTitle(xmlUnescapeChars(title));
--- 109,121 ----
  
          if (typeString.equals("text/csv"))
!             node.getArticle().setArticleMode(JreepadArticle.ARTICLEMODE_CSV);
          else if (typeString.equals("text/html"))
!             node.getArticle().setArticleMode(JreepadArticle.ARTICLEMODE_HTML);
          else if (typeString.equals("text/textile"))
!             node.getArticle().setArticleMode(JreepadArticle.ARTICLEMODE_TEXTILEHTML);
!         //else if (typeString.equals("application/x-jreepad-softlink"))
!         //    node.setArticleMode(JreepadArticle.ARTICLEMODE_SOFTLINK);
          else
!             node.getArticle().setArticleMode(JreepadArticle.ARTICLEMODE_ORDINARY);
  
          node.setTitle(xmlUnescapeChars(title));
***************
*** 155,159 ****
                      String returnFromBaby = currentXmlContent.substring(endTagOffset + 7);
                      // System.out.println("\n\nBaby intends to return:"+returnFromBaby);
!                     node.setContent(content);
                      return new ReturnValue(returnFromBaby, node);
                  }
--- 156,160 ----
                      String returnFromBaby = currentXmlContent.substring(endTagOffset + 7);
                      // System.out.println("\n\nBaby intends to return:"+returnFromBaby);
!                     node.getArticle().setContent(content);
                      return new ReturnValue(returnFromBaby, node);
                  }
***************
*** 163,167 ****
                      {
                          content += xmlUnescapeChars(currentXmlContent.substring(0, startTagOffset));
!                         node.setContent(content);
                      }
  
--- 164,168 ----
                      {
                          content += xmlUnescapeChars(currentXmlContent.substring(0, startTagOffset));
!                         node.getArticle().setContent(content);
                      }
  
***************
*** 191,195 ****
          if (readingContent && (endTagOffset != -1))
              content += xmlUnescapeChars(currentXmlContent.substring(0, endTagOffset));
!         node.setContent(content);
          // System.out.println("THE MAIN WHILE LOOP HAS ENDED. SPARE CONTENT:\n" +
          // currentXmlContent);
--- 192,196 ----
          if (readingContent && (endTagOffset != -1))
              content += xmlUnescapeChars(currentXmlContent.substring(0, endTagOffset));
!         node.getArticle().setContent(content);
          // System.out.println("THE MAIN WHILE LOOP HAS ENDED. SPARE CONTENT:\n" +
          // currentXmlContent);

Index: HtmlWriter.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/HtmlWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HtmlWriter.java	22 Jan 2007 23:00:37 -0000	1.1
--- HtmlWriter.java	26 Jan 2007 21:47:56 -0000	1.2
***************
*** 27,30 ****
--- 27,31 ----
  import java.util.Enumeration;
  
+ import jreepad.JreepadArticle;
  import jreepad.JreepadNode;
  
***************
*** 120,124 ****
      {
          writer.write("\n<dt><a name=\"");
!         if (anchorType == JreepadNode.EXPORT_HTML_ANCHORS_WIKI)
              writer.write(node.getTitle());
          else
--- 121,125 ----
      {
          writer.write("\n<dt><a name=\"");
!         if (anchorType == JreepadArticle.EXPORT_HTML_ANCHORS_WIKI)
              writer.write(node.getTitle());
          else
***************
*** 130,134 ****
          // Write out the node's article content - using normal, preformatted, or HTML modes as
          // appropriate
!         writer.write(node.articleToHtml(exportMode, urlsToLinks, anchorType));
  
          if (node.getChildCount() > 0)
--- 131,135 ----
          // Write out the node's article content - using normal, preformatted, or HTML modes as
          // appropriate
!         writer.write(node.getArticle().toHtml(exportMode, urlsToLinks, anchorType));
  
          if (node.getChildCount() > 0)

Index: TreepadReader.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/TreepadReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TreepadReader.java	20 Jan 2007 13:01:19 -0000	1.1
--- TreepadReader.java	26 Jan 2007 21:47:56 -0000	1.2
***************
*** 26,29 ****
--- 26,30 ----
  import java.util.Stack;
  
+ import jreepad.JreepadArticle;
  import jreepad.JreepadNode;
  
***************
*** 101,106 ****
              String compareContent = newNode.getContent().toLowerCase().trim();
              int newArticleMode = (autoDetectHtmlArticles && compareContent.startsWith("<html>") && compareContent
!                 .endsWith("</html>")) ? JreepadNode.ARTICLEMODE_HTML : JreepadNode.ARTICLEMODE_ORDINARY;
!             newNode.setArticleMode(newArticleMode);
  
              if (depthLine.equals("0"))
--- 102,107 ----
              String compareContent = newNode.getContent().toLowerCase().trim();
              int newArticleMode = (autoDetectHtmlArticles && compareContent.startsWith("<html>") && compareContent
!                 .endsWith("</html>")) ? JreepadArticle.ARTICLEMODE_HTML : JreepadArticle.ARTICLEMODE_ORDINARY;
!             newNode.getArticle().setArticleMode(newArticleMode);
  
              if (depthLine.equals("0"))

Index: XmlWriter.java
===================================================================
RCS file: /cvsroot/jreepad/jreepad/src/jreepad/io/XmlWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XmlWriter.java	22 Jan 2007 23:16:40 -0000	1.3
--- XmlWriter.java	26 Jan 2007 21:47:56 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  import java.util.Enumeration;
  
+ import jreepad.JreepadArticle;
  import jreepad.JreepadNode;
  
***************
*** 59,71 ****
          writer.write("title=\"" + xmlEscapeChars(node.getTitle()) + "\" type=\"");
  
!         switch (node.getArticleMode())
          {
!         case JreepadNode.ARTICLEMODE_HTML:
              writer.write("text/html");
              break;
!         case JreepadNode.ARTICLEMODE_TEXTILEHTML:
              writer.write("text/textile");
              break;
!         case JreepadNode.ARTICLEMODE_CSV:
              writer.write("text/csv");
              break;
--- 60,72 ----
          writer.write("title=\"" + xmlEscapeChars(node.getTitle()) + "\" type=\"");
  
!         switch (node.getArticle().getArticleMode())
          {
!         case JreepadArticle.ARTICLEMODE_HTML:
              writer.write("text/html");
              break;
!         case JreepadArticle.ARTICLEMODE_TEXTILEHTML:
              writer.write("text/textile");
              break;
!         case JreepadArticle.ARTICLEMODE_CSV:
              writer.write("text/csv");
              break;