ui: show method visibility

z7zmey · Oct 25, 2017 · 1bda221 · 1bda221
1 parent 70802a6
commit 1bda221
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 16 deletions.
diff --git a/handlers.go b/handlers.go
@@ -74,8 +74,9 @@ func GetTree(w http.ResponseWriter, r *http.Request) {
 }
 
 type umlMethod struct {
-	NsName string
-	Name   string
+	NsName     string
+	Name       string
+	Visibility string
 }
 
 type uml struct {
@@ -135,10 +136,10 @@ func GetUml(w http.ResponseWriter, r *http.Request) {
 
 	for _, astClass := range classes {
 		var cls = uml{
-			astClass.Name, 
-			string(astClass.Extends), 
-			[]umlMethod{}, 
-			[]string{}, 
+			astClass.Name,
+			string(astClass.Extends),
+			[]umlMethod{},
+			[]string{},
 			astClass.IsAbstract || astClass.IsInterface,
 		}
 
@@ -156,6 +157,7 @@ func GetUml(w http.ResponseWriter, r *http.Request) {
 			var umlMethod = umlMethod{
 				astMethod.ID,
 				astMethod.Name,
+				astMethod.Visibility,
 			}
 			cls.Methods = append(cls.Methods, umlMethod)
 		}

diff --git a/php-worker/AstVisitor/GraphVisitor.php b/php-worker/AstVisitor/GraphVisitor.php
@@ -88,6 +88,18 @@ public function enterNode(Node $node)
         }
 
         if ($node instanceof Node\Stmt\ClassMethod) {
+            $visibility = '';
+
+            if ($node->isPublic()) {
+                $visibility = '+';
+            }
+            if ($node->isProtected()) {
+                $visibility = '#';
+            }
+            if ($node->isPrivate()) {
+                $visibility = '-';
+            }
+
             $data = [
                 'methods' => [
                     [
@@ -98,6 +110,7 @@ public function enterNode(Node $node)
                         'class' => (string)$node->parent->namespacedName,
                         'types' => $node->returnTypes,
                         'isAbstract' => $node->isAbstract() || $node->parent instanceof Node\Stmt\Interface_,
+                        'visibility' => $visibility
                     ]
                 ]
             ];

diff --git a/schema.go b/schema.go
@@ -30,18 +30,17 @@ type AstFile struct {
 }
 
 type AstClass struct {
-	rdfType    struct{}   `quad:"@type > ast:class"`
-	Name       string     `json:"name" quad:"@id"`
-	StartLine  int        `json:"startLine" quad:"ast:start_line,optional"`
-	EndLine    int        `json:"endLine" quad:"ast:end_line,optional"`
-	File       quad.IRI   `json:"file" quad:"ast:file"`
-	Extends    quad.IRI   `json:"extends" quad:"ast:extends,optional"`
-	Implements []quad.IRI `json:"implements" quad:"ast:implements,optional"`
-	IsAbstract bool       `json:"isAbstract" quad:"ast:is_abstract,optional"`
+	rdfType     struct{}   `quad:"@type > ast:class"`
+	Name        string     `json:"name" quad:"@id"`
+	StartLine   int        `json:"startLine" quad:"ast:start_line,optional"`
+	EndLine     int        `json:"endLine" quad:"ast:end_line,optional"`
+	File        quad.IRI   `json:"file" quad:"ast:file"`
+	Extends     quad.IRI   `json:"extends" quad:"ast:extends,optional"`
+	Implements  []quad.IRI `json:"implements" quad:"ast:implements,optional"`
+	IsAbstract  bool       `json:"isAbstract" quad:"ast:is_abstract,optional"`
 	IsInterface bool       `json:"isInterface" quad:"ast:is_interface,optional"`
 }
 
-
 type AstMethod struct {
 	rdfType         struct{}   `quad:"@type > ast:method"`
 	ID              string     `json:"id" quad:"@id"`
@@ -53,6 +52,7 @@ type AstMethod struct {
 	Calls           []quad.IRI `json:"calls" quad:"ast:calls,optional"`
 	IsAbstract      bool       `json:"isAbstract" quad:"ast:is_abstract,optional"`
 	Implementations []quad.IRI `json:"implementations" quad:"ast:method_implementation,optional"`
+	Visibility      string     `json:"visibility" quad:"ast:method_visibility,optional"`
 }
 
 type AstProperty struct {

diff --git a/ui/src/app/shapes.uml.ts b/ui/src/app/shapes.uml.ts
@@ -34,7 +34,7 @@ export const uml = function (parent, bbox, node) {
       .append("text")
       .attr('data-method', '')
       .text(function (d) {
-        return d.Name
+        return d.Visibility + ' ' + d.Name
       })
       .style("cursor", "pointer");