project rename, settings for standard UML notation

Author: nikitaeverywhere

cache/projectTemplate.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2015.2 (Build 540)" ts="2015-04-28 19:50:48">
-<Class name="UMLExplorer.ClassView">
+<Class name="ClassExplorer.ClassView">
 <Description>
-Cache UML Explorer vX.X.X/*build.replace:pkg.version*/
+Cache Class Explorer vX.X.X/*build.replace:pkg.version*/
 Class contains methods that return structured classes/packages data.</Description>
 <TimeChanged>63843,83200.096917</TimeChanged>
 <TimeCreated>63653,67019.989197</TimeCreated>
@@ -365,19 +365,19 @@ Returns structured package data</Description>
 </Class>
 
 
-<Project name="UMLExplorer" LastModified="2015-05-24 18:14:48.579613">
+<Project name="ClassExplorer" LastModified="2015-05-24 18:14:48.579613">
   <Items>
-    <ProjectItem name="UMLExplorer.ClassView" type="CLS"></ProjectItem>
-    <ProjectItem name="UMLExplorer.Router" type="CLS"></ProjectItem>
-    <ProjectItem name="UMLExplorer.StaticContent" type="CLS"></ProjectItem>
-    <ProjectItem name="UMLExplorer.WebAppInstaller" type="CLS"></ProjectItem>
+    <ProjectItem name="ClassExplorer.ClassView" type="CLS"></ProjectItem>
+    <ProjectItem name="ClassExplorer.Router" type="CLS"></ProjectItem>
+    <ProjectItem name="ClassExplorer.StaticContent" type="CLS"></ProjectItem>
+    <ProjectItem name="ClassExplorer.WebAppInstaller" type="CLS"></ProjectItem>
   </Items>
 </Project>
 
 
-<Class name="UMLExplorer.Router">
+<Class name="ClassExplorer.Router">
 <Description>
-REST interface for UMLExplorer</Description>
+REST interface for ClassExplorer</Description>
 <Super>%CSP.REST</Super>
 <TimeChanged>63697,73073.878177</TimeChanged>
 <TimeCreated>63648,30450.187229</TimeCreated>
@@ -387,8 +387,8 @@ REST interface for UMLExplorer</Description>
 <Routes>
    <Route Url="/" Method="GET" Call="Index"/>
    <Route Url="/index" Method="GET" Call="Index"/>
-   <Route Url="/css/CacheUMLExplorer.css" Method="GET" Call="GetCss"/>
-   <Route Url="/js/CacheUMLExplorer.js" Method="GET" Call="GetJs"/>
+   <Route Url="/css/CacheClassExplorer.css" Method="GET" Call="GetCss"/>
+   <Route Url="/js/CacheClassExplorer.js" Method="GET" Call="GetJs"/>
    <Route Url="/Test" Method="GET" Call="Test"/>
    <Route Url="/GetClassTree" Method="GET" Call="GetClassTree"/>
    <Route Url="/GetClassView" Method="GET" Call="GetClassView"/>
@@ -405,7 +405,7 @@ Method returns whole class tree visible in the current namespace.</Description>
 <ClassMethod>1</ClassMethod>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-    do ##class(UMLExplorer.ClassView).getClassTree(%request.Get("namespace")).%ToJSON(, "o")
+    do ##class(ClassExplorer.ClassView).getClassTree(%request.Get("namespace")).%ToJSON(, "o")
     return $$$OK
 ]]></Implementation>
 </Method>
@@ -442,7 +442,7 @@ Return the list of all namespaces</Description>
 <ClassMethod>1</ClassMethod>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-    do ##class(UMLExplorer.ClassView).getAllNamespacesList().%ToJSON(, "o")
+    do ##class(ClassExplorer.ClassView).getAllNamespacesList().%ToJSON(, "o")
     return $$$OK
 ]]></Implementation>
 </Method>
@@ -500,7 +500,7 @@ Method returns user application HTML.</Description>
 </Class>
 
 
-<Class name="UMLExplorer.StaticContent">
+<Class name="ClassExplorer.StaticContent">
 <Description>
 Cache UML Explorer vX.X.X/*build.replace:pkg.version*/ static content generator.
 Class contains methods that return JS/CSS/HTML data for single page application.</Description>
@@ -514,7 +514,7 @@ Write the contents of xData tag</Description>
 <FormalSpec>Const:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-    Set xdata = ##class(%Dictionary.CompiledXData).%OpenId("UMLExplorer.StaticContent||"_Const).Data
+    Set xdata = ##class(%Dictionary.CompiledXData).%OpenId("ClassExplorer.StaticContent||"_Const).Data
     set status=##class(%XML.TextReader).ParseStream(xdata, .textreader)
     while textreader.Read() { if (textreader.NodeType="chars") { w textreader.Value } }
     return $$$OK
@@ -547,7 +547,7 @@ Write the contents of xData tag</Description>
 </Class>
 
 
-<Class name="UMLExplorer.WebAppInstaller">
+<Class name="ClassExplorer.WebAppInstaller">
 <Super>%Projection.AbstractProjection</Super>
 <TimeChanged>63696,65168.289869</TimeChanged>
 <TimeCreated>63696,64041.85537</TimeCreated>
@@ -574,14 +574,14 @@ This method is invoked when a class is compiled.</Description>
     set cspProperties("NameSpace") = ns
     set cspProperties("Description") = "A WEB application for Cache UML Explorer."
     set cspProperties("IsNameSpaceDefault") = 1
-    set cspProperties("DispatchClass") = "UMLExplorer.Router"
-    if ('##class(Security.Applications).Exists("/UMLExplorer")) {
-        w !, "Creating WEB application ""/UMLExplorer""..."
-        set tSC = ##class(Security.Applications).Create("/UMLExplorer", .cspProperties)
+    set cspProperties("DispatchClass") = "ClassExplorer.Router"
+    if ('##class(Security.Applications).Exists("/ClassExplorer")) {
+        w !, "Creating WEB application ""/ClassExplorer""..."
+        set tSC = ##class(Security.Applications).Create("/ClassExplorer", .cspProperties)
         if $$$ISERR(tSC) throw ##class(%Installer.Exception).CreateFromStatus(tSC)
-        w !, "WEB application ""/UMLExplorer"" created."
+        w !, "WEB application ""/ClassExplorer"" created."
     } else {
-        w !, "WEB application ""/UMLExplorer"" already exists, so it is ready to use."
+        w !, "WEB application ""/ClassExplorer"" already exists, so it is ready to use."
     }
     zn:ns'="%SYS" ns
     quit $$$OK
@@ -597,10 +597,10 @@ This method is invoked when a class is 'uncompiled'.</Description>
 <Implementation><![CDATA[
     set ns = $NAMESPACE
     zn:ns'="%SYS" "%SYS"
-    if (##class(Security.Applications).Exists("/UMLExplorer")) {
-        w !, "Deleting WEB application ""/UMLExplorer""..."
-        do ##class(Security.Applications).Delete("/UMLExplorer")
-        w !, "WEB application ""/UMLExplorer"" was successfully removed."
+    if (##class(Security.Applications).Exists("/ClassExplorer")) {
+        w !, "Deleting WEB application ""/ClassExplorer""..."
+        do ##class(Security.Applications).Delete("/ClassExplorer")
+        w !, "WEB application ""/ClassExplorer"" was successfully removed."
     }
     zn:ns'="%SYS" ns
     QUIT $$$OK

gulpfile.js

@@ -23,7 +23,7 @@ var banner = [
     " ** @author <%= pkg.author %>",
     " ** @version <%= pkg.version %>",
     " ** @license <%= pkg.license %>",
-    " ** @see https://github.com/ZitRos/CacheUMLExplorer",
+    " ** @see https://github.com/ZitRos/CacheClassExplorer",
     " **/",
     ""
 ].join("\n");
@@ -58,17 +58,17 @@ gulp.task("gatherLibs", ["clean"], function () {
             "web/jsLib/joint.layout.DirectedGraph.min.js"
         ]))
         .pipe(stripComments({ safe: true }))
-        .pipe(concat("CacheUMLExplorer.js"))
+        .pipe(concat("CacheClassExplorer.js"))
         .pipe(replace(//g, "\\x0B"))
         .pipe(replace(/\x1b/g, "\\x1B"))
         .pipe(gulp.dest("build/web/js/"));
 });
 
 gulp.task("gatherScripts", ["clean", "gatherLibs"], function () {
     return gulp.src("web/js/*.js")
-        .pipe(concat("CacheUMLExplorer.js"))
+        .pipe(concat("CacheClassExplorer.js"))
         .pipe(specialReplace())
-        .pipe(wrap("CacheUMLExplorer = (function(){<%= contents %> return CacheUMLExplorer;}());"))
+        .pipe(wrap("CacheClassExplorer = (function(){<%= contents %> return CacheClassExplorer;}());"))
         .pipe(uglify({
             output: {
                 ascii_only: true,
@@ -78,15 +78,15 @@ gulp.task("gatherScripts", ["clean", "gatherLibs"], function () {
             preserveComments: "some"
         }))
         .pipe(header(banner, { pkg: pkg }))
-        .pipe(addsrc.prepend("build/web/js/CacheUMLExplorer.js"))
-        .pipe(concat("CacheUMLExplorer.js"))
+        .pipe(addsrc.prepend("build/web/js/CacheClassExplorer.js"))
+        .pipe(concat("CacheClassExplorer.js"))
         .pipe(replace(/\x1b/g, "\\x1B"))
         .pipe(gulp.dest("build/web/js/"));
 });
 
 gulp.task("gatherCSS", ["clean"], function () {
     return gulp.src("web/css/*.css")
-        .pipe(concat("CacheUMLExplorer.css"))
+        .pipe(concat("CacheClassExplorer.css"))
         .pipe(postcss([ autoprefixer({ browsers: ["last 3 version"] }) ]))
         .pipe(minifyCSS({ keepSpecialComments: 0 }))
         .pipe(gulp.dest("build/web/css/"));
@@ -95,8 +95,8 @@ gulp.task("gatherCSS", ["clean"], function () {
 gulp.task("addHTMLFile", ["clean"], function () {
     return gulp.src("web/index.html")
         .pipe(htmlReplace({
-            "css": "css/CacheUMLExplorer.css",
-            "js": "js/CacheUMLExplorer.js"
+            "css": "css/CacheClassExplorer.css",
+            "js": "js/CacheClassExplorer.js"
         }))
         .pipe(gulp.dest("build/web/"));
 });
@@ -118,23 +118,23 @@ gulp.task("exportCacheXML", [
         .pipe(specialReplace())
         .pipe(replace(
             /\{\{replace:css}}/,
-            function () { return fs.readFileSync("build/web/css/CacheUMLExplorer.css", "utf-8"); }
+            function () { return fs.readFileSync("build/web/css/CacheClassExplorer.css", "utf-8"); }
         ))
         .pipe(replace(
             /\{\{replace:js}}/,
-            function () { return fs.readFileSync("build/web/js/CacheUMLExplorer.js", "utf-8"); }
+            function () { return fs.readFileSync("build/web/js/CacheClassExplorer.js", "utf-8"); }
         ))
         .pipe(replace(
             /\{\{replace:html}}/,
             function () { return fs.readFileSync("build/web/index.html", "utf-8"); }
         ))
-        .pipe(rename(function (path) { path.basename = "CacheUMLExplorer-v" + pkg["version"]; }))
+        .pipe(rename(function (path) { path.basename = "CacheClassExplorer-v" + pkg["version"]; }))
         .pipe(gulp.dest("build/Cache"));
 });
 
 gulp.task("zipRelease", ["exportCacheXML"], function () {
     return gulp.src(["build/**/*", "!build/web/**/*"])
-        .pipe(zip("CacheUMLExplorer-v" + pkg["version"] + ".zip", {
+        .pipe(zip("CacheClassExplorer-v" + pkg["version"] + ".zip", {
             comment: "Cache UML explorer v" + pkg["version"] + " by Nikita Savchenko\n\n" +
             "+ Cache folder holds XML file to import to InterSystems Cache.\n\n" +
             "For further information about installation and information, check README.md file."

package.json

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

web/index.html

@@ -2,7 +2,7 @@
 <html>
 <head lang="en">
     <meta charset="UTF-8">
-    <title>Cache UML explorer</title>
+    <title>Cache Class Explorer</title>
     <!-- build:css -->
     <link rel="stylesheet" href="css/interface.css"/>
     <link rel="stylesheet" href="css/treeView.css"/>
@@ -22,15 +22,15 @@
     <script type="text/javascript" src="jsLib/ImageExporter.js"></script>
     <script type="text/javascript" src="js/ClassView.js"></script>
     <script type="text/javascript" src="js/Lib.js"></script>
-    <script type="text/javascript" src="js/CacheUMLExplorer.js"></script>
+    <script type="text/javascript" src="js/CacheClassExplorer.js"></script>
     <script type="text/javascript" src="js/ClassTree.js"></script>
     <script type="text/javascript" src="js/Source.js"></script>
     <script type="text/javascript" src="js/UI.js"></script>
     <script type="text/javascript" src="js/HoverMessage.js"></script>
     <!-- endbuild -->
     <link id="favicon" rel="shortcut icon" href="#"/>
 </head>
-<body onload="cue = new CacheUMLExplorer(document.getElementById('treeView'), document.getElementById('svgContainer'))">
+<body onload="cue = new CacheClassExplorer(document.getElementById('treeView'), document.getElementById('svgContainer'))">
     <div class="ui-body" id="ui-body">
         <div class="ui-sideBlock">
             <div class="ui-sideSearchBlock" id="searchBlock">
@@ -104,7 +104,12 @@ <h1>
                             <tr>
                                 <td><input id="setting.showClassIcons" type="checkbox"/></td>
                                 <td><label for="setting.showClassIcons">Show Icons Over Class Name</label></td>
-                                <td>Visualize class keywords</td>
+                                <td>Visualize class keywords (turn off for standard UML notation)</td>
+                            </tr>
+                            <tr>
+                                <td><input id="setting.showPropertyIcons" type="checkbox"/></td>
+                                <td><label for="setting.showPropertyIcons">Show Class Properties Icons</label></td>
+                                <td>Visualize property keywords (turn off for standard UML notation)</td>
                             </tr>
                             <tr>
                                 <td><input id="setting.showParameters" type="checkbox"/></td>

web/js/CacheUMLExplorer.js renamed to web/js/CacheClassExplorer.js

@@ -1,12 +1,12 @@
 /**
- * UML class diagram visualization tool for InterSystems products.
+ * Class diagram visualization tool for InterSystems products.
  * @author ZitRo
  * @see http://zitros.tk
  * @param {HTMLElement} treeViewContainer
  * @param {HTMLElement} classViewContainer
  * @constructor
  */
-var CacheUMLExplorer = function (treeViewContainer, classViewContainer) {
+var CacheClassExplorer = function (treeViewContainer, classViewContainer) {
 
     var id = function (e) { return document.getElementById(e); };
 
@@ -41,6 +41,7 @@ var CacheUMLExplorer = function (treeViewContainer, classViewContainer) {
         settings: {
             showDataTypesOnDiagram: id("setting.showDataTypesOnDiagram"),
             showClassIcons: id("setting.showClassIcons"),
+            showPropertyIcons: id("setting.showPropertyIcons"),
             showParameters: id("setting.showParameters"),
             showProperties: id("setting.showProperties"),
             showMethods: id("setting.showMethods"),
@@ -57,6 +58,7 @@ var CacheUMLExplorer = function (treeViewContainer, classViewContainer) {
     this.settings = {
         showDataTypesOnDiagram: settingsValue("showDataTypesOnDiagram"),
         showClassIcons: settingsValue("showClassIcons", true),
+        showPropertyIcons: settingsValue("showPropertyIcons", true),
         showParameters: settingsValue("showParameters", true),
         showProperties: settingsValue("showProperties", true),
         showMethods: settingsValue("showMethods", true),
@@ -74,12 +76,16 @@ var CacheUMLExplorer = function (treeViewContainer, classViewContainer) {
 
 };
 
-CacheUMLExplorer.prototype.initSettings = function () {
+CacheClassExplorer.prototype.initSettings = function () {
 
     var self = this,
         textChanged = "Please, re-render diagram to make changes apply.";
 
     for (var st in this.elements.settings) {
+        if (!this.elements.settings[st]) {
+            console.warn(st, "is Bred Sivoi Cobyly.");
+            continue;
+        }
         this.elements.settings[st].checked = this.settings[st];
         this.elements.settings[st].addEventListener("change", (function (st) {
             return function (e) {
@@ -98,7 +104,7 @@ CacheUMLExplorer.prototype.initSettings = function () {
  * Render namespaces.
  * @param nsData
  */
-CacheUMLExplorer.prototype.updateNamespaces = function (nsData) {
+CacheClassExplorer.prototype.updateNamespaces = function (nsData) {
 
     var ns, e;
 
@@ -118,7 +124,7 @@ CacheUMLExplorer.prototype.updateNamespaces = function (nsData) {
 /**
  * @param {string} namespace
  */
-CacheUMLExplorer.prototype.setNamespace = function (namespace) {
+CacheClassExplorer.prototype.setNamespace = function (namespace) {
 
     var self = this;
 
@@ -132,7 +138,7 @@ CacheUMLExplorer.prototype.setNamespace = function (namespace) {
 
 };
 
-CacheUMLExplorer.prototype.updateURL = function () {
+CacheClassExplorer.prototype.updateURL = function () {
 
     var obj = {
         name: this.classTree.SELECTED_NAME,
@@ -145,7 +151,7 @@ CacheUMLExplorer.prototype.updateURL = function () {
 
 };
 
-CacheUMLExplorer.prototype.restoreFromURL = function () {
+CacheClassExplorer.prototype.restoreFromURL = function () {
 
     var hash = (location.hash || "").substr(1),
         obj;
@@ -165,7 +171,7 @@ CacheUMLExplorer.prototype.restoreFromURL = function () {
 
 };
 
-CacheUMLExplorer.prototype.init = function () {
+CacheClassExplorer.prototype.init = function () {
 
     var self = this,
         restored;
@@ -184,7 +190,7 @@ CacheUMLExplorer.prototype.init = function () {
 
     this.elements.infoButton.addEventListener("click", function () {
         self.UI.displayMessage(
-            "Caché UML explorer v"
+            "Caché Class explorer v"
             + "[NOT-BUILT]"/*build.replace:"pkg.version"*/
             + "<br/>for InterSystems Cach&eacute;"
             + "<br/>By Nikita Savchenko"