Cleanup

Author: nikitaeverywhere

cache/projectTemplate.xml

@@ -361,22 +361,6 @@ Returns if class with given name exists.</Description>
 ]]></Implementation>
 </Method>
 
-<Method name="getClassView">
-<Description>
-Returns structured class data</Description>
-<ClassMethod>1</ClassMethod>
-<FormalSpec>className:%String,namespace:%String,level:%Integer</FormalSpec>
-<ReturnType>%ZEN.proxyObject</ReturnType>
-<Implementation><![CDATA[
-    set baseNamespace = $namespace
-    zn:$GET(namespace)'="" namespace
-    set package = $LISTTOSTRING($LIST($LISTFROMSTRING(className, "."), 1, *-1), ".")
-    set oData = ..getBaseOData(package, baseNamespace, "CLASS:"_className)
-    do ..fillClassData(oData, className, level)
-    quit oData
-]]></Implementation>
-</Method>
-
 <Method name="getPackageView">
 <Description>
 Returns structured package data</Description>
@@ -459,7 +443,6 @@ REST interface for ClassExplorer</Description>
    <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"/>
    <Route Url="/GetAllNamespacesList" Method="GET" Call="GetAllNamespacesList"/>
    <Route Url="/GetPackageView" Method="GET" Call="GetPackageView"/>
    <Route Url="/GetArbitraryView" Method="GET" Call="GetArbitraryView"/>
@@ -481,19 +464,6 @@ Method returns whole class tree visible in the current namespace.</Description>
 ]]></Implementation>
 </Method>
 
-<Method name="GetClassView">
-<Description>
-Returns classTree by given class name</Description>
-<ClassMethod>1</ClassMethod>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-    set className = %request.Get("name")
-    set classData = ##class(ClassView).getClassView(className, %request.Get("namespace"), %request.Get("level"))
-    do classData.%ToJSON(, "o")
-    return $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="GetArbitraryView">
 <Description>
 Returns classTree by given class name</Description>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CacheClassExplorer",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "description": "Class Explorer for InterSystems Caché",
   "directories": {
     "test": "test"

web/js/CacheClassExplorer.js

@@ -187,7 +187,7 @@ CacheClassExplorer.prototype.restoreFromURL = function () {
     }
 
     if (obj.namespace) this.NAMESPACE = obj.namespace;
-    if (obj.type === "class") {
+    if (obj.type === "class") { // left for older Class Explorer versions support
         this.classView.loadClasses([obj.name], true);
     } else if (obj.type === "package") {
         this.classView.loadPackage(obj.name, true);

web/js/ClassTree.js

@@ -75,25 +75,6 @@ ClassTree.prototype.removeLoader = function () {
 
 };
 
-/**
- * @deprecated
- * @param element
- * @param className
- */
-ClassTree.prototype.classSelected = function (element, className) {
-
-    if (element !== this.SELECTED_ELEMENT) {
-        if (this.SELECTED_ELEMENT) this.SELECTED_ELEMENT.classList.remove("selected");
-        this.SELECTED_ELEMENT = element;
-    }
-
-    if (!element.classList.contains("selected")) {
-        element.classList.add("selected");
-        this.cacheClassExplorer.classView.loadClass(className);
-    }
-
-};
-
 ClassTree.prototype.packageSelected = function (element, packageName) {
 
     if (element !== this.SELECTED_ELEMENT) {
@@ -197,7 +178,6 @@ ClassTree.prototype.updateTree = function (treeObject, doNotChangeRoot) {
     function inPath (path, classList) {
         var inside = false,
             s = path + ".";
-        console.log(s);
         classList.forEach(function (e) {
             if (e.indexOf(s) === 0)
                 inside = true;
@@ -211,14 +191,15 @@ ClassTree.prototype.updateTree = function (treeObject, doNotChangeRoot) {
                 && sce === level && selectedClassElement[sce] === elementName ? ++sce : null,
             el1 = div(),
             el2, el3, el4, checkbox, span,
-            selectedNames = self.SELECTED_NAME ? self.SELECTED_NAME.split(",") : [];
+            selectedNames = self.SELECTED_NAME ? self.SELECTED_NAME.split(",") : [],
+            fullName = (path ? path + "." : path) + elementName;
 
         if (isPackage) {
             el1.className = "tv-package";
             (el2 = div()).className = "tv-package-name" + (
-                    sel || inPath((path ? path + "." : path) + elementName, self.selectedClassList)
-                        ? ""
-                        : " minimized");
+                sel || inPath(fullName, self.selectedClassList)
+                    ? ""
+                    : " minimized");
             el2.textContent = elementName;
             if (sel && sce === selectedClassElement.length) {
                 el2.className += " selected";
@@ -233,8 +214,7 @@ ClassTree.prototype.updateTree = function (treeObject, doNotChangeRoot) {
                 self.packageSelected(el2, (path ? path + "." : path) + elementName);
             });
         } else {
-            if (sel) self.SELECTED_ELEMENT = el1;
-            el1.className = "tv-class-name" + (sel ? " selected" : "");
+            el1.className = "tv-class-name";
             el1.CLASS_NAME = path + (path ? "." : "") + elementName;
             checkbox = document.createElement("input");
             checkbox.setAttribute("type", "checkbox");

web/js/ClassView.js

@@ -906,42 +906,6 @@ ClassView.prototype.restoreView = function (data) {
 
 };
 
-/**
- * @deprecated
- * @param className
- * @param restoring
- */
-ClassView.prototype.loadClass = function (className, restoring) {
-
-    var self = this;
-
-    this.cacheClassExplorer.classTree.SELECTED_NAME = className;
-    this.cacheClassExplorer.classTree.SELECTED_TYPE = "class";
-	if (!restoring)
-        this.cacheClassExplorer.classTree.SELECTED_LEVEL =
-            this.cacheClassExplorer.elements.settings["dependencyLevel"].value;
-    this.showLoader();
-    this.cacheClassExplorer.source.getClassView(
-        className,
-        this.cacheClassExplorer.classTree.SELECTED_LEVEL + "",
-        function (err, data) {
-            //console.log(data);
-            self.removeLoader();
-            if (err) {
-                self.showLoader("Unable to get " + self.cacheClassExplorer.classTree.SELECTED_NAME);
-                console.error.call(console, err);
-            } else {
-                self.render(data);
-            }
-        }
-    );
-
-    this.cacheClassExplorer.elements.className.textContent = className;
-    this.CURRENT_RENDER_NAME = "CLASS:" + className;
-    this.cacheClassExplorer.updateURL();
-
-};
-
 ClassView.prototype.loadPackage = function (packageName, restoring) {
 
     var self = this;

web/js/Source.js

@@ -50,23 +50,6 @@ Source.prototype.getMethod = function (className, methodName, callback) {
 
 };
 
-/**
- * Return class view.
- * @param {string} className
- * @param {string} level
- * @param {Source~dataCallback} callback
- */
-Source.prototype.getClassView = function (className, level, callback) { 
-    lib.load(
-        this.URL + "/GetClassView?name=" + encodeURIComponent(className)
-			+ "&level=" + encodeURIComponent(level)
-            + (this.cue.NAMESPACE ? "&namespace=" + encodeURIComponent(this.cue.NAMESPACE) : ""),
-        null,
-        callback
-    );
-
-};
-
 Source.prototype.saveView = function (packageName, data) {
 
     lib.load(