Refactored test data, now we have one package for each match type

testdata/java/gr/spinellis/basic/invoice/Customer.java

@@ -1,4 +1,4 @@
-package gr.spinellis.invoice;
+package gr.spinellis.basic.invoice;
 
 public class Customer {
     String name;

testdata/java/gr/spinellis/basic/invoice/Invoice.java

@@ -1,11 +1,11 @@
-package gr.spinellis.invoice;
+package gr.spinellis.basic.invoice;
 
 import java.util.List;
-import gr.spinellis.product.*;
+import gr.spinellis.basic.product.*;
 
 /**
- * @composed 1 - * gr.spinellis.invoice.InvoiceItem
- * @assoc * - 1 gr.spinellis.invoice.Customer
+ * @composed 1 - * InvoiceItem
+ * @assoc * - 1 Customer
  */
 public class Invoice {
     public double total;

testdata/java/gr/spinellis/basic/invoice/InvoiceItem.java

@@ -0,0 +1,12 @@
+package gr.spinellis.basic.invoice;
+
+import gr.spinellis.basic.product.*;
+
+/**
+ * @assoc * - 1 Product
+ */
+public class InvoiceItem {
+
+    public Product product;
+    public int quantity;
+}

testdata/java/gr/spinellis/basic/product/Category.java

@@ -1,4 +1,4 @@
-package gr.spinellis.product;
+package gr.spinellis.basic.product;
 import java.util.*;
 
 /**

testdata/java/gr/spinellis/basic/product/Product.java

@@ -1,7 +1,7 @@
-package gr.spinellis.product;
+package gr.spinellis.basic.product;
 
 /**
- * @assoc * - 1 gr.spinellis.product.Category
+ * @assoc * - 1 Category
  */
 public class Product {
 

testdata/java/gr/spinellis/basic/views/ViewAbstract.java

@@ -1,12 +1,12 @@
-package gr.spinellis.views;
+package gr.spinellis.basic.views;
 
 /**
  * @view
  * @opt hide
  *  
- * @match class gr.spinellis.product.* 
+ * @match class gr.spinellis.basic.product.* 
  * @opt !hide
- * @match class gr.spinellis.*
+ * @match class gr.spinellis.basic.*
  * @opt nodefillcolor LemonChiffon 
  */
 public abstract class ViewAbstract {

testdata/java/gr/spinellis/basic/views/ViewAll.java

@@ -0,0 +1,11 @@
+package gr.spinellis.basic.views;
+
+/**
+ * @view
+ * @opt hide 
+ * 
+ * @match class gr.spinellis.basic.*
+ * @opt !hide
+ */
+public class ViewAll {
+}

testdata/java/gr/spinellis/basic/views/ViewAllDetailed.java

@@ -0,0 +1,16 @@
+package gr.spinellis.basic.views;
+
+/**
+ * @view
+ * @opt hide 
+ * 
+ * @match class gr.spinellis.basic.*
+ * @opt !hide
+ * 
+ * @match class gr.spinellis.basic.*
+ * @opt attributes 
+ * @opt operations 
+ * @opt types
+ */
+public class ViewAllDetailed {
+}

testdata/java/gr/spinellis/basic/views/ViewAtt.java

@@ -1,10 +1,11 @@
-package gr.spinellis.views;
+package gr.spinellis.basic.views;
 
 /**
  * @view
- * @opt hide java.*
- * 
- * @match class gr.spinellis.*
+ * @opt hide
+ *
+ * @match class gr.spinellis.basic.*
+ * @opt !hide
  * @opt attributes 
  * @opt nodefontsize 16 
  * @opt nodefillcolor yellow

testdata/java/gr/spinellis/basic/views/ViewChildEmpty.java

@@ -1,4 +1,4 @@
-package gr.spinellis.views;
+package gr.spinellis.basic.views;
 
 /**
  * @view

testdata/java/gr/spinellis/basic/views/ViewChildOverride.java

@@ -1,12 +1,12 @@
-package gr.spinellis.views;
+package gr.spinellis.basic.views;
 
 /**
  * @view
  * 
  * @opt nodefillcolor LightGray
- * @match class gr.spinellis.product.Product
+ * @match class gr.spinellis.basic.product.Product
  * @opt attributes
- * @match class gr.spinellis.product.Category
+ * @match class gr.spinellis.basic.product.Category
  * @opt nodefillcolor brown
  */
 public class ViewChildOverride extends ViewAbstract {

testdata/java/gr/spinellis/basic/views/ViewColors.java

@@ -1,8 +1,11 @@
-package gr.spinellis.views;
+package gr.spinellis.basic.views;
 
 /**
  * @view
-
+ * @opt hide
+ *
+ * @match class (gr.spinellis.basic.*|java.*)
+ * @opt !hide
  * @match class .*
  * @opt nodefillcolor gray
  * @match class gr.spinellis.*

testdata/java/gr/spinellis/basic/views/ViewProduct.java

@@ -1,10 +1,10 @@
-package gr.spinellis.views;
+package gr.spinellis.basic.views;
 
 /**
  * @view
  * @opt hide
  * 
- * @match class gr.spinellis.product.* 
+ * @match class gr.spinellis.basic.product.* 
  * @opt !hide 
  * @opt attributes
  */

testdata/java/gr/spinellis/context/classes/A.java

@@ -0,0 +1,48 @@
+package gr.spinellis.context.classes;
+
+import javax.swing.JComponent;
+
+class ABaseClass {
+    
+}
+
+public class A extends ABaseClass {
+    B b;
+    JComponent component;
+    
+    public E getChild() {};
+}
+
+class B {
+    C c;
+}
+
+/**
+ * Linked indirectly, won't be rendered
+ */
+class C {
+    
+}
+
+class D {
+    A a;
+}
+
+class E {
+    
+}
+
+class ASubclass extends A {
+    
+}
+
+class AClient {
+    public void compute(A a);
+}
+
+/**
+ * This won't be rendererd since it's not linked to the A 
+ */
+class AloneInTheDark {
+    
+}

testdata/java/gr/spinellis/context/views/ViewContext.java

@@ -0,0 +1,17 @@
+package gr.spinellis.context.views;
+
+/**
+ * @view
+ * @opt hide
+ * @opt inferrel
+ * @opt inferdep
+ *  
+ * @match context gr.spinellis.context.classes.A
+ * @opt !hide
+ * @match class gr.spinellis.context.classes.A
+ * @opt nodefillcolor lemonchiffon
+ */
+public class ViewContext {
+}
+
+

testdata/java/gr/spinellis/iface/classes/Face.java

@@ -0,0 +1,17 @@
+package gr.spinellis.iface.classes;
+
+import java.io.Serializable;
+
+public interface Face {}
+
+interface SubFace extends Face, Serializable {}
+
+interface SubSubFace extends SubFace {}
+
+interface Independent extends Serializable {}
+
+class DirectImplementor implements Face {}
+
+class FarImplementor implements SubSubFace {}
+
+class NonCompliant {}

testdata/java/gr/spinellis/iface/views/ViewInterfaces.java

@@ -0,0 +1,16 @@
+package gr.spinellis.iface.views;
+
+/**
+ * @view
+ *
+ * @match class .*
+ * @opt hide
+ * @match interface gr.spinellis.iface.classes.Face
+ * @opt !hide
+ * @match class gr.spinellis.iface.classes.Face
+ * @opt nodefillcolor lemonchiffon
+ */
+public class ViewInterfaces {
+}
+
+

testdata/java/gr/spinellis/invoice/InvoiceItem.java

@@ -1,12 +0,0 @@
-package gr.spinellis.invoice;
-
-import gr.spinellis.product.*;
-
-/**
- * @assoc * - 1 gr.spinellis.product.Product
- */
-public class InvoiceItem {
-
-    public Product product;
-    public int quantity;
-}

testdata/java/gr/spinellis/subclass/classes/Super.java

@@ -0,0 +1,15 @@
+package gr.spinellis.subclass.classes;
+
+import java.io.Serializable;
+
+public class Super {}
+
+class SubOne extends Super {}
+
+class SubTwo extends Super {}
+
+class SubOneOne extends SubOne {}
+
+class SubOneTwo extends SubOne {}
+
+class Alone {}

testdata/java/gr/spinellis/subclass/views/ViewSubclasses.java

@@ -0,0 +1,16 @@
+package gr.spinellis.subclass.views;
+
+/**
+ * @view
+ *
+ * @match class .*
+ * @opt hide
+ * @match subclass gr.spinellis.subclass.classes.Super
+ * @opt !hide
+ * @match class gr.spinellis.subclass.classes.Super
+ * @opt nodefillcolor lemonchiffon
+ */
+public class ViewSubclasses {
+}
+
+

testdata/java/gr/spinellis/views/ViewAll.java

@@ -1,8 +0,0 @@
-package gr.spinellis.views;
-
-/**
- * @view
- * @opt hide java.*
- */
-public class ViewAll {
-}

testdata/java/gr/spinellis/views/ViewAllDetailed.java

@@ -1,13 +0,0 @@
-package gr.spinellis.views;
-
-/**
- * @view
- * @opt hide java.*
- * 
- * @match class gr.spinellis.*
- * @opt attributes 
- * @opt operations 
- * @opt types
- */
-public class ViewAllDetailed {
-}