265993: more jdt like handles

3 files changed, 19 insertions, 19 deletions

diff --git a/tests/model/expected/pr131932.txt b/tests/model/expected/pr131932.txt
index 4f038a447..3eae47206 100644
--- a/tests/model/expected/pr131932.txt
+++ b/tests/model/expected/pr131932.txt
@@ -13,12 +13,12 @@
       Foo  [class] TEST_SANDBOX\pr131932.aj:19:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
+(targets=1) <*pr131932.aj}Slide74)Foo.Foo_new)QList\<TT;>; (declared on) <*pr131932.aj[Foo
 (targets=1) <*pr131932.aj}Slide74)Bar.children (declared on) <*pr131932.aj}Slide74[Bar
-(targets=1) <*pr131932.aj}Slide74)Bar.getFirst (declared on) <*pr131932.aj}Slide74[Bar
-(targets=1) <*pr131932.aj[Foo (aspect declarations) <*pr131932.aj}Slide74)Foo.Foo_new)Qjava.util.List\<TT;>;
 (targets=2) <*pr131932.aj}Slide74[Bar (aspect declarations) <*pr131932.aj}Slide74)Bar.getFirst
 (targets=2) <*pr131932.aj}Slide74[Bar (aspect declarations) <*pr131932.aj}Slide74)Bar.children
-(targets=1) <*pr131932.aj}Slide74)Foo.Foo_new)Qjava.util.List\<TT;>; (declared on) <*pr131932.aj[Foo
+(targets=1) <*pr131932.aj}Slide74)Bar.getFirst (declared on) <*pr131932.aj}Slide74[Bar
+(targets=1) <*pr131932.aj[Foo (aspect declarations) <*pr131932.aj}Slide74)Foo.Foo_new)QList\<TT;>;
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 import reference=2
diff --git a/tests/model/expected/pr141730_1.txt b/tests/model/expected/pr141730_1.txt
index 2f6eb6f9d..9eaa1144c 100644
--- a/tests/model/expected/pr141730_1.txt
+++ b/tests/model/expected/pr141730_1.txt
@@ -19,28 +19,28 @@
       MyClass  [class] TEST_SANDBOX\pr141730.aj:33:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) <*pr141730.aj[C~main~\[QString; (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C~intArray~\[I (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C~myClassMethod~QMyClass; (advised by) <*pr141730.aj}A&before
 (targets=1) <*pr141730.aj[C~method (advised by) <*pr141730.aj}A&before
-(targets=1) <*pr141730.aj[MyClass (advised by) <*pr141730.aj}A&before
-(targets=1) <*pr141730.aj[C~twoArgsMethod~I~QString; (advised by) <*pr141730.aj}A&before
 (targets=1) <*pr141730.aj[C~intMethod~I (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C~C (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C~multiMethod~\[\[QString; (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C~twoArgsMethod~I~QString; (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[MyClass (advised by) <*pr141730.aj}A&before
 (targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj}A
 (targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[MyClass
 (targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~C
 (targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~method
 (targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~intMethod~I
 (targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~stringMethod~QString;
-(targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~myClassMethod~LMyClass;
+(targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~myClassMethod~QMyClass;
 (targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~twoArgsMethod~I~QString;
 (targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~main~\[QString;
 (targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~multiMethod~\[\[QString;
 (targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~intArray~\[I
-(targets=1) <*pr141730.aj[C~multiMethod~\[\[QString; (advised by) <*pr141730.aj}A&before
-(targets=1) <*pr141730.aj[C~stringMethod~QString; (advised by) <*pr141730.aj}A&before
-(targets=1) <*pr141730.aj[C~intArray~\[I (advised by) <*pr141730.aj}A&before
-(targets=1) <*pr141730.aj[C~myClassMethod~LMyClass; (advised by) <*pr141730.aj}A&before
-(targets=1) <*pr141730.aj[C~C (advised by) <*pr141730.aj}A&before
 (targets=1) <*pr141730.aj}A (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C~main~\[QString; (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C~stringMethod~QString; (advised by) <*pr141730.aj}A&before
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=8
diff --git a/tests/model/expected/pr141730_2.txt b/tests/model/expected/pr141730_2.txt
index 49282247b..6dbbe5278 100644
--- a/tests/model/expected/pr141730_2.txt
+++ b/tests/model/expected/pr141730_2.txt
@@ -14,18 +14,18 @@
       MyGenericClass  [class] TEST_SANDBOX\pr141730.aj:22:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) <*pr141730.aj[MyGenericClass (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C~genericMethod2~QMyGenericClass\<QString;QMyClass;>; (advised by) <*pr141730.aj}A&before
 (targets=1) <*pr141730.aj[MyClass (advised by) <*pr141730.aj}A&before
-(targets=1) <*pr141730.aj[C~genericMethod~Qjava.util.List\<QString;>; (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[MyGenericClass (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C~genericMethod~QList\<QString;>; (advised by) <*pr141730.aj}A&before
 (targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj}A
 (targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[C
-(targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~genericMethod~Qjava.util.List\<QString;>;
-(targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~genericMethod2~QMyGenericClass\<QString;LMyClass;>;
-(targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[MyClass
+(targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~genericMethod~QList\<QString;>;
+(targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~genericMethod2~QMyGenericClass\<QString;QMyClass;>;
 (targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[MyGenericClass
-(targets=1) <*pr141730.aj[C (advised by) <*pr141730.aj}A&before
-(targets=1) <*pr141730.aj[C~genericMethod2~QMyGenericClass\<QString;LMyClass;>; (advised by) <*pr141730.aj}A&before
+(targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[MyClass
 (targets=1) <*pr141730.aj}A (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C (advised by) <*pr141730.aj}A&before
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=2