ticket:10944: Extend ByteBuffer support in ICUBinary and Trie classes.

ticket:10944: Extend ByteBuffer support in ICUBinary and Trie classes.

This new functionality is needed for ByteBuffer support in
Normalizer2Impl and BreakIterator.

R=markus.icu@gmail.com

Committed: http://bugs.icu-project.org/trac/changeset/36033

[markus.icu, 2014-07-11 17:52:23]

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
File main/classes/core/src/com/ibm/icu/impl/CharTrie.java (right):

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/CharTrie.java:52: * <p>Creates a new Trie
with the settings for the trie data.</p>
comment indent...

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/CharTrie.java:262: protected final void
unserialize(InputStream inputStream)
Not called any more, I think, please remove.

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/CharTrie.java:269: * <p>Parses the byte
buffer and stores its trie content into a index and
ditto comment indent

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
File main/classes/core/src/com/ibm/icu/impl/Trie.java (right):

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/Trie.java:153:
this(ICUBinary.getByteBufferFromInputStream(inputStream), dataManipulate);
This is inefficient. If we need to keep this constructor, we should probably
just duplicate the code for InputStream vs. ByteBuffer. If we won't need it any
more, then this is fine temporarily.

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/Trie.java:157: * Trie constructor for
CharTrie use.
Please line up multi-line comments like this:

    /**
     *
     *
     */

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/Trie.java:380: protected void
unserialize(InputStream inputStream) throws IOException
I assume that this is not called any more. If so, then please remove it.

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/Trie.java:386: * <p>Parses the byte
buffer and creates the trie index with it.</p>
ditto comment indent

Add: The position of the input ByteBuffer must be right after the trie header.

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
File main/classes/core/src/com/ibm/icu/impl/Trie2_16.java (right):

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/Trie2_16.java:69: * @return An
unserialized Trie_16, ready for use.
Trie_16 --> Trie2_16 or UTrie2

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/Trie2_16.java:72: * @throws
ClassCastException if the bytes contains a serialized Trie2_32
contains -> contain

[roubert (google), 2014-07-14 15:03:48]

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
File main/classes/core/src/com/ibm/icu/impl/CharTrie.java (right):

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/CharTrie.java:52: * <p>Creates a new Trie
with the settings for the trie data.</p>
On 2014/07/11 17:52:23, markus.icu wrote:
> comment indent...

Done.

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/CharTrie.java:262: protected final void
unserialize(InputStream inputStream)
On 2014/07/11 17:52:22, markus.icu wrote:
> Not called any more, I think, please remove.

Deleted in Issue 109640044, when it isn't called anymore.

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/CharTrie.java:269: * <p>Parses the byte
buffer and stores its trie content into a index and
On 2014/07/11 17:52:22, markus.icu wrote:
> ditto comment indent

Done.

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
File main/classes/core/src/com/ibm/icu/impl/Trie.java (right):

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/Trie.java:153:
this(ICUBinary.getByteBufferFromInputStream(inputStream), dataManipulate);
On 2014/07/11 17:52:23, markus.icu wrote:
> If we won't need it any
> more, then this is fine temporarily.

This is deleted in Issue 109640044, when it isn't used anymore.

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/Trie.java:157: * Trie constructor for
CharTrie use.
On 2014/07/11 17:52:23, markus.icu wrote:
> Please line up multi-line comments like this:
> 
>     /**
>      *
>      *
>      */

Done.

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/Trie.java:380: protected void
unserialize(InputStream inputStream) throws IOException
On 2014/07/11 17:52:23, markus.icu wrote:
> I assume that this is not called any more. If so, then please remove it.

Issue 109640044.

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/Trie.java:386: * <p>Parses the byte
buffer and creates the trie index with it.</p>
On 2014/07/11 17:52:23, markus.icu wrote:
> ditto comment indent
> 
> Add: The position of the input ByteBuffer must be right after the trie header.

Done.

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
File main/classes/core/src/com/ibm/icu/impl/Trie2_16.java (right):

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/Trie2_16.java:69: * @return An
unserialized Trie_16, ready for use.
On 2014/07/11 17:52:23, markus.icu wrote:
> Trie_16 --> Trie2_16 or UTrie2

Done.

https://codereview.appspot.com/107620044/diff/60001/main/classes/core/src/com...
main/classes/core/src/com/ibm/icu/impl/Trie2_16.java:72: * @throws
ClassCastException if the bytes contains a serialized Trie2_32
On 2014/07/11 17:52:23, markus.icu wrote:
> contains -> contain

Done.

[markus.icu, 2014-07-15 16:31:51]

LGTM

[roubert (google), 2014-07-15 20:20:02]

Committed patchset #8 manually as r36033 (presubmit successful).