[easystruts-cvs] net.sf.easystruts/src/org/easystruts/jdom XMLOutputter.java,1.1,1.2 JDomStruts.java,1.1,1.2

[Francois G. <far...@us...>]

Update of /cvsroot/easystruts/net.sf.easystruts/src/org/easystruts/jdom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6376/src/org/easystruts/jdom

Modified Files:
	XMLOutputter.java JDomStruts.java 
Log Message:
Fixed a lot of compilation errors. Still ~ 400 of them (was 650 before). This requires the plugin "org.eclipse.update.ui.forms", which is not in 3.0 or 3.1 anymore. A solution is to take it from CVS (tag R2_1_3).

Index: JDomStruts.java
===================================================================
RCS file: /cvsroot/easystruts/net.sf.easystruts/src/org/easystruts/jdom/JDomStruts.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JDomStruts.java	15 Apr 2005 04:25:37 -0000	1.1
--- JDomStruts.java	27 Apr 2005 05:46:57 -0000	1.2
***************
*** 652,666 ****
  	public static void saveDocument(Document document, OutputStream os,
  			int version, boolean reconstruct) throws IOException {
- 		XMLOutputter outputter = new XMLOutputter();
- 
  		Format f = Format.getPrettyFormat();
  		f.setLineSeparator("\n");
- 		outputter.setFormat(f);
- 		// outputter.setIndent(true);
- 		// outputter.setIndentSize(4);
- 		// outputter.setNewlines(true);
- 		// outputter.setLineSeparator("\n");
- 		// outputter.setTextNormalize(true);
  
  		if (version == 2 || version == 3) {
  			outputter.output(document, os);
--- 652,660 ----
  	public static void saveDocument(Document document, OutputStream os,
  			int version, boolean reconstruct) throws IOException {
  		Format f = Format.getPrettyFormat();
  		f.setLineSeparator("\n");
  
+ 		XMLOutputter outputter = new XMLOutputter(f);
+ 		
  		if (version == 2 || version == 3) {
  			outputter.output(document, os);
***************
*** 677,685 ****
  	public static String printDocument(Document document, int version,
  			boolean reconstruct) throws IOException {
! 		XMLOutputter outputter = new XMLOutputter();
  		ByteArrayOutputStream out = new ByteArrayOutputStream();
  
- 		Format f = Format.getPrettyFormat();
- 		outputter.setFormat(f);
  		//POM
  //		outputter.setIndent(true);
--- 671,678 ----
  	public static String printDocument(Document document, int version,
  			boolean reconstruct) throws IOException {
! 		Format f = Format.getPrettyFormat();
! 		XMLOutputter outputter = new XMLOutputter(f);
  		ByteArrayOutputStream out = new ByteArrayOutputStream();
  
  		//POM
  //		outputter.setIndent(true);
***************
*** 778,792 ****
  	public static void saveDocument(Document document, PrintWriter writer,
  			int version, boolean reconstruct) throws IOException {
- 		XMLOutputter outputter = new XMLOutputter();
- 
  		Format f = Format.getPrettyFormat();
! 		outputter.setFormat(f);
! 
! //pom
! //		outputter.setIndent(true);
! //		outputter.setIndentSize(4);
! //		outputter.setNewlines(true);
! //		outputter.setLineSeparator("\n");
! //		outputter.setTextNormalize(true);
  
  		if (version == 2) {
--- 771,776 ----
  	public static void saveDocument(Document document, PrintWriter writer,
  			int version, boolean reconstruct) throws IOException {
  		Format f = Format.getPrettyFormat();
! 		XMLOutputter outputter = new XMLOutputter(f);
  
  		if (version == 2) {
***************
*** 803,815 ****
  
  	public static void println(Document document) throws IOException {
! 		XMLOutputter outputter = new XMLOutputter();
  		Format f = Format.getPrettyFormat();
! 		outputter.setFormat(f);
  
- //		outputter.setIndent(true);
- //		outputter.setIndentSize(4);
- //		outputter.setNewlines(true);
- //		outputter.setLineSeparator("\n");
- //		outputter.setTextNormalize(true);
  		outputter.output(document, System.out);
  		System.out.println();
--- 787,794 ----
  
  	public static void println(Document document) throws IOException {
! 
  		Format f = Format.getPrettyFormat();
! 		XMLOutputter outputter = new XMLOutputter(f);
  
  		outputter.output(document, System.out);
  		System.out.println();

Index: XMLOutputter.java
===================================================================
RCS file: /cvsroot/easystruts/net.sf.easystruts/src/org/easystruts/jdom/XMLOutputter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XMLOutputter.java	15 Apr 2005 04:25:37 -0000	1.1
--- XMLOutputter.java	27 Apr 2005 05:46:57 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
  import java.util.List;
  import org.jdom.*;
+ import org.jdom.output.Format;
  
  /**
***************
*** 12,15 ****
--- 13,19 ----
  public class XMLOutputter extends org.jdom.output.XMLOutputter
  {
+ 	public XMLOutputter(Format format) {
+ 		super(format);
+ 	}
  	/** number of attributes for adding newLine */
  	protected int numberAttributesForNewLine=4;
***************
*** 26,31 ****
      	
          	out.write("\n");
!         	indent(out, level);
!         	super.printComment(comment,out);
  	}
  	
--- 30,36 ----
      	
          	out.write("\n");
!         	// TODO 3.0 indent method is now private, see how to make it work
!         	//indent(out, level);
!         	super.printComment(out,comment);
  	}
  	
***************
*** 39,43 ****
      	Element e=parent;
      	while ( e != null ) {
!     		e = e.getParent();
      		level++;
      	}
--- 44,48 ----
      	Element e=parent;
      	while ( e != null ) {
!     		e = e.getParentElement();
      		level++;
      	}
***************
*** 54,58 ****
              if ( size >= numberAttributesForNewLine ) {
  				out.write("\n");
!                 indent(out, level);
              } else {
              	out.write(" ");
--- 59,64 ----
              if ( size >= numberAttributesForNewLine ) {
  				out.write("\n");
!                  // TODO 3.0 indent method is now private, see how to make it work
! 	        	    //indent(out, level);
              } else {
              	out.write(" ");