composition visualizing

Author: nikitaeverywhere

cache/projectTemplate.xml

@@ -3,7 +3,7 @@
 <Class name="UMLExplorer.ClassView">
 <Description>
 Class contains methods that return structured class data.</Description>
-<TimeChanged>63670,70761.169478</TimeChanged>
+<TimeChanged>63670,72515.130814</TimeChanged>
 <TimeCreated>63653,67019.989197</TimeCreated>
 
 <Method name="getClassTree">
@@ -70,8 +70,8 @@ return structured data about class</Description>
         do oProp.%DispatchSetProperty("private", p.Private)
         do oProp.%DispatchSetProperty("readOnly", p.ReadOnly)
         do oProp.%DispatchSetProperty("type", p.Type)
-        do ..collectAggregation(oData, classDefinition.Name, p.Type)
-        do ..collectAggregation(oData, classDefinition.Name, basePack _ "." _ p.Type)
+        do ..collectAggregation(oData, classDefinition.Name, p.Type, p.Private)
+        do ..collectAggregation(oData, classDefinition.Name, basePack _ "." _ p.Type, p.Private)
     }
 
     set oMethods = ##class(%ZEN.proxyObject).%New()
@@ -143,15 +143,16 @@ return structured data about class</Description>
 
 <Method name="collectAggregation">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>oData:%ZEN.proxyObject,className:%String,type:%String</FormalSpec>
+<FormalSpec>oData:%ZEN.proxyObject,className:%String,type:%String,private:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
     set classDef = ##class(%Dictionary.ClassDefinition).%OpenId(type)
     if (classDef '= "") {
-        set oAgg = oData.aggregation.%DispatchGetProperty(className)
+        if (private) { set t = "composition" } else { set t = "aggregation" }
+        set oAgg = oData.%DispatchGetProperty(t).%DispatchGetProperty(className)
         if (oAgg = "") {
             set oAgg = ##class(%ZEN.proxyObject).%New()
-            do oData.aggregation.%DispatchSetProperty(className, oAgg)
+            do oData.%DispatchGetProperty(t).%DispatchSetProperty(className, oAgg)
         }
     } else { quit $$$OK }
 
@@ -198,6 +199,7 @@ return structured data about class</Description>
     set oData.classes = ##class(%ZEN.proxyObject).%New()
     set oData.inheritance = ##class(%ZEN.proxyObject).%New()
     set oData.aggregation = ##class(%ZEN.proxyObject).%New()
+    set oData.composition = ##class(%ZEN.proxyObject).%New()
 
     set classes = ##class(%ResultSet).%New("%Dictionary.ClassDefinition:Summary")
     do classes.Execute()
@@ -218,7 +220,7 @@ return structured data about class</Description>
 </Class>
 
 
-<Project name="UMLExplorer" LastModified="2015-04-28 19:17:47.344256">
+<Project name="UMLExplorer" LastModified="2015-04-28 19:55:49.450783">
   <Items>
     <ProjectItem name="UMLExplorer.ClassView" type="CLS"></ProjectItem>
     <ProjectItem name="UMLExplorer.Router" type="CLS"></ProjectItem>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CacheUMLExplorer",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "An UML Class explorer for InterSystems Caché",
   "directories": {
     "test": "test"

web/js/ClassView.js

@@ -138,7 +138,7 @@ ClassView.prototype.createClassInstance = function (name, classMetaData) {
 
 ClassView.prototype.render = function (data) {
 
-    var p, pp, className, classInstance,
+    var self = this, p, pp, className, classInstance,
         uml = joint.shapes.uml, relFrom, relTo,
         classes = {}, connector;
 
@@ -158,37 +158,29 @@ ClassView.prototype.render = function (data) {
 
     }
 
-    for (p in data["inheritance"]) {
-        relFrom = (classes[p] || {}).instance;
-        for (pp in data["inheritance"][p]) {
-            relTo = (classes[pp] || {}).instance;
-            if (relFrom && relTo) {
-                this.graph.addCell(connector = new uml.Generalization({
-                    source: { id: relFrom.id },
-                    target: { id: relTo.id },
-                    router: { name: "manhattan" },
-                    connector: { name: "rounded" }
-                }));
-                this.links.push(connector);
+    var link = function (type) {
+        var name = type === "inheritance" ? "Generalization" :
+                type === "aggregation" ? "Aggregation" : "Composition";
+        for (p in data[type]) {
+            relFrom = (classes[p] || {}).instance;
+            for (pp in data[type][p]) {
+                relTo = (classes[pp] || {}).instance;
+                if (relFrom && relTo) {
+                    self.graph.addCell(connector = new uml[name]({
+                        source: { id: type === "inheritance" ? relFrom.id : relTo.id },
+                        target: { id: type === "inheritance" ? relTo.id : relFrom.id },
+                        router: { name: "manhattan" },
+                        connector: { name: "rounded" }
+                    }));
+                    self.links.push(connector);
+                }
             }
         }
-    }
+    };
 
-    for (p in data["aggregation"]) {
-        relTo = (classes[p] || {}).instance;
-        for (pp in data["aggregation"][p]) {
-            relFrom = (classes[pp] || {}).instance;
-            if (relFrom && relTo) {
-                this.graph.addCell(connector = new uml.Aggregation({
-                    source: { id: relFrom.id },
-                    target: { id: relTo.id },
-                    router: { name: "manhattan" },
-                    connector: { name: "rounded" }
-                }));
-                this.links.push(connector);
-            }
-        }
-    }
+    link("inheritance");
+    link("composition");
+    link("aggregation");
 
     joint.layout.DirectedGraph.layout(this.graph, {
         setLinkVertices: false,

web/jsLib/joint.shapes.uml.js

@@ -190,7 +190,7 @@ joint.shapes.uml.Aggregation = joint.dia.Link.extend({
 joint.shapes.uml.Composition = joint.dia.Link.extend({
     defaults: {
         type: 'uml.Composition',
-        attrs: { '.marker-target': { d: 'M 40 10 L 20 20 L 0 10 L 20 0 z', fill: 'black' }}
+        attrs: { '.marker-target': { d: 'M 20 10 L 10 15 L 0 10 L 10 5 z', fill: 'black' }}
     }
 });