Loading...
Helix SwarmHelix Swarm
Loading...

diff2

  • //
  • guest/
  • john_kristian/
  • p4d2p/
  • test/
  • golden/
  • diff2 #1
  • View
  • Commits
  • Open Download .zip Download (8 KB) 
  1. ==== //depot/maindev/src/java/com/docent/io/Base64.java#1 (text) - //depot/universe/src/com/docent/io/Base64.java#2 (text) ==== content
  2. Index: depot/maindev/src/java/com/docent/io/Base64.java
  3. diff -r //depot/maindev/src/java/com/docent/io/Base64.java //depot/universe/src/com/docent/io/Base64.java
  4. 40c40
  5. <     /** This byte is appended to encoded data, as needed to
  6. ---
  7. >     /** This character is appended to encoded data, as needed to
  8. 43c43
  9. <     public static final byte PAD = (byte)'=';
  10. ---
  11. >     public static final char PAD = '=';
  12. 45,53c45,52
  13. <     protected static final String hexDigit = "0123456789abcdef";
  14. < 
  15. <     /** @return the hexadecimal representation of b, 2 characters zero-filled. */
  16. <     public static String toHexString(byte b)
  17. <     {
  18. <         char[] s = {hexDigit.charAt((((int)b) >> 4) & 0xF),
  19. <                     hexDigit.charAt((((int)b)     ) & 0xF)};
  20. <         return new String(s);
  21. <     }
  22. ---
  23. >     /** Characters that are significant in encoded data.
  24. >      * <code>ALPHABET.charAt(0)</code> encodes 0, and so on up to <code>ALPHABET.charAt(63)</code> which encodes 63.
  25. >      * <code>ALPHABET.charAt(64)</code> is <code>PAD</code>.
  26. >      */
  27. >     public static final String ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
  28. >                                         + "abcdefghijklmnopqrstuvwxyz"
  29. >                                         + "0123456789+/"
  30. >                                         + PAD;
  31. ==== //depot/maindev/src/java/com/docent/io/Base64DecodeInputStream.java#2 (text) - //depot/universe/src/com/docent/io/Base64DecodeInputStream.java#2 (text) ==== content
  32. Index: depot/maindev/src/java/com/docent/io/Base64DecodeInputStream.java
  33. diff -r //depot/maindev/src/java/com/docent/io/Base64DecodeInputStream.java //depot/universe/src/com/docent/io/Base64DecodeInputStream.java
  34. 3a4
  35. > import java.io.OutputStream;
  36. 15c16
  37. <         setByteFilter(new Base64DecodeOutputStream(getByteFilter()));
  38. ---
  39. >         setByteFilter(newDecoder(getByteFilter()));
  40. 21c22,29
  41. <         setByteFilter(new Base64DecodeOutputStream(getByteFilter()));
  42. ---
  43. >         setByteFilter(newDecoder(getByteFilter()));
  44. >     }
  45. > 
  46. >     protected static OutputStream newDecoder(OutputStream out)
  47. >     {
  48. >         Base64DecodeOutputStream result = new Base64DecodeOutputStream(out);
  49. >         result.setFlushCausesReset(true);
  50. >         return result;
  51. 22a31
  52. > 
  53. ==== //depot/maindev/src/java/com/docent/io/Base64DecodeOutputStream.java#3 (ktext) - //depot/universe/src/com/docent/io/Base64DecodeOutputStream.java#2 (text) ==== content
  54. Index: depot/maindev/src/java/com/docent/io/Base64DecodeOutputStream.java
  55. diff -r //depot/maindev/src/java/com/docent/io/Base64DecodeOutputStream.java //depot/universe/src/com/docent/io/Base64DecodeOutputStream.java
  56. 10c10
  57. <  * Base64 encoding is defined by RFC 2045 (MIME) section 6.8.
  58. ---
  59. >  * <p>Base64 encoding is defined by RFC 2045 (MIME) section 6.8.
  60. 66a67,99
  61. >     public void flush()
  62. >         throws IOException
  63. >     {
  64. >         if (flushCausesReset) n = 0;
  65. >         super.flush();
  66. >     }
  67. > 
  68. >     /** Subsequently, a call to <code>flush()</code> will reset this object's state
  69. >      * if and only if the given parameter is <code>true</code>.
  70. >      * The default setting (if this method is not called) is <code>false</code>.
  71. >      *
  72. >      * <p>For example, <code>write("BA"); flush(); write("BA")</code> will ordinarily
  73. >      * produce the same sequence of decoded bytes as <code>write("BABA")</code>;
  74. >      * that is {4, 0, 64}.
  75. >      * But {4, 4} will be produced if <code>setFlushCausesReset(true)</code>
  76. >      * is called before <code>flush()</code>.  In the latter case,
  77. >      * the second "BA" will be decoded as if it appeared at the beginning of a stream.
  78. >      *
  79. >      * @param b whether the decoder will be reset by a subsequent call to flush().
  80. >      * <code>false</code> (the default) is appropriate if flush() is called
  81. >      * merely for performance optimization, and should not affect decoding.
  82. >      * <code>true</code> is appropriate if a call to flush() indicates
  83. >      * a significant boundary in the data stream, such that previous
  84. >      * bytes should not be combined with subsequent bytes for decoding.
  85. >      */
  86. >     public void setFlushCausesReset(boolean b)
  87. >     {
  88. >         flushCausesReset = b;
  89. >     }
  90. > 
  91. >     /** whether flush() resets the decoder */
  92. >     protected boolean flushCausesReset = false;
  93. > 
  94. 122c155
  95. <                     System.err.print(" " + Base64.toHexString(b[j]));
  96. ---
  97. >                     System.err.print(" " + Hexadecimal.format(b[j]));
  98. ==== //depot/maindev/src/java/com/docent/io/Base64EncodeInputStream.java#2 (text) - //depot/universe/src/com/docent/io/Base64EncodeInputStream.java#2 (text) ==== identical
  99. ==== //depot/maindev/src/java/com/docent/io/Base64EncodeOutputStream.java#3 (text) - //depot/universe/src/com/docent/io/Base64EncodeOutputStream.java#2 (text) ==== content
  100. Index: depot/maindev/src/java/com/docent/io/Base64EncodeOutputStream.java
  101. diff -r //depot/maindev/src/java/com/docent/io/Base64EncodeOutputStream.java //depot/universe/src/com/docent/io/Base64EncodeOutputStream.java
  102. 13c13
  103. <  * Base64 encoding is defined by RFC 2045 (MIME) section 6.8.
  104. ---
  105. >  * <p>Base64 encoding is defined by RFC 2045 (MIME) section 6.8.
  106. 54a55,56
  107. >     private byte[] encoded = new byte[4];
  108. > 
  109. 58,62c60,63
  110. <         byte[] encoded = {map[0x3F & (buf >> 18)] // sextet 1 (octet 1)
  111. <                          ,map[0x3F & (buf >> 12)] // sextet 2 (octet 1 and 2)
  112. <                          ,map[0x3F & (buf >>  6)] // sextet 3 (octet 2 and 3)
  113. <                          ,map[0x3F & (buf      )] // sextet 4 (octet 3)
  114. <                          };
  115. ---
  116. >         encoded[0] = map[0x3F & (buf >> 18)]; // sextet 1 (octet 1)
  117. >         encoded[1] = map[0x3F & (buf >> 12)]; // sextet 2 (octet 1 and 2)
  118. >         encoded[2] = map[0x3F & (buf >>  6)]; // sextet 3 (octet 2 and 3)
  119. >         encoded[3] = map[0x3F & (buf      )]; // sextet 4 (octet 3)
  120. 72,76c73,76
  121. <         byte[] encoded = {   map[0x3F & (buf >> 18)]              // sextet 1 (octet 1)
  122. <          ,                   map[0x3F & (buf >> 12)]              // sextet 2 (octet 1 and 2)
  123. <          ,(buf_length > 1) ? map[0x3F & (buf >>  6)] : Base64.PAD // sextet 3 (octet 2 and 3)
  124. <          ,(buf_length > 2) ? map[0x3F & (buf      )] : Base64.PAD // sextet 4 (octet 3)
  125. <                          };
  126. ---
  127. >         encoded[0] =                    map[0x3F & (buf >> 18)];       // sextet 1 (octet 1)
  128. >         encoded[1] =                    map[0x3F & (buf >> 12)];       // sextet 2 (octet 1 and 2)
  129. >         encoded[2] = (buf_length > 1) ? map[0x3F & (buf >>  6)] : PAD; // sextet 3 (octet 2 and 3)
  130. >         encoded[3] = (buf_length > 2) ? map[0x3F & (buf      )] : PAD; // sextet 4 (octet 3)
  131. 84a85,89
  132. >     /** This byte is appended to encoded data, as needed to
  133. >      * make the encoding an integral multiple of four bytes long.
  134. >      */
  135. >     protected static final byte PAD = (byte)Base64.PAD;
  136. > 
  137. 86,89c91
  138. <     protected static final byte[] map =
  139. <         toLatin1("ABCDEFGHIJKLMNOPQRSTUVWXYZ"
  140. <                 +"abcdefghijklmnopqrstuvwxyz"
  141. <                 +"0123456789+/");
  142. ---
  143. >     protected static final byte[] map = toLatin1(Base64.ALPHABET.substring(0,64));
  144. ==== //depot/maindev/src/java/com/docent/io/FilteredByteInputStream.java#2 (text) - //depot/universe/src/com/docent/io/FilteredByteInputStream.java#2 (text) ==== identical
  145. ==== //depot/maindev/src/java/com/docent/io/FilteredCharInputStream.java#2 (text) - //depot/universe/src/com/docent/io/FilteredCharInputStream.java#2 (text) ==== identical
  146. ==== < none > - //depot/universe/src/com/docent/io/FormEncodedOutput.java#1 ====
  147. ==== < none > - //depot/universe/src/com/docent/io/Hexadecimal.java#2 ====
  148. ==== //depot/maindev/src/java/com/docent/io/InputFilterInputStream.java#1 (text) - //depot/universe/src/com/docent/io/InputFilterInputStream.java#2 (text) ==== identical
  149. ==== //depot/maindev/src/java/com/docent/io/ReaderFilterInputStream.java#3 - <none> ===
  150. ==== //depot/maindev/src/java/com/docent/io/SteerableOutputStream.java#1 (text) - //depot/universe/src/com/docent/io/SteerableOutputStream.java#2 (text) ==== identical
  151. ==== //depot/maindev/src/java/com/docent/io/StringFilterInputStream.java#1 (text) - //depot/universe/src/com/docent/io/StringFilterInputStream.java#2 (text) ==== identical
  152. ==== //depot/maindev/src/java/com/docent/io/SynchronizedInputStream.java#1 - <none> ===
  153. ==== < none > - //depot/universe/src/com/docent/io/URLEncodedOutputStream.java#2 ====
  154. ==== < none > - //depot/universe/src/com/docent/io/tests/TestBase64.java#2 ====
  155. ==== < none > - //depot/universe/src/com/docent/io/tests/TestBase64InputStream.java#2 ====
# Change User Description Committed
#1 5121 John Kristian corrected capitalization 20 years ago