summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/doc/model/Entity.scala
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2010-07-18 15:59:14 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2010-07-18 15:59:14 +0000
commit289e6a43d40b5b47ecd4ae55b59389ad27e5508a (patch)
tree0706b98b1d9bed213711876808e15d3bd7e7b744 /src/compiler/scala/tools/nsc/doc/model/Entity.scala
parentbdbaba4cf02f53492fef9c8e8c72b85ba18d323b (diff)
downloadscala-289e6a43d40b5b47ecd4ae55b59389ad27e5508a.tar.gz
scala-289e6a43d40b5b47ecd4ae55b59389ad27e5508a.tar.bz2
scala-289e6a43d40b5b47ecd4ae55b59389ad27e5508a.zip
[scaladoc] Print "Inherited from" headings usin...
[scaladoc] Print "Inherited from" headings using type instances ("SeqLike[A, List[A]]") instead of template names ("SeqLike"). Review by malayeri.
Diffstat (limited to 'src/compiler/scala/tools/nsc/doc/model/Entity.scala')
-rw-r--r--src/compiler/scala/tools/nsc/doc/model/Entity.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/model/Entity.scala b/src/compiler/scala/tools/nsc/doc/model/Entity.scala
index 8c47fd7fbb..7d4fbbfbfb 100644
--- a/src/compiler/scala/tools/nsc/doc/model/Entity.scala
+++ b/src/compiler/scala/tools/nsc/doc/model/Entity.scala
@@ -71,8 +71,8 @@ trait DocTemplateEntity extends TemplateEntity with MemberEntity {
def inSource: Option[(io.AbstractFile, Int)]
def sourceUrl: Option[java.net.URL]
def parentType: Option[TypeEntity]
- def parentTemplates: List[TemplateEntity]
- def linearization: List[TemplateEntity]
+ def linearization: List[(TemplateEntity, TypeEntity)]
+ def linearizationTemplates: List[TemplateEntity]
def linearizationTypes: List[TypeEntity]
def subClasses: List[DocTemplateEntity]
def members: List[MemberEntity]