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–67 unchanged (67 lines)
68
69 for (Iterator i = option.getTriggers().iterator(); i.hasNext();) {
70 nameToOption.put(i.next(), option);
71 }
72
73 // ensure that all parent options are also added
74 }
75
76 public void addValue(final Option option,
77 final Object value) {
78 if (option instanceof Argument) {
79 addOption(option);
80 }
…lines 81–277 unchanged (197 lines)

After

…lines 1–67 unchanged (67 lines)
68
69 for (Iterator i = option.getTriggers().iterator(); i.hasNext();) {
70 nameToOption.put(i.next(), option);
71 }
72
73 // ensure that all parent options are also added
74 Option parent = option.getParent();
75 while (parent != null && !options.contains(parent)) {
76 options.add(parent);
77 parent = parent.getParent();
78 }
79 }
80
81 public void addValue(final Option option,
82 final Object value) {
83 if (option instanceof Argument) {
84 addOption(option);
…lines 85–282 unchanged (198 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 "option"
. "."
identifier "PropertyOption"
; ";"
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 "Map"
variable_declarator
identifier "optionToProperties"
= "="
object_creation_expression
new "new"
type_identifier "HashMap"
argument_list
( "("
) ")"
; ";"
line_comment "// private final Properties properties = new Properties()"...
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
modifiers
public "public"
void_type "void"
identifier "addOption"
formal_parameters
( "("
formal_parameter
type_identifier "Option"
identifier "option"
) ")"
block
{ "{"
expression_statement
method_invocation
identifier "options"
. "."
identifier "add"
argument_list
( "("
identifier "option"
) ")"
; ";"
expression_statement
method_invocation
identifier "nameToOption"
. "."
identifier "put"
argument_list
( "("
method_invocation
identifier "option"
. "."
identifier "getPreferredName"
argument_list
( "("
) ")"
, ","
identifier "option"
) ")"
; ";"
for_statement (+52 nodes collapsed)
line_comment "// ensure that all parent options are also added"
} "}"
method_declaration (+105 nodes collapsed)
method_declaration (+99 nodes collapsed)
method_declaration (+36 nodes collapsed)
method_declaration (+31 nodes collapsed)
method_declaration (+242 nodes collapsed)
method_declaration (+59 nodes collapsed)
method_declaration (+97 nodes collapsed)
method_declaration (+32 nodes collapsed)
method_declaration (+93 nodes collapsed)
method_declaration (+39 nodes collapsed)
method_declaration (+75 nodes collapsed)
method_declaration (+70 nodes collapsed)
method_declaration (+25 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 "option"
. "."
identifier "PropertyOption"
; ";"
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 "Map"
variable_declarator
identifier "optionToProperties"
= "="
object_creation_expression
new "new"
type_identifier "HashMap"
argument_list
( "("
) ")"
; ";"
line_comment "// private final Properties properties = new Properties()"...
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
modifiers
public "public"
void_type "void"
identifier "addOption"
formal_parameters
( "("
formal_parameter
type_identifier "Option"
identifier "option"
) ")"
block
{ "{"
expression_statement
method_invocation
identifier "options"
. "."
identifier "add"
argument_list
( "("
identifier "option"
) ")"
; ";"
expression_statement
method_invocation
identifier "nameToOption"
. "."
identifier "put"
argument_list
( "("
method_invocation
identifier "option"
. "."
identifier "getPreferredName"
argument_list
( "("
) ")"
, ","
identifier "option"
) ")"
; ";"
for_statement (+52 nodes collapsed)
line_comment "// ensure that all parent options are also added"
local_variable_declaration
type_identifier "Option"
variable_declarator
identifier "parent"
= "="
method_invocation
identifier "option"
. "."
identifier "getParent"
argument_list
( "("
) ")"
; ";"
while_statement
while "while"
parenthesized_expression
( "("
binary_expression
binary_expression
identifier "parent"
!= "!="
null_literal "null"
&& "&&"
unary_expression
! "!"
method_invocation
identifier "options"
. "."
identifier "contains"
argument_list
( "("
identifier "parent"
) ")"
) ")"
block
{ "{"
expression_statement
method_invocation
identifier "options"
. "."
identifier "add"
argument_list
( "("
identifier "parent"
) ")"
; ";"
expression_statement
assignment_expression
identifier "parent"
= "="
method_invocation
identifier "parent"
. "."
identifier "getParent"
argument_list
( "("
) ")"
; ";"
} "}"
} "}"
method_declaration (+105 nodes collapsed)
method_declaration (+99 nodes collapsed)
method_declaration (+36 nodes collapsed)
method_declaration (+31 nodes collapsed)
method_declaration (+242 nodes collapsed)
method_declaration (+59 nodes collapsed)
method_declaration (+97 nodes collapsed)
method_declaration (+32 nodes collapsed)
method_declaration (+93 nodes collapsed)
method_declaration (+39 nodes collapsed)
method_declaration (+75 nodes collapsed)
method_declaration (+70 nodes collapsed)
method_declaration (+25 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)
} "}"