Code view:

A painting is a person's account of this edit as text, recorded independently of the node mapping - a rendering often has several equally defensible answers where the mapping has one. Deletions and insertions carry no position on the opposite side in a painting, so that panel draws no caret for them.

Before

…lines 1–92 unchanged (92 lines)
93 // 0 1 2 3 4 5 6 7 8 9 A B C D E F
94 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 00-0f
95 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 10-1f
96 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 20-2f
97 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, // 30-3f 2-7
98 -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, // 40-4f A-O
99 25, 26, 27, 28, 29, 30, 31, 32,
100 };
101
102 /**
103 * This array is a lookup table that translates 5-bit positive integer index values into their
104 * "Base32 Hex Alphabet" equivalents as specified in Table 4 of RFC 4648.
105 */
…lines 106–540 unchanged (435 lines)

After

…lines 1–92 unchanged (92 lines)
93 // 0 1 2 3 4 5 6 7 8 9 A B C D E F
94 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 00-0f
95 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 10-1f
96 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 20-2f
97 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, // 30-3f 2-7
98 -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, // 40-4f A-O
99 25, 26, 27, 28, 29, 30, 31, // 50-57 P-V
100 };
101
102 /**
103 * This array is a lookup table that translates 5-bit positive integer index values into their
104 * "Base32 Hex Alphabet" equivalents as specified in Table 4 of RFC 4648.
105 */
…lines 106–540 unchanged (435 lines)

Before

program
block_comment "/*\n * Licensed to the Apache Software Foundation (ASF) under"...
package_declaration
package "package"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "codec"
. "."
identifier "binary"
; ";"
block_comment "/**\n * Provides Base32 encoding and decoding as defined by <"...
class_declaration
modifiers
public "public"
class "class"
identifier "Base32"
superclass
extends "extends"
type_identifier "BaseNCodec"
class_body
{ "{"
block_comment "/**\n * BASE32 characters are 5 bits in length.\n * Th"...
field_declaration
modifiers
private "private"
static "static"
final "final"
integral_type
int "int"
variable_declarator
identifier "BITS_PER_ENCODED_BYTE"
= "="
decimal_integer_literal "5"
; ";"
field_declaration
modifiers
private "private"
static "static"
final "final"
integral_type
int "int"
variable_declarator
identifier "BYTES_PER_ENCODED_BLOCK"
= "="
decimal_integer_literal "8"
; ";"
field_declaration
modifiers
private "private"
static "static"
final "final"
integral_type
int "int"
variable_declarator
identifier "BYTES_PER_UNENCODED_BLOCK"
= "="
decimal_integer_literal "5"
; ";"
block_comment "/**\n * Chunk separator per RFC 2045 section 2.1.\n *\n"...
field_declaration (+21 nodes collapsed)
block_comment "/**\n * This array is a lookup table that translates Unic"...
field_declaration (+325 nodes collapsed)
block_comment "/**\n * This array is a lookup table that translates 5-bi"...
field_declaration (+82 nodes collapsed)
block_comment "/**\n * This array is a lookup table that translates Unic"...
field_declaration
modifiers
private "private"
static "static"
final "final"
array_type
integral_type
byte "byte"
dimensions
[ "["
] "]"
variable_declarator
identifier "HEX_DECODE_TABLE"
= "="
array_initializer
{ "{"
line_comment "// 0 1 2 3 4 5 6 7 8 9 A B C D "...
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
line_comment "// 00-0f"
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
line_comment "// 10-1f"
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
line_comment "// 20-2f"
decimal_integer_literal "0"
, ","
decimal_integer_literal "1"
, ","
decimal_integer_literal "2"
, ","
decimal_integer_literal "3"
, ","
decimal_integer_literal "4"
, ","
decimal_integer_literal "5"
, ","
decimal_integer_literal "6"
, ","
decimal_integer_literal "7"
, ","
decimal_integer_literal "8"
, ","
decimal_integer_literal "9"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
line_comment "// 30-3f 2-7"
unary_expression
- "-"
decimal_integer_literal "1"
, ","
decimal_integer_literal "10"
, ","
decimal_integer_literal "11"
, ","
decimal_integer_literal "12"
, ","
decimal_integer_literal "13"
, ","
decimal_integer_literal "14"
, ","
decimal_integer_literal "15"
, ","
decimal_integer_literal "16"
, ","
decimal_integer_literal "17"
, ","
decimal_integer_literal "18"
, ","
decimal_integer_literal "19"
, ","
decimal_integer_literal "20"
, ","
decimal_integer_literal "21"
, ","
decimal_integer_literal "22"
, ","
decimal_integer_literal "23"
, ","
decimal_integer_literal "24"
, ","
line_comment "// 40-4f A-O"
decimal_integer_literal "25"
, ","
decimal_integer_literal "26"
, ","
decimal_integer_literal "27"
, ","
decimal_integer_literal "28"
, ","
decimal_integer_literal "29"
, ","
decimal_integer_literal "30"
, ","
decimal_integer_literal "31"
, ","
decimal_integer_literal "32"
, ","
} "}"
; ";"
block_comment "/**\n * This array is a lookup table that translates 5-bi"...
field_declaration (+82 nodes collapsed)
block_comment "/** Mask used to extract 5 bits, used when encoding Base32 b"...
field_declaration
modifiers
private "private"
static "static"
final "final"
integral_type
int "int"
variable_declarator
identifier "MASK_5BITS"
= "="
hex_integer_literal "0x1f"
; ";"
line_comment "// The static final fields above are used for the original s"...
line_comment "// The private member fields below are used with the new str"...
line_comment "// some state be preserved between calls of encode() and dec"...
block_comment "/**\n * Place holder for the bytes we're dealing with for"...
block_comment "/**\n * Convenience variable to help us determine when ou"...
field_declaration
modifiers
private "private"
final "final"
integral_type
int "int"
variable_declarator
identifier "decodeSize"
; ";"
block_comment "/**\n * Decode table to use.\n */"
field_declaration
modifiers
private "private"
final "final"
array_type
integral_type
byte "byte"
dimensions
[ "["
] "]"
variable_declarator
identifier "decodeTable"
; ";"
block_comment "/**\n * Convenience variable to help us determine when ou"...
field_declaration
modifiers
private "private"
final "final"
integral_type
int "int"
variable_declarator
identifier "encodeSize"
; ";"
block_comment "/**\n * Encode table to use.\n */"
field_declaration
modifiers
private "private"
final "final"
array_type
integral_type
byte "byte"
dimensions
[ "["
] "]"
variable_declarator
identifier "encodeTable"
; ";"
block_comment "/**\n * Line separator for encoding. Not used when decodi"...
field_declaration
modifiers
private "private"
final "final"
array_type
integral_type
byte "byte"
dimensions
[ "["
] "]"
variable_declarator
identifier "lineSeparator"
; ";"
block_comment "/**\n * Creates a Base32 codec used for decoding and enco"...
constructor_declaration
modifiers
public "public"
identifier "Base32"
formal_parameters
( "("
) ")"
constructor_body
{ "{"
explicit_constructor_invocation
this "this"
argument_list
( "("
false "false"
) ")"
; ";"
} "}"
block_comment "/**\n * Creates a Base32 codec used for decoding and enco"...
constructor_declaration (+25 nodes collapsed)
block_comment "/**\n * Creates a Base32 codec used for decoding and enco"...
constructor_declaration (+28 nodes collapsed)
block_comment "/**\n * Creates a Base32 codec used for decoding and enco"...
constructor_declaration (+35 nodes collapsed)
block_comment "/**\n * Creates a Base32 codec used for decoding and enco"...
constructor_declaration (+25 nodes collapsed)
block_comment "/**\n * Creates a Base32 codec used for decoding and enco"...
constructor_declaration (+40 nodes collapsed)
block_comment "/**\n * Creates a Base32 / Base32 Hex codec used for deco"...
constructor_declaration (+46 nodes collapsed)
block_comment "/**\n * Creates a Base32 / Base32 Hex codec used for deco"...
constructor_declaration (+344 nodes collapsed)
block_comment "/**\n * <p>\n * Decodes all of the provided data, star"...
method_declaration (+1124 nodes collapsed)
block_comment "/**\n * <p>\n * Encodes all of the provided data, star"...
method_declaration (+1666 nodes collapsed)
block_comment "/**\n * Returns whether or not the {@code octet} is in th"...
method_declaration (+48 nodes collapsed)
} "}"

After

program
block_comment "/*\n * Licensed to the Apache Software Foundation (ASF) under"...
package_declaration
package "package"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "codec"
. "."
identifier "binary"
; ";"
block_comment "/**\n * Provides Base32 encoding and decoding as defined by <"...
class_declaration
modifiers
public "public"
class "class"
identifier "Base32"
superclass
extends "extends"
type_identifier "BaseNCodec"
class_body
{ "{"
block_comment "/**\n * BASE32 characters are 5 bits in length.\n * Th"...
field_declaration
modifiers
private "private"
static "static"
final "final"
integral_type
int "int"
variable_declarator
identifier "BITS_PER_ENCODED_BYTE"
= "="
decimal_integer_literal "5"
; ";"
field_declaration
modifiers
private "private"
static "static"
final "final"
integral_type
int "int"
variable_declarator
identifier "BYTES_PER_ENCODED_BLOCK"
= "="
decimal_integer_literal "8"
; ";"
field_declaration
modifiers
private "private"
static "static"
final "final"
integral_type
int "int"
variable_declarator
identifier "BYTES_PER_UNENCODED_BLOCK"
= "="
decimal_integer_literal "5"
; ";"
block_comment "/**\n * Chunk separator per RFC 2045 section 2.1.\n *\n"...
field_declaration (+21 nodes collapsed)
block_comment "/**\n * This array is a lookup table that translates Unic"...
field_declaration (+325 nodes collapsed)
block_comment "/**\n * This array is a lookup table that translates 5-bi"...
field_declaration (+82 nodes collapsed)
block_comment "/**\n * This array is a lookup table that translates Unic"...
field_declaration
modifiers
private "private"
static "static"
final "final"
array_type
integral_type
byte "byte"
dimensions
[ "["
] "]"
variable_declarator
identifier "HEX_DECODE_TABLE"
= "="
array_initializer
{ "{"
line_comment "// 0 1 2 3 4 5 6 7 8 9 A B C D "...
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
line_comment "// 00-0f"
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
line_comment "// 10-1f"
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
line_comment "// 20-2f"
decimal_integer_literal "0"
, ","
decimal_integer_literal "1"
, ","
decimal_integer_literal "2"
, ","
decimal_integer_literal "3"
, ","
decimal_integer_literal "4"
, ","
decimal_integer_literal "5"
, ","
decimal_integer_literal "6"
, ","
decimal_integer_literal "7"
, ","
decimal_integer_literal "8"
, ","
decimal_integer_literal "9"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
unary_expression
- "-"
decimal_integer_literal "1"
, ","
line_comment "// 30-3f 2-7"
unary_expression
- "-"
decimal_integer_literal "1"
, ","
decimal_integer_literal "10"
, ","
decimal_integer_literal "11"
, ","
decimal_integer_literal "12"
, ","
decimal_integer_literal "13"
, ","
decimal_integer_literal "14"
, ","
decimal_integer_literal "15"
, ","
decimal_integer_literal "16"
, ","
decimal_integer_literal "17"
, ","
decimal_integer_literal "18"
, ","
decimal_integer_literal "19"
, ","
decimal_integer_literal "20"
, ","
decimal_integer_literal "21"
, ","
decimal_integer_literal "22"
, ","
decimal_integer_literal "23"
, ","
decimal_integer_literal "24"
, ","
line_comment "// 40-4f A-O"
decimal_integer_literal "25"
, ","
decimal_integer_literal "26"
, ","
decimal_integer_literal "27"
, ","
decimal_integer_literal "28"
, ","
decimal_integer_literal "29"
, ","
decimal_integer_literal "30"
, ","
decimal_integer_literal "31"
, ","
line_comment "// 50-57 P-V"
} "}"
; ";"
block_comment "/**\n * This array is a lookup table that translates 5-bi"...
field_declaration (+82 nodes collapsed)
block_comment "/** Mask used to extract 5 bits, used when encoding Base32 b"...
field_declaration
modifiers
private "private"
static "static"
final "final"
integral_type
int "int"
variable_declarator
identifier "MASK_5BITS"
= "="
hex_integer_literal "0x1f"
; ";"
line_comment "// The static final fields above are used for the original s"...
line_comment "// The private member fields below are used with the new str"...
line_comment "// some state be preserved between calls of encode() and dec"...
block_comment "/**\n * Place holder for the bytes we're dealing with for"...
block_comment "/**\n * Convenience variable to help us determine when ou"...
field_declaration
modifiers
private "private"
final "final"
integral_type
int "int"
variable_declarator
identifier "decodeSize"
; ";"
block_comment "/**\n * Decode table to use.\n */"
field_declaration
modifiers
private "private"
final "final"
array_type
integral_type
byte "byte"
dimensions
[ "["
] "]"
variable_declarator
identifier "decodeTable"
; ";"
block_comment "/**\n * Convenience variable to help us determine when ou"...
field_declaration
modifiers
private "private"
final "final"
integral_type
int "int"
variable_declarator
identifier "encodeSize"
; ";"
block_comment "/**\n * Encode table to use.\n */"
field_declaration
modifiers
private "private"
final "final"
array_type
integral_type
byte "byte"
dimensions
[ "["
] "]"
variable_declarator
identifier "encodeTable"
; ";"
block_comment "/**\n * Line separator for encoding. Not used when decodi"...
field_declaration
modifiers
private "private"
final "final"
array_type
integral_type
byte "byte"
dimensions
[ "["
] "]"
variable_declarator
identifier "lineSeparator"
; ";"
block_comment "/**\n * Creates a Base32 codec used for decoding and enco"...
constructor_declaration
modifiers
public "public"
identifier "Base32"
formal_parameters
( "("
) ")"
constructor_body
{ "{"
explicit_constructor_invocation
this "this"
argument_list
( "("
false "false"
) ")"
; ";"
} "}"
block_comment "/**\n * Creates a Base32 codec used for decoding and enco"...
constructor_declaration (+25 nodes collapsed)
block_comment "/**\n * Creates a Base32 codec used for decoding and enco"...
constructor_declaration (+28 nodes collapsed)
block_comment "/**\n * Creates a Base32 codec used for decoding and enco"...
constructor_declaration (+35 nodes collapsed)
block_comment "/**\n * Creates a Base32 codec used for decoding and enco"...
constructor_declaration (+25 nodes collapsed)
block_comment "/**\n * Creates a Base32 codec used for decoding and enco"...
constructor_declaration (+40 nodes collapsed)
block_comment "/**\n * Creates a Base32 / Base32 Hex codec used for deco"...
constructor_declaration (+46 nodes collapsed)
block_comment "/**\n * Creates a Base32 / Base32 Hex codec used for deco"...
constructor_declaration (+344 nodes collapsed)
block_comment "/**\n * <p>\n * Decodes all of the provided data, star"...
method_declaration (+1124 nodes collapsed)
block_comment "/**\n * <p>\n * Encodes all of the provided data, star"...
method_declaration (+1666 nodes collapsed)
block_comment "/**\n * Returns whether or not the {@code octet} is in th"...
method_declaration (+48 nodes collapsed)
} "}"