247742:c27

15 files changed, 256 insertions, 216 deletions

diff --git a/tests/model/expected/pr115607.txt b/tests/model/expected/pr115607.txt
index dfee43ad1..1eb3ce89b 100644
--- a/tests/model/expected/pr115607.txt
+++ b/tests/model/expected/pr115607.txt
@@ -1,24 +1,26 @@
 === MODEL STATUS REPORT ========= After a batch build
 <root>  [java source file] 
-  pr115607.java  [java source file] TEST_SANDBOX\pr115607.java:1:
-    import declarations  [import reference] 
-    I  [annotation] TEST_SANDBOX\pr115607.java:1:
-    Simple  [class] TEST_SANDBOX\pr115607.java:3:
-    pr115607  [aspect] TEST_SANDBOX\pr115607.java:5:
-      declare @type: Simple : @I  [declare @type] TEST_SANDBOX\pr115607.java:6:
+    [package] 
+    pr115607.java  [java source file] TEST_SANDBOX\pr115607.java:1:
+      import declarations  [import reference] 
+      I  [annotation] TEST_SANDBOX\pr115607.java:1:
+      Simple  [class] TEST_SANDBOX\pr115607.java:3:
+      pr115607  [aspect] TEST_SANDBOX\pr115607.java:5:
+        declare @type: Simple : @I  [declare @type] TEST_SANDBOX\pr115607.java:6:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) {pr115607.java}pr115607`declare @type (annotates) {pr115607.java[Simple
-(targets=1) {pr115607.java[Simple (annotated by) {pr115607.java}pr115607`declare @type
+(targets=1) <{pr115607.java}pr115607`declare @type (annotates) <{pr115607.java[Simple
+(targets=1) <{pr115607.java[Simple (annotated by) <{pr115607.java}pr115607`declare @type
 (targets=1) {pr115607.java (annotates) {pr115607.java
 (targets=1) {pr115607.java (annotated by) {pr115607.java
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
-annotation=1
-FileMapSize=1
+import reference=1
 aspect=1
-RelationshipMapSize=3
-java source file=2
 declare @type=1
-import reference=1
 class=1
+annotation=1
+RelationshipMapSize=3
+FileMapSize=1
+package=1
+java source file=2
diff --git a/tests/model/expected/pr120356.txt b/tests/model/expected/pr120356.txt
index 04ff17df5..dec2ad7d4 100644
--- a/tests/model/expected/pr120356.txt
+++ b/tests/model/expected/pr120356.txt
@@ -1,31 +1,33 @@
 === MODEL STATUS REPORT ========= After a batch build
 <root>  [java source file] 
-  A.java  [java source file] TEST_SANDBOX\A.java:1:
-    import declarations  [import reference] 
-      org.aspectj.lang.annotation.DeclareError  [import reference] TEST_SANDBOX\A.java:4:
-      org.aspectj.lang.annotation.DeclareWarning  [import reference] TEST_SANDBOX\A.java:3:
-      org.aspectj.lang.annotation.Aspect  [import reference] TEST_SANDBOX\A.java:2:
-    A  [aspect] TEST_SANDBOX\A.java:7:
-      warning  [field] TEST_SANDBOX\A.java:10:
-      error  [field] TEST_SANDBOX\A.java:13:
-  C.java  [java source file] TEST_SANDBOX\C.java:1:
-    import declarations  [import reference] 
-    C  [class] TEST_SANDBOX\C.java:3:
-      warningMethod()  [method] TEST_SANDBOX\C.java:5:
-      badMethod()  [method] TEST_SANDBOX\C.java:8:
+    [package] 
+    A.java  [java source file] TEST_SANDBOX\A.java:1:
+      import declarations  [import reference] 
+        org.aspectj.lang.annotation.DeclareError  [import reference] TEST_SANDBOX\A.java:4:
+        org.aspectj.lang.annotation.DeclareWarning  [import reference] TEST_SANDBOX\A.java:3:
+        org.aspectj.lang.annotation.Aspect  [import reference] TEST_SANDBOX\A.java:2:
+      A  [aspect] TEST_SANDBOX\A.java:7:
+        warning  [field] TEST_SANDBOX\A.java:10:
+        error  [field] TEST_SANDBOX\A.java:13:
+    C.java  [java source file] TEST_SANDBOX\C.java:1:
+      import declarations  [import reference] 
+      C  [class] TEST_SANDBOX\C.java:3:
+        warningMethod()  [method] TEST_SANDBOX\C.java:5:
+        badMethod()  [method] TEST_SANDBOX\C.java:8:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) {A.java}A^warning (matched by) {C.java[C~warningMethod
-(targets=1) {C.java[C~badMethod (matches declare) {A.java}A^error
-(targets=1) {C.java[C~warningMethod (matches declare) {A.java}A^warning
-(targets=1) {A.java}A^error (matched by) {C.java[C~badMethod
+(targets=1) <{C.java[C~badMethod (matches declare) <{A.java}A^error
+(targets=1) <{C.java[C~warningMethod (matches declare) <{A.java}A^warning
+(targets=1) <{A.java}A^warning (matched by) <{C.java[C~warningMethod
+(targets=1) <{A.java}A^error (matched by) <{C.java[C~badMethod
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
-FileMapSize=2
-aspect=1
-RelationshipMapSize=4
-java source file=3
+method=2
 import reference=5
+aspect=1
 class=1
+RelationshipMapSize=4
+FileMapSize=2
 field=2
-method=2
+package=1
+java source file=3
diff --git a/tests/model/expected/pr131932.txt b/tests/model/expected/pr131932.txt
index ff0ad9e9b..844137bac 100644
--- a/tests/model/expected/pr131932.txt
+++ b/tests/model/expected/pr131932.txt
@@ -1,23 +1,24 @@
 === MODEL STATUS REPORT ========= After a batch build
 <root>  [java source file] 
-  pr131932.aj  [java source file] TEST_SANDBOX\pr131932.aj:1:
-    import declarations  [import reference] 
-      java.util.List  [import reference] TEST_SANDBOX\pr131932.aj:1:
-    Slide74  [aspect] TEST_SANDBOX\pr131932.aj:3:
-      Bar  [class] TEST_SANDBOX\pr131932.aj:13:
-        lts  [field] TEST_SANDBOX\pr131932.aj:14:
-      Bar.getFirst()  [inter-type method] TEST_SANDBOX\pr131932.aj:5:
-      Foo.Foo(java.util.List<T>)  [inter-type constructor] TEST_SANDBOX\pr131932.aj:9:
-      Bar.children  [inter-type field] TEST_SANDBOX\pr131932.aj:11:
-    Foo  [class] TEST_SANDBOX\pr131932.aj:19:
+    [package] 
+    pr131932.aj  [java source file] TEST_SANDBOX\pr131932.aj:1:
+      import declarations  [import reference] 
+        java.util.List  [import reference] TEST_SANDBOX\pr131932.aj:1:
+      Slide74  [aspect] TEST_SANDBOX\pr131932.aj:3:
+        Bar  [class] TEST_SANDBOX\pr131932.aj:13:
+          lts  [field] TEST_SANDBOX\pr131932.aj:14:
+        Bar.getFirst()  [inter-type method] TEST_SANDBOX\pr131932.aj:5:
+        Foo.Foo(java.util.List<T>)  [inter-type constructor] TEST_SANDBOX\pr131932.aj:9:
+        Bar.children  [inter-type field] TEST_SANDBOX\pr131932.aj:11:
+      Foo  [class] TEST_SANDBOX\pr131932.aj:19:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) *pr131932.aj}Slide74)Foo.Foo)QList\<TT;>; (declared on) *pr131932.aj[Foo
-(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)Bar.children (declared on) *pr131932.aj}Slide74[Bar
-(targets=1) *pr131932.aj[Foo (aspect declarations) *pr131932.aj}Slide74)Foo.Foo)QList\<TT;>;
-(targets=1) *pr131932.aj}Slide74)Bar.getFirst (declared on) *pr131932.aj}Slide74[Bar
+(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)QList\<TT;>;
+(targets=1) <*pr131932.aj}Slide74)Foo.Foo)QList\<TT;>; (declared on) <*pr131932.aj[Foo
+(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
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 import reference=2
@@ -28,5 +29,6 @@ inter-type constructor=1
 RelationshipMapSize=5
 FileMapSize=1
 field=1
+package=1
 inter-type method=1
 java source file=2
diff --git a/tests/model/expected/pr132130.txt b/tests/model/expected/pr132130.txt
index 812748022..5aa586111 100644
--- a/tests/model/expected/pr132130.txt
+++ b/tests/model/expected/pr132130.txt
@@ -1,20 +1,21 @@
 === MODEL STATUS REPORT ========= After a batch build
 <root>  [java source file] 
-  pr132130.aj  [java source file] TEST_SANDBOX\pr132130.aj:1:
-    import declarations  [import reference] 
-    basic  [aspect] TEST_SANDBOX\pr132130.aj:1:
-      declare @method: * debit(..) : @Secured(role = "supervisor")  [declare @method] TEST_SANDBOX\pr132130.aj:3:
-      declare @constructor: BankAccount+.new(..) : @Secured(role = "supervisor")  [declare @constructor] TEST_SANDBOX\pr132130.aj:4:
-    BankAccount  [class] TEST_SANDBOX\pr132130.aj:7:
-      BankAccount(java.lang.String,int)  [constructor] TEST_SANDBOX\pr132130.aj:9:
-      debit(long,long)  [method] TEST_SANDBOX\pr132130.aj:11:
-    Secured  [annotation] TEST_SANDBOX\pr132130.aj:15:
+    [package] 
+    pr132130.aj  [java source file] TEST_SANDBOX\pr132130.aj:1:
+      import declarations  [import reference] 
+      basic  [aspect] TEST_SANDBOX\pr132130.aj:1:
+        declare @method: * debit(..) : @Secured(role = "supervisor")  [declare @method] TEST_SANDBOX\pr132130.aj:3:
+        declare @constructor: BankAccount+.new(..) : @Secured(role = "supervisor")  [declare @constructor] TEST_SANDBOX\pr132130.aj:4:
+      BankAccount  [class] TEST_SANDBOX\pr132130.aj:7:
+        BankAccount(java.lang.String,int)  [constructor] TEST_SANDBOX\pr132130.aj:9:
+        debit(long,long)  [method] TEST_SANDBOX\pr132130.aj:11:
+      Secured  [annotation] TEST_SANDBOX\pr132130.aj:15:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) *pr132130.aj[BankAccount~BankAccount~QString;~I (annotated by) *pr132130.aj}basic`declare @constructor!2
-(targets=1) *pr132130.aj}basic`declare @constructor!2 (annotates) *pr132130.aj[BankAccount~BankAccount~QString;~I
-(targets=1) *pr132130.aj[BankAccount~debit~J~J (annotated by) *pr132130.aj}basic`declare @method
-(targets=1) *pr132130.aj}basic`declare @method (annotates) *pr132130.aj[BankAccount~debit~J~J
+(targets=1) <*pr132130.aj[BankAccount~BankAccount~QString;~I (annotated by) <*pr132130.aj}basic`declare @constructor!2
+(targets=1) <*pr132130.aj}basic`declare @method (annotates) <*pr132130.aj[BankAccount~debit~J~J
+(targets=1) <*pr132130.aj}basic`declare @constructor!2 (annotates) <*pr132130.aj[BankAccount~BankAccount~QString;~I
+(targets=1) <*pr132130.aj[BankAccount~debit~J~J (annotated by) <*pr132130.aj}basic`declare @method
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=1
@@ -27,4 +28,5 @@ class=1
 annotation=1
 RelationshipMapSize=4
 FileMapSize=1
+package=1
 java source file=2
diff --git a/tests/model/expected/pr141730_1.txt b/tests/model/expected/pr141730_1.txt
index 3ca7a5502..248713e7e 100644
--- a/tests/model/expected/pr141730_1.txt
+++ b/tests/model/expected/pr141730_1.txt
@@ -1,45 +1,46 @@
 === MODEL STATUS REPORT ========= After a batch build
 <root>  [java source file] 
-  pr141730.aj  [java source file] TEST_SANDBOX\pr141730.aj:1:
-    import declarations  [import reference] 
-    A  [aspect] TEST_SANDBOX\pr141730.aj:1:
-      p()  [pointcut] TEST_SANDBOX\pr141730.aj:3:
-      before(): p..  [advice] TEST_SANDBOX\pr141730.aj:5:
-    C  [class] TEST_SANDBOX\pr141730.aj:11:
-      C()  [constructor] TEST_SANDBOX\pr141730.aj:13:
-      method()  [method] TEST_SANDBOX\pr141730.aj:15:
-      intMethod(int)  [method] TEST_SANDBOX\pr141730.aj:17:
-      stringMethod(java.lang.String)  [method] TEST_SANDBOX\pr141730.aj:19:
-      myClassMethod(MyClass)  [method] TEST_SANDBOX\pr141730.aj:21:
-      twoArgsMethod(int,java.lang.String)  [method] TEST_SANDBOX\pr141730.aj:23:
-      main(java.lang.String[])  [method] TEST_SANDBOX\pr141730.aj:25:
-      multiMethod(java.lang.String[][])  [method] TEST_SANDBOX\pr141730.aj:27:
-      intArray(int[])  [method] TEST_SANDBOX\pr141730.aj:29:
-    MyClass  [class] TEST_SANDBOX\pr141730.aj:33:
+    [package] 
+    pr141730.aj  [java source file] TEST_SANDBOX\pr141730.aj:1:
+      import declarations  [import reference] 
+      A  [aspect] TEST_SANDBOX\pr141730.aj:1:
+        p()  [pointcut] TEST_SANDBOX\pr141730.aj:3:
+        before(): p..  [advice] TEST_SANDBOX\pr141730.aj:5:
+      C  [class] TEST_SANDBOX\pr141730.aj:11:
+        C()  [constructor] TEST_SANDBOX\pr141730.aj:13:
+        method()  [method] TEST_SANDBOX\pr141730.aj:15:
+        intMethod(int)  [method] TEST_SANDBOX\pr141730.aj:17:
+        stringMethod(java.lang.String)  [method] TEST_SANDBOX\pr141730.aj:19:
+        myClassMethod(MyClass)  [method] TEST_SANDBOX\pr141730.aj:21:
+        twoArgsMethod(int,java.lang.String)  [method] TEST_SANDBOX\pr141730.aj:23:
+        main(java.lang.String[])  [method] TEST_SANDBOX\pr141730.aj:25:
+        multiMethod(java.lang.String[][])  [method] TEST_SANDBOX\pr141730.aj:27:
+        intArray(int[])  [method] TEST_SANDBOX\pr141730.aj:29:
+      MyClass  [class] TEST_SANDBOX\pr141730.aj:33:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) *pr141730.aj[C~intMethod~I (advised by) *pr141730.aj}A&before
-(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~twoArgsMethod~I~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~myClassMethod~LMyClass; (advised by) *pr141730.aj}A&before
-(targets=1) *pr141730.aj}A (advised by) *pr141730.aj}A&before
-(targets=1) *pr141730.aj[C~C (advised by) *pr141730.aj}A&before
-(targets=1) *pr141730.aj[C~multiMethod~\[[String; (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~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~\[[String;
-(targets=11) *pr141730.aj}A&before (advises) *pr141730.aj[C~intArray~\[I
-(targets=1) *pr141730.aj[C~method (advised by) *pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C~main~\[QString; (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=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~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~\[[String;
+(targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~intArray~\[I
+(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~multiMethod~\[[String; (advised by) <*pr141730.aj}A&before
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=8
@@ -51,4 +52,5 @@ advice=1
 pointcut=1
 RelationshipMapSize=12
 FileMapSize=1
+package=1
 java source file=2
diff --git a/tests/model/expected/pr141730_2.txt b/tests/model/expected/pr141730_2.txt
index 010773f01..246fd26a6 100644
--- a/tests/model/expected/pr141730_2.txt
+++ b/tests/model/expected/pr141730_2.txt
@@ -1,30 +1,31 @@
 === MODEL STATUS REPORT ========= After a batch build
 <root>  [java source file] 
-  pr141730.aj  [java source file] TEST_SANDBOX\pr141730.aj:1:
-    import declarations  [import reference] 
-      java.util.List  [import reference] TEST_SANDBOX\pr141730.aj:1:
-    A  [aspect] TEST_SANDBOX\pr141730.aj:3:
-      p()  [pointcut] TEST_SANDBOX\pr141730.aj:5:
-      before(): p..  [advice] TEST_SANDBOX\pr141730.aj:7:
-    C  [class] TEST_SANDBOX\pr141730.aj:13:
-      genericMethod(java.util.List<java.lang.String>)  [method] TEST_SANDBOX\pr141730.aj:15:
-      genericMethod2(MyGenericClass<java.lang.String,MyClass>)  [method] TEST_SANDBOX\pr141730.aj:16:
-    MyClass  [class] TEST_SANDBOX\pr141730.aj:20:
-    MyGenericClass  [class] TEST_SANDBOX\pr141730.aj:22:
+    [package] 
+    pr141730.aj  [java source file] TEST_SANDBOX\pr141730.aj:1:
+      import declarations  [import reference] 
+        java.util.List  [import reference] TEST_SANDBOX\pr141730.aj:1:
+      A  [aspect] TEST_SANDBOX\pr141730.aj:3:
+        p()  [pointcut] TEST_SANDBOX\pr141730.aj:5:
+        before(): p..  [advice] TEST_SANDBOX\pr141730.aj:7:
+      C  [class] TEST_SANDBOX\pr141730.aj:13:
+        genericMethod(java.util.List<java.lang.String>)  [method] TEST_SANDBOX\pr141730.aj:15:
+        genericMethod2(MyGenericClass<java.lang.String,MyClass>)  [method] TEST_SANDBOX\pr141730.aj:16:
+      MyClass  [class] TEST_SANDBOX\pr141730.aj:20:
+      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[MyClass (advised by) *pr141730.aj}A&before
-(targets=1) *pr141730.aj[C~genericMethod2~PMyGenericClass\<QString;LMyClass;>; (advised by) *pr141730.aj}A&before
-(targets=1) *pr141730.aj[C~genericMethod~QList\<QString;>; (advised by) *pr141730.aj}A&before
-(targets=1) *pr141730.aj}A (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[MyClass
-(targets=6) *pr141730.aj}A&before (advises) *pr141730.aj[MyGenericClass
-(targets=6) *pr141730.aj}A&before (advises) *pr141730.aj[C
-(targets=6) *pr141730.aj}A&before (advises) *pr141730.aj[C~genericMethod~QList\<QString;>;
-(targets=6) *pr141730.aj}A&before (advises) *pr141730.aj[C~genericMethod2~PMyGenericClass\<QString;LMyClass;>;
-(targets=1) *pr141730.aj[C (advised by) *pr141730.aj}A&before
+(targets=1) <*pr141730.aj[MyClass (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[MyGenericClass (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C~genericMethod2~PMyGenericClass\<QString;LMyClass;>; (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~QList\<QString;>;
+(targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~genericMethod2~PMyGenericClass\<QString;LMyClass;>;
+(targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[MyGenericClass
+(targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[MyClass
+(targets=1) <*pr141730.aj[C~genericMethod~QList\<QString;>; (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj}A (advised by) <*pr141730.aj}A&before
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=2
@@ -35,4 +36,5 @@ advice=1
 pointcut=1
 RelationshipMapSize=7
 FileMapSize=1
+package=1
 java source file=2
diff --git a/tests/model/expected/pr143924.txt b/tests/model/expected/pr143924.txt
index 26f8768eb..70ffad471 100644
--- a/tests/model/expected/pr143924.txt
+++ b/tests/model/expected/pr143924.txt
@@ -1,16 +1,17 @@
 === MODEL STATUS REPORT ========= After a batch build
 <root>  [java source file] 
-  pr143924.aj  [java source file] TEST_SANDBOX\pr143924.aj:1:
-    import declarations  [import reference] 
-    DeclareAnnotation  [aspect] TEST_SANDBOX\pr143924.aj:1:
-      declare @method: * debit(..) : @Secured(role = "supervisor")  [declare @method] TEST_SANDBOX\pr143924.aj:2:
-    BankAccount  [class] TEST_SANDBOX\pr143924.aj:5:
-      debit(java.lang.String,long)  [method] TEST_SANDBOX\pr143924.aj:7:
-    Secured  [annotation] TEST_SANDBOX\pr143924.aj:11:
+    [package] 
+    pr143924.aj  [java source file] TEST_SANDBOX\pr143924.aj:1:
+      import declarations  [import reference] 
+      DeclareAnnotation  [aspect] TEST_SANDBOX\pr143924.aj:1:
+        declare @method: * debit(..) : @Secured(role = "supervisor")  [declare @method] TEST_SANDBOX\pr143924.aj:2:
+      BankAccount  [class] TEST_SANDBOX\pr143924.aj:5:
+        debit(java.lang.String,long)  [method] TEST_SANDBOX\pr143924.aj:7:
+      Secured  [annotation] TEST_SANDBOX\pr143924.aj:11:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) *pr143924.aj}DeclareAnnotation`declare @method (annotates) *pr143924.aj[BankAccount~debit~QString;~J
-(targets=1) *pr143924.aj[BankAccount~debit~QString;~J (annotated by) *pr143924.aj}DeclareAnnotation`declare @method
+(targets=1) <*pr143924.aj}DeclareAnnotation`declare @method (annotates) <*pr143924.aj[BankAccount~debit~QString;~J
+(targets=1) <*pr143924.aj[BankAccount~debit~QString;~J (annotated by) <*pr143924.aj}DeclareAnnotation`declare @method
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=1
@@ -21,4 +22,5 @@ class=1
 annotation=1
 RelationshipMapSize=2
 FileMapSize=1
+package=1
 java source file=2
diff --git a/tests/model/expected/pr145963_1.txt b/tests/model/expected/pr145963_1.txt
index 5e2067ec2..a0bfee878 100644
--- a/tests/model/expected/pr145963_1.txt
+++ b/tests/model/expected/pr145963_1.txt
@@ -7,28 +7,30 @@
         declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\SourceAspect.aj:5:
         p()  [pointcut] TEST_SANDBOX\SourceAspect.aj:7:
         before(): p..  [advice] TEST_SANDBOX\SourceAspect.aj:9:
-    BinaryAspect.class (binary)  [class] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:1:
-      import declarations  [import reference] 
-      BinaryAspect  [aspect] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:1:
-        p()  [pointcut] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:7:
-        before(): p..  [advice] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:9:
-        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:5:
   pack  [package] 
     C.java  [java source file] TEST_SANDBOX\C.java:1:
       import declarations  [import reference] 
       C  [class] TEST_SANDBOX\C.java:3:
         method1()  [method] TEST_SANDBOX\C.java:5:
           field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6:
+  binaries  [source folder] 
+    pkg  [package] 
+      BinaryAspect.class  [file] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:1:
+        import declarations  [import reference] 
+        BinaryAspect  [aspect] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:1:
+          p()  [pointcut] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:7:
+          before(): p..  [advice] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:9:
+          declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:5:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) <pkg[BinaryAspect.class (binary)}BinaryAspect&before (advises) <pack{C.java[C~method1
 (targets=2) <pack{C.java[C~method1 (advised by) <pkg*SourceAspect.aj}SourceAspect&before
-(targets=2) <pack{C.java[C~method1 (advised by) <pkg[BinaryAspect.class (binary)}BinaryAspect&before
+(targets=2) <pack{C.java[C~method1 (advised by) /binaries<pkg(BinaryAspect.class}BinaryAspect&before
 (targets=1) <pkg*SourceAspect.aj}SourceAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
-(targets=1) <pkg[BinaryAspect.class (binary)}BinaryAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
 (targets=1) <pkg*SourceAspect.aj}SourceAspect&before (advises) <pack{C.java[C~method1
 (targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) <pkg*SourceAspect.aj}SourceAspect`declare warning
-(targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) <pkg[BinaryAspect.class (binary)}BinaryAspect`declare warning
+(targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) /binaries<pkg(BinaryAspect.class}BinaryAspect`declare warning
+(targets=1) /binaries<pkg(BinaryAspect.class}BinaryAspect&before (advises) <pack{C.java[C~method1
+(targets=1) /binaries<pkg(BinaryAspect.class}BinaryAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=1
@@ -36,10 +38,12 @@ import reference=3
 aspect=2
 code=1
 declare warning=2
-class=2
+file=1
+class=1
 advice=2
 pointcut=2
 RelationshipMapSize=6
+source folder=1
 FileMapSize=2
-package=2
+package=3
 java source file=3
diff --git a/tests/model/expected/pr145963_2.txt b/tests/model/expected/pr145963_2.txt
index 7c996f7c5..ea19d2623 100644
--- a/tests/model/expected/pr145963_2.txt
+++ b/tests/model/expected/pr145963_2.txt
@@ -7,28 +7,30 @@
         declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\SourceAspect.aj:5:
         p()  [pointcut] TEST_SANDBOX\SourceAspect.aj:7:
         before(): p..  [advice] TEST_SANDBOX\SourceAspect.aj:9:
-    BinaryAspect.class (binary)  [class] TEST_SANDBOX!pkg\BinaryAspect.class:1:
-      import declarations  [import reference] 
-      BinaryAspect  [aspect] TEST_SANDBOX!pkg\BinaryAspect.class:1:
-        p()  [pointcut] TEST_SANDBOX!pkg\BinaryAspect.class:7:
-        before(): p..  [advice] TEST_SANDBOX!pkg\BinaryAspect.class:9:
-        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX!pkg\BinaryAspect.class:5:
   pack  [package] 
     C.java  [java source file] TEST_SANDBOX\C.java:1:
       import declarations  [import reference] 
       C  [class] TEST_SANDBOX\C.java:3:
         method1()  [method] TEST_SANDBOX\C.java:5:
           field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6:
+  binaries  [source folder] 
+    pkg  [package] 
+      BinaryAspect.class  [file] TEST_SANDBOX!pkg\BinaryAspect.class:1:
+        import declarations  [import reference] 
+        BinaryAspect  [aspect] TEST_SANDBOX!pkg\BinaryAspect.class:1:
+          p()  [pointcut] TEST_SANDBOX!pkg\BinaryAspect.class:7:
+          before(): p..  [advice] TEST_SANDBOX!pkg\BinaryAspect.class:9:
+          declare warning: "There should be n.."  [declare warning] TEST_SANDBOX!pkg\BinaryAspect.class:5:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) <pkg[BinaryAspect.class (binary)}BinaryAspect&before (advises) <pack{C.java[C~method1
 (targets=2) <pack{C.java[C~method1 (advised by) <pkg*SourceAspect.aj}SourceAspect&before
-(targets=2) <pack{C.java[C~method1 (advised by) <pkg[BinaryAspect.class (binary)}BinaryAspect&before
+(targets=2) <pack{C.java[C~method1 (advised by) /binaries<pkg(BinaryAspect.class}BinaryAspect&before
 (targets=1) <pkg*SourceAspect.aj}SourceAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
-(targets=1) <pkg[BinaryAspect.class (binary)}BinaryAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
 (targets=1) <pkg*SourceAspect.aj}SourceAspect&before (advises) <pack{C.java[C~method1
 (targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) <pkg*SourceAspect.aj}SourceAspect`declare warning
-(targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) <pkg[BinaryAspect.class (binary)}BinaryAspect`declare warning
+(targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) /binaries<pkg(BinaryAspect.class}BinaryAspect`declare warning
+(targets=1) /binaries<pkg(BinaryAspect.class}BinaryAspect&before (advises) <pack{C.java[C~method1
+(targets=1) /binaries<pkg(BinaryAspect.class}BinaryAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=1
@@ -36,10 +38,12 @@ import reference=3
 aspect=2
 code=1
 declare warning=2
-class=2
+file=1
+class=1
 advice=2
 pointcut=2
 RelationshipMapSize=6
+source folder=1
 FileMapSize=2
-package=2
+package=3
 java source file=3
diff --git a/tests/model/expected/pr145963_3.txt b/tests/model/expected/pr145963_3.txt
index e3cff1bbf..f7dc1dd8f 100644
--- a/tests/model/expected/pr145963_3.txt
+++ b/tests/model/expected/pr145963_3.txt
@@ -1,18 +1,21 @@
 === MODEL STATUS REPORT ========= After a batch build
 <root>  [java source file] 
-  C.java  [java source file] TEST_SANDBOX\C.java:1:
-    import declarations  [import reference] 
-    C  [class] TEST_SANDBOX\C.java:3:
-      method1()  [method] TEST_SANDBOX\C.java:5:
-        field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6:
-  AspectInDefaultPackage.class (binary)  [class] TEST_SANDBOX\simple.jar!AspectInDefaultPackage.class:1:
-    import declarations  [import reference] 
-    AspectInDefaultPackage  [aspect] TEST_SANDBOX\simple.jar!AspectInDefaultPackage.class:1:
-      declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!AspectInDefaultPackage.class:4:
+    [package] 
+    C.java  [java source file] TEST_SANDBOX\C.java:1:
+      import declarations  [import reference] 
+      C  [class] TEST_SANDBOX\C.java:3:
+        method1()  [method] TEST_SANDBOX\C.java:5:
+          field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6:
+  binaries  [source folder] 
+      [package] 
+      AspectInDefaultPackage.class  [file] TEST_SANDBOX\simple.jar!\AspectInDefaultPackage.class:1:
+        import declarations  [import reference] 
+        AspectInDefaultPackage  [aspect] TEST_SANDBOX\simple.jar!\AspectInDefaultPackage.class:1:
+          declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!\AspectInDefaultPackage.class:4:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) {C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) [AspectInDefaultPackage.class (binary)}AspectInDefaultPackage`declare warning
-(targets=1) [AspectInDefaultPackage.class (binary)}AspectInDefaultPackage`declare warning (matched by) {C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
+(targets=1) /binaries<(AspectInDefaultPackage.class}AspectInDefaultPackage`declare warning (matched by) <{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
+(targets=1) <{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) /binaries<(AspectInDefaultPackage.class}AspectInDefaultPackage`declare warning
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=1
@@ -20,7 +23,10 @@ import reference=2
 aspect=1
 code=1
 declare warning=1
-class=2
+file=1
+class=1
 RelationshipMapSize=2
+source folder=1
 FileMapSize=1
+package=2
 java source file=2
diff --git a/tests/model/expected/pr145963_4.txt b/tests/model/expected/pr145963_4.txt
index 04a5873e6..178bcecdd 100644
--- a/tests/model/expected/pr145963_4.txt
+++ b/tests/model/expected/pr145963_4.txt
@@ -6,14 +6,16 @@
       C  [class] TEST_SANDBOX\C.java:3:
         method1()  [method] TEST_SANDBOX\C.java:5:
           field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6:
-  A.class (binary)  [class] TEST_SANDBOX\simple.jar!A.class:1:
-    import declarations  [import reference] 
-    A  [aspect] TEST_SANDBOX\simple.jar!A.class:1:
-      declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!A.class:4:
+  binaries  [source folder] 
+      [package] 
+      A.class  [file] TEST_SANDBOX\simple.jar!\A.class:1:
+        import declarations  [import reference] 
+        A  [aspect] TEST_SANDBOX\simple.jar!\A.class:1:
+          declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!\A.class:4:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) [A.class (binary)}A`declare warning
-(targets=1) [A.class (binary)}A`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
+(targets=1) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) /binaries<(A.class}A`declare warning
+(targets=1) /binaries<(A.class}A`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=1
@@ -21,8 +23,10 @@ import reference=2
 aspect=1
 code=1
 declare warning=1
-class=2
+file=1
+class=1
 RelationshipMapSize=2
+source folder=1
 FileMapSize=1
-package=1
+package=2
 java source file=2
diff --git a/tests/model/expected/pr148027.txt b/tests/model/expected/pr148027.txt
index 644b0a690..b9995df89 100644
--- a/tests/model/expected/pr148027.txt
+++ b/tests/model/expected/pr148027.txt
@@ -15,14 +15,14 @@
         cMethod()  [method] TEST_SANDBOX\C.aj:7:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) <pkg*A.aj}A+pointcutInAspect (pointcut used by) <pkg*A.aj}A&before!2
-(targets=1) <pkg*A.aj}A&before!2 (uses pointcut) <pkg*A.aj}A+pointcutInAspect
-(targets=1) <pkg*A.aj}A&before!2 (advises) <pkg*A.aj}A~aMethod
 (targets=1) <pkg*C.aj[C~cMethod (advised by) <pkg*A.aj}A&before
-(targets=1) *C.aj (pointcut used by) <pkg*A.aj}A&before
+(targets=1) <pkg*A.aj}A+pointcutInAspect (pointcut used by) <pkg*A.aj}A&before!2
 (targets=1) <pkg*A.aj}A~aMethod (advised by) <pkg*A.aj}A&before!2
+(targets=1) *C.aj (pointcut used by) <pkg*A.aj}A&before
 (targets=1) <pkg*A.aj}A&before (uses pointcut) *C.aj
 (targets=1) <pkg*A.aj}A&before (advises) <pkg*C.aj[C~cMethod
+(targets=1) <pkg*A.aj}A&before!2 (uses pointcut) <pkg*A.aj}A+pointcutInAspect
+(targets=1) <pkg*A.aj}A&before!2 (advises) <pkg*A.aj}A~aMethod
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=2
diff --git a/tests/model/expected/pr160469_1.txt b/tests/model/expected/pr160469_1.txt
index 7a0d90850..67fc2d6b9 100644
--- a/tests/model/expected/pr160469_1.txt
+++ b/tests/model/expected/pr160469_1.txt
@@ -5,28 +5,31 @@
       import declarations  [import reference] 
       Simple  [class] TEST_SANDBOX\Simple.java:3:
         Simple()  [constructor] TEST_SANDBOX\Simple.java:5:
-  pkg  [package] 
-    AbstractBeanConfigurerAspect.class (binary)  [class] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
-      import declarations  [import reference] 
-      AbstractBeanConfigurerAspect  [aspect] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
-        beanCreation()  [pointcut] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
-        afterReturning(): beanCreation..  [advice] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:6:
-        before(): beanCreation..  [advice] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:11:
+  binaries  [source folder] 
+    pkg  [package] 
+      AbstractBeanConfigurerAspect.class  [file] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
+        import declarations  [import reference] 
+        AbstractBeanConfigurerAspect  [aspect] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
+          beanCreation()  [pointcut] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
+          afterReturning(): beanCreation..  [advice] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:6:
+          before(): beanCreation..  [advice] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:11:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) <pkg[AbstractBeanConfigurerAspect.class (binary)}AbstractBeanConfigurerAspect&afterReturning (advises) <test{Simple.java[Simple~Simple
-(targets=1) <pkg[AbstractBeanConfigurerAspect.class (binary)}AbstractBeanConfigurerAspect&before (advises) <test{Simple.java[Simple~Simple
-(targets=2) <test{Simple.java[Simple~Simple (advised by) <pkg[AbstractBeanConfigurerAspect.class (binary)}AbstractBeanConfigurerAspect&afterReturning
-(targets=2) <test{Simple.java[Simple~Simple (advised by) <pkg[AbstractBeanConfigurerAspect.class (binary)}AbstractBeanConfigurerAspect&before
+(targets=1) /binaries<pkg(AbstractBeanConfigurerAspect.class}AbstractBeanConfigurerAspect&before (advises) <test{Simple.java[Simple~Simple
+(targets=1) /binaries<pkg(AbstractBeanConfigurerAspect.class}AbstractBeanConfigurerAspect&afterReturning (advises) <test{Simple.java[Simple~Simple
+(targets=2) <test{Simple.java[Simple~Simple (advised by) /binaries<pkg(AbstractBeanConfigurerAspect.class}AbstractBeanConfigurerAspect&afterReturning
+(targets=2) <test{Simple.java[Simple~Simple (advised by) /binaries<pkg(AbstractBeanConfigurerAspect.class}AbstractBeanConfigurerAspect&before
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 import reference=2
 aspect=1
 constructor=1
-class=2
+file=1
+class=1
 advice=2
 pointcut=1
 RelationshipMapSize=3
+source folder=1
 FileMapSize=1
 package=2
 java source file=2
diff --git a/tests/model/expected/pr160469_2.txt b/tests/model/expected/pr160469_2.txt
index 9ea21547e..d32d6a1df 100644
--- a/tests/model/expected/pr160469_2.txt
+++ b/tests/model/expected/pr160469_2.txt
@@ -5,25 +5,28 @@
       import declarations  [import reference] 
       Simple  [class] TEST_SANDBOX\Simple.java:3:
         Simple()  [constructor] TEST_SANDBOX\Simple.java:5:
-  pkg  [package] 
-    AbstractBeanConfigurerAspect.class (binary)  [class] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
-      import declarations  [import reference] 
-      AbstractBeanConfigurerAspect  [aspect] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
-        beanCreation()  [pointcut] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
-        declare warning: "warning"  [declare warning] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:7:
+  binaries  [source folder] 
+    pkg  [package] 
+      AbstractBeanConfigurerAspect.class  [file] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
+        import declarations  [import reference] 
+        AbstractBeanConfigurerAspect  [aspect] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
+          beanCreation()  [pointcut] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
+          declare warning: "warning"  [declare warning] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:7:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) <pkg[AbstractBeanConfigurerAspect.class (binary)}AbstractBeanConfigurerAspect`declare warning (matched by) <test{Simple.java[Simple~Simple
-(targets=1) <test{Simple.java[Simple~Simple (matches declare) <pkg[AbstractBeanConfigurerAspect.class (binary)}AbstractBeanConfigurerAspect`declare warning
+(targets=1) /binaries<pkg(AbstractBeanConfigurerAspect.class}AbstractBeanConfigurerAspect`declare warning (matched by) <test{Simple.java[Simple~Simple
+(targets=1) <test{Simple.java[Simple~Simple (matches declare) /binaries<pkg(AbstractBeanConfigurerAspect.class}AbstractBeanConfigurerAspect`declare warning
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 import reference=2
 aspect=1
 declare warning=1
 constructor=1
-class=2
+file=1
+class=1
 pointcut=1
 RelationshipMapSize=2
+source folder=1
 FileMapSize=1
 package=2
 java source file=2
diff --git a/tests/model/expected/pr77269_2.txt b/tests/model/expected/pr77269_2.txt
index 87cc37b69..cd750034c 100644
--- a/tests/model/expected/pr77269_2.txt
+++ b/tests/model/expected/pr77269_2.txt
@@ -1,20 +1,21 @@
 === MODEL STATUS REPORT ========= After a batch build
 <root>  [java source file] 
-  pr77269b.aj  [java source file] TEST_SANDBOX\pr77269b.aj:1:
-    import declarations  [import reference] 
-    Test  [class] TEST_SANDBOX\pr77269b.aj:1:
-      testMethod()  [method] TEST_SANDBOX\pr77269b.aj:3:
-        new Runnable() {..}  [class] TEST_SANDBOX\pr77269b.aj:4:
-          run()  [method] TEST_SANDBOX\pr77269b.aj:5:
-        C  [class] TEST_SANDBOX\pr77269b.aj:8:
-          m()  [method] TEST_SANDBOX\pr77269b.aj:9:
-    A  [aspect] TEST_SANDBOX\pr77269b.aj:16:
-      p()  [pointcut] TEST_SANDBOX\pr77269b.aj:18:
-      before(): p..  [advice] TEST_SANDBOX\pr77269b.aj:20:
+    [package] 
+    pr77269b.aj  [java source file] TEST_SANDBOX\pr77269b.aj:1:
+      import declarations  [import reference] 
+      Test  [class] TEST_SANDBOX\pr77269b.aj:1:
+        testMethod()  [method] TEST_SANDBOX\pr77269b.aj:3:
+          new Runnable() {..}  [class] TEST_SANDBOX\pr77269b.aj:4:
+            run()  [method] TEST_SANDBOX\pr77269b.aj:5:
+          C  [class] TEST_SANDBOX\pr77269b.aj:8:
+            m()  [method] TEST_SANDBOX\pr77269b.aj:9:
+      A  [aspect] TEST_SANDBOX\pr77269b.aj:16:
+        p()  [pointcut] TEST_SANDBOX\pr77269b.aj:18:
+        before(): p..  [advice] TEST_SANDBOX\pr77269b.aj:20:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) *pr77269b.aj}A&before (advises) *pr77269b.aj[Test~testMethod[C~m
-(targets=1) *pr77269b.aj[Test~testMethod[C~m (advised by) *pr77269b.aj}A&before
+(targets=1) <*pr77269b.aj}A&before (advises) <*pr77269b.aj[Test~testMethod[C~m
+(targets=1) <*pr77269b.aj[Test~testMethod[C~m (advised by) <*pr77269b.aj}A&before
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=3
@@ -25,4 +26,5 @@ advice=1
 pointcut=1
 RelationshipMapSize=2
 FileMapSize=1
+package=1
 java source file=2