Merge remote-tracking branch 'upstream/master'

intersystems-community · Sep 14, 2015 · d33e00a · d33e00a
2 parents 5a11c57 + 63fb6ce
commit d33e00a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ An UML Class explorer for InterSystems Caché.
 
 ## Screenshots
 
-![Demo](https://cloud.githubusercontent.com/assets/4989256/7972419/ec9ef408-0a54-11e5-96a1-8ef70e24a168.png)
+![Demo](https://cloud.githubusercontent.com/assets/4989256/9852547/890543f8-5b07-11e5-9dc3-a539e33b2058.png)
 
 ## Installation
 

diff --git a/cache/projectTemplate.xml b/cache/projectTemplate.xml
@@ -94,7 +94,6 @@ Return structured data about class.</Description>
     set package = $LISTTOSTRING($LIST($LISTFROMSTRING(classDefinition.Name, "."), 1, *-1),".")
     set oProperties = ##class(%ZEN.proxyObject).%New()
 
-    set oClass.super = ..correctInheritance(oData, classDefinition, package)
     set oClass.NAMESPACE = $NAMESPACE
     set oClass.SYSTEM = classDefinition.System
     set oClass.PROCEDUREBLOCK = classDefinition.ProcedureBlock
@@ -106,6 +105,7 @@ Return structured data about class.</Description>
     set oClass.isDataType = classDefinition.ClientDataTypeIsDefined()
 
     if (oData.restrictPackage) && ('..inPackage(oData.basePackageName, package)) quit oClass
+    set oClass.super = ..correctInheritance(oData, classDefinition, package)
 
     set oClass.properties = oProperties
     set count = classDefinition.Properties.Count()

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CacheUMLExplorer",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "An UML Class explorer for InterSystems Caché",
   "directories": {
     "test": "test"

diff --git a/web/jsLib/joint.shapes.uml.js b/web/jsLib/joint.shapes.uml.js
@@ -103,7 +103,7 @@ joint.shapes.uml.Class = joint.shapes.basic.Generic.extend({
         switch (CLASS_TYPE) {
             case "Persistent": headColor = "rgb(255,219,170)"; break; // light orange
             case "Serial": headColor = "rgb(252,255,149)"; break; // light yellow
-            case "Registered": headColor = "rgb(192,255,170)"; break; // light green
+            //case "Registered": headColor = "rgb(192,255,170)"; break; // light green
             case "DataType": headColor = "rgb(193,250,255)"; break; // light blue
             case "Stream": headColor = "rgb(246,188,255)"; break; // light magenta
             case "View": headColor = "rgb(255,188,188)"; break; // light red