From f881249ba19084b194c0db07fd36ab2a68af5228 Mon Sep 17 00:00:00 2001
From: Vlad Ureche <vlad.ureche@gmail.com>
Date: Thu, 12 Jul 2012 14:08:34 +0200
Subject: Scaladoc: Inherited templates in diagrams

Related to SI-3314, where we started showing inherited templates
that were normally not documented. This patch corrects a problem
in parentTypes that was preventing inherited templates from being
displayed in diagrams.

Also renamed:
PackageDiagram => ContentDiagram
ClassDiagram => InheritanceDiagram
which should have been done much earlier
---
 test/scaladoc/resources/SI-3314-diagrams.scala | 78 ++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 test/scaladoc/resources/SI-3314-diagrams.scala

(limited to 'test/scaladoc/resources')

diff --git a/test/scaladoc/resources/SI-3314-diagrams.scala b/test/scaladoc/resources/SI-3314-diagrams.scala
new file mode 100644
index 0000000000..b80a97b522
--- /dev/null
+++ b/test/scaladoc/resources/SI-3314-diagrams.scala
@@ -0,0 +1,78 @@
+package scala.test.scaladoc {
+
+  /** Check the interaction between SI-3314 and diagrams
+   *  - the three enumerations below should get valid content diagrams:
+   *                       Value
+   *              __________/|\__________
+   *             /   /   /   |   \   \   \
+   *            Mon Tue Wed Thu Fri Sat Sun
+   *
+   *  - each member should receive an inhertiance diagram:
+   *                       Value
+   *                         |
+   *                         |
+   *           {Mon,Tue,Wed,Thu,Fri,Sat,Sun}
+   */
+  package diagrams {
+
+    /** @contentDiagram
+     *  @inheritanceDiagram hideDiagram */
+    trait WeekDayTraitWithDiagram extends Enumeration {
+      type WeekDay = Value
+      /** @inheritanceDiagram */
+      object Mon extends WeekDay
+      /** @inheritanceDiagram */
+      object Tue extends WeekDay
+      /** @inheritanceDiagram */
+      object Wed extends WeekDay
+      /** @inheritanceDiagram */
+      object Thu extends WeekDay
+      /** @inheritanceDiagram */
+      object Fri extends WeekDay
+      /** @inheritanceDiagram */
+      object Sat extends WeekDay
+      /** @inheritanceDiagram */
+      object Sun extends WeekDay
+    }
+
+    /** @contentDiagram
+     *  @inheritanceDiagram hideDiagram */
+    class WeekDayClassWithDiagram extends Enumeration {
+      type WeekDay = Value
+      /** @inheritanceDiagram */
+      object Mon extends WeekDay
+      /** @inheritanceDiagram */
+      object Tue extends WeekDay
+      /** @inheritanceDiagram */
+      object Wed extends WeekDay
+      /** @inheritanceDiagram */
+      object Thu extends WeekDay
+      /** @inheritanceDiagram */
+      object Fri extends WeekDay
+      /** @inheritanceDiagram */
+      object Sat extends WeekDay
+      /** @inheritanceDiagram */
+      object Sun extends WeekDay
+    }
+
+    /** @contentDiagram
+     *  @inheritanceDiagram hideDiagram */
+    object WeekDayObjectWithDiagram extends Enumeration {
+      type WeekDay = Value
+      /** @inheritanceDiagram */
+      object Mon extends WeekDay
+      /** @inheritanceDiagram */
+      object Tue extends WeekDay
+      /** @inheritanceDiagram */
+      object Wed extends WeekDay
+      /** @inheritanceDiagram */
+      object Thu extends WeekDay
+      /** @inheritanceDiagram */
+      object Fri extends WeekDay
+      /** @inheritanceDiagram */
+      object Sat extends WeekDay
+      /** @inheritanceDiagram */
+      object Sun extends WeekDay
+    }
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3