From 92796201dff87cc8ae0b16d06f6892d8af69ccef Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 17 Jan 2017 10:23:09 +0100 Subject: Hide private & protected members by default --- .../src/dotty/tools/dottydoc/model/entities.scala | 3 ++ doc-tool/src/dotty/tools/dottydoc/model/java.scala | 34 +++++++++++++++------- 2 files changed, 26 insertions(+), 11 deletions(-) (limited to 'doc-tool/src') diff --git a/doc-tool/src/dotty/tools/dottydoc/model/entities.scala b/doc-tool/src/dotty/tools/dottydoc/model/entities.scala index 295b6568a..e9d388c3b 100644 --- a/doc-tool/src/dotty/tools/dottydoc/model/entities.scala +++ b/doc-tool/src/dotty/tools/dottydoc/model/entities.scala @@ -53,6 +53,9 @@ trait Modifiers { val isPrivate: Boolean = modifiers.contains("private") + + val isProtected: Boolean = + modifiers.contains("protected") } trait TypeParams { diff --git a/doc-tool/src/dotty/tools/dottydoc/model/java.scala b/doc-tool/src/dotty/tools/dottydoc/model/java.scala index c46414061..331699957 100644 --- a/doc-tool/src/dotty/tools/dottydoc/model/java.scala +++ b/doc-tool/src/dotty/tools/dottydoc/model/java.scala @@ -57,15 +57,17 @@ object java { implicit class JavaCaseClass(val ent: CaseClass) extends AnyVal { def asJava(extras: Map[String, _] = Map.empty): JMap[String, _] = (Map( - "kind" -> ent.kind, + "kind" -> ent.kind, "annotations" -> ent.annotations.asJava, - "name" -> ent.name, - "members" -> ent.members.map(_.asJava()).asJava, - "modifiers" -> ent.modifiers.asJava, - "path" -> ent.path.asJava, + "name" -> ent.name, + "members" -> ent.members.map(_.asJava()).asJava, + "modifiers" -> ent.modifiers.asJava, + "path" -> ent.path.asJava, "typeParams" -> ent.typeParams.asJava, "superTypes" -> ent.superTypes.map(_.asJava).asJava, - "comment" -> ent.comment.map(_.asJava).asJava + "comment" -> ent.comment.map(_.asJava).asJava, + "isPrivate" -> ent.isPrivate, + "isProtected" -> ent.isProtected ) ++ extras).asJava } @@ -79,7 +81,9 @@ object java { "path" -> ent.path.asJava, "typeParams" -> ent.typeParams.asJava, "superTypes" -> ent.superTypes.map(_.asJava).asJava, - "comment" -> ent.comment.map(_.asJava).asJava + "comment" -> ent.comment.map(_.asJava).asJava, + "isPrivate" -> ent.isPrivate, + "isProtected" -> ent.isProtected ) ++ extras).asJava } @@ -93,7 +97,9 @@ object java { "path" -> ent.path.asJava, "typeParams" -> ent.typeParams.asJava, "superTypes" -> ent.superTypes.map(_.asJava).asJava, - "comment" -> ent.comment.map(_.asJava).asJava + "comment" -> ent.comment.map(_.asJava).asJava, + "isPrivate" -> ent.isPrivate, + "isProtected" -> ent.isProtected ) ++ extras).asJava } @@ -106,7 +112,9 @@ object java { "modifiers" -> ent.modifiers.asJava, "path" -> ent.path.asJava, "superTypes" -> ent.superTypes.map(_.asJava).asJava, - "comment" -> ent.comment.map(_.asJava).asJava + "comment" -> ent.comment.map(_.asJava).asJava, + "isPrivate" -> ent.isPrivate, + "isProtected" -> ent.isProtected ) ++ extras).asJava } @@ -121,7 +129,9 @@ object java { "typeParams" -> ent.typeParams.asJava, "paramLists" -> ent.paramLists.map(_.asJava).asJava, "comment" -> ent.comment.map(_.asJava).asJava, - "implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).asJava + "implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).asJava, + "isPrivate" -> ent.isPrivate, + "isProtected" -> ent.isProtected ).asJava } @@ -134,7 +144,9 @@ object java { "path" -> ent.path.asJava, "returnValue" -> ent.returnValue.asJava, "comment" -> ent.comment.map(_.asJava).asJava, - "implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).asJava + "implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).asJava, + "isPrivate" -> ent.isPrivate, + "isProtected" -> ent.isProtected ).asJava } -- cgit v1.2.3