neo_doxygen: Unlink `name` and `full_name`.
authorJean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Wed, 17 Dec 2014 16:53:18 +0000 (11:53 -0500)
committerJean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>
Wed, 17 Dec 2014 16:53:18 +0000 (11:53 -0500)
Also, remove `full_name` from the graph.

Signed-off-by: Jean-Christophe Beaupré <jcbrinfo@users.noreply.github.com>

19 files changed:
contrib/neo_doxygen/src/model/class_compound.nit
contrib/neo_doxygen/src/model/graph.nit
contrib/neo_doxygen/src/model/inner_class.nit
contrib/neo_doxygen/src/model/member.nit
contrib/neo_doxygen/src/model/module_compound.nit
contrib/neo_doxygen/src/model/namespace_members.nit
contrib/neo_doxygen/src/tests/neo_doxygen_file_compound.nit
contrib/neo_doxygen/src/tests/neo_doxygen_namespace_members.nit
tests/sav/neo_doxygen_dump_args1.res
tests/sav/neo_doxygen_dump_args2.res
tests/sav/neo_doxygen_dump_args3.res
tests/sav/neo_doxygen_dump_args4.res
tests/sav/neo_doxygen_dump_args5.res
tests/sav/neo_doxygen_dump_args6.res
tests/sav/neo_doxygen_dump_args7.res
tests/sav/neo_doxygen_dump_args8.res
tests/sav/neo_doxygen_file_compound.res
tests/sav/neo_doxygen_graph_empty_project.res
tests/sav/neo_doxygen_namespace_members.res

index 6727cb3..aca58cb 100644 (file)
@@ -50,18 +50,6 @@ class ClassCompound
                class_def.name = name
        end
 
-       redef fun full_name=(full_name: String) do
-               super
-               class_type.full_name = full_name
-               class_def.full_name = full_name
-       end
-
-       redef fun parent_name=(parent_name: String) do
-               super
-               class_type.parent_name = parent_name
-               class_def.parent_name = parent_name
-       end
-
        redef fun location=(location: nullable Location) do
                super
                class_def.location = location
@@ -119,10 +107,12 @@ class ClassDef
        #
        # Includes inner classes.
        #
-       # To ensure that the `full_name` of each member is correctly set,
-       # `declare_member` or `declare_class` should be used to add each member.
+       # Filled by `declare_member` and `declare_class`.
        #
        # Note: `declare_class` is defined by the `inner_class` module.
+       #
+       # SEE: `declare_member`
+       # SEE: `declare_class`
        var members: SimpleCollection[MemberOrInner] = new Array[MemberOrInner]
 
        init do
@@ -149,28 +139,9 @@ class ClassDef
 
        # Append the specified member.
        fun declare_member(member: Member) do
-               var full_name = self["full_name"]
-
-               if full_name != null then
-                       member.parent_name = full_name.to_s
-               end
                members.add(member)
        end
 
-       redef fun full_name=(full_name: String) do
-               super
-               for m in members do
-                       m.parent_name = full_name
-               end
-       end
-
-       redef fun parent_name=(parent_name: String) do
-               super
-               for m in members do
-                       m.parent_name = full_name
-               end
-       end
-
        redef fun put_edges do
                super
                graph.add_edge(self, "BOUNDTYPE", class_compound.class_type)
index 6d127cd..7c8d2a3 100644 (file)
@@ -128,6 +128,12 @@ abstract class Entity
        # Is empty for entities without an ID.
        var model_id: String = "" is writable
 
+       # The full (qualified) name, as presented by the original model.
+       #
+       # Fully independant of `name`. By default, equals to `""` for the root
+       # namespace.
+       var full_name: nullable String = null is writable
+
        # Associated documentation.
        var doc = new JsonArray is writable
 
@@ -137,8 +143,6 @@ abstract class Entity
        end
 
        # The short (unqualified) name.
-       #
-       # May be also set by `full_name=`.
        fun name=(name: String) do
                self["name"] = name
        end
@@ -156,40 +160,10 @@ abstract class Entity
        end
 
        # The namespace separator of Nit/C++.
-       fun ns_separator: String do return "::"
-
-       # The name separator used when calling `full_name=`.
-       fun name_separator: String do return ns_separator
-
-       # The full (qualified) name.
        #
-       # Also set `name` using `name_separator`.
-       fun full_name=(full_name: String) do
-               var m = full_name.search_last(name_separator)
-
-               self["full_name"] = full_name
-               if m == null then
-                       name = full_name
-               else
-                       name = full_name.substring_from(m.after)
-               end
-       end
-
-       # The full (qualified) name.
-       fun full_name: String do
-               var full_name = self["full_name"]
-               assert full_name isa String
-               return full_name
-       end
-
-       # Set the full name using the current name and the specified parent name.
-       fun parent_name=(parent_name: String) do
-               if parent_name.is_empty then
-                       self["full_name"] = name
-               else
-                       self["full_name"] = parent_name + name_separator + name
-               end
-       end
+       # Used to join two or more names when we need to work around some
+       # limitations of the Nit model.
+       fun ns_separator: String do return "::"
 
        # Set the location of the entity in the source code.
        fun location=(location: nullable Location) do
@@ -321,13 +295,16 @@ class Namespace
                inner_namespaces.add new NamespaceRef(id, full_name)
        end
 
-       redef fun declare_class(id: String, full_name: String, prot: String) do
+       redef fun declare_class(id, name, prot) do
+               assert not id.is_empty else
+                       sys.stderr.write "Inner class declarations without ID are not yet supported.\n"
+               end
                graph.class_to_ns[id] = self
        end
 
        redef fun put_in_graph do
                super
-               var full_name = self["full_name"]
+               var full_name = self.full_name
                if full_name isa String then graph.namespaces[full_name] = self
        end
 
@@ -380,7 +357,7 @@ class RootNamespace
 
        init do
                super
-               self["full_name"] = ""
-               self["name"] = graph.project_name
+               full_name = ""
+               name = graph.project_name
        end
 end
index c6e49fc..9476739 100644 (file)
@@ -93,9 +93,8 @@ redef class ClassDef
        # All `InnerClass` entities registred here are automatically added to the
        # graph with the `ClassDef`.
        #
-       # To ensure that the `full_name` of each `InnerClass` entity is correctly
-       # set and that each inner class will be correctly linked, `declare_class`
-       # should be used to add each inner class.
+       # To ensure that each inner class will be correctly linked,
+       # `declare_class` should be used to add each inner class.
        var inner_classes: SimpleCollection[InnerClass] = new Array[InnerClass]
 
        # Declare an inner class.
index f6d9317..05b82cb 100644 (file)
@@ -44,13 +44,10 @@ abstract class MemberOrInner
                self["is_intro"] = is_intro
                if is_intro then
                        var visibility = self["visibility"]
-                       var full_name = self["full_name"]
                        var name = self["name"]
 
                        introducer = create_introducer
-                       if full_name isa String then
-                               introducer.full_name = full_name
-                       else if name isa String then
+                       if name isa String then
                                introducer.name = name
                        end
                        if visibility isa String then
@@ -92,20 +89,6 @@ abstract class MemberOrInner
                end
        end
 
-       redef fun full_name=(full_name: String) do
-               super
-               if introducer != null then
-                       introducer.as(not null).full_name = full_name
-               end
-       end
-
-       redef fun parent_name=(parent_name: String) do
-               super
-               if introducer != null then
-                       introducer.as(not null).parent_name = parent_name
-               end
-       end
-
        # Create an instance of `MemberIntroducer` that will be linked to `self`.
        protected fun create_introducer: INTRODUCER_TYPE is abstract
 
index 301fc23..6a4d6e6 100644 (file)
@@ -46,13 +46,8 @@ class FileCompound
                super
        end
 
-       redef fun name_separator: String do return "/"
-
        redef fun location=(location: nullable Location) do
                super
-               if location != null and location.path != null then
-                       full_name = location.path.as(not null)
-               end
                for m in inner_namespaces do m.location = location
        end
 
@@ -81,7 +76,7 @@ class FileCompound
                inner_namespaces.add m
        end
 
-       redef fun declare_class(id, full_name, prot) do
+       redef fun declare_class(id, name, prot) do
                assert not id.is_empty else
                        sys.stderr.write "Inner class declarations without ID are not yet supported.\n"
                end
@@ -138,14 +133,11 @@ private class Module
                update_name
        end
 
-       # Update the `full_name` and the `name`.
+       # Update the `name`.
        #
        # Update the short name of the module to the `basename` of the file that
        # declares it.
-       fun update_name do
-               name = file_compound.basename
-               parent_name = namespace.full_name
-       end
+       fun update_name do name = file_compound.basename
 
        redef fun put_in_graph do
                super
index dba1a43..ce73ee3 100644 (file)
@@ -37,18 +37,6 @@ redef class Namespace
                self_class.as(not null).declare_member(member)
        end
 
-       redef fun full_name=(full_name) do
-               super
-               var self_class = self.self_class
-               if self_class isa SelfClass then self_class.update_name
-       end
-
-       redef fun parent_name=(parent_name) do
-               super
-               var self_class = self.self_class
-               if self_class isa SelfClass then self_class.update_name
-       end
-
        redef fun put_in_graph do
                super
                var self_class = self.self_class
@@ -76,11 +64,5 @@ class SelfClass
        init do
                super
                name = "(self)"
-               update_name
        end
-
-       # Update the `full_name`.
-       #
-       # Update the parent name to the `full_name` of the namespace.
-       private fun update_name do parent_name = namespace.full_name
 end
index f8af04f..73adc61 100644 (file)
@@ -28,7 +28,7 @@ var buffer = new RopeBuffer
 var root_ns = graph.by_id[""].as(Namespace)
 var location: Location
 
-file.full_name = "Bar.java"
+file.name = "Bar.java"
 file.model_id = "_Bar_8java"
 location = new Location
 location.path = "a/b/Bar.java"
@@ -38,7 +38,7 @@ file.declare_class("classbaz", "Baz", "")
 file.declare_namespace("", "a::b")
 file.put_in_graph
 
-file_2.full_name = "Bar.java"
+file_2.name = "Bar.java"
 file_2.model_id = "_Bar_8java_2"
 location = new Location
 location.path = "Bar.java"
@@ -48,7 +48,7 @@ file_2.declare_namespace("", "d")
 file_2.put_in_graph
 
 bar_class.model_id = "classa_b_bar"
-bar_class.full_name = "a::b::Bar"
+bar_class.name = "Bar"
 location = new Location
 location.path = "a/b/Bar.class"
 location.line_start = 5
@@ -59,7 +59,7 @@ bar_class.location = location
 bar_class.put_in_graph
 
 baz_class.model_id = "classbaz"
-baz_class.full_name = "Baz"
+baz_class.name = "Baz"
 location = new Location
 location.path = "Baz.jar"
 baz_class.location = location
@@ -69,19 +69,23 @@ root_ns.declare_namespace("", "a")
 root_ns.declare_namespace("namespacec", "c")
 root_ns.declare_namespace("", "d")
 
+a_ns.name = "a"
 a_ns.full_name = "a"
 a_ns.declare_namespace("", "a::b")
 a_ns.put_in_graph
 
+b_ns.name = "b"
 b_ns.full_name = "a::b"
 b_ns.declare_class("classa_b_bar", "", "")
 b_ns.put_in_graph
 
 c_ns.model_id = "namespacec"
+c_ns.name = "c"
 c_ns.full_name = "c"
 c_ns.put_in_graph
 
 d_ns.model_id = "namespaced"
+d_ns.name = "d"
 d_ns.full_name = "d"
 d_ns.put_in_graph
 
index f23d35e..346723d 100644 (file)
@@ -17,11 +17,12 @@ import model
 
 var graph = new ProjectGraph("foo")
 var file = new FileCompound(graph)
+var root_ns = graph.by_id[""].as(Namespace)
 var ns = new Namespace(graph)
 var member = new Attribute(graph)
 var buffer = new RopeBuffer
 
-file.full_name = "foo.py"
+file.name = "foo.py"
 file.model_id = "_foo_8py"
 file.declare_namespace("namespacefoo", "foo")
 file.put_in_graph
@@ -30,10 +31,12 @@ member.name = "bar"
 member.put_in_graph
 
 ns.model_id = "namespacefoo"
-ns.full_name = "foo"
+ns.name = "foo"
 ns.declare_member(member)
 ns.put_in_graph
 
+root_ns.declare_namespace("namespacefoo", "")
+
 graph.add_global_modules
 graph.put_edges
 graph.debug buffer
index 743b9a2..fd65e88 100644 (file)
@@ -22,8 +22,8 @@ Edge
 35:empty project with default settings
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"empty project with default settings"}
+=properties=JsonObject(1):
+{"name":"empty project with default settings"}
 
 
 Edge
@@ -36,8 +36,8 @@ Edge
 35:empty project with default settings
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"empty project with default settings"}
+=properties=JsonObject(1):
+{"name":"empty project with default settings"}
 ----
 =to=Node
 =labels=Array(3):
index 724e242..08f87af 100644 (file)
@@ -22,8 +22,8 @@ Edge
 13:empty-project
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"empty-project"}
+=properties=JsonObject(1):
+{"name":"empty-project"}
 
 
 Edge
@@ -36,8 +36,8 @@ Edge
 13:empty-project
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"empty-project"}
+=properties=JsonObject(1):
+{"name":"empty-project"}
 ----
 =to=Node
 =labels=Array(3):
index 724e242..08f87af 100644 (file)
@@ -22,8 +22,8 @@ Edge
 13:empty-project
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"empty-project"}
+=properties=JsonObject(1):
+{"name":"empty-project"}
 
 
 Edge
@@ -36,8 +36,8 @@ Edge
 13:empty-project
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"empty-project"}
+=properties=JsonObject(1):
+{"name":"empty-project"}
 ----
 =to=Node
 =labels=Array(3):
index 76eb5d1..3a3c933 100644 (file)
@@ -22,8 +22,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 
 Edge
@@ -36,8 +36,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Node
 =labels=Array(3):
@@ -58,16 +58,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 
 Edge
@@ -80,16 +80,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Entity#12:namespaceorg
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
 
 
 Edge
@@ -102,16 +102,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A"}
 
 
 Edge
@@ -124,8 +124,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A"}
 ----
 =to=Entity#32:classorg_1_1example_1_1foo_1_1_a
 =labels=Array(3):
@@ -146,8 +146,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -168,16 +168,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B"}
 
 
 Edge
@@ -190,8 +190,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B"}
 ----
 =to=Entity#32:classorg_1_1example_1_1foo_1_1_b
 =labels=Array(3):
@@ -212,8 +212,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -234,16 +234,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C","full_name":"org::example::foo::C"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C"}
 
 
 Edge
@@ -256,8 +256,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C","full_name":"org::example::foo::C"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C"}
 ----
 =to=Entity#36:interfaceorg_1_1example_1_1foo_1_1_c
 =labels=Array(3):
@@ -278,8 +278,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C","full_name":"org::example::foo::C"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -300,16 +300,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass","full_name":"org::example::foo::EmptyClass"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass"}
 
 
 Edge
@@ -322,8 +322,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass","full_name":"org::example::foo::EmptyClass"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass"}
 ----
 =to=Entity#42:classorg_1_1example_1_1foo_1_1_empty_class
 =labels=Array(3):
@@ -344,8 +344,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass","full_name":"org::example::foo::EmptyClass"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -1804,8 +1804,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Node
 =labels=Array(3):
@@ -1826,16 +1826,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Entity#12:namespaceorg
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
 
 
 Edge
@@ -1848,16 +1848,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Entity#23:namespaceorg_1_1example
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 
 
 Edge
@@ -1870,8 +1870,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Node
 =labels=Array(3):
@@ -1892,16 +1892,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#23:namespaceorg_1_1example
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 
 
 Edge
@@ -1914,16 +1914,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Entity#30:namespaceorg_1_1example_1_1foo
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 
 
 Edge
@@ -1936,8 +1936,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Node
 =labels=Array(3):
index 6ea019e..95633f3 100644 (file)
@@ -22,8 +22,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 
 Edge
@@ -36,8 +36,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Node
 =labels=Array(3):
@@ -58,16 +58,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 
 Edge
@@ -80,16 +80,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Entity#12:namespaceorg
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
 
 
 Edge
@@ -102,16 +102,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A"}
 
 
 Edge
@@ -124,8 +124,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A"}
 ----
 =to=Entity#32:classorg_1_1example_1_1foo_1_1_a
 =labels=Array(3):
@@ -146,8 +146,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -168,16 +168,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B"}
 
 
 Edge
@@ -190,8 +190,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B"}
 ----
 =to=Entity#32:classorg_1_1example_1_1foo_1_1_b
 =labels=Array(3):
@@ -212,8 +212,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -234,16 +234,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C","full_name":"org::example::foo::C"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C"}
 
 
 Edge
@@ -256,8 +256,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C","full_name":"org::example::foo::C"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C"}
 ----
 =to=Entity#36:interfaceorg_1_1example_1_1foo_1_1_c
 =labels=Array(3):
@@ -278,8 +278,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C","full_name":"org::example::foo::C"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -300,16 +300,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass","full_name":"org::example::foo::EmptyClass"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass"}
 
 
 Edge
@@ -322,8 +322,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass","full_name":"org::example::foo::EmptyClass"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass"}
 ----
 =to=Entity#42:classorg_1_1example_1_1foo_1_1_empty_class
 =labels=Array(3):
@@ -344,8 +344,8 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass","full_name":"org::example::foo::EmptyClass"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -1804,8 +1804,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Node
 =labels=Array(3):
@@ -1826,16 +1826,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Entity#12:namespaceorg
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
 
 
 Edge
@@ -1848,16 +1848,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Entity#23:namespaceorg_1_1example
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 
 
 Edge
@@ -1870,8 +1870,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Node
 =labels=Array(3):
@@ -1892,16 +1892,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#23:namespaceorg_1_1example
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 
 
 Edge
@@ -1914,16 +1914,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Entity#30:namespaceorg_1_1example_1_1foo
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 
 
 Edge
@@ -1936,8 +1936,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Node
 =labels=Array(3):
index a8b64b8..5436c24 100644 (file)
@@ -22,8 +22,8 @@ Edge
 14:root-namespace
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"root-namespace"}
+=properties=JsonObject(1):
+{"name":"root-namespace"}
 
 
 Edge
@@ -36,8 +36,8 @@ Edge
 14:root-namespace
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"root-namespace"}
+=properties=JsonObject(1):
+{"name":"root-namespace"}
 ----
 =to=Node
 =labels=Array(3):
@@ -149,16 +149,16 @@ Edge
 14:root-namespace
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"root-namespace"}
+=properties=JsonObject(1):
+{"name":"root-namespace"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 14:root-namespace
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/Foo.java:1,1--1,1","name":"Foo","full_name":"Foo"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/Foo.java:1,1--1,1","name":"Foo"}
 
 
 Edge
@@ -171,8 +171,8 @@ Edge
 14:root-namespace
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/Foo.java:1,1--1,1","name":"Foo","full_name":"Foo"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/Foo.java:1,1--1,1","name":"Foo"}
 ----
 =to=Entity#9:class_foo
 =labels=Array(3):
@@ -193,8 +193,8 @@ Edge
 14:root-namespace
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/Foo.java:1,1--1,1","name":"Foo","full_name":"Foo"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/Foo.java:1,1--1,1","name":"Foo"}
 ----
 =to=Entity#0:
 =labels=Array(3):
index 8f38f44..ed4bd1d 100644 (file)
@@ -22,8 +22,8 @@ Edge
 11:inner-class
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"inner-class"}
+=properties=JsonObject(1):
+{"name":"inner-class"}
 
 
 Edge
@@ -36,8 +36,8 @@ Edge
 11:inner-class
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"inner-class"}
+=properties=JsonObject(1):
+{"name":"inner-class"}
 ----
 =to=Node
 =labels=Array(3):
@@ -379,16 +379,16 @@ Edge
 11:inner-class
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"inner-class"}
+=properties=JsonObject(1):
+{"name":"inner-class"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 11:inner-class
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/OuterClass.java:1,1--1,1","name":"OuterClass","full_name":"OuterClass"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/OuterClass.java:1,1--1,1","name":"OuterClass"}
 
 
 Edge
@@ -401,8 +401,8 @@ Edge
 11:inner-class
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/OuterClass.java:1,1--1,1","name":"OuterClass","full_name":"OuterClass"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/OuterClass.java:1,1--1,1","name":"OuterClass"}
 ----
 =to=Entity#17:class_outer_class
 =labels=Array(3):
@@ -423,8 +423,8 @@ Edge
 11:inner-class
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/OuterClass.java:1,1--1,1","name":"OuterClass","full_name":"OuterClass"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/OuterClass.java:1,1--1,1","name":"OuterClass"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -445,8 +445,8 @@ Edge
 11:inner-class
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/OuterClass.java:1,1--1,1","name":"OuterClass","full_name":"OuterClass"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/OuterClass.java:1,1--1,1","name":"OuterClass"}
 ----
 =to=Entity#33:class_outer_class_1_1_inner_class
 =labels=Array(3):
@@ -467,8 +467,8 @@ Edge
 11:inner-class
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/OuterClass.java:1,1--1,1","name":"OuterClass","full_name":"OuterClass"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/OuterClass.java:1,1--1,1","name":"OuterClass"}
 ----
 =to=Entity#0:
 =labels=Array(3):
index 91cda0b..b311247 100644 (file)
@@ -22,8 +22,8 @@ Edge
 10:python-def
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"python-def"}
+=properties=JsonObject(1):
+{"name":"python-def"}
 
 
 Edge
@@ -36,8 +36,8 @@ Edge
 10:python-def
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"python-def"}
+=properties=JsonObject(1):
+{"name":"python-def"}
 ----
 =to=Node
 =labels=Array(3):
@@ -49,6 +49,50 @@ Edge
 
 
 Edge
+=type=6:PARENT
+=properties=JsonObject(0):
+{}
+----
+=from=Entity#12:namespacefoo
+=labels=Array(3):
+10:python-def
+7:MEntity
+6:MGroup
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
+----
+=to=Entity#0:
+=labels=Array(3):
+10:python-def
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"python-def"}
+
+
+Edge
+=type=5:NESTS
+=properties=JsonObject(0):
+{}
+----
+=from=Entity#0:
+=labels=Array(3):
+10:python-def
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"python-def"}
+----
+=to=Entity#12:namespacefoo
+=labels=Array(3):
+10:python-def
+7:MEntity
+6:MGroup
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
+
+
+Edge
 =type=8:DECLARES
 =properties=JsonObject(0):
 {}
@@ -58,16 +102,16 @@ Edge
 10:python-def
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"foo","name":"foo","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 10:python-def
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","name":"foo","full_name":"foo::foo"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","name":"foo"}
 
 
 Edge
@@ -80,16 +124,16 @@ Edge
 10:python-def
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","name":"foo","full_name":"foo::foo"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","name":"foo"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 10:python-def
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","name":"(self)","full_name":"foo::(self)","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"(self)","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
 
 
 Edge
@@ -102,16 +146,16 @@ Edge
 10:python-def
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","name":"foo","full_name":"foo::foo"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","name":"foo"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 10:python-def
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","is_intro":true,"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","is_intro":true,"name":"(self)"}
 
 
 Edge
@@ -125,8 +169,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(9):
-{"location":"%SOURCE_DIRECTORY%\/foo.py:16,1--20,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","mdoc":["A bar function in the foo namespace.","By default, Doxygen recognizes anything in the docstrings as verbatim\ndetailed description."],"is_intro":true,"full_name":"foo::(self)::bar"}
+=properties=JsonObject(8):
+{"location":"%SOURCE_DIRECTORY%\/foo.py:16,1--20,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","mdoc":["A bar function in the foo namespace.","By default, Doxygen recognizes anything in the docstrings as verbatim\ndetailed description."],"is_intro":true}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -134,8 +178,8 @@ Edge
 7:MEntity
 9:MProperty
 7:MMethod
-=properties=JsonObject(4):
-{"visibility":"public","is_init":false,"name":"bar","full_name":"foo::(self)::bar"}
+=properties=JsonObject(3):
+{"visibility":"public","is_init":false,"name":"bar"}
 
 
 Edge
@@ -149,8 +193,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(9):
-{"location":"%SOURCE_DIRECTORY%\/foo.py:16,1--20,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","mdoc":["A bar function in the foo namespace.","By default, Doxygen recognizes anything in the docstrings as verbatim\ndetailed description."],"is_intro":true,"full_name":"foo::(self)::bar"}
+=properties=JsonObject(8):
+{"location":"%SOURCE_DIRECTORY%\/foo.py:16,1--20,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","mdoc":["A bar function in the foo namespace.","By default, Doxygen recognizes anything in the docstrings as verbatim\ndetailed description."],"is_intro":true}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -196,8 +240,8 @@ Edge
 10:python-def
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"foo","name":"foo","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
 ----
 =to=Node
 =labels=Array(3):
@@ -209,50 +253,6 @@ Edge
 
 
 Edge
-=type=6:PARENT
-=properties=JsonObject(0):
-{}
-----
-=from=Entity#12:namespacefoo
-=labels=Array(3):
-10:python-def
-7:MEntity
-6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"foo","name":"foo","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
-----
-=to=Entity#0:
-=labels=Array(3):
-10:python-def
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"python-def"}
-
-
-Edge
-=type=5:NESTS
-=properties=JsonObject(0):
-{}
-----
-=from=Entity#0:
-=labels=Array(3):
-10:python-def
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"python-def"}
-----
-=to=Entity#12:namespacefoo
-=labels=Array(3):
-10:python-def
-7:MEntity
-6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"foo","name":"foo","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
-
-
-Edge
 =type=9:CLASSTYPE
 =properties=JsonObject(0):
 {}
@@ -262,8 +262,8 @@ Edge
 10:python-def
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","name":"(self)","full_name":"foo::(self)","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"(self)","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -271,8 +271,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(1):
+{"name":"(self)"}
 
 
 Edge
@@ -286,16 +286,16 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(1):
+{"name":"(self)"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 10:python-def
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","name":"(self)","full_name":"foo::(self)","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"(self)","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
 
 
 Edge
@@ -308,8 +308,8 @@ Edge
 10:python-def
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","is_intro":true,"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","is_intro":true,"name":"(self)"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -317,8 +317,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(1):
+{"name":"(self)"}
 
 
 Edge
@@ -331,16 +331,16 @@ Edge
 10:python-def
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","is_intro":true,"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","is_intro":true,"name":"(self)"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 10:python-def
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","name":"(self)","full_name":"foo::(self)","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"(self)","location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1"}
 
 
 Edge
@@ -353,8 +353,8 @@ Edge
 10:python-def
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","is_intro":true,"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","is_intro":true,"name":"(self)"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -362,8 +362,8 @@ Edge
 7:MEntity
 9:MProperty
 7:MMethod
-=properties=JsonObject(4):
-{"visibility":"public","is_init":false,"name":"bar","full_name":"foo::(self)::bar"}
+=properties=JsonObject(3):
+{"visibility":"public","is_init":false,"name":"bar"}
 
 
 Edge
@@ -377,16 +377,16 @@ Edge
 7:MEntity
 9:MProperty
 7:MMethod
-=properties=JsonObject(4):
-{"visibility":"public","is_init":false,"name":"bar","full_name":"foo::(self)::bar"}
+=properties=JsonObject(3):
+{"visibility":"public","is_init":false,"name":"bar"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 10:python-def
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","is_intro":true,"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","is_intro":true,"name":"(self)"}
 
 
 Edge
@@ -399,8 +399,8 @@ Edge
 10:python-def
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","is_intro":true,"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/foo.py:1,1--1,1","is_intro":true,"name":"(self)"}
 ----
 =to=Entity#47:namespacefoo_1aab1e88a2212b202c20f3c9bd799a1ad4
 =labels=Array(4):
@@ -408,8 +408,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(9):
-{"location":"%SOURCE_DIRECTORY%\/foo.py:16,1--20,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","mdoc":["A bar function in the foo namespace.","By default, Doxygen recognizes anything in the docstrings as verbatim\ndetailed description."],"is_intro":true,"full_name":"foo::(self)::bar"}
+=properties=JsonObject(8):
+{"location":"%SOURCE_DIRECTORY%\/foo.py:16,1--20,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","mdoc":["A bar function in the foo namespace.","By default, Doxygen recognizes anything in the docstrings as verbatim\ndetailed description."],"is_intro":true}
 
 
 ---===DONE===---
index 805f702..9b16eb8 100644 (file)
@@ -18,8 +18,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=7:PROJECT
@@ -31,8 +31,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Node
 =labels=Array(3):
@@ -52,16 +52,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=5:NESTS
@@ -73,16 +73,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 
 Edge
 =type=6:PARENT
@@ -94,16 +94,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+=properties=JsonObject(1):
+{"name":"c"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=5:NESTS
@@ -115,16 +115,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Entity#10:namespacec
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+=properties=JsonObject(1):
+{"name":"c"}
 
 Edge
 =type=6:PARENT
@@ -136,16 +136,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
+=properties=JsonObject(1):
+{"name":"d"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=5:NESTS
@@ -157,16 +157,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Entity#10:namespaced
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
+=properties=JsonObject(1):
+{"name":"d"}
 
 Edge
 =type=8:DECLARES
@@ -178,16 +178,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(2):
+{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar"}
 
 Edge
 =type=10:INTRODUCES
@@ -199,16 +199,16 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(2):
+{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar"}
 ----
 =to=Entity#12:classa_b_bar
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
 
 Edge
 =type=7:DEFINES
@@ -220,16 +220,16 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(2):
+{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"a\/b\/Bar.class:5,1--100,10","is_intro":true,"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(3):
+{"location":"a\/b\/Bar.class:5,1--100,10","is_intro":true,"name":"Bar"}
 
 Edge
 =type=8:DECLARES
@@ -241,16 +241,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+=properties=JsonObject(1):
+{"name":"c"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"Bar.java:1,1--1,1","name":"Bar","full_name":"c::Bar"}
+=properties=JsonObject(2):
+{"location":"Bar.java:1,1--1,1","name":"Bar"}
 
 Edge
 =type=8:DECLARES
@@ -262,16 +262,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
+=properties=JsonObject(1):
+{"name":"d"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"Bar.java:1,1--1,1","name":"Bar","full_name":"d::Bar"}
+=properties=JsonObject(2):
+{"location":"Bar.java:1,1--1,1","name":"Bar"}
 
 Edge
 =type=9:CLASSTYPE
@@ -283,8 +283,8 @@ Edge
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -292,8 +292,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(1):
+{"name":"Bar"}
 
 Edge
 =type=5:CLASS
@@ -306,16 +306,16 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(1):
+{"name":"Bar"}
 ----
 =to=Entity#12:classa_b_bar
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
 
 Edge
 =type=9:BOUNDTYPE
@@ -327,8 +327,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"a\/b\/Bar.class:5,1--100,10","is_intro":true,"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(3):
+{"location":"a\/b\/Bar.class:5,1--100,10","is_intro":true,"name":"Bar"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -336,8 +336,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(1):
+{"name":"Bar"}
 
 Edge
 =type=6:MCLASS
@@ -349,16 +349,16 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"a\/b\/Bar.class:5,1--100,10","is_intro":true,"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(3):
+{"location":"a\/b\/Bar.class:5,1--100,10","is_intro":true,"name":"Bar"}
 ----
 =to=Entity#12:classa_b_bar
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
 
 Edge
 =type=9:CLASSTYPE
@@ -370,8 +370,8 @@ Edge
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz","location":"Baz.jar:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -379,8 +379,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(1):
+{"name":"Baz"}
 
 Edge
 =type=5:CLASS
@@ -393,16 +393,16 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(1):
+{"name":"Baz"}
 ----
 =to=Entity#8:classbaz
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz","location":"Baz.jar:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 
 Edge
 =type=9:BOUNDTYPE
@@ -414,8 +414,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(3):
+{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -423,8 +423,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(1):
+{"name":"Baz"}
 
 Edge
 =type=6:MCLASS
@@ -436,16 +436,16 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(3):
+{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz"}
 ----
 =to=Entity#8:classbaz
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz","location":"Baz.jar:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 
 Edge
 =type=7:PROJECT
@@ -457,8 +457,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 ----
 =to=Node
 =labels=Array(3):
@@ -478,16 +478,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 
 Edge
 =type=5:NESTS
@@ -499,16 +499,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 
 Edge
 =type=7:PROJECT
@@ -520,8 +520,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 ----
 =to=Node
 =labels=Array(3):
@@ -541,8 +541,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+=properties=JsonObject(1):
+{"name":"c"}
 ----
 =to=Node
 =labels=Array(3):
@@ -562,8 +562,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
+=properties=JsonObject(1):
+{"name":"d"}
 ----
 =to=Node
 =labels=Array(3):
@@ -594,8 +594,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=7:PROJECT
@@ -607,8 +607,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Node
 =labels=Array(3):
@@ -628,16 +628,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=5:NESTS
@@ -649,16 +649,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 
 Edge
 =type=6:PARENT
@@ -670,16 +670,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+=properties=JsonObject(1):
+{"name":"c"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=5:NESTS
@@ -691,16 +691,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Entity#10:namespacec
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+=properties=JsonObject(1):
+{"name":"c"}
 
 Edge
 =type=6:PARENT
@@ -712,16 +712,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
+=properties=JsonObject(1):
+{"name":"d"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=5:NESTS
@@ -733,16 +733,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Entity#10:namespaced
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
+=properties=JsonObject(1):
+{"name":"d"}
 
 Edge
 =type=8:DECLARES
@@ -754,16 +754,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(2):
+{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar"}
 
 Edge
 =type=10:INTRODUCES
@@ -775,16 +775,16 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(2):
+{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar"}
 ----
 =to=Entity#12:classa_b_bar
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
 
 Edge
 =type=7:DEFINES
@@ -796,16 +796,16 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(2):
+{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"a\/b\/Bar.class:5,1--100,10","is_intro":true,"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(3):
+{"location":"a\/b\/Bar.class:5,1--100,10","is_intro":true,"name":"Bar"}
 
 Edge
 =type=8:DECLARES
@@ -817,16 +817,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+=properties=JsonObject(1):
+{"name":"c"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"Bar.java:1,1--1,1","name":"Bar","full_name":"c::Bar"}
+=properties=JsonObject(2):
+{"location":"Bar.java:1,1--1,1","name":"Bar"}
 
 Edge
 =type=8:DECLARES
@@ -838,16 +838,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
+=properties=JsonObject(1):
+{"name":"d"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"Bar.java:1,1--1,1","name":"Bar","full_name":"d::Bar"}
+=properties=JsonObject(2):
+{"location":"Bar.java:1,1--1,1","name":"Bar"}
 
 Edge
 =type=9:CLASSTYPE
@@ -859,8 +859,8 @@ Edge
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -868,8 +868,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(1):
+{"name":"Bar"}
 
 Edge
 =type=5:CLASS
@@ -882,16 +882,16 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(1):
+{"name":"Bar"}
 ----
 =to=Entity#12:classa_b_bar
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
 
 Edge
 =type=9:BOUNDTYPE
@@ -903,8 +903,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"a\/b\/Bar.class:5,1--100,10","is_intro":true,"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(3):
+{"location":"a\/b\/Bar.class:5,1--100,10","is_intro":true,"name":"Bar"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -912,8 +912,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(1):
+{"name":"Bar"}
 
 Edge
 =type=6:MCLASS
@@ -925,16 +925,16 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"a\/b\/Bar.class:5,1--100,10","is_intro":true,"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(3):
+{"location":"a\/b\/Bar.class:5,1--100,10","is_intro":true,"name":"Bar"}
 ----
 =to=Entity#12:classa_b_bar
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Bar","location":"a\/b\/Bar.class:5,1--100,10"}
 
 Edge
 =type=9:CLASSTYPE
@@ -946,8 +946,8 @@ Edge
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz","location":"Baz.jar:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -955,8 +955,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(1):
+{"name":"Baz"}
 
 Edge
 =type=5:CLASS
@@ -969,16 +969,16 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(1):
+{"name":"Baz"}
 ----
 =to=Entity#8:classbaz
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz","location":"Baz.jar:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 
 Edge
 =type=9:BOUNDTYPE
@@ -990,8 +990,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(3):
+{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -999,8 +999,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(1):
+{"name":"Baz"}
 
 Edge
 =type=6:MCLASS
@@ -1012,16 +1012,16 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(3):
+{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz"}
 ----
 =to=Entity#8:classbaz
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz","location":"Baz.jar:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 
 Edge
 =type=7:PROJECT
@@ -1033,8 +1033,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 ----
 =to=Node
 =labels=Array(3):
@@ -1054,16 +1054,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 
 Edge
 =type=5:NESTS
@@ -1075,16 +1075,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 
 Edge
 =type=7:PROJECT
@@ -1096,8 +1096,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 ----
 =to=Node
 =labels=Array(3):
@@ -1117,8 +1117,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+=properties=JsonObject(1):
+{"name":"c"}
 ----
 =to=Node
 =labels=Array(3):
@@ -1138,8 +1138,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
+=properties=JsonObject(1):
+{"name":"d"}
 ----
 =to=Node
 =labels=Array(3):
@@ -1159,16 +1159,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar","full_name":"Bar"}
+=properties=JsonObject(2):
+{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar"}
 
 Edge
 =type=10:INTRODUCES
@@ -1180,16 +1180,16 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar","full_name":"Bar"}
+=properties=JsonObject(2):
+{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar"}
 ----
 =to=Entity#8:classbaz
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz","location":"Baz.jar:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 
 Edge
 =type=7:DEFINES
@@ -1201,15 +1201,15 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar","full_name":"Bar"}
+=properties=JsonObject(2):
+{"location":"a\/b\/Bar.java:1,1--1,1","name":"Bar"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(3):
+{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz"}
 
 
index d57edd6..21f7eef 100644 (file)
@@ -17,8 +17,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=7:PROJECT
@@ -30,8 +30,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Node
 =labels=Array(3):
index e38767b..c785591 100644 (file)
@@ -17,8 +17,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=7:PROJECT
@@ -30,8 +30,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Node
 =labels=Array(3):
@@ -42,7 +42,7 @@ Edge
 {"name":"foo"}
 
 Edge
-=type=8:DECLARES
+=type=6:PARENT
 =properties=JsonObject(0):
 {}
 ----
@@ -51,19 +51,19 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"foo","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
-7:MModule
-=properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"foo","full_name":"foo::foo"}
+6:MGroup
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
-=type=10:INTRODUCES
+=type=5:NESTS
 =properties=JsonObject(0):
 {}
 ----
@@ -71,124 +71,124 @@ Edge
 =labels=Array(3):
 3:foo
 7:MEntity
-7:MModule
-=properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"foo","full_name":"foo::foo"}
+6:MGroup
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
-=to=Entity#0:
+=to=Entity#12:namespacefoo
 =labels=Array(3):
 3:foo
 7:MEntity
-6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","name":"(self)","full_name":"foo::(self)","location":"\/dev\/null:1,1--1,1"}
+6:MGroup
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
-=type=7:DEFINES
+=type=8:DECLARES
 =properties=JsonObject(0):
 {}
 ----
-=from=Entity#0:
+=from=Entity#12:namespacefoo
 =labels=Array(3):
 3:foo
 7:MEntity
-7:MModule
-=properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"foo","full_name":"foo::foo"}
+6:MGroup
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
-9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"(self)","full_name":"foo::(self)"}
+7:MModule
+=properties=JsonObject(2):
+{"location":"\/dev\/null:1,1--1,1","name":"foo"}
 
 Edge
-=type=7:DEFINES
+=type=10:INTRODUCES
 =properties=JsonObject(0):
 {}
 ----
 =from=Entity#0:
-=labels=Array(4):
+=labels=Array(3):
 3:foo
 7:MEntity
-8:MPropDef
-13:MAttributeDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","name":"bar","is_intro":true,"full_name":"foo::(self)::bar"}
+7:MModule
+=properties=JsonObject(2):
+{"location":"\/dev\/null:1,1--1,1","name":"foo"}
 ----
 =to=Entity#0:
-=labels=Array(4):
+=labels=Array(3):
 3:foo
 7:MEntity
-9:MProperty
-10:MAttribute
-=properties=JsonObject(3):
-{"visibility":"public","name":"bar","full_name":"foo::(self)::bar"}
+6:MClass
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"(self)","location":"\/dev\/null:1,1--1,1"}
 
 Edge
-=type=7:PROJECT
+=type=7:DEFINES
 =properties=JsonObject(0):
 {}
 ----
-=from=Entity#12:namespacefoo
+=from=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
-6:MGroup
+7:MModule
 =properties=JsonObject(2):
-{"full_name":"foo","name":"foo"}
+{"location":"\/dev\/null:1,1--1,1","name":"foo"}
 ----
-=to=Node
+=to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
-8:MProject
-=properties=JsonObject(1):
-{"name":"foo"}
+9:MClassDef
+=properties=JsonObject(3):
+{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"(self)"}
 
 Edge
-=type=6:PARENT
+=type=7:DEFINES
 =properties=JsonObject(0):
 {}
 ----
-=from=Entity#12:namespacefoo
-=labels=Array(3):
+=from=Entity#0:
+=labels=Array(4):
 3:foo
 7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"foo","name":"foo"}
+8:MPropDef
+13:MAttributeDef
+=properties=JsonObject(3):
+{"location":"\/dev\/null:1,1--1,1","name":"bar","is_intro":true}
 ----
 =to=Entity#0:
-=labels=Array(3):
+=labels=Array(4):
 3:foo
 7:MEntity
-6:MGroup
+9:MProperty
+10:MAttribute
 =properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+{"visibility":"public","name":"bar"}
 
 Edge
-=type=5:NESTS
+=type=7:PROJECT
 =properties=JsonObject(0):
 {}
 ----
-=from=Entity#0:
+=from=Entity#12:namespacefoo
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
-=to=Entity#12:namespacefoo
+=to=Node
 =labels=Array(3):
 3:foo
 7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"foo","name":"foo"}
+8:MProject
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=9:CLASSTYPE
@@ -200,8 +200,8 @@ Edge
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","name":"(self)","full_name":"foo::(self)","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"(self)","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -209,8 +209,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(1):
+{"name":"(self)"}
 
 Edge
 =type=5:CLASS
@@ -223,16 +223,16 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(1):
+{"name":"(self)"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","name":"(self)","full_name":"foo::(self)","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"(self)","location":"\/dev\/null:1,1--1,1"}
 
 Edge
 =type=9:BOUNDTYPE
@@ -244,8 +244,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(3):
+{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"(self)"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -253,8 +253,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(1):
+{"name":"(self)"}
 
 Edge
 =type=6:MCLASS
@@ -266,16 +266,16 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(3):
+{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"(self)"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","name":"(self)","full_name":"foo::(self)","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"(self)","location":"\/dev\/null:1,1--1,1"}
 
 Edge
 =type=10:INTRODUCES
@@ -287,8 +287,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(3):
+{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"(self)"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -296,8 +296,8 @@ Edge
 7:MEntity
 9:MProperty
 10:MAttribute
-=properties=JsonObject(3):
-{"visibility":"public","name":"bar","full_name":"foo::(self)::bar"}
+=properties=JsonObject(2):
+{"visibility":"public","name":"bar"}
 
 Edge
 =type=14:INTRO_CLASSDEF
@@ -310,16 +310,16 @@ Edge
 7:MEntity
 9:MProperty
 10:MAttribute
-=properties=JsonObject(3):
-{"visibility":"public","name":"bar","full_name":"foo::(self)::bar"}
+=properties=JsonObject(2):
+{"visibility":"public","name":"bar"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(3):
+{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"(self)"}
 
 Edge
 =type=8:DECLARES
@@ -331,8 +331,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"(self)","full_name":"foo::(self)"}
+=properties=JsonObject(3):
+{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"(self)"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -340,7 +340,7 @@ Edge
 7:MEntity
 8:MPropDef
 13:MAttributeDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","name":"bar","is_intro":true,"full_name":"foo::(self)::bar"}
+=properties=JsonObject(3):
+{"location":"\/dev\/null:1,1--1,1","name":"bar","is_intro":true}