Mercurial > hg > release > icedtea6-1.7
changeset 1930:670a8e9e498b
From mwong@redhat.com:
Added encoding support for netx.
author | Deepak Bhole <dbhole@redhat.com> |
---|---|
date | Fri, 09 Jul 2010 12:30:10 -0400 |
parents | 8cc0ee1848d6 |
children | d8eb9c640eb4 |
files | ChangeLog rt/net/sourceforge/jnlp/Parser.java |
diffstat | 2 files changed, 79 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jun 29 15:48:10 2010 -0400 +++ b/ChangeLog Fri Jul 09 12:30:10 2010 -0400 @@ -1,3 +1,13 @@ +2010-07-08 Man Lung Wong <mwong@redhat.com> + + * netx/net/sourceforge/jnlp/Parser.java: + (getRootNode): Used BufferedInputStream instead of InputStream to + have mark and reset method available. Passed the encoding to the + constructor of InputStreamReader, such that the stream will now + be parsed with the encoding the jnlp file is in. + (getEncoding): A new method which checks the first four bytes of input + and determines what the files encoding is. + 2010-06-29 Omair Majid <omajid@redhat.com> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/rt/net/sourceforge/jnlp/Parser.java Tue Jun 29 15:48:10 2010 -0400 +++ b/rt/net/sourceforge/jnlp/Parser.java Fri Jul 09 12:30:10 2010 -0400 @@ -1171,13 +1171,16 @@ Node document = new Node(TinyParser.parseXML(input)); Node jnlpNode = getChildNode(document, "jnlp"); // skip comments */ + + //A BufferedInputStream is used to allow marking and reseting + //of a stream. + BufferedInputStream bs = new BufferedInputStream(input); /* NANO */ final XMLElement xml = new XMLElement(); final PipedInputStream pin = new PipedInputStream(); - final PipedOutputStream pout = new PipedOutputStream(pin); - final InputStreamReader isr = new InputStreamReader(input); - + final PipedOutputStream pout = new PipedOutputStream(pin); + final InputStreamReader isr = new InputStreamReader(bs, getEncoding(bs)); // Clean the jnlp xml file of all comments before passing // it to the parser. new Thread( @@ -1200,7 +1203,69 @@ throw new ParseException(R("PBadXML"), ex); } } + + /** + * Returns the name of the encoding used in this InputStream. + * + * @param input the InputStream + * @return a String representation of encoding + */ + private static String getEncoding(InputStream input) throws IOException{ + //Fixme: This only recognizes UTF-8, UTF-16, and + //UTF-32, which is enough to parse the prolog portion of xml to + //find out the exact encoding (if it exists). The reason being + //there could be other encodings, such as ISO 8859 which is 8-bits + //but it supports latin characters. + //So what needs to be done is to parse the prolog and retrieve + //the exact encoding from it. + int[] s = new int[4]; + String encoding = "UTF-8"; + + //Determine what the first four bytes are and store + //them into an int array. + input.mark(4); + for (int i = 0; i < 4; i++) { + s[i] = input.read(); + } + input.reset(); + + //Set the encoding base on what the first four bytes of the + //inputstream turn out to be (following the information from + //www.w3.org/TR/REC-xml/#sec-guessing). + if (s[0] == 255) { + if (s[1] == 254) { + if (s[2] != 0 || s[3] != 0) { + encoding = "UnicodeLittle"; + } else { + encoding = "X-UTF-32LE-BOM"; + } + } + } else if (s[0] == 254 && s[1] == 255 && (s[2] != 0 || + s[3] != 0)) { + encoding = "UTF-16"; + + } else if (s[0] == 0 && s[1] == 0 && s[2] == 254 && + s[3] == 255) { + encoding = "X-UTF-32BE-BOM"; + + } else if (s[0] == 0 && s[1] == 0 && s[2] == 0 && + s[3] == 60) { + encoding = "UTF-32BE"; + + } else if (s[0] == 60 && s[1] == 0 && s[2] == 0 && + s[3] == 0) { + encoding = "UTF-32LE"; + + } else if (s[0] == 0 && s[1] == 60 && s[2] == 0 && + s[3] == 63) { + encoding = "UTF-16BE"; + } else if (s[0] == 60 && s[1] == 0 && s[2] == 63 && + s[3] == 0) { + encoding = "UTF-16LE"; + } + + return encoding; + } } -