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–85 unchanged (85 lines)
86 fieldClass = fieldClass.getSuperclass();
87 }
88 }
89 }
90
91 private void injectMockCandidate(Class<?> awaitingInjectionClazz, Set<Object> mocks, Object fieldInstance) {
92 for(Field field : orderedInstanceFieldsFrom(awaitingInjectionClazz)) {
93 mockCandidateFilter.filterCandidate(mocks, field, fieldInstance).thenInject();
94 }
95 }
96
97 private Field[] orderedInstanceFieldsFrom(Class<?> awaitingInjectionClazz) {
98 Field[] declaredFields = awaitingInjectionClazz.getDeclaredFields();
99 Arrays.sort(declaredFields, supertypesLast);
…lines 100–104 unchanged (5 lines)

After

…lines 1–86 unchanged (86 lines)
87 }
88 }
89 }
90
91 private void injectMockCandidate(Class<?> awaitingInjectionClazz, Set<Object> mocks, Object fieldInstance) {
92 for(Field field : orderedInstanceFieldsFrom(awaitingInjectionClazz)) {
93 Object injected = mockCandidateFilter.filterCandidate(mocks, field, fieldInstance).thenInject();
94 mocks.remove(injected);
95 }
96 }
97
98 private Field[] orderedInstanceFieldsFrom(Class<?> awaitingInjectionClazz) {
99 Field[] declaredFields = awaitingInjectionClazz.getDeclaredFields();
100 Arrays.sort(declaredFields, supertypesLast);
…lines 101–105 unchanged (5 lines)

Before

program
block_comment "/*\r\n * Copyright (c) 2007 Mockito contributors\r\n * This prog"...
package_declaration
package "package"
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "configuration"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "exceptions"
. "."
identifier "Reporter"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "exceptions"
. "."
identifier "base"
. "."
identifier "MockitoException"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "configuration"
. "."
identifier "injection"
. "."
identifier "FinalMockCandidateFilter"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "configuration"
. "."
identifier "injection"
. "."
identifier "MockCandidateFilter"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "configuration"
. "."
identifier "injection"
. "."
identifier "NameBasedCandidateFilter"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "configuration"
. "."
identifier "injection"
. "."
identifier "TypeBasedCandidateFilter"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "util"
. "."
identifier "reflection"
. "."
identifier "FieldInitializer"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "lang"
. "."
identifier "reflect"
. "."
identifier "Field"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Arrays"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Comparator"
; ";"
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 "Set"
; ";"
block_comment "/**\r\n * Initializes mock/spies dependencies for fields annot"...
class_declaration
modifiers
public "public"
class "class"
identifier "DefaultInjectionEngine"
class_body
{ "{"
field_declaration (+27 nodes collapsed)
field_declaration (+130 nodes collapsed)
block_comment "/**\r\n * Inject mocks in injectMocksFields, and initializ"...
method_declaration (+191 nodes collapsed)
method_declaration
modifiers
private "private"
void_type "void"
identifier "injectMockCandidate"
formal_parameters (+25 nodes collapsed)
block
{ "{"
enhanced_for_statement
for "for"
( "("
type_identifier "Field"
identifier "field"
: ":"
method_invocation
identifier "orderedInstanceFieldsFrom"
argument_list
( "("
identifier "awaitingInjectionClazz"
) ")"
) ")"
block
{ "{"
expression_statement
method_invocation
method_invocation
identifier "mockCandidateFilter"
. "."
identifier "filterCandidate"
argument_list
( "("
identifier "mocks"
, ","
identifier "field"
, ","
identifier "fieldInstance"
) ")"
. "."
identifier "thenInject"
argument_list
( "("
) ")"
; ";"
} "}"
} "}"
method_declaration (+57 nodes collapsed)
} "}"

After

program
block_comment "/*\r\n * Copyright (c) 2007 Mockito contributors\r\n * This prog"...
package_declaration
package "package"
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "configuration"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "exceptions"
. "."
identifier "Reporter"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "exceptions"
. "."
identifier "base"
. "."
identifier "MockitoException"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "configuration"
. "."
identifier "injection"
. "."
identifier "FinalMockCandidateFilter"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "configuration"
. "."
identifier "injection"
. "."
identifier "MockCandidateFilter"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "configuration"
. "."
identifier "injection"
. "."
identifier "NameBasedCandidateFilter"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "configuration"
. "."
identifier "injection"
. "."
identifier "TypeBasedCandidateFilter"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
scoped_identifier
identifier "org"
. "."
identifier "mockito"
. "."
identifier "internal"
. "."
identifier "util"
. "."
identifier "reflection"
. "."
identifier "FieldInitializer"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "lang"
. "."
identifier "reflect"
. "."
identifier "Field"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Arrays"
; ";"
import_declaration
import "import"
scoped_identifier
scoped_identifier
identifier "java"
. "."
identifier "util"
. "."
identifier "Comparator"
; ";"
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 "Set"
; ";"
block_comment "/**\r\n * Initializes mock/spies dependencies for fields annot"...
class_declaration
modifiers
public "public"
class "class"
identifier "DefaultInjectionEngine"
class_body
{ "{"
field_declaration (+27 nodes collapsed)
field_declaration (+130 nodes collapsed)
block_comment "/**\r\n * Inject mocks in injectMocksFields, and initializ"...
method_declaration (+191 nodes collapsed)
method_declaration
modifiers
private "private"
void_type "void"
identifier "injectMockCandidate"
formal_parameters (+25 nodes collapsed)
block
{ "{"
enhanced_for_statement
for "for"
( "("
type_identifier "Field"
identifier "field"
: ":"
method_invocation
identifier "orderedInstanceFieldsFrom"
argument_list
( "("
identifier "awaitingInjectionClazz"
) ")"
) ")"
block
{ "{"
local_variable_declaration
type_identifier "Object"
variable_declarator
identifier "injected"
= "="
method_invocation
method_invocation
identifier "mockCandidateFilter"
. "."
identifier "filterCandidate"
argument_list
( "("
identifier "mocks"
, ","
identifier "field"
, ","
identifier "fieldInstance"
) ")"
. "."
identifier "thenInject"
argument_list
( "("
) ")"
; ";"
expression_statement
method_invocation
identifier "mocks"
. "."
identifier "remove"
argument_list
( "("
identifier "injected"
) ")"
; ";"
} "}"
} "}"
method_declaration (+57 nodes collapsed)
} "}"