cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gree...@apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/formatter AbstractFormatter.java
Date Mon, 26 Mar 2001 00:20:46 GMT
greenrd     01/03/25 16:20:46

  Modified:    .        changes.xml
               src/org/apache/cocoon/formatter AbstractFormatter.java
  Log:
  the right encoding fix
  
  Revision  Changes    Path
  1.225     +4 -1      xml-cocoon/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/changes.xml,v
  retrieving revision 1.224
  retrieving revision 1.225
  diff -u -r1.224 -r1.225
  --- changes.xml	2001/03/26 00:17:10	1.224
  +++ changes.xml	2001/03/26 00:20:45	1.225
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes   
  -  $Id: changes.xml,v 1.224 2001/03/26 00:17:10 greenrd Exp $ 
  +  $Id: changes.xml,v 1.225 2001/03/26 00:20:45 greenrd Exp $ 
   -->
   
   <changes title="History of Changes">
  @@ -18,6 +18,9 @@
     </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="RDG" type="fix" due-to="Jay Freeman" due-to-email="saurik@saurik.com">
  +   Fixed default encoding bug introduced by the changes for FOP 0.16 below.
  +  </action>
     <action dev="RDG" type="fix" due-to="Krzysztof Zielinski" 
      due-to-email="kzielinski@supermedia.pl">
      Non-default encodings in logicsheets should now work.
  
  
  
  1.6       +12 -3     xml-cocoon/src/org/apache/cocoon/formatter/AbstractFormatter.java
  
  Index: AbstractFormatter.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/formatter/AbstractFormatter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractFormatter.java	2001/03/07 22:32:16	1.5
  +++ AbstractFormatter.java	2001/03/26 00:20:46	1.6
  @@ -1,4 +1,4 @@
  -/*-- $Id: AbstractFormatter.java,v 1.5 2001/03/07 22:32:16 greenrd Exp $ -- 
  +/*-- $Id: AbstractFormatter.java,v 1.6 2001/03/26 00:20:46 greenrd Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -59,13 +59,14 @@
   
   /**
    * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
  - * @version $Revision: 1.5 $ $Date: 2001/03/07 22:32:16 $
  + * @version $Revision: 1.6 $ $Date: 2001/03/26 00:20:46 $
    */
   
   public abstract class AbstractFormatter 
   implements Configurable, Formatter, Status, Cacheable {
    
       protected String statusMessage = "Abstract Formatter";
  +    protected String omitXMLDeclaration;
       protected String MIMEtype;
       protected String encoding;
       protected String doctypePublic;
  @@ -89,6 +90,9 @@
           if (encoding != null) {
               format.setEncoding(encoding);
           }
  +        else {
  +            encoding = format.getEncoding ();
  +        }
   
           doctypePublic = (String) conf.get("doctype-public");
           doctypeSystem = (String) conf.get("doctype-system");
  @@ -114,7 +118,7 @@
       }
   
       public String getEncoding() {
  -        return encoding;
  +        return format.getEncoding ();
       }
   
       public String getMIMEType() {
  @@ -157,6 +161,11 @@
           if (lineWidth != null) {
               message.append("[ Line Width:  ");
               message.append(lineWidth);
  +            message.append(" ]<br>");
  +        }
  +        if (omitXMLDeclaration != null) {
  +            message.append("[ Omit XML Declaration:  ");
  +            message.append(omitXMLDeclaration);
               message.append(" ]<br>");
           }
           message.append("<br>");
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message