xml-xalan-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minc...@apache.org
Subject cvs commit: xml-xalan/java/src/org/apache/xalan/res XSLTErrorResources.java
Date Thu, 23 Oct 2003 15:59:02 GMT
minchau     2003/10/23 08:59:02

  Modified:    java/src/org/apache/xml/serializer Tag: xslt20-compiled
                        ToTextStream.java Encodings.properties
               java/src/org/apache/xalan/res Tag: xslt20-compiled
                        XSLTErrorResources.java
  Log:
  bug 795 patched
  (method="text" emits message when output char does not fit 
  with the given output encoding)
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.11.2.2  +9 -2      xml-xalan/java/src/org/apache/xml/serializer/ToTextStream.java
  
  Index: ToTextStream.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/ToTextStream.java,v
  retrieving revision 1.11.2.1
  retrieving revision 1.11.2.2
  diff -u -r1.11.2.1 -r1.11.2.2
  --- ToTextStream.java	6 Oct 2003 14:35:48 -0000	1.11.2.1
  +++ ToTextStream.java	23 Oct 2003 15:59:01 -0000	1.11.2.2
  @@ -65,6 +65,9 @@
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
   
  +import org.apache.xalan.res.XSLMessages;
  +import org.apache.xalan.res.XSLTErrorResources;
  +
   public class ToTextStream extends ToStream 
   { 
   
  @@ -356,7 +359,9 @@
                   }
                   else
                   {
  -                    writer.write(c);
  +                    // writer.write(c);
  +                    throw new SAXException(XSLMessages.createMessage(
  +                        XSLTErrorResources.ER_ILLEGAL_CHARACTER,null));
                   }
               }
           }
  @@ -383,7 +388,9 @@
               }
               else
               {
  -                writer.write(c);
  +                // writer.write(c);
  +                throw new SAXException(XSLMessages.createMessage(
  +                    XSLTErrorResources.ER_ILLEGAL_CHARACTER,null));
               }
           }
       }
  
  
  
  1.2.2.1   +3 -3      xml-xalan/java/src/org/apache/xml/serializer/Encodings.properties
  
  Index: Encodings.properties
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/serializer/Encodings.properties,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- Encodings.properties	13 Aug 2003 16:30:52 -0000	1.2
  +++ Encodings.properties	23 Oct 2003 15:59:01 -0000	1.2.2.1
  @@ -4,7 +4,7 @@
   # Patch attributed to havardw@underdusken.no (Håvard Wigtil)
   Cp1251 WINDOWS-1251 0x00FF
   Cp1252 WINDOWS-1252 0x00FF
  -ISO8859_1 US-ASCII,ISO-8859-1 0x007F
  +ISO8859_1 ISO-8859-1 0x00FF
   # Patch attributed to havardw@underdusken.no (Håvard Wigtil)
   ISO8859-1 ISO-8859-1 0x00FF
   ISO8859_2 ISO-8859-2 0x00FF
  @@ -25,7 +25,7 @@
   ISO8859_9 ISO-8859-9 0x00FF
   ISO8859-9 ISO-8859-9 0x00FF
   # # ?
  -8859_1 US-ASCII,ISO-8859-1 0x00FF
  +8859_1 ISO-8859-1 0x00FF
   8859_2 ISO-8859-2 0x00FF
   8859_3 ISO-8859-3 0x00FF
   8859_4 ISO-8859-4 0x00FF
  @@ -76,7 +76,7 @@
   Cp918 EBCDIC-CP-AR2 0x00FF
   Cp1047 IBM1047,IBM-1047 0x00FF
   MacTEC MacRoman 0x00FF
  -ASCII ASCII,ISO-Latin-1 0x007F
  +ASCII ASCII,US-ASCII 0x007F
   Unicode UNICODE,UTF-16 0xFFFF
   UTF8 UTF-8 0xFFFF
   # patch attributed to Jinsung Lee
  
  
  
  No                   revision
  No                   revision
  1.41.2.1  +8 -0      xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources.java
  
  Index: XSLTErrorResources.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources.java,v
  retrieving revision 1.41
  retrieving revision 1.41.2.1
  diff -u -r1.41 -r1.41.2.1
  --- XSLTErrorResources.java	3 Sep 2003 19:49:41 -0000	1.41
  +++ XSLTErrorResources.java	23 Oct 2003 15:59:01 -0000	1.41.2.1
  @@ -418,6 +418,9 @@
   	 "ER_NOT_ALLOWED_IN_POSITION";
     public static final String ER_NONWHITESPACE_NOT_ALLOWED_IN_POSITION = 
   	 "ER_NONWHITESPACE_NOT_ALLOWED_IN_POSITION";
  +  public static final String ER_ILLEGAL_CHARACTER = 
  +     "ER_ILLEGAL_CHARACTER";
  +     
     public static final String INVALID_TCHAR = "INVALID_TCHAR";
     public static final String INVALID_QNAME = "INVALID_QNAME";
     public static final String INVALID_ENUM = "INVALID_ENUM";
  @@ -484,6 +487,7 @@
   	 "WG_ILLEGAL_ATTRIBUTE_POSITION";
   
   
  +
   //  public static final int ER_NO_CURLYBRACE = 1;
     /*
      * Now fill in the message text.
  @@ -2145,7 +2149,11 @@
       { ER_FUNCTION_NOT_FOUND,
        "The function named {0} does not exist"},
   
  +//   ER_ILLEGAL_CHARACTER
  +//     public static final int ER_ILLEGAL_CHARACTER = 255;
   
  +     { ER_ILLEGAL_CHARACTER,
  +      "Attempt to output character not represented in specified encoding."},
   
   
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org


Mime
View raw message