keith 2002/08/17 18:53:38
Modified: src/share/org/apache/jasper/compiler CharDataGenerator.java
MappedCharDataGenerator.java
Log:
Jasper fix for high byte chars (xlate to unicode)
Submitted by: Thibault Frey
Revision Changes Path
1.6 +17 -5
jakarta-tomcat/src/share/org/apache/jasper/compiler/CharDataGenerator.java
Index: CharDataGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/CharDataGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CharDataGenerator.java 4 Dec 2001 02:21:04 -0000 1.5
+++ CharDataGenerator.java 18 Aug 2002 01:53:38 -0000 1.6
@@ -123,7 +123,7 @@
sb.append("\\t");
break;
default:
- sb.append((char) ch);
+ this.writeChar((char) ch, sb);
}
}
writer.print(sb.toString());
@@ -131,6 +131,18 @@
writer.println();
}
-
+ protected void writeChar( char c, StringBuffer buf ) {
+ if ( c < 128 )
+ // if char is pure ASCII -> write it
+ buf.append( c );
+ else {
+ // if char isn't pure ASCII -> write it's unicode
+ buf.append( "\\u" );
+ String hexa = Integer.toHexString( c );
+ for( int i = hexa.length() ; i < 4 ; i++ )
+ buf.append( '0' );
+ buf.append( hexa );
+ }
+ }
}
1.5 +4 -4
jakarta-tomcat/src/share/org/apache/jasper/compiler/MappedCharDataGenerator.java
Index: MappedCharDataGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/MappedCharDataGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MappedCharDataGenerator.java 4 Dec 2001 02:21:04 -0000 1.4
+++ MappedCharDataGenerator.java 18 Aug 2002 01:53:38 -0000 1.5
@@ -113,7 +113,7 @@
sb.append("\\t");
break;
default:
- sb.append((char) ch);
+ this.writeChar((char) ch, sb);
}
}
writer.print(sb.toString());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
