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–124 unchanged (124 lines)
125 if (valueList == null) {
126 valueList = Collections.EMPTY_LIST;
127 }
128
129 return valueList;
130 }
131
132 // First grab the command line values
133
134 // Finally use an empty list
135
136 public Boolean getSwitch(final Option option,
137 final Boolean defaultValue) {
138 // First grab the command line values
139 Boolean bool = (Boolean) switches.get(option);
140
141 // Secondly try the defaults supplied to the method
…lines 142–231 unchanged (90 lines)

After

…lines 1–125 unchanged (125 lines)
126 valueList = Collections.EMPTY_LIST;
127 }
128
129 return valueList;
130 }
131
132 public List getUndefaultedValues(Option option) {
133 // First grab the command line values
134 List valueList = (List) values.get(option);
135
136 // Finally use an empty list
137 if (valueList == null) {
138 valueList = Collections.EMPTY_LIST;
139 }
140
141 return valueList;
142 }
143
144 public Boolean getSwitch(final Option option,
145 final Boolean defaultValue) {
146 // First grab the command line values
147 Boolean bool = (Boolean) switches.get(option);
148
…lines 149–239 unchanged (91 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 "cli2"
. "."
identifier "commandline"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "ArrayList"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Collections"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "HashMap"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Iterator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "List"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Map"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Properties"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Set"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "Argument"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "Option"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "WriteableCommandLine"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "resource"
. "."
identifier "ResourceConstants"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "resource"
. "."
identifier "ResourceHelper"
; ";"
block_comment "/**\n * A WriteableCommandLine implementation allowing Option"...
class_declaration
modifiers
public "public"
class "class"
identifier "WriteableCommandLineImpl"
superclass
extends "extends"
type_identifier "CommandLineImpl"
super_interfaces
implements "implements"
type_list
type_identifier "WriteableCommandLine"
class_body
{ "{"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Properties"
variable_declarator
identifier "properties"
= "="
object_creation_expression
new "new"
type_identifier "Properties"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "List"
variable_declarator
identifier "options"
= "="
object_creation_expression
new "new"
type_identifier "ArrayList"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Map"
variable_declarator
identifier "nameToOption"
= "="
object_creation_expression
new "new"
type_identifier "HashMap"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Map"
variable_declarator
identifier "values"
= "="
object_creation_expression
new "new"
type_identifier "HashMap"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Map"
variable_declarator
identifier "switches"
= "="
object_creation_expression
new "new"
type_identifier "HashMap"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Map"
variable_declarator
identifier "defaultValues"
= "="
object_creation_expression
new "new"
type_identifier "HashMap"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Map"
variable_declarator
identifier "defaultSwitches"
= "="
object_creation_expression
new "new"
type_identifier "HashMap"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "List"
variable_declarator
identifier "normalised"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Set"
variable_declarator
identifier "prefixes"
; ";"
block_comment "/**\n * Creates a new WriteableCommandLineImpl rooted on "...
constructor_declaration (+45 nodes collapsed)
method_declaration (+94 nodes collapsed)
method_declaration (+105 nodes collapsed)
method_declaration (+99 nodes collapsed)
method_declaration (+36 nodes collapsed)
method_declaration (+31 nodes collapsed)
method_declaration (+143 nodes collapsed)
line_comment "// First grab the command line values"
line_comment "// Finally use an empty list"
method_declaration (+97 nodes collapsed)
method_declaration (+34 nodes collapsed)
method_declaration (+35 nodes collapsed)
method_declaration (+28 nodes collapsed)
method_declaration (+89 nodes collapsed)
method_declaration (+173 nodes collapsed)
method_declaration (+22 nodes collapsed)
method_declaration (+28 nodes collapsed)
method_declaration (+60 nodes collapsed)
method_declaration (+60 nodes collapsed)
method_declaration (+22 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 "cli2"
. "."
identifier "commandline"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "ArrayList"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Collections"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "HashMap"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Iterator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "List"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Map"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Properties"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Set"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "Argument"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "Option"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "WriteableCommandLine"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "resource"
. "."
identifier "ResourceConstants"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "resource"
. "."
identifier "ResourceHelper"
; ";"
block_comment "/**\n * A WriteableCommandLine implementation allowing Option"...
class_declaration
modifiers
public "public"
class "class"
identifier "WriteableCommandLineImpl"
superclass
extends "extends"
type_identifier "CommandLineImpl"
super_interfaces
implements "implements"
type_list
type_identifier "WriteableCommandLine"
class_body
{ "{"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Properties"
variable_declarator
identifier "properties"
= "="
object_creation_expression
new "new"
type_identifier "Properties"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "List"
variable_declarator
identifier "options"
= "="
object_creation_expression
new "new"
type_identifier "ArrayList"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Map"
variable_declarator
identifier "nameToOption"
= "="
object_creation_expression
new "new"
type_identifier "HashMap"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Map"
variable_declarator
identifier "values"
= "="
object_creation_expression
new "new"
type_identifier "HashMap"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Map"
variable_declarator
identifier "switches"
= "="
object_creation_expression
new "new"
type_identifier "HashMap"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Map"
variable_declarator
identifier "defaultValues"
= "="
object_creation_expression
new "new"
type_identifier "HashMap"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Map"
variable_declarator
identifier "defaultSwitches"
= "="
object_creation_expression
new "new"
type_identifier "HashMap"
argument_list
( "("
) ")"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "List"
variable_declarator
identifier "normalised"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "Set"
variable_declarator
identifier "prefixes"
; ";"
block_comment "/**\n * Creates a new WriteableCommandLineImpl rooted on "...
constructor_declaration (+45 nodes collapsed)
method_declaration (+94 nodes collapsed)
method_declaration (+105 nodes collapsed)
method_declaration (+99 nodes collapsed)
method_declaration (+36 nodes collapsed)
method_declaration (+31 nodes collapsed)
method_declaration (+143 nodes collapsed)
method_declaration
modifiers
public "public"
type_identifier "List"
identifier "getUndefaultedValues"
formal_parameters
( "("
formal_parameter
type_identifier "Option"
identifier "option"
) ")"
block
{ "{"
line_comment "// First grab the command line values"
local_variable_declaration
type_identifier "List"
variable_declarator
identifier "valueList"
= "="
cast_expression
( "("
type_identifier "List"
) ")"
method_invocation
identifier "values"
. "."
identifier "get"
argument_list
( "("
identifier "option"
) ")"
; ";"
line_comment "// Finally use an empty list"
if_statement
if "if"
parenthesized_expression
( "("
binary_expression
identifier "valueList"
== "=="
null_literal "null"
) ")"
block
{ "{"
expression_statement
assignment_expression
identifier "valueList"
= "="
field_access
identifier "Collections"
. "."
identifier "EMPTY_LIST"
; ";"
} "}"
return_statement
return "return"
identifier "valueList"
; ";"
} "}"
method_declaration (+97 nodes collapsed)
method_declaration (+34 nodes collapsed)
method_declaration (+35 nodes collapsed)
method_declaration (+28 nodes collapsed)
method_declaration (+89 nodes collapsed)
method_declaration (+173 nodes collapsed)
method_declaration (+22 nodes collapsed)
method_declaration (+28 nodes collapsed)
method_declaration (+60 nodes collapsed)
method_declaration (+60 nodes collapsed)
method_declaration (+22 nodes collapsed)
} "}"