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–12 unchanged (12 lines)
13 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 * See the License for the specific language governing permissions and
15 * limitations under the License.
16 */
17package org.apache.commons.cli2.builder;
18
19import java.util.HashSet;
20import java.util.Iterator;
21import java.util.Set;
22
23import org.apache.commons.cli2.Argument;
24import org.apache.commons.cli2.Option;
25import org.apache.commons.cli2.validation.ClassValidator;
…lines 26–60 unchanged (35 lines)
61 final ArgumentBuilder abuilder) {
62 this.gbuilder = gbuilder;
63 this.obuilder = obuilder;
64 this.abuilder = abuilder;
65 }
66
67 private final Set options = new HashSet();
68
69 /**
70 * Creates a new Option instance.
71 * @return a new Option instance
72 */
73 public Option create() {
…lines 74–203 unchanged (130 lines)

After

…lines 1–13 unchanged (13 lines)
14 * See the License for the specific language governing permissions and
15 * limitations under the License.
16 */
17package org.apache.commons.cli2.builder;
18
19import java.util.Iterator;
20import java.util.LinkedHashSet;
21import java.util.Set;
22
23import org.apache.commons.cli2.Argument;
24import org.apache.commons.cli2.Option;
25import org.apache.commons.cli2.validation.ClassValidator;
26import org.apache.commons.cli2.validation.DateValidator;
…lines 27–60 unchanged (34 lines)
61 final ArgumentBuilder abuilder) {
62 this.gbuilder = gbuilder;
63 this.obuilder = obuilder;
64 this.abuilder = abuilder;
65 }
66
67 private final Set options = new LinkedHashSet();
68
69 /**
70 * Creates a new Option instance.
71 * @return a new Option instance
72 */
73 public Option create() {
…lines 74–203 unchanged (130 lines)

Before

program
block_comment "/**\n * Licensed to the Apache Software Foundation (ASF) unde"...
package_declaration
package "package"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "builder"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "HashSet"
; ";"
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 "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
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "validation"
. "."
identifier "ClassValidator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "validation"
. "."
identifier "DateValidator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "validation"
. "."
identifier "FileValidator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "validation"
. "."
identifier "NumberValidator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "validation"
. "."
identifier "UrlValidator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "validation"
. "."
identifier "Validator"
; ";"
block_comment "/**\n * Builds Options using a String pattern\n */"
line_comment "//TODO Document and link to the acceptable patterns"
class_declaration
modifiers
public "public"
class "class"
identifier "PatternBuilder"
class_body
{ "{"
field_declaration
modifiers
private "private"
final "final"
type_identifier "GroupBuilder"
variable_declarator
identifier "gbuilder"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "DefaultOptionBuilder"
variable_declarator
identifier "obuilder"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "ArgumentBuilder"
variable_declarator
identifier "abuilder"
; ";"
block_comment "/**\n * Creates a new PatternBuilder\n */"
constructor_declaration (+36 nodes collapsed)
block_comment "/**\n * Creates a new PatternBuilder\n * @param gbuild"...
constructor_declaration (+54 nodes collapsed)
field_declaration
modifiers
private "private"
final "final"
type_identifier "Set"
variable_declarator
identifier "options"
= "="
object_creation_expression
new "new"
type_identifier "HashSet"
argument_list
( "("
) ")"
; ";"
block_comment "/**\n * Creates a new Option instance.\n * @return a n"...
method_declaration (+144 nodes collapsed)
block_comment "/**\n * Resets this builder\n */"
method_declaration (+24 nodes collapsed)
method_declaration (+198 nodes collapsed)
block_comment "/**\n * Builds an Option using a pattern string.\n * @"...
method_declaration (+244 nodes collapsed)
method_declaration (+198 nodes collapsed)
} "}"

After

program
block_comment "/**\n * Licensed to the Apache Software Foundation (ASF) unde"...
package_declaration
package "package"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "builder"
; ";"
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 "LinkedHashSet"
; ";"
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
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "validation"
. "."
identifier "ClassValidator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "validation"
. "."
identifier "DateValidator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "validation"
. "."
identifier "FileValidator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "validation"
. "."
identifier "NumberValidator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "validation"
. "."
identifier "UrlValidator"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "apache"
. "."
identifier "commons"
. "."
identifier "cli2"
. "."
identifier "validation"
. "."
identifier "Validator"
; ";"
block_comment "/**\n * Builds Options using a String pattern\n */"
line_comment "//TODO Document and link to the acceptable patterns"
class_declaration
modifiers
public "public"
class "class"
identifier "PatternBuilder"
class_body
{ "{"
field_declaration
modifiers
private "private"
final "final"
type_identifier "GroupBuilder"
variable_declarator
identifier "gbuilder"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "DefaultOptionBuilder"
variable_declarator
identifier "obuilder"
; ";"
field_declaration
modifiers
private "private"
final "final"
type_identifier "ArgumentBuilder"
variable_declarator
identifier "abuilder"
; ";"
block_comment "/**\n * Creates a new PatternBuilder\n */"
constructor_declaration (+36 nodes collapsed)
block_comment "/**\n * Creates a new PatternBuilder\n * @param gbuild"...
constructor_declaration (+54 nodes collapsed)
field_declaration
modifiers
private "private"
final "final"
type_identifier "Set"
variable_declarator
identifier "options"
= "="
object_creation_expression
new "new"
type_identifier "LinkedHashSet"
argument_list
( "("
) ")"
; ";"
block_comment "/**\n * Creates a new Option instance.\n * @return a n"...
method_declaration (+144 nodes collapsed)
block_comment "/**\n * Resets this builder\n */"
method_declaration (+24 nodes collapsed)
method_declaration (+198 nodes collapsed)
block_comment "/**\n * Builds an Option using a pattern string.\n * @"...
method_declaration (+244 nodes collapsed)
method_declaration (+198 nodes collapsed)
} "}"